texinfo-commits
[Top][All Lists]
Advanced
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[no subject]

From: Patrice Dumas
Date: Sat, 18 Feb 2023 08:52:52 -0500 (EST) 
branch: master
commit 3e2a5097282d4260099126dcc418324e8139229e
Author: Patrice Dumas <pertusus@free.fr>
AuthorDate: Sat Feb 18 14:49:44 2023 +0100

    * tp/Texinfo/Convert/HTML.pm (_convert_printindex_command)
    (_prepare_index_entries), tp/Texinfo/Convert/IXIN.pm (output_ixin),
    tp/Texinfo/Convert/Plaintext.pm (process_printindex),
    tp/Texinfo/ParserNonXS.pm (_enter_index_entry),
    tp/Texinfo/Transformations.pm (_reassociate_to_node),
    tp/Texinfo/XS/parsetexi/indices.c (enter_index_entry),
    tp/t/automatic_nodes.t: rename 'entry_node' as 'element_node' and
    'entry_region' as 'element_region'.
---
 ChangeLog                                          |  11 +
 tp/Texinfo/Convert/HTML.pm                         |  18 +-
 tp/Texinfo/Convert/IXIN.pm                         |   2 +-
 tp/Texinfo/Convert/Plaintext.pm                    |   6 +-
 tp/Texinfo/ParserNonXS.pm                          |   4 +-
 tp/Texinfo/Transformations.pm                      |  10 +-
 tp/Texinfo/XS/parsetexi/indices.c                  |   4 +-
 tp/t/automatic_nodes.t                             |   2 +-
 .../results/converters_tests/at_commands_in_raw.pl |   4 +-
 tp/t/results/converters_tests/complex_nestings.pl  |  20 +-
 .../converters_tests/definition_commands.pl        | 312 ++++++------
 tp/t/results/converters_tests/form_feeds.pl        |   8 +-
 .../converters_tests/frenchspacing_and_code.pl     |  16 +-
 .../index_entry_in_preformatted.pl                 |  12 +-
 .../indices_in_begin_tables_lists.pl               | 116 ++---
 ...ces_in_begin_tables_lists_entries_after_item.pl | 116 ++---
 .../printindex_merged_indices_code_style.pl        |  20 +-
 .../references_to_top_no_top_output.pl             |   8 +-
 .../converters_tests/test_deftypefnnewline.pl      |  56 +--
 .../coverage/punctuation_in_line_commands.pl       |   4 +-
 .../coverage_braces/contain_plain_text_nestings.pl |   8 +-
 .../def/all_commands_delimiters_printindex.pl      | 188 +++----
 tp/t/results/def/all_commands_printindex.pl        | 108 ++---
 tp/t/results/def/omit_def_space.pl                 |   8 +-
 tp/t/results/def/ref_in_def.pl                     |   8 +-
 tp/t/results/def/space_in_def_for_index.pl         |   8 +-
 tp/t/results/float/cindex_in_caption.pl            |   4 +-
 tp/t/results/float/complex_float.pl                |  12 +-
 tp/t/results/float/float_copying.pl                |   8 +-
 .../char_latin1_latin1_in_refs.pl                  |  24 +-
 .../formats_encodings/char_latin1_utf8_in_refs.pl  |  24 +-
 .../char_latin2_latin2_in_refs.pl                  |   4 +-
 tp/t/results/formats_encodings/sample_utf8.pl      |  16 +-
 tp/t/results/heading/heading_in_copying.pl         |   2 +-
 .../deftypefnnewline_for_copying_after.pl          |   6 +-
 .../deftypefnnewline_for_copying_before.pl         |   6 +-
 tp/t/results/html_tests/float_copying.pl           |  16 +-
 .../results/html_tests/index_and_node_same_name.pl |   4 +-
 tp/t/results/indices/complex_recursive_synindex.pl |  24 +-
 tp/t/results/indices/def_syn_indices.pl            |  28 +-
 ...default_cp_index_and_one_letter_syncodeindex.pl |   8 +-
 tp/t/results/indices/double_index_entry.pl         |  12 +-
 tp/t/results/indices/double_seeentry_seealso.pl    |  16 +-
 tp/t/results/indices/double_syncodeindex.pl        |   8 +-
 tp/t/results/indices/empty_string_index_entry.pl   |  16 +-
 tp/t/results/indices/encoding_index_ascii.pl       | 220 ++++-----
 .../encoding_index_ascii_enable_encoding.pl        | 220 ++++-----
 tp/t/results/indices/encoding_index_latin1.pl      | 220 ++++-----
 .../encoding_index_latin1_enable_encoding.pl       | 220 ++++-----
 tp/t/results/indices/encoding_index_utf8.pl        | 220 ++++-----
 .../indices/encoding_index_utf8_enable_encoding.pl | 220 ++++-----
 tp/t/results/indices/explicit_sort_key.pl          |  16 +-
 tp/t/results/indices/ftable_vtable.pl              |  28 +-
 .../indices/ignored_sort_char_empty_entries.pl     |  16 +-
 tp/t/results/indices/image_lines_count.pl          | Bin 6817 -> 6821 bytes
 tp/t/results/indices/image_text_lines_count.pl     | Bin 7292 -> 7296 bytes
 tp/t/results/indices/index_and_node_same_name.pl   |   4 +-
 tp/t/results/indices/index_entries_before_nodes.pl |   8 +-
 tp/t/results/indices/index_entries_locations.pl    |  16 +-
 tp/t/results/indices/index_entry_before_node.pl    |   4 +-
 tp/t/results/indices/index_entry_in_footnote.pl    | Bin 8354 -> 8358 bytes
 .../index_entry_in_footnote_different_node_end.pl  |   8 +-
 .../indices/index_entry_in_footnote_sections.pl    |   4 +-
 .../index_entry_in_footnote_sections_separate.pl   |   4 +-
 .../indices/index_entry_in_footnote_separate.pl    |   8 +-
 tp/t/results/indices/index_nodes.pl                |  44 +-
 .../indices/index_nodes_no_split_no_use_nodes.pl   |  44 +-
 tp/t/results/indices/index_special_region.pl       |  24 +-
 .../index_special_region_no_insertcopying.pl       |  24 +-
 ...egion_no_insertcopying_no_titlepage_no_nodes.pl |  24 +-
 ...l_region_no_insertcopying_titlepage_no_nodes.pl |  24 +-
 ...copying_titlepage_no_nodes_footnotes_default.pl |  24 +-
 .../index_special_region_no_titlepage_no_nodes.pl  |  24 +-
 .../index_special_region_titlepage_no_nodes.pl     |  24 +-
 ..._region_titlepage_no_nodes_footnotes_default.pl |  24 +-
 tp/t/results/indices/index_split.pl                |  76 +--
 .../indices/index_split_split_chapter_no_nodes.pl  |  76 +--
 tp/t/results/indices/index_table.pl                | 540 ++++++++++-----------
 .../results/indices/index_table_chapter_no_node.pl | 540 ++++++++++-----------
 .../multiple_index_text_sortas_seeentry_seealso.pl |  12 +-
 tp/t/results/indices/nodes_before_top.pl           |  52 +-
 .../nodes_before_top_and_sections_chapter.pl       |  60 +--
 ...odes_before_top_and_sections_chapter_no_node.pl |  60 +--
 ...des_before_top_and_sections_unsplit_no_nodes.pl |  60 +--
 .../indices/nodes_before_top_split_chapter.pl      |  52 +-
 .../nodes_before_top_split_chapter_no_nodes.pl     |  52 +-
 .../indices/printindex_between_node_section.pl     |  24 +-
 .../indices/printindex_between_part_chapter.pl     |  24 +-
 .../indices/printindex_index_entry_in_copying.pl   |  10 +-
 ...rintindex_index_entry_in_copying_in_footnote.pl |   2 +-
 ...ndex_index_entry_in_copying_no_insertcopying.pl |  10 +-
 .../indices/printindex_with_space_before.pl        | Bin 8490 -> 8494 bytes
 .../indices/same_index_entry_merged_indices.pl     |   8 +-
 tp/t/results/indices/same_only_seealso_seeentry.pl |  24 +-
 tp/t/results/indices/same_seealso_seeentry.pl      |  28 +-
 tp/t/results/indices/seealso_duplicate.pl          |   8 +-
 tp/t/results/indices/seeentry.pl                   |  16 +-
 tp/t/results/indices/sorted_subentries.pl          |  72 +--
 tp/t/results/indices/split_chapter_index.pl        |  48 +-
 tp/t/results/indices/subentries.pl                 |  32 +-
 tp/t/results/indices/subentry_and_sortas.pl        |   8 +-
 tp/t/results/indices/subentry_and_sortas_spaces.pl |  16 +-
 tp/t/results/indices/syncode_index_print_both.pl   |   8 +-
 tp/t/results/indices/syncodeindex_to_plain.pl      |  12 +-
 tp/t/results/indices/transparent_sort_chars.pl     |  12 +-
 tp/t/results/indices/w_lines_count.pl              |   4 +-
 tp/t/results/info_tests/colon_in_index_entry.pl    |  16 +-
 .../info_tests/colons_in_index_entries_and_node.pl |  24 +-
 .../colons_in_index_entries_and_node_no_quoting.pl |  24 +-
 tp/t/results/info_tests/def_in_copying.pl          |  12 +-
 .../end_of_line_command_in_node_lines.pl           |   4 +-
 tp/t/results/info_tests/index_entry_at_end_node.pl |   4 +-
 .../multitable_anchor_and_index_entry.pl           |   8 +-
 .../info_tests/nested_multitable_anchor_index.pl   |   8 +-
 .../info_tests/one_node_counted_elements.pl        |   4 +-
 tp/t/results/info_tests/test_index.pl              |  68 +--
 tp/t/results/invalid_nestings/in_table.pl          |  20 +-
 .../itemize/inter_item_commands_in_enumerate.pl    |  28 +-
 .../itemize/inter_item_commands_in_itemize.pl      |  16 +-
 tp/t/results/languages/documentlanguage.pl         |   4 +-
 tp/t/results/languages/documentlanguage_option.pl  |   4 +-
 tp/t/results/languages/documentlanguage_unknown.pl |   4 +-
 .../results/languages/multiple_documentlanguage.pl |  10 +-
 tp/t/results/languages/multiple_in_preamble.pl     |  10 +-
 .../languages/multiple_in_preamble_before_node.pl  |   6 +-
 tp/t/results/languages/multiple_lang_chapters.pl   |  12 +-
 .../languages/multiple_lang_chapters_latex.pl      |  12 +-
 .../languages/multiple_lang_chapters_texi2html.pl  |  12 +-
 tp/t/results/languages/simple_documentlanguage.pl  |   4 +-
 tp/t/results/languages/unknown_region.pl           |   4 +-
 tp/t/results/latex_tests/indices.pl                |  44 +-
 .../latex_tests/indices_disable_encoding.pl        |  44 +-
 tp/t/results/layout/no_monolithic.pl               |   4 +-
 tp/t/results/layout/no_monolithic_only_toc_out.pl  |   4 +-
 tp/t/results/macro/backslash_in_arg.pl             |  16 +-
 tp/t/results/macro/macro_in_index_commands.pl      |  16 +-
 tp/t/results/menu/menu_in_deffn.pl                 |   4 +-
 .../misc_commands/comment_space_command_on_line.pl |   4 +-
 ...dex_entries_relate_to_item_no_transformation.pl |  12 +-
 .../index_entries_relate_to_item_transformation.pl |  12 +-
 tp/t/results/value/value_in_index_commands.pl      |  16 +-
 tp/t/results/xml_tests/commands_and_spaces.pl      |   4 +-
 tp/t/results/xtable/block_commands_in_table.pl     |  20 +-
 .../results/xtable/inter_item_commands_in_table.pl |  84 ++--
 144 files changed, 2795 insertions(+), 2784 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 22e71b45c9..26439c36c0 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -15,6 +15,17 @@
        * tp/Texinfo/Convert/LaTeX.pm (_convert): Do not treat @defline
        as "unhandled".
 
+2023-02-18  Patrice Dumas  <pertusus@free.fr>
+
+       * tp/Texinfo/Convert/HTML.pm (_convert_printindex_command)
+       (_prepare_index_entries), tp/Texinfo/Convert/IXIN.pm (output_ixin),
+       tp/Texinfo/Convert/Plaintext.pm (process_printindex),
+       tp/Texinfo/ParserNonXS.pm (_enter_index_entry),
+       tp/Texinfo/Transformations.pm (_reassociate_to_node),
+       tp/Texinfo/XS/parsetexi/indices.c (enter_index_entry),
+       tp/t/automatic_nodes.t: rename 'entry_node' as 'element_node' and
+       'entry_region' as 'element_region'.
+
 2023-02-18  Patrice Dumas  <pertusus@free.fr>
 
        * tp/Texinfo/Convert/HTML.pm (_convert_printindex_command)
diff --git a/tp/Texinfo/Convert/HTML.pm b/tp/Texinfo/Convert/HTML.pm
index ef8a363861..6a97012611 100644
--- a/tp/Texinfo/Convert/HTML.pm
+++ b/tp/Texinfo/Convert/HTML.pm
@@ -5560,11 +5560,11 @@ sub _convert_printindex_command($$$$)
       $entry_nr++;
       my $main_entry_element = $index_entry_ref->{'entry_element'};
       next if ($self->get_conf('NO_TOP_NODE_OUTPUT')
-               and defined($main_entry_element->{'extra'}->{'entry_node'})
-               and $main_entry_element->{'extra'}->{'entry_node'}->{'extra'}
-               and $main_entry_element->{'extra'}->{'entry_node'}
+               and defined($main_entry_element->{'extra'}->{'element_node'})
+               and $main_entry_element->{'extra'}->{'element_node'}->{'extra'}
+               and $main_entry_element->{'extra'}->{'element_node'}
                                                ->{'extra'}->{'normalized'}
-               and $main_entry_element->{'extra'}->{'entry_node'}
+               and $main_entry_element->{'extra'}->{'element_node'}
                                        ->{'extra'}->{'normalized'} eq 'Top');
 
       # to avoid double error messages, call 
convert_tree_new_formatting_context
@@ -5789,14 +5789,14 @@ sub _convert_printindex_command($$$$)
 
       my $associated_command;
       if ($self->get_conf('NODE_NAME_IN_INDEX')) {
-        $associated_command = $main_entry_element->{'extra'}->{'entry_node'};
+        $associated_command = $main_entry_element->{'extra'}->{'element_node'};
         if (!defined($associated_command)) {
           $associated_command
             = $self->command_node($target_element);
         }
         if (!defined($associated_command)
             # do not warn if the entry is in a special region, like titlepage
-            and not $main_entry_element->{'extra'}->{'entry_region'}
+            and not $main_entry_element->{'extra'}->{'element_region'}
             and $formatted_index_entries->{$index_entry_ref} == 1) {
           # NOTE _noticed_line_warn is not used as printindex should not
           # happen in multiple tree parsing that lead to ignore_notice being 
set,
@@ -5827,7 +5827,7 @@ sub _convert_printindex_command($$$$)
           if (defined($self->get_conf('NODE_NAME_IN_INDEX'))
               and not $self->get_conf('NODE_NAME_IN_INDEX')
               # do not warn if the entry is in a special region, like titlepage
-              and not $main_entry_element->{'extra'}->{'entry_region'}
+              and not $main_entry_element->{'extra'}->{'element_region'}
               and $formatted_index_entries->{$index_entry_ref} == 1) {
             # NOTE _noticed_line_warn is not used as printindex should not
             # happen in multiple tree parsing that lead to ignore_notice being 
set,
@@ -9275,8 +9275,8 @@ sub _prepare_index_entries($)
                  and ($main_entry_element->{'extra'}->{'seeentry'}
                       or $main_entry_element->{'extra'}->{'seealso'}));
         my $region = '';
-        $region = "$main_entry_element->{'extra'}->{'entry_region'}-"
-          if (defined($main_entry_element->{'extra'}->{'entry_region'}));
+        $region = "$main_entry_element->{'extra'}->{'element_region'}-"
+          if (defined($main_entry_element->{'extra'}->{'element_region'}));
         my $entry_reference_content_element
           = Texinfo::Common::index_content_element($main_entry_element, 1);
         my @contents = ($entry_reference_content_element);
diff --git a/tp/Texinfo/Convert/IXIN.pm b/tp/Texinfo/Convert/IXIN.pm
index ace0e67f06..1081791d9a 100644
--- a/tp/Texinfo/Convert/IXIN.pm
+++ b/tp/Texinfo/Convert/IXIN.pm
@@ -693,7 +693,7 @@ sub output_ixin($$)
       my $dts_in_code = $index_names->{$index_name}->{'in_code'};
       foreach my $dts_entry (@{$entries->{$index_name}}) {
         my $main_entry_element = $dts_entry->{'entry_element'};
-        my $node = $main_entry_element->{'extra'}->{'entry_node'};
+        my $node = $main_entry_element->{'extra'}->{'element_node'};
         my $associated_node_id;
         if (defined($node)) {
           $associated_node_id = $self->_associated_node_id(undef,
diff --git a/tp/Texinfo/Convert/Plaintext.pm b/tp/Texinfo/Convert/Plaintext.pm
index 896b100eb3..0884ab71d8 100644
--- a/tp/Texinfo/Convert/Plaintext.pm
+++ b/tp/Texinfo/Convert/Plaintext.pm
@@ -1350,7 +1350,7 @@ sub process_printindex($$;$)
       $line_nr = $self->{'index_entries_line_location'}
                                      ->{$main_entry_element}->{'lines'};
       # ignore index entries in special regions that haven't been seen
-    } elsif ($main_entry_element->{'extra'}->{'entry_region'}) {
+    } elsif ($main_entry_element->{'extra'}->{'element_region'}) {
       $ignored_entries{$entry} = 1;
       next;
     }
@@ -1364,8 +1364,8 @@ sub process_printindex($$;$)
                                     ->{$main_entry_element}->{'node'})) {
       $node = $self->{'index_entries_line_location'}
                                     ->{$main_entry_element}->{'node'};
-    } elsif (defined($main_entry_element->{'extra'}->{'entry_node'})) {
-      $node = $main_entry_element->{'extra'}->{'entry_node'};
+    } elsif (defined($main_entry_element->{'extra'}->{'element_node'})) {
+      $node = $main_entry_element->{'extra'}->{'element_node'};
     }
     $entry_nodes{$entry} = $node;
     if (!defined($node)) {
diff --git a/tp/Texinfo/ParserNonXS.pm b/tp/Texinfo/ParserNonXS.pm
index 40db180712..b3bb0ad9cf 100644
--- a/tp/Texinfo/ParserNonXS.pm
+++ b/tp/Texinfo/ParserNonXS.pm
@@ -3339,10 +3339,10 @@ sub _enter_index_entry($$$$)
     }
   }
   if (@{$self->{'nesting_context'}->{'regions_stack'}} > 0) {
-    $element->{'extra'}->{'entry_region'}
+    $element->{'extra'}->{'element_region'}
       = $self->{'nesting_context'}->{'regions_stack'}->[-1];
   } elsif ($self->{'current_node'}) {
-    $element->{'extra'}->{'entry_node'} = $self->{'current_node'};
+    $element->{'extra'}->{'element_node'} = $self->{'current_node'};
   } elsif (!$self->{'current_section'}) {
     # NOTE depending on the location, format and presence of @printindex,
     # an index entry out of node and sections may be correctly formatted (or
diff --git a/tp/Texinfo/Transformations.pm b/tp/Texinfo/Transformations.pm
index e74d611657..7094461f44 100644
--- a/tp/Texinfo/Transformations.pm
+++ b/tp/Texinfo/Transformations.pm
@@ -322,23 +322,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'}->{'entry_node'}
-             or $current->{'extra'}->{'entry_node'} ne $previous_node)) {
+        and (!$current->{'extra'}->{'element_node'}
+             or $current->{'extra'}->{'element_node'} ne $previous_node)) {
       print STDERR "Bug: index entry $current (".
         Texinfo::Convert::Texinfo::convert_to_texinfo(
            Texinfo::Common::index_content_element($current))
          .") 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'}->{'entry_node'}) {
+      if ($current->{'extra'}->{'element_node'}) {
         print STDERR "  current node: ".
          Texinfo::Convert::Texinfo::root_heading_command_to_texinfo(
-                            $current->{'extra'}->{'entry_node'})."\n";
+                            $current->{'extra'}->{'element_node'})."\n";
       } else {
         print STDERR "  current node not set\n";
       }
     }
-    $current->{'extra'}->{'entry_node'} = $new_node;
+    $current->{'extra'}->{'element_node'} = $new_node;
   }
   return ($current);
 }
diff --git a/tp/Texinfo/XS/parsetexi/indices.c 
b/tp/Texinfo/XS/parsetexi/indices.c
index 4df2e27fb5..a638ed2b91 100644
--- a/tp/Texinfo/XS/parsetexi/indices.c
+++ b/tp/Texinfo/XS/parsetexi/indices.c
@@ -302,10 +302,10 @@ enter_index_entry (enum command_id index_type_cmd,
   if (nesting_context.regions_stack.top > 0)
     {
       enum command_id region = top_command (&nesting_context.regions_stack);
-      add_extra_string_dup (element, "entry_region", command_name (region));
+      add_extra_string_dup (element, "element_region", command_name (region));
     }
   else if (current_node)
-    add_extra_element (element, "entry_node", current_node);
+    add_extra_element (element, "element_node", current_node);
 
   if (nesting_context.regions_stack.top == 0
       && !current_node && !current_section)
diff --git a/tp/t/automatic_nodes.t b/tp/t/automatic_nodes.t
index dffa0f738e..8faf924de4 100644
--- a/tp/t/automatic_nodes.t
+++ b/tp/t/automatic_nodes.t
@@ -204,7 +204,7 @@ is 
(Texinfo::Convert::Texinfo::convert_to_texinfo($labels->{'chap'}->{'extra'}->
 ', 'reassociated menu is correct');
 #print STDERR join('|', keys(%{$index_names->{'cp'}->{'index_entries'}}))."\n";
 is ($labels->{'chap'}, $index_names->{'cp'}->{'index_entries'}->[0]
-                                ->{'entry_element'}->{'extra'}->{'entry_node'},
+                                
->{'entry_element'}->{'extra'}->{'element_node'},
   'index entry reassociated');
 #print STDERR Texinfo::Convert::Texinfo::convert_to_texinfo($tree);
 
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 02e03b2c83..f8e9f68499 100644
--- a/tp/t/results/converters_tests/at_commands_in_raw.pl
+++ b/tp/t/results/converters_tests/at_commands_in_raw.pl
@@ -821,7 +821,7 @@ $result_trees{'at_commands_in_raw'} = {
               ],
               'cmdname' => 'findex',
               'extra' => {
-                'entry_node' => {},
+                'element_node' => {},
                 'index_entry' => {
                   'entry_element' => {},
                   'entry_number' => 1,
@@ -1115,7 +1115,7 @@ 
$result_trees{'at_commands_in_raw'}{'contents'}[4]{'contents'}[1]{'contents'}[0]
 
$result_trees{'at_commands_in_raw'}{'contents'}[4]{'contents'}[13]{'contents'}[0]{'extra'}{'label'}
 = 
$result_trees{'at_commands_in_raw'}{'contents'}[4]{'contents'}[1]{'contents'}[0]{'contents'}[3];
 
$result_trees{'at_commands_in_raw'}{'contents'}[4]{'contents'}[13]{'contents'}[0]{'extra'}{'node_argument'}{'node_content'}[0]
 = 
$result_trees{'at_commands_in_raw'}{'contents'}[4]{'contents'}[13]{'contents'}[0]{'args'}[0]{'contents'}[0];
 
$result_trees{'at_commands_in_raw'}{'contents'}[4]{'contents'}[15]{'contents'}[0]{'extra'}{'node_argument'}{'node_content'}[0]
 = 
$result_trees{'at_commands_in_raw'}{'contents'}[4]{'contents'}[15]{'contents'}[0]{'args'}[0]{'contents'}[0];
-$result_trees{'at_commands_in_raw'}{'contents'}[4]{'contents'}[15]{'contents'}[2]{'extra'}{'entry_node'}
 = $result_trees{'at_commands_in_raw'}{'contents'}[3];
+$result_trees{'at_commands_in_raw'}{'contents'}[4]{'contents'}[15]{'contents'}[2]{'extra'}{'element_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_element'}
 = 
$result_trees{'at_commands_in_raw'}{'contents'}[4]{'contents'}[15]{'contents'}[2];
 
$result_trees{'at_commands_in_raw'}{'contents'}[4]{'contents'}[22]{'extra'}{'type'}{'content'}[0]
 = 
$result_trees{'at_commands_in_raw'}{'contents'}[4]{'contents'}[22]{'args'}[0]{'contents'}[0];
 
diff --git a/tp/t/results/converters_tests/complex_nestings.pl 
b/tp/t/results/converters_tests/complex_nestings.pl
index 84c0d2725a..563fb8b569 100644
--- a/tp/t/results/converters_tests/complex_nestings.pl
+++ b/tp/t/results/converters_tests/complex_nestings.pl
@@ -302,7 +302,7 @@ $result_trees{'complex_nestings'} = {
                       'category' => {},
                       'name' => {}
                     },
-                    'entry_node' => {},
+                    'element_node' => {},
                     'index_entry' => {
                       'entry_element' => {},
                       'entry_number' => 1,
@@ -400,7 +400,7 @@ $result_trees{'complex_nestings'} = {
                       'category' => {},
                       'name' => {}
                     },
-                    'entry_node' => {},
+                    'element_node' => {},
                     'index_entry' => {
                       'entry_element' => {},
                       'entry_number' => 2,
@@ -538,7 +538,7 @@ $result_trees{'complex_nestings'} = {
                               'category' => {},
                               'name' => {}
                             },
-                            'entry_node' => {},
+                            'element_node' => {},
                             'index_entry' => {
                               'entry_element' => {},
                               'entry_number' => 3,
@@ -627,7 +627,7 @@ $result_trees{'complex_nestings'} = {
                                       'category' => {},
                                       'name' => {}
                                     },
-                                    'entry_node' => {},
+                                    'element_node' => {},
                                     'index_entry' => {
                                       'entry_element' => {},
                                       'entry_number' => 1,
@@ -727,7 +727,7 @@ $result_trees{'complex_nestings'} = {
                                       'category' => {},
                                       'name' => {}
                                     },
-                                    'entry_node' => {},
+                                    'element_node' => {},
                                     'index_entry' => {
                                       'entry_element' => {},
                                       'entry_number' => 2,
@@ -1168,27 +1168,27 @@ 
$result_trees{'complex_nestings'}{'contents'}[3]{'extra'}{'nodes_manuals'}[0]{'n
 
$result_trees{'complex_nestings'}{'contents'}[4]{'contents'}[1]{'contents'}[1]{'contents'}[0]{'extra'}{'def_index_element'}
 = 
$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'}{'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'}{'entry_node'}
 = $result_trees{'complex_nestings'}{'contents'}[3];
+$result_trees{'complex_nestings'}{'contents'}[4]{'contents'}[1]{'contents'}[1]{'contents'}[0]{'extra'}{'element_node'}
 = $result_trees{'complex_nestings'}{'contents'}[3];
 
$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'}[1]{'extra'}{'def_index_element'}
 = 
$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'}{'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'}{'entry_node'}
 = $result_trees{'complex_nestings'}{'contents'}[3];
+$result_trees{'complex_nestings'}{'contents'}[4]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'extra'}{'element_node'}
 = $result_trees{'complex_nestings'}{'contents'}[3];
 
$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'}[2]{'contents'}[0]{'contents'}[0]{'extra'}{'def_index_element'}
 = 
$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'}{'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'}{'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'}{'element_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_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'}[1]{'contents'}[0]{'contents'}[0]{'extra'}{'def_index_element'}
 = 
$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'}{'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'}{'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'}{'element_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_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'}[2]{'extra'}{'def_index_element'}
 = 
$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'}{'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'}{'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'}{'element_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_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'}[3]{'contents'}[1]{'extra'}{'command_as_argument'}
 = 
$result_trees{'complex_nestings'}{'contents'}[4]{'contents'}[1]{'contents'}[1]{'contents'}[2]{'contents'}[0]{'contents'}[1]{'contents'}[0]{'contents'}[3]{'contents'}[1]{'args'}[0]{'contents'}[0];
 
diff --git a/tp/t/results/converters_tests/definition_commands.pl 
b/tp/t/results/converters_tests/definition_commands.pl
index 5b2dff5b29..58f0c27728 100644
--- a/tp/t/results/converters_tests/definition_commands.pl
+++ b/tp/t/results/converters_tests/definition_commands.pl
@@ -232,7 +232,7 @@ $result_trees{'definition_commands'} = {
                   'category' => {},
                   'name' => {}
                 },
-                'entry_node' => {},
+                'element_node' => {},
                 'index_entry' => {
                   'entry_element' => {},
                   'entry_number' => 1,
@@ -452,7 +452,7 @@ $result_trees{'definition_commands'} = {
                   'category' => {},
                   'name' => {}
                 },
-                'entry_node' => {},
+                'element_node' => {},
                 'index_entry' => {
                   'entry_element' => {},
                   'entry_number' => 2,
@@ -702,7 +702,7 @@ $result_trees{'definition_commands'} = {
                   'category' => {},
                   'name' => {}
                 },
-                'entry_node' => {},
+                'element_node' => {},
                 'index_entry' => {
                   'entry_element' => {},
                   'entry_number' => 3,
@@ -978,7 +978,7 @@ $result_trees{'definition_commands'} = {
                   'category' => {},
                   'name' => {}
                 },
-                'entry_node' => {},
+                'element_node' => {},
                 'index_entry' => {
                   'entry_element' => {},
                   'entry_number' => 4,
@@ -1182,7 +1182,7 @@ $result_trees{'definition_commands'} = {
                   'category' => {},
                   'name' => {}
                 },
-                'entry_node' => {},
+                'element_node' => {},
                 'index_entry' => {
                   'entry_element' => {},
                   'entry_number' => 5,
@@ -1391,7 +1391,7 @@ $result_trees{'definition_commands'} = {
                   'category' => {},
                   'name' => {}
                 },
-                'entry_node' => {},
+                'element_node' => {},
                 'index_entry' => {
                   'entry_element' => {},
                   'entry_number' => 6,
@@ -1600,7 +1600,7 @@ $result_trees{'definition_commands'} = {
                   'category' => {},
                   'name' => {}
                 },
-                'entry_node' => {},
+                'element_node' => {},
                 'index_entry' => {
                   'entry_element' => {},
                   'entry_number' => 7,
@@ -1809,7 +1809,7 @@ $result_trees{'definition_commands'} = {
                   'category' => {},
                   'name' => {}
                 },
-                'entry_node' => {},
+                'element_node' => {},
                 'index_entry' => {
                   'entry_element' => {},
                   'entry_number' => 8,
@@ -2018,7 +2018,7 @@ $result_trees{'definition_commands'} = {
                   'category' => {},
                   'name' => {}
                 },
-                'entry_node' => {},
+                'element_node' => {},
                 'index_entry' => {
                   'entry_element' => {},
                   'entry_number' => 9,
@@ -2272,7 +2272,7 @@ $result_trees{'definition_commands'} = {
                   'category' => {},
                   'name' => {}
                 },
-                'entry_node' => {},
+                'element_node' => {},
                 'index_entry' => {
                   'entry_element' => {},
                   'entry_number' => 10,
@@ -2526,7 +2526,7 @@ $result_trees{'definition_commands'} = {
                   'category' => {},
                   'name' => {}
                 },
-                'entry_node' => {},
+                'element_node' => {},
                 'index_entry' => {
                   'entry_element' => {},
                   'entry_number' => 11,
@@ -2780,7 +2780,7 @@ $result_trees{'definition_commands'} = {
                   'category' => {},
                   'name' => {}
                 },
-                'entry_node' => {},
+                'element_node' => {},
                 'index_entry' => {
                   'entry_element' => {},
                   'entry_number' => 12,
@@ -3034,7 +3034,7 @@ $result_trees{'definition_commands'} = {
                   'category' => {},
                   'name' => {}
                 },
-                'entry_node' => {},
+                'element_node' => {},
                 'index_entry' => {
                   'entry_element' => {},
                   'entry_number' => 13,
@@ -3288,7 +3288,7 @@ $result_trees{'definition_commands'} = {
                   'category' => {},
                   'name' => {}
                 },
-                'entry_node' => {},
+                'element_node' => {},
                 'index_entry' => {
                   'entry_element' => {},
                   'entry_number' => 14,
@@ -3542,7 +3542,7 @@ $result_trees{'definition_commands'} = {
                   'category' => {},
                   'name' => {}
                 },
-                'entry_node' => {},
+                'element_node' => {},
                 'index_entry' => {
                   'entry_element' => {},
                   'entry_number' => 15,
@@ -3796,7 +3796,7 @@ $result_trees{'definition_commands'} = {
                   'category' => {},
                   'name' => {}
                 },
-                'entry_node' => {},
+                'element_node' => {},
                 'index_entry' => {
                   'entry_element' => {},
                   'entry_number' => 16,
@@ -4050,7 +4050,7 @@ $result_trees{'definition_commands'} = {
                   'category' => {},
                   'name' => {}
                 },
-                'entry_node' => {},
+                'element_node' => {},
                 'index_entry' => {
                   'entry_element' => {},
                   'entry_number' => 17,
@@ -4304,7 +4304,7 @@ $result_trees{'definition_commands'} = {
                   'category' => {},
                   'name' => {}
                 },
-                'entry_node' => {},
+                'element_node' => {},
                 'index_entry' => {
                   'entry_element' => {},
                   'entry_number' => 18,
@@ -4462,7 +4462,7 @@ $result_trees{'definition_commands'} = {
                   'category' => {},
                   'name' => {}
                 },
-                'entry_node' => {},
+                'element_node' => {},
                 'index_entry' => {
                   'entry_element' => {},
                   'entry_number' => 19,
@@ -4565,7 +4565,7 @@ $result_trees{'definition_commands'} = {
                   'category' => {},
                   'name' => {}
                 },
-                'entry_node' => {},
+                'element_node' => {},
                 'index_entry' => {
                   'entry_element' => {},
                   'entry_number' => 20,
@@ -4673,7 +4673,7 @@ $result_trees{'definition_commands'} = {
                   'category' => {},
                   'name' => {}
                 },
-                'entry_node' => {},
+                'element_node' => {},
                 'index_entry' => {
                   'entry_element' => {},
                   'entry_number' => 21,
@@ -4781,7 +4781,7 @@ $result_trees{'definition_commands'} = {
                   'category' => {},
                   'name' => {}
                 },
-                'entry_node' => {},
+                'element_node' => {},
                 'index_entry' => {
                   'entry_element' => {},
                   'entry_number' => 22,
@@ -4889,7 +4889,7 @@ $result_trees{'definition_commands'} = {
                   'category' => {},
                   'name' => {}
                 },
-                'entry_node' => {},
+                'element_node' => {},
                 'index_entry' => {
                   'entry_element' => {},
                   'entry_number' => 23,
@@ -4997,7 +4997,7 @@ $result_trees{'definition_commands'} = {
                   'category' => {},
                   'name' => {}
                 },
-                'entry_node' => {},
+                'element_node' => {},
                 'index_entry' => {
                   'entry_element' => {},
                   'entry_number' => 24,
@@ -5120,7 +5120,7 @@ $result_trees{'definition_commands'} = {
                   'category' => {},
                   'name' => {}
                 },
-                'entry_node' => {},
+                'element_node' => {},
                 'index_entry' => {
                   'entry_element' => {},
                   'entry_number' => 25,
@@ -5243,7 +5243,7 @@ $result_trees{'definition_commands'} = {
                   'category' => {},
                   'name' => {}
                 },
-                'entry_node' => {},
+                'element_node' => {},
                 'index_entry' => {
                   'entry_element' => {},
                   'entry_number' => 26,
@@ -5366,7 +5366,7 @@ $result_trees{'definition_commands'} = {
                   'category' => {},
                   'name' => {}
                 },
-                'entry_node' => {},
+                'element_node' => {},
                 'index_entry' => {
                   'entry_element' => {},
                   'entry_number' => 27,
@@ -5489,7 +5489,7 @@ $result_trees{'definition_commands'} = {
                   'category' => {},
                   'name' => {}
                 },
-                'entry_node' => {},
+                'element_node' => {},
                 'index_entry' => {
                   'entry_element' => {},
                   'entry_number' => 28,
@@ -5612,7 +5612,7 @@ $result_trees{'definition_commands'} = {
                   'category' => {},
                   'name' => {}
                 },
-                'entry_node' => {},
+                'element_node' => {},
                 'index_entry' => {
                   'entry_element' => {},
                   'entry_number' => 29,
@@ -5735,7 +5735,7 @@ $result_trees{'definition_commands'} = {
                   'category' => {},
                   'name' => {}
                 },
-                'entry_node' => {},
+                'element_node' => {},
                 'index_entry' => {
                   'entry_element' => {},
                   'entry_number' => 30,
@@ -5858,7 +5858,7 @@ $result_trees{'definition_commands'} = {
                   'category' => {},
                   'name' => {}
                 },
-                'entry_node' => {},
+                'element_node' => {},
                 'index_entry' => {
                   'entry_element' => {},
                   'entry_number' => 31,
@@ -5981,7 +5981,7 @@ $result_trees{'definition_commands'} = {
                   'category' => {},
                   'name' => {}
                 },
-                'entry_node' => {},
+                'element_node' => {},
                 'index_entry' => {
                   'entry_element' => {},
                   'entry_number' => 32,
@@ -6104,7 +6104,7 @@ $result_trees{'definition_commands'} = {
                   'category' => {},
                   'name' => {}
                 },
-                'entry_node' => {},
+                'element_node' => {},
                 'index_entry' => {
                   'entry_element' => {},
                   'entry_number' => 33,
@@ -6303,7 +6303,7 @@ $result_trees{'definition_commands'} = {
                   'category' => {},
                   'name' => {}
                 },
-                'entry_node' => {},
+                'element_node' => {},
                 'index_entry' => {
                   'entry_element' => {},
                   'entry_number' => 34,
@@ -6447,7 +6447,7 @@ $result_trees{'definition_commands'} = {
                   'category' => {},
                   'name' => {}
                 },
-                'entry_node' => {},
+                'element_node' => {},
                 'index_entry' => {
                   'entry_element' => {},
                   'entry_number' => 35,
@@ -6596,7 +6596,7 @@ $result_trees{'definition_commands'} = {
                   'category' => {},
                   'name' => {}
                 },
-                'entry_node' => {},
+                'element_node' => {},
                 'index_entry' => {
                   'entry_element' => {},
                   'entry_number' => 36,
@@ -6835,7 +6835,7 @@ $result_trees{'definition_commands'} = {
                   'category' => {},
                   'name' => {}
                 },
-                'entry_node' => {},
+                'element_node' => {},
                 'index_entry' => {
                   'entry_element' => {},
                   'entry_number' => 37,
@@ -6912,7 +6912,7 @@ $result_trees{'definition_commands'} = {
                   'category' => {},
                   'name' => {}
                 },
-                'entry_node' => {},
+                'element_node' => {},
                 'index_entry' => {
                   'entry_element' => {},
                   'entry_number' => 38,
@@ -8106,7 +8106,7 @@ $result_trees{'definition_commands'} = {
                   'category' => {},
                   'name' => {}
                 },
-                'entry_node' => {},
+                'element_node' => {},
                 'index_entry' => {
                   'entry_element' => {},
                   'entry_number' => 39,
@@ -8445,7 +8445,7 @@ $result_trees{'definition_commands'} = {
                   'category' => {},
                   'name' => {}
                 },
-                'entry_node' => {},
+                'element_node' => {},
                 'index_entry' => {
                   'entry_element' => {},
                   'entry_number' => 40,
@@ -8699,7 +8699,7 @@ $result_trees{'definition_commands'} = {
                   'name' => {},
                   'type' => {}
                 },
-                'entry_node' => {},
+                'element_node' => {},
                 'index_entry' => {
                   'entry_element' => {},
                   'entry_number' => 41,
@@ -9033,7 +9033,7 @@ $result_trees{'definition_commands'} = {
                   'name' => {},
                   'type' => {}
                 },
-                'entry_node' => {},
+                'element_node' => {},
                 'index_entry' => {
                   'entry_element' => {},
                   'entry_number' => 42,
@@ -9258,7 +9258,7 @@ $result_trees{'definition_commands'} = {
                   'class' => {},
                   'name' => {}
                 },
-                'entry_node' => {},
+                'element_node' => {},
                 'index_entry' => {
                   'entry_element' => {},
                   'entry_number' => 1,
@@ -9464,7 +9464,7 @@ $result_trees{'definition_commands'} = {
                   'name' => {},
                   'type' => {}
                 },
-                'entry_node' => {},
+                'element_node' => {},
                 'index_entry' => {
                   'entry_element' => {},
                   'entry_number' => 2,
@@ -9740,7 +9740,7 @@ $result_trees{'definition_commands'} = {
                       'name' => {},
                       'type' => {}
                     },
-                    'entry_node' => {},
+                    'element_node' => {},
                     'index_entry' => {
                       'entry_element' => {},
                       'entry_number' => 43,
@@ -10000,7 +10000,7 @@ $result_trees{'definition_commands'} = {
                   'category' => {},
                   'name' => {}
                 },
-                'entry_node' => {},
+                'element_node' => {},
                 'index_entry' => {
                   'entry_element' => {},
                   'entry_number' => 44,
@@ -10256,7 +10256,7 @@ $result_trees{'definition_commands'} = {
                   'category' => {},
                   'name' => {}
                 },
-                'entry_node' => {},
+                'element_node' => {},
                 'index_entry' => {
                   'entry_element' => {},
                   'entry_number' => 45,
@@ -10733,7 +10733,7 @@ $result_trees{'definition_commands'} = {
                   'category' => {},
                   'name' => {}
                 },
-                'entry_node' => {},
+                'element_node' => {},
                 'index_entry' => {
                   'entry_element' => {},
                   'entry_number' => 46,
@@ -11009,7 +11009,7 @@ $result_trees{'definition_commands'} = {
                   'name' => {},
                   'type' => {}
                 },
-                'entry_node' => {},
+                'element_node' => {},
                 'index_entry' => {
                   'entry_element' => {},
                   'entry_number' => 47,
@@ -11248,7 +11248,7 @@ $result_trees{'definition_commands'} = {
                   'name' => {},
                   'type' => {}
                 },
-                'entry_node' => {},
+                'element_node' => {},
                 'index_entry' => {
                   'entry_element' => {},
                   'entry_number' => 48,
@@ -11492,7 +11492,7 @@ $result_trees{'definition_commands'} = {
                   'name' => {},
                   'type' => {}
                 },
-                'entry_node' => {},
+                'element_node' => {},
                 'index_entry' => {
                   'entry_element' => {},
                   'entry_number' => 49,
@@ -11736,7 +11736,7 @@ $result_trees{'definition_commands'} = {
                   'name' => {},
                   'type' => {}
                 },
-                'entry_node' => {},
+                'element_node' => {},
                 'index_entry' => {
                   'entry_element' => {},
                   'entry_number' => 50,
@@ -11980,7 +11980,7 @@ $result_trees{'definition_commands'} = {
                   'name' => {},
                   'type' => {}
                 },
-                'entry_node' => {},
+                'element_node' => {},
                 'index_entry' => {
                   'entry_element' => {},
                   'entry_number' => 51,
@@ -12224,7 +12224,7 @@ $result_trees{'definition_commands'} = {
                   'name' => {},
                   'type' => {}
                 },
-                'entry_node' => {},
+                'element_node' => {},
                 'index_entry' => {
                   'entry_element' => {},
                   'entry_number' => 52,
@@ -12498,7 +12498,7 @@ $result_trees{'definition_commands'} = {
                   'name' => {},
                   'type' => {}
                 },
-                'entry_node' => {},
+                'element_node' => {},
                 'index_entry' => {
                   'entry_element' => {},
                   'entry_number' => 53,
@@ -12772,7 +12772,7 @@ $result_trees{'definition_commands'} = {
                   'name' => {},
                   'type' => {}
                 },
-                'entry_node' => {},
+                'element_node' => {},
                 'index_entry' => {
                   'entry_element' => {},
                   'entry_number' => 54,
@@ -13046,7 +13046,7 @@ $result_trees{'definition_commands'} = {
                   'name' => {},
                   'type' => {}
                 },
-                'entry_node' => {},
+                'element_node' => {},
                 'index_entry' => {
                   'entry_element' => {},
                   'entry_number' => 55,
@@ -13320,7 +13320,7 @@ $result_trees{'definition_commands'} = {
                   'name' => {},
                   'type' => {}
                 },
-                'entry_node' => {},
+                'element_node' => {},
                 'index_entry' => {
                   'entry_element' => {},
                   'entry_number' => 56,
@@ -13594,7 +13594,7 @@ $result_trees{'definition_commands'} = {
                   'name' => {},
                   'type' => {}
                 },
-                'entry_node' => {},
+                'element_node' => {},
                 'index_entry' => {
                   'entry_element' => {},
                   'entry_number' => 57,
@@ -13868,7 +13868,7 @@ $result_trees{'definition_commands'} = {
                   'name' => {},
                   'type' => {}
                 },
-                'entry_node' => {},
+                'element_node' => {},
                 'index_entry' => {
                   'entry_element' => {},
                   'entry_number' => 58,
@@ -14142,7 +14142,7 @@ $result_trees{'definition_commands'} = {
                   'name' => {},
                   'type' => {}
                 },
-                'entry_node' => {},
+                'element_node' => {},
                 'index_entry' => {
                   'entry_element' => {},
                   'entry_number' => 59,
@@ -14416,7 +14416,7 @@ $result_trees{'definition_commands'} = {
                   'name' => {},
                   'type' => {}
                 },
-                'entry_node' => {},
+                'element_node' => {},
                 'index_entry' => {
                   'entry_element' => {},
                   'entry_number' => 60,
@@ -14690,7 +14690,7 @@ $result_trees{'definition_commands'} = {
                   'name' => {},
                   'type' => {}
                 },
-                'entry_node' => {},
+                'element_node' => {},
                 'index_entry' => {
                   'entry_element' => {},
                   'entry_number' => 61,
@@ -14971,7 +14971,7 @@ $result_trees{'definition_commands'} = {
                   'name' => {},
                   'type' => {}
                 },
-                'entry_node' => {},
+                'element_node' => {},
                 'index_entry' => {
                   'entry_element' => {},
                   'entry_number' => 62,
@@ -15197,7 +15197,7 @@ $result_trees{'definition_commands'} = {
                   'name' => {},
                   'type' => {}
                 },
-                'entry_node' => {},
+                'element_node' => {},
                 'index_entry' => {
                   'entry_element' => {},
                   'entry_number' => 63,
@@ -15428,7 +15428,7 @@ $result_trees{'definition_commands'} = {
                   'name' => {},
                   'type' => {}
                 },
-                'entry_node' => {},
+                'element_node' => {},
                 'index_entry' => {
                   'entry_element' => {},
                   'entry_number' => 64,
@@ -15659,7 +15659,7 @@ $result_trees{'definition_commands'} = {
                   'name' => {},
                   'type' => {}
                 },
-                'entry_node' => {},
+                'element_node' => {},
                 'index_entry' => {
                   'entry_element' => {},
                   'entry_number' => 65,
@@ -15890,7 +15890,7 @@ $result_trees{'definition_commands'} = {
                   'name' => {},
                   'type' => {}
                 },
-                'entry_node' => {},
+                'element_node' => {},
                 'index_entry' => {
                   'entry_element' => {},
                   'entry_number' => 66,
@@ -16121,7 +16121,7 @@ $result_trees{'definition_commands'} = {
                   'name' => {},
                   'type' => {}
                 },
-                'entry_node' => {},
+                'element_node' => {},
                 'index_entry' => {
                   'entry_element' => {},
                   'entry_number' => 67,
@@ -16367,7 +16367,7 @@ $result_trees{'definition_commands'} = {
                   'name' => {},
                   'type' => {}
                 },
-                'entry_node' => {},
+                'element_node' => {},
                 'index_entry' => {
                   'entry_element' => {},
                   'entry_number' => 68,
@@ -16613,7 +16613,7 @@ $result_trees{'definition_commands'} = {
                   'name' => {},
                   'type' => {}
                 },
-                'entry_node' => {},
+                'element_node' => {},
                 'index_entry' => {
                   'entry_element' => {},
                   'entry_number' => 69,
@@ -16859,7 +16859,7 @@ $result_trees{'definition_commands'} = {
                   'name' => {},
                   'type' => {}
                 },
-                'entry_node' => {},
+                'element_node' => {},
                 'index_entry' => {
                   'entry_element' => {},
                   'entry_number' => 70,
@@ -17105,7 +17105,7 @@ $result_trees{'definition_commands'} = {
                   'name' => {},
                   'type' => {}
                 },
-                'entry_node' => {},
+                'element_node' => {},
                 'index_entry' => {
                   'entry_element' => {},
                   'entry_number' => 71,
@@ -17351,7 +17351,7 @@ $result_trees{'definition_commands'} = {
                   'name' => {},
                   'type' => {}
                 },
-                'entry_node' => {},
+                'element_node' => {},
                 'index_entry' => {
                   'entry_element' => {},
                   'entry_number' => 72,
@@ -17597,7 +17597,7 @@ $result_trees{'definition_commands'} = {
                   'name' => {},
                   'type' => {}
                 },
-                'entry_node' => {},
+                'element_node' => {},
                 'index_entry' => {
                   'entry_element' => {},
                   'entry_number' => 73,
@@ -17843,7 +17843,7 @@ $result_trees{'definition_commands'} = {
                   'name' => {},
                   'type' => {}
                 },
-                'entry_node' => {},
+                'element_node' => {},
                 'index_entry' => {
                   'entry_element' => {},
                   'entry_number' => 74,
@@ -18089,7 +18089,7 @@ $result_trees{'definition_commands'} = {
                   'name' => {},
                   'type' => {}
                 },
-                'entry_node' => {},
+                'element_node' => {},
                 'index_entry' => {
                   'entry_element' => {},
                   'entry_number' => 75,
@@ -18335,7 +18335,7 @@ $result_trees{'definition_commands'} = {
                   'name' => {},
                   'type' => {}
                 },
-                'entry_node' => {},
+                'element_node' => {},
                 'index_entry' => {
                   'entry_element' => {},
                   'entry_number' => 76,
@@ -18442,220 +18442,220 @@ 
$result_trees{'definition_commands'}{'contents'}[3]{'extra'}{'nodes_manuals'}[0]
 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[1]{'contents'}[0]{'extra'}{'def_index_element'}
 = 
$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'}{'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'}{'entry_node'}
 = $result_trees{'definition_commands'}{'contents'}[3];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[1]{'contents'}[0]{'extra'}{'element_node'}
 = $result_trees{'definition_commands'}{'contents'}[3];
 
$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'}[3]{'contents'}[0]{'extra'}{'def_index_element'}
 = 
$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'}{'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'}{'entry_node'}
 = $result_trees{'definition_commands'}{'contents'}[3];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[3]{'contents'}[0]{'extra'}{'element_node'}
 = $result_trees{'definition_commands'}{'contents'}[3];
 
$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'}[5]{'contents'}[0]{'extra'}{'def_index_element'}
 = 
$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'}{'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'}{'entry_node'}
 = $result_trees{'definition_commands'}{'contents'}[3];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[5]{'contents'}[0]{'extra'}{'element_node'}
 = $result_trees{'definition_commands'}{'contents'}[3];
 
$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'}[7]{'contents'}[0]{'extra'}{'def_index_element'}
 = 
$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'}{'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'}{'entry_node'}
 = $result_trees{'definition_commands'}{'contents'}[3];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[7]{'contents'}[0]{'extra'}{'element_node'}
 = $result_trees{'definition_commands'}{'contents'}[3];
 
$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'}[1]{'extra'}{'def_index_element'}
 = 
$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'}{'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'}{'entry_node'}
 = $result_trees{'definition_commands'}{'contents'}[3];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[7]{'contents'}[1]{'extra'}{'element_node'}
 = $result_trees{'definition_commands'}{'contents'}[3];
 
$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'}[2]{'extra'}{'def_index_element'}
 = 
$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'}{'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'}{'entry_node'}
 = $result_trees{'definition_commands'}{'contents'}[3];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[7]{'contents'}[2]{'extra'}{'element_node'}
 = $result_trees{'definition_commands'}{'contents'}[3];
 
$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'}[3]{'extra'}{'def_index_element'}
 = 
$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'}{'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'}{'entry_node'}
 = $result_trees{'definition_commands'}{'contents'}[3];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[7]{'contents'}[3]{'extra'}{'element_node'}
 = $result_trees{'definition_commands'}{'contents'}[3];
 
$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'}[4]{'extra'}{'def_index_element'}
 = 
$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'}{'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'}{'entry_node'}
 = $result_trees{'definition_commands'}{'contents'}[3];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[7]{'contents'}[4]{'extra'}{'element_node'}
 = $result_trees{'definition_commands'}{'contents'}[3];
 
$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'}[5]{'extra'}{'def_index_element'}
 = 
$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'}{'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'}{'entry_node'}
 = $result_trees{'definition_commands'}{'contents'}[3];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[7]{'contents'}[5]{'extra'}{'element_node'}
 = $result_trees{'definition_commands'}{'contents'}[3];
 
$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'}[6]{'extra'}{'def_index_element'}
 = 
$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'}{'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'}{'entry_node'}
 = $result_trees{'definition_commands'}{'contents'}[3];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[7]{'contents'}[6]{'extra'}{'element_node'}
 = $result_trees{'definition_commands'}{'contents'}[3];
 
$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'}[7]{'extra'}{'def_index_element'}
 = 
$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'}{'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'}{'entry_node'}
 = $result_trees{'definition_commands'}{'contents'}[3];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[7]{'contents'}[7]{'extra'}{'element_node'}
 = $result_trees{'definition_commands'}{'contents'}[3];
 
$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'}[8]{'extra'}{'def_index_element'}
 = 
$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'}{'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'}{'entry_node'}
 = $result_trees{'definition_commands'}{'contents'}[3];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[7]{'contents'}[8]{'extra'}{'element_node'}
 = $result_trees{'definition_commands'}{'contents'}[3];
 
$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'}[9]{'extra'}{'def_index_element'}
 = 
$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'}{'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'}{'entry_node'}
 = $result_trees{'definition_commands'}{'contents'}[3];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[7]{'contents'}[9]{'extra'}{'element_node'}
 = $result_trees{'definition_commands'}{'contents'}[3];
 
$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'}[10]{'extra'}{'def_index_element'}
 = 
$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'}{'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'}{'entry_node'}
 = $result_trees{'definition_commands'}{'contents'}[3];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[7]{'contents'}[10]{'extra'}{'element_node'}
 = $result_trees{'definition_commands'}{'contents'}[3];
 
$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'}[11]{'extra'}{'def_index_element'}
 = 
$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'}{'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'}{'entry_node'}
 = $result_trees{'definition_commands'}{'contents'}[3];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[7]{'contents'}[11]{'extra'}{'element_node'}
 = $result_trees{'definition_commands'}{'contents'}[3];
 
$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'}[12]{'extra'}{'def_index_element'}
 = 
$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'}{'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'}{'entry_node'}
 = $result_trees{'definition_commands'}{'contents'}[3];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[7]{'contents'}[12]{'extra'}{'element_node'}
 = $result_trees{'definition_commands'}{'contents'}[3];
 
$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'}[13]{'extra'}{'def_index_element'}
 = 
$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'}{'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'}{'entry_node'}
 = $result_trees{'definition_commands'}{'contents'}[3];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[7]{'contents'}[13]{'extra'}{'element_node'}
 = $result_trees{'definition_commands'}{'contents'}[3];
 
$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'}[14]{'extra'}{'def_index_element'}
 = 
$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'}{'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'}{'entry_node'}
 = $result_trees{'definition_commands'}{'contents'}[3];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[7]{'contents'}[14]{'extra'}{'element_node'}
 = $result_trees{'definition_commands'}{'contents'}[3];
 
$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'}[9]{'contents'}[0]{'extra'}{'def_index_element'}
 = 
$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'}{'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'}{'entry_node'}
 = $result_trees{'definition_commands'}{'contents'}[3];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[9]{'contents'}[0]{'extra'}{'element_node'}
 = $result_trees{'definition_commands'}{'contents'}[3];
 
$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'}[1]{'extra'}{'def_index_element'}
 = 
$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'}{'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'}{'entry_node'}
 = $result_trees{'definition_commands'}{'contents'}[3];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[9]{'contents'}[1]{'extra'}{'element_node'}
 = $result_trees{'definition_commands'}{'contents'}[3];
 
$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'}[2]{'extra'}{'def_index_element'}
 = 
$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'}{'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'}{'entry_node'}
 = $result_trees{'definition_commands'}{'contents'}[3];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[9]{'contents'}[2]{'extra'}{'element_node'}
 = $result_trees{'definition_commands'}{'contents'}[3];
 
$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'}[3]{'extra'}{'def_index_element'}
 = 
$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'}{'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'}{'entry_node'}
 = $result_trees{'definition_commands'}{'contents'}[3];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[9]{'contents'}[3]{'extra'}{'element_node'}
 = $result_trees{'definition_commands'}{'contents'}[3];
 
$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'}[4]{'extra'}{'def_index_element'}
 = 
$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'}{'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'}{'entry_node'}
 = $result_trees{'definition_commands'}{'contents'}[3];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[9]{'contents'}[4]{'extra'}{'element_node'}
 = $result_trees{'definition_commands'}{'contents'}[3];
 
$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'}[5]{'extra'}{'def_index_element'}
 = 
$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'}{'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'}{'entry_node'}
 = $result_trees{'definition_commands'}{'contents'}[3];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[9]{'contents'}[5]{'extra'}{'element_node'}
 = $result_trees{'definition_commands'}{'contents'}[3];
 
$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'}[6]{'extra'}{'def_index_element'}
 = 
$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'}{'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'}{'entry_node'}
 = $result_trees{'definition_commands'}{'contents'}[3];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[9]{'contents'}[6]{'extra'}{'element_node'}
 = $result_trees{'definition_commands'}{'contents'}[3];
 
$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'}[7]{'extra'}{'def_index_element'}
 = 
$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'}{'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'}{'entry_node'}
 = $result_trees{'definition_commands'}{'contents'}[3];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[9]{'contents'}[7]{'extra'}{'element_node'}
 = $result_trees{'definition_commands'}{'contents'}[3];
 
$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'}[8]{'extra'}{'def_index_element'}
 = 
$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'}{'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'}{'entry_node'}
 = $result_trees{'definition_commands'}{'contents'}[3];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[9]{'contents'}[8]{'extra'}{'element_node'}
 = $result_trees{'definition_commands'}{'contents'}[3];
 
$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'}[9]{'extra'}{'def_index_element'}
 = 
$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'}{'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'}{'entry_node'}
 = $result_trees{'definition_commands'}{'contents'}[3];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[9]{'contents'}[9]{'extra'}{'element_node'}
 = $result_trees{'definition_commands'}{'contents'}[3];
 
$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'}[10]{'extra'}{'def_index_element'}
 = 
$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'}{'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'}{'entry_node'}
 = $result_trees{'definition_commands'}{'contents'}[3];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[9]{'contents'}[10]{'extra'}{'element_node'}
 = $result_trees{'definition_commands'}{'contents'}[3];
 
$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'}[11]{'extra'}{'def_index_element'}
 = 
$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'}{'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'}{'entry_node'}
 = $result_trees{'definition_commands'}{'contents'}[3];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[9]{'contents'}[11]{'extra'}{'element_node'}
 = $result_trees{'definition_commands'}{'contents'}[3];
 
$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'}[12]{'extra'}{'def_index_element'}
 = 
$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'}{'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'}{'entry_node'}
 = $result_trees{'definition_commands'}{'contents'}[3];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[9]{'contents'}[12]{'extra'}{'element_node'}
 = $result_trees{'definition_commands'}{'contents'}[3];
 
$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'}[13]{'extra'}{'def_index_element'}
 = 
$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'}{'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'}{'entry_node'}
 = $result_trees{'definition_commands'}{'contents'}[3];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[9]{'contents'}[13]{'extra'}{'element_node'}
 = $result_trees{'definition_commands'}{'contents'}[3];
 
$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'}[14]{'extra'}{'def_index_element'}
 = 
$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'}{'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'}{'entry_node'}
 = $result_trees{'definition_commands'}{'contents'}[3];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[9]{'contents'}[14]{'extra'}{'element_node'}
 = $result_trees{'definition_commands'}{'contents'}[3];
 
$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'}[11]{'contents'}[0]{'extra'}{'def_index_element'}
 = 
$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'}{'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'}{'entry_node'}
 = $result_trees{'definition_commands'}{'contents'}[3];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[11]{'contents'}[0]{'extra'}{'element_node'}
 = $result_trees{'definition_commands'}{'contents'}[3];
 
$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'}[1]{'extra'}{'def_index_element'}
 = 
$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'}{'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'}{'entry_node'}
 = $result_trees{'definition_commands'}{'contents'}[3];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[11]{'contents'}[1]{'extra'}{'element_node'}
 = $result_trees{'definition_commands'}{'contents'}[3];
 
$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'}[2]{'extra'}{'def_index_element'}
 = 
$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'}{'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'}{'entry_node'}
 = $result_trees{'definition_commands'}{'contents'}[3];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[11]{'contents'}[2]{'extra'}{'element_node'}
 = $result_trees{'definition_commands'}{'contents'}[3];
 
$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'}[3]{'extra'}{'def_index_element'}
 = 
$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'}{'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'}{'entry_node'}
 = $result_trees{'definition_commands'}{'contents'}[3];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[11]{'contents'}[3]{'extra'}{'element_node'}
 = $result_trees{'definition_commands'}{'contents'}[3];
 
$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'}[4]{'extra'}{'def_index_element'}
 = 
$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'}{'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'}{'entry_node'}
 = $result_trees{'definition_commands'}{'contents'}[3];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[11]{'contents'}[4]{'extra'}{'element_node'}
 = $result_trees{'definition_commands'}{'contents'}[3];
 
$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'}[13]{'contents'}[0]{'extra'}{'def_index_element'}
 = 
$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'}{'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'}{'entry_node'}
 = $result_trees{'definition_commands'}{'contents'}[3];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[13]{'contents'}[0]{'extra'}{'element_node'}
 = $result_trees{'definition_commands'}{'contents'}[3];
 
$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'}[1]{'extra'}{'def_index_element'}
 = 
$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'}{'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'}{'entry_node'}
 = $result_trees{'definition_commands'}{'contents'}[3];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[13]{'contents'}[1]{'extra'}{'element_node'}
 = $result_trees{'definition_commands'}{'contents'}[3];
 
$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'}[15]{'contents'}[0]{'extra'}{'def_index_element'}
 = 
$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'}{'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'}{'entry_node'}
 = $result_trees{'definition_commands'}{'contents'}[3];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[15]{'contents'}[0]{'extra'}{'element_node'}
 = $result_trees{'definition_commands'}{'contents'}[3];
 
$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'}[17]{'contents'}[0]{'extra'}{'def_index_element'}
 = 
$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'}{'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'}{'entry_node'}
 = $result_trees{'definition_commands'}{'contents'}[3];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[17]{'contents'}[0]{'extra'}{'element_node'}
 = $result_trees{'definition_commands'}{'contents'}[3];
 
$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'}[22]{'contents'}[0]{'extra'}{'def_index_element'}
 = 
$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'}{'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'}{'entry_node'}
 = $result_trees{'definition_commands'}{'contents'}[3];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[22]{'contents'}[0]{'extra'}{'element_node'}
 = $result_trees{'definition_commands'}{'contents'}[3];
 
$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'}[24]{'contents'}[0]{'extra'}{'def_index_element'}{'contents'}[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'}{'def_index_element'}{'contents'}[2]
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[24]{'contents'}[0]{'args'}[0]{'contents'}[2];
@@ -18665,208 +18665,208 @@ 
$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'}{'entry_node'}
 = $result_trees{'definition_commands'}{'contents'}[3];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[24]{'contents'}[0]{'extra'}{'element_node'}
 = $result_trees{'definition_commands'}{'contents'}[3];
 
$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'}[26]{'contents'}[0]{'contents'}[0]{'extra'}{'def_index_element'}
 = 
$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'}{'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'}{'entry_node'}
 = $result_trees{'definition_commands'}{'contents'}[3];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[26]{'contents'}[0]{'contents'}[0]{'extra'}{'element_node'}
 = $result_trees{'definition_commands'}{'contents'}[3];
 
$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'}[28]{'contents'}[0]{'extra'}{'def_index_element'}
 = 
$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'}{'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'}{'entry_node'}
 = $result_trees{'definition_commands'}{'contents'}[3];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[28]{'contents'}[0]{'extra'}{'element_node'}
 = $result_trees{'definition_commands'}{'contents'}[3];
 
$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'}[30]{'contents'}[0]{'extra'}{'def_index_element'}
 = 
$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'}{'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'}{'entry_node'}
 = $result_trees{'definition_commands'}{'contents'}[3];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[30]{'contents'}[0]{'extra'}{'element_node'}
 = $result_trees{'definition_commands'}{'contents'}[3];
 
$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'}[32]{'contents'}[0]{'extra'}{'def_index_element'}
 = 
$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'}{'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'}{'entry_node'}
 = $result_trees{'definition_commands'}{'contents'}[3];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[32]{'contents'}[0]{'extra'}{'element_node'}
 = $result_trees{'definition_commands'}{'contents'}[3];
 
$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'}[34]{'contents'}[0]{'extra'}{'def_index_element'}
 = 
$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'}{'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'}{'entry_node'}
 = $result_trees{'definition_commands'}{'contents'}[3];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[34]{'contents'}[0]{'extra'}{'element_node'}
 = $result_trees{'definition_commands'}{'contents'}[3];
 
$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'}[1]{'extra'}{'def_index_element'}
 = 
$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'}{'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'}{'entry_node'}
 = $result_trees{'definition_commands'}{'contents'}[3];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[34]{'contents'}[1]{'extra'}{'element_node'}
 = $result_trees{'definition_commands'}{'contents'}[3];
 
$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'}[2]{'extra'}{'def_index_element'}
 = 
$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'}{'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'}{'entry_node'}
 = $result_trees{'definition_commands'}{'contents'}[3];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[34]{'contents'}[2]{'extra'}{'element_node'}
 = $result_trees{'definition_commands'}{'contents'}[3];
 
$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'}[3]{'extra'}{'def_index_element'}
 = 
$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'}{'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'}{'entry_node'}
 = $result_trees{'definition_commands'}{'contents'}[3];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[34]{'contents'}[3]{'extra'}{'element_node'}
 = $result_trees{'definition_commands'}{'contents'}[3];
 
$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'}[4]{'extra'}{'def_index_element'}
 = 
$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'}{'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'}{'entry_node'}
 = $result_trees{'definition_commands'}{'contents'}[3];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[34]{'contents'}[4]{'extra'}{'element_node'}
 = $result_trees{'definition_commands'}{'contents'}[3];
 
$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'}[5]{'extra'}{'def_index_element'}
 = 
$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'}{'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'}{'entry_node'}
 = $result_trees{'definition_commands'}{'contents'}[3];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[34]{'contents'}[5]{'extra'}{'element_node'}
 = $result_trees{'definition_commands'}{'contents'}[3];
 
$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'}[6]{'extra'}{'def_index_element'}
 = 
$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'}{'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'}{'entry_node'}
 = $result_trees{'definition_commands'}{'contents'}[3];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[34]{'contents'}[6]{'extra'}{'element_node'}
 = $result_trees{'definition_commands'}{'contents'}[3];
 
$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'}[7]{'extra'}{'def_index_element'}
 = 
$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'}{'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'}{'entry_node'}
 = $result_trees{'definition_commands'}{'contents'}[3];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[34]{'contents'}[7]{'extra'}{'element_node'}
 = $result_trees{'definition_commands'}{'contents'}[3];
 
$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'}[8]{'extra'}{'def_index_element'}
 = 
$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'}{'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'}{'entry_node'}
 = $result_trees{'definition_commands'}{'contents'}[3];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[34]{'contents'}[8]{'extra'}{'element_node'}
 = $result_trees{'definition_commands'}{'contents'}[3];
 
$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'}[9]{'extra'}{'def_index_element'}
 = 
$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'}{'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'}{'entry_node'}
 = $result_trees{'definition_commands'}{'contents'}[3];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[34]{'contents'}[9]{'extra'}{'element_node'}
 = $result_trees{'definition_commands'}{'contents'}[3];
 
$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'}[10]{'extra'}{'def_index_element'}
 = 
$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'}{'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'}{'entry_node'}
 = $result_trees{'definition_commands'}{'contents'}[3];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[34]{'contents'}[10]{'extra'}{'element_node'}
 = $result_trees{'definition_commands'}{'contents'}[3];
 
$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'}[11]{'extra'}{'def_index_element'}
 = 
$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'}{'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'}{'entry_node'}
 = $result_trees{'definition_commands'}{'contents'}[3];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[34]{'contents'}[11]{'extra'}{'element_node'}
 = $result_trees{'definition_commands'}{'contents'}[3];
 
$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'}[12]{'extra'}{'def_index_element'}
 = 
$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'}{'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'}{'entry_node'}
 = $result_trees{'definition_commands'}{'contents'}[3];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[34]{'contents'}[12]{'extra'}{'element_node'}
 = $result_trees{'definition_commands'}{'contents'}[3];
 
$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'}[13]{'extra'}{'def_index_element'}
 = 
$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'}{'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'}{'entry_node'}
 = $result_trees{'definition_commands'}{'contents'}[3];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[34]{'contents'}[13]{'extra'}{'element_node'}
 = $result_trees{'definition_commands'}{'contents'}[3];
 
$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'}[14]{'extra'}{'def_index_element'}
 = 
$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'}{'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'}{'entry_node'}
 = $result_trees{'definition_commands'}{'contents'}[3];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[34]{'contents'}[14]{'extra'}{'element_node'}
 = $result_trees{'definition_commands'}{'contents'}[3];
 
$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'}[36]{'contents'}[0]{'extra'}{'def_index_element'}
 = 
$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'}{'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'}{'entry_node'}
 = $result_trees{'definition_commands'}{'contents'}[3];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[36]{'contents'}[0]{'extra'}{'element_node'}
 = $result_trees{'definition_commands'}{'contents'}[3];
 
$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'}[1]{'extra'}{'def_index_element'}
 = 
$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'}{'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'}{'entry_node'}
 = $result_trees{'definition_commands'}{'contents'}[3];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[36]{'contents'}[1]{'extra'}{'element_node'}
 = $result_trees{'definition_commands'}{'contents'}[3];
 
$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'}[2]{'extra'}{'def_index_element'}
 = 
$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'}{'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'}{'entry_node'}
 = $result_trees{'definition_commands'}{'contents'}[3];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[36]{'contents'}[2]{'extra'}{'element_node'}
 = $result_trees{'definition_commands'}{'contents'}[3];
 
$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'}[3]{'extra'}{'def_index_element'}
 = 
$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'}{'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'}{'entry_node'}
 = $result_trees{'definition_commands'}{'contents'}[3];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[36]{'contents'}[3]{'extra'}{'element_node'}
 = $result_trees{'definition_commands'}{'contents'}[3];
 
$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'}[4]{'extra'}{'def_index_element'}
 = 
$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'}{'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'}{'entry_node'}
 = $result_trees{'definition_commands'}{'contents'}[3];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[36]{'contents'}[4]{'extra'}{'element_node'}
 = $result_trees{'definition_commands'}{'contents'}[3];
 
$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'}[5]{'extra'}{'def_index_element'}
 = 
$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'}{'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'}{'entry_node'}
 = $result_trees{'definition_commands'}{'contents'}[3];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[36]{'contents'}[5]{'extra'}{'element_node'}
 = $result_trees{'definition_commands'}{'contents'}[3];
 
$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'}[6]{'extra'}{'def_index_element'}
 = 
$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'}{'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'}{'entry_node'}
 = $result_trees{'definition_commands'}{'contents'}[3];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[36]{'contents'}[6]{'extra'}{'element_node'}
 = $result_trees{'definition_commands'}{'contents'}[3];
 
$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'}[7]{'extra'}{'def_index_element'}
 = 
$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'}{'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'}{'entry_node'}
 = $result_trees{'definition_commands'}{'contents'}[3];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[36]{'contents'}[7]{'extra'}{'element_node'}
 = $result_trees{'definition_commands'}{'contents'}[3];
 
$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'}[8]{'extra'}{'def_index_element'}
 = 
$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'}{'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'}{'entry_node'}
 = $result_trees{'definition_commands'}{'contents'}[3];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[36]{'contents'}[8]{'extra'}{'element_node'}
 = $result_trees{'definition_commands'}{'contents'}[3];
 
$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'}[9]{'extra'}{'def_index_element'}
 = 
$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'}{'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'}{'entry_node'}
 = $result_trees{'definition_commands'}{'contents'}[3];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[36]{'contents'}[9]{'extra'}{'element_node'}
 = $result_trees{'definition_commands'}{'contents'}[3];
 
$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'}[10]{'extra'}{'def_index_element'}
 = 
$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'}{'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'}{'entry_node'}
 = $result_trees{'definition_commands'}{'contents'}[3];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[36]{'contents'}[10]{'extra'}{'element_node'}
 = $result_trees{'definition_commands'}{'contents'}[3];
 
$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'}[11]{'extra'}{'def_index_element'}
 = 
$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'}{'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'}{'entry_node'}
 = $result_trees{'definition_commands'}{'contents'}[3];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[36]{'contents'}[11]{'extra'}{'element_node'}
 = $result_trees{'definition_commands'}{'contents'}[3];
 
$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'}[12]{'extra'}{'def_index_element'}
 = 
$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'}{'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'}{'entry_node'}
 = $result_trees{'definition_commands'}{'contents'}[3];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[36]{'contents'}[12]{'extra'}{'element_node'}
 = $result_trees{'definition_commands'}{'contents'}[3];
 
$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'}[13]{'extra'}{'def_index_element'}
 = 
$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'}{'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'}{'entry_node'}
 = $result_trees{'definition_commands'}{'contents'}[3];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[36]{'contents'}[13]{'extra'}{'element_node'}
 = $result_trees{'definition_commands'}{'contents'}[3];
 
$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'}[14]{'extra'}{'def_index_element'}
 = 
$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'}{'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'}{'entry_node'}
 = $result_trees{'definition_commands'}{'contents'}[3];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[36]{'contents'}[14]{'extra'}{'element_node'}
 = $result_trees{'definition_commands'}{'contents'}[3];
 
$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_texis{'definition_commands'} = '@node Top
diff --git a/tp/t/results/converters_tests/form_feeds.pl 
b/tp/t/results/converters_tests/form_feeds.pl
index 1174533217..9213ea0326 100644
--- a/tp/t/results/converters_tests/form_feeds.pl
+++ b/tp/t/results/converters_tests/form_feeds.pl
@@ -621,7 +621,7 @@ $result_trees{'form_feeds'} = {
                   'category' => {},
                   'name' => {}
                 },
-                'entry_node' => {},
+                'element_node' => {},
                 'index_entry' => {
                   'entry_element' => {},
                   'entry_number' => 1,
@@ -807,7 +807,7 @@ $result_trees{'form_feeds'} = {
                   'category' => {},
                   'name' => {}
                 },
-                'entry_node' => {},
+                'element_node' => {},
                 'index_entry' => {
                   'entry_element' => {},
                   'entry_number' => 2,
@@ -1276,12 +1276,12 @@ 
$result_trees{'form_feeds'}{'contents'}[2]{'contents'}[18]{'contents'}[0]{'extra
 
$result_trees{'form_feeds'}{'contents'}[2]{'contents'}[27]{'contents'}[0]{'extra'}{'def_index_element'}
 = 
$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'}{'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'}{'entry_node'}
 = $result_trees{'form_feeds'}{'contents'}[2];
+$result_trees{'form_feeds'}{'contents'}[2]{'contents'}[27]{'contents'}[0]{'extra'}{'element_node'}
 = $result_trees{'form_feeds'}{'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'}[1]{'extra'}{'def_index_element'}
 = 
$result_trees{'form_feeds'}{'contents'}[2]{'contents'}[27]{'contents'}[1]{'args'}[0]{'contents'}[2];
 
$result_trees{'form_feeds'}{'contents'}[2]{'contents'}[27]{'contents'}[1]{'extra'}{'def_parsed_hash'}{'category'}
 = 
$result_trees{'form_feeds'}{'contents'}[2]{'contents'}[27]{'contents'}[1]{'args'}[0]{'contents'}[0];
 
$result_trees{'form_feeds'}{'contents'}[2]{'contents'}[27]{'contents'}[1]{'extra'}{'def_parsed_hash'}{'name'}
 = 
$result_trees{'form_feeds'}{'contents'}[2]{'contents'}[27]{'contents'}[1]{'args'}[0]{'contents'}[2];
-$result_trees{'form_feeds'}{'contents'}[2]{'contents'}[27]{'contents'}[1]{'extra'}{'entry_node'}
 = $result_trees{'form_feeds'}{'contents'}[2];
+$result_trees{'form_feeds'}{'contents'}[2]{'contents'}[27]{'contents'}[1]{'extra'}{'element_node'}
 = $result_trees{'form_feeds'}{'contents'}[2];
 
$result_trees{'form_feeds'}{'contents'}[2]{'contents'}[27]{'contents'}[1]{'extra'}{'index_entry'}{'entry_element'}
 = $result_trees{'form_feeds'}{'contents'}[2]{'contents'}[27]{'contents'}[1];
 
$result_trees{'form_feeds'}{'contents'}[2]{'contents'}[29]{'contents'}[1]{'extra'}{'float'}
 = $result_trees{'form_feeds'}{'contents'}[2]{'contents'}[29];
 
$result_trees{'form_feeds'}{'contents'}[2]{'contents'}[29]{'contents'}[4]{'extra'}{'float'}
 = $result_trees{'form_feeds'}{'contents'}[2]{'contents'}[29];
diff --git a/tp/t/results/converters_tests/frenchspacing_and_code.pl 
b/tp/t/results/converters_tests/frenchspacing_and_code.pl
index 2fb3a66895..84695c4b21 100644
--- a/tp/t/results/converters_tests/frenchspacing_and_code.pl
+++ b/tp/t/results/converters_tests/frenchspacing_and_code.pl
@@ -540,7 +540,7 @@ $result_trees{'frenchspacing_and_code'} = {
                   'name' => {},
                   'type' => {}
                 },
-                'entry_node' => {},
+                'element_node' => {},
                 'index_entry' => {
                   'entry_element' => {},
                   'entry_number' => 1,
@@ -819,7 +819,7 @@ $result_trees{'frenchspacing_and_code'} = {
                   'class' => {},
                   'name' => {}
                 },
-                'entry_node' => {},
+                'element_node' => {},
                 'index_entry' => {
                   'entry_element' => {},
                   'entry_number' => 2,
@@ -1349,7 +1349,7 @@ $result_trees{'frenchspacing_and_code'} = {
                   'name' => {},
                   'type' => {}
                 },
-                'entry_node' => {},
+                'element_node' => {},
                 'index_entry' => {
                   'entry_element' => {},
                   'entry_number' => 3,
@@ -1628,7 +1628,7 @@ $result_trees{'frenchspacing_and_code'} = {
                   'class' => {},
                   'name' => {}
                 },
-                'entry_node' => {},
+                'element_node' => {},
                 'index_entry' => {
                   'entry_element' => {},
                   'entry_number' => 4,
@@ -1730,7 +1730,7 @@ 
$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'}{'entry_node'}
 = $result_trees{'frenchspacing_and_code'}{'contents'}[3];
+$result_trees{'frenchspacing_and_code'}{'contents'}[4]{'contents'}[7]{'contents'}[0]{'extra'}{'element_node'}
 = $result_trees{'frenchspacing_and_code'}{'contents'}[3];
 
$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'}[9]{'contents'}[0]{'extra'}{'def_index_element'}{'contents'}[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'}{'def_index_element'}{'contents'}[2]
 = 
$result_trees{'frenchspacing_and_code'}{'contents'}[4]{'contents'}[9]{'contents'}[0]{'args'}[0]{'contents'}[2];
@@ -1739,7 +1739,7 @@ 
$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'}{'entry_node'}
 = $result_trees{'frenchspacing_and_code'}{'contents'}[3];
+$result_trees{'frenchspacing_and_code'}{'contents'}[4]{'contents'}[9]{'contents'}[0]{'extra'}{'element_node'}
 = $result_trees{'frenchspacing_and_code'}{'contents'}[3];
 
$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'}[5]{'extra'}{'node_content'}[0]
 = 
$result_trees{'frenchspacing_and_code'}{'contents'}[5]{'args'}[0]{'contents'}[0];
 
$result_trees{'frenchspacing_and_code'}{'contents'}[5]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = 
$result_trees{'frenchspacing_and_code'}{'contents'}[5]{'args'}[0]{'contents'}[0];
@@ -1751,7 +1751,7 @@ 
$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'}{'entry_node'}
 = $result_trees{'frenchspacing_and_code'}{'contents'}[5];
+$result_trees{'frenchspacing_and_code'}{'contents'}[6]{'contents'}[7]{'contents'}[0]{'extra'}{'element_node'}
 = $result_trees{'frenchspacing_and_code'}{'contents'}[5];
 
$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'}[9]{'contents'}[0]{'extra'}{'def_index_element'}{'contents'}[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'}{'def_index_element'}{'contents'}[2]
 = 
$result_trees{'frenchspacing_and_code'}{'contents'}[6]{'contents'}[9]{'contents'}[0]{'args'}[0]{'contents'}[2];
@@ -1760,7 +1760,7 @@ 
$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'}{'entry_node'}
 = $result_trees{'frenchspacing_and_code'}{'contents'}[5];
+$result_trees{'frenchspacing_and_code'}{'contents'}[6]{'contents'}[9]{'contents'}[0]{'extra'}{'element_node'}
 = $result_trees{'frenchspacing_and_code'}{'contents'}[5];
 
$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_texis{'frenchspacing_and_code'} = '
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 e850f86828..91bcee3fb4 100644
--- a/tp/t/results/converters_tests/index_entry_in_preformatted.pl
+++ b/tp/t/results/converters_tests/index_entry_in_preformatted.pl
@@ -192,7 +192,7 @@ $result_trees{'index_entry_in_preformatted'} = {
                   ],
                   'cmdname' => 'cindex',
                   'extra' => {
-                    'entry_node' => {},
+                    'element_node' => {},
                     'index_entry' => {
                       'entry_element' => {},
                       'entry_number' => 1,
@@ -255,7 +255,7 @@ $result_trees{'index_entry_in_preformatted'} = {
                   ],
                   'cmdname' => 'cindex',
                   'extra' => {
-                    'entry_node' => {},
+                    'element_node' => {},
                     'index_entry' => {
                       'entry_element' => {},
                       'entry_number' => 2,
@@ -298,7 +298,7 @@ $result_trees{'index_entry_in_preformatted'} = {
                   ],
                   'cmdname' => 'cindex',
                   'extra' => {
-                    'entry_node' => {},
+                    'element_node' => {},
                     'index_entry' => {
                       'entry_element' => {},
                       'entry_number' => 3,
@@ -380,11 +380,11 @@ 
$result_trees{'index_entry_in_preformatted'}{'contents'}[1]{'extra'}{'node_conte
 
$result_trees{'index_entry_in_preformatted'}{'contents'}[1]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = 
$result_trees{'index_entry_in_preformatted'}{'contents'}[1]{'args'}[0]{'contents'}[0];
 
$result_trees{'index_entry_in_preformatted'}{'contents'}[3]{'extra'}{'node_content'}[0]
 = 
$result_trees{'index_entry_in_preformatted'}{'contents'}[3]{'args'}[0]{'contents'}[0];
 
$result_trees{'index_entry_in_preformatted'}{'contents'}[3]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = 
$result_trees{'index_entry_in_preformatted'}{'contents'}[3]{'args'}[0]{'contents'}[0];
-$result_trees{'index_entry_in_preformatted'}{'contents'}[4]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'extra'}{'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'}{'element_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_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'}[3]{'extra'}{'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'}{'element_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_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'}[5]{'extra'}{'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'}{'element_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_element'}
 = 
$result_trees{'index_entry_in_preformatted'}{'contents'}[4]{'contents'}[1]{'contents'}[0]{'contents'}[5];
 
 $result_texis{'index_entry_in_preformatted'} = '@node Top
diff --git a/tp/t/results/converters_tests/indices_in_begin_tables_lists.pl 
b/tp/t/results/converters_tests/indices_in_begin_tables_lists.pl
index 2c0b940c41..fee5cb8592 100644
--- a/tp/t/results/converters_tests/indices_in_begin_tables_lists.pl
+++ b/tp/t/results/converters_tests/indices_in_begin_tables_lists.pl
@@ -240,7 +240,7 @@ $result_trees{'indices_in_begin_tables_lists'} = {
                   ],
                   'cmdname' => 'cindex',
                   'extra' => {
-                    'entry_node' => {},
+                    'element_node' => {},
                     'index_entry' => {
                       'entry_element' => {},
                       'entry_number' => 1,
@@ -387,7 +387,7 @@ $result_trees{'indices_in_begin_tables_lists'} = {
                   ],
                   'cmdname' => 'cindex',
                   'extra' => {
-                    'entry_node' => {},
+                    'element_node' => {},
                     'index_entry' => {
                       'entry_element' => {},
                       'entry_number' => 2,
@@ -468,7 +468,7 @@ $result_trees{'indices_in_begin_tables_lists'} = {
                   ],
                   'cmdname' => 'cindex',
                   'extra' => {
-                    'entry_node' => {},
+                    'element_node' => {},
                     'index_entry' => {
                       'entry_element' => {},
                       'entry_number' => 3,
@@ -622,7 +622,7 @@ $result_trees{'indices_in_begin_tables_lists'} = {
                       ],
                       'cmdname' => 'cindex',
                       'extra' => {
-                        'entry_node' => {},
+                        'element_node' => {},
                         'index_entry' => {
                           'entry_element' => {},
                           'entry_number' => 4,
@@ -874,7 +874,7 @@ $result_trees{'indices_in_begin_tables_lists'} = {
                   ],
                   'cmdname' => 'cindex',
                   'extra' => {
-                    'entry_node' => {},
+                    'element_node' => {},
                     'index_entry' => {
                       'entry_element' => {},
                       'entry_number' => 5,
@@ -1015,7 +1015,7 @@ $result_trees{'indices_in_begin_tables_lists'} = {
                   ],
                   'cmdname' => 'cindex',
                   'extra' => {
-                    'entry_node' => {},
+                    'element_node' => {},
                     'index_entry' => {
                       'entry_element' => {},
                       'entry_number' => 6,
@@ -1146,7 +1146,7 @@ $result_trees{'indices_in_begin_tables_lists'} = {
                   ],
                   'cmdname' => 'cindex',
                   'extra' => {
-                    'entry_node' => {},
+                    'element_node' => {},
                     'index_entry' => {
                       'entry_element' => {},
                       'entry_number' => 7,
@@ -1288,7 +1288,7 @@ $result_trees{'indices_in_begin_tables_lists'} = {
                       ],
                       'cmdname' => 'cindex',
                       'extra' => {
-                        'entry_node' => {},
+                        'element_node' => {},
                         'index_entry' => {
                           'entry_element' => {},
                           'entry_number' => 8,
@@ -1422,7 +1422,7 @@ $result_trees{'indices_in_begin_tables_lists'} = {
                   ],
                   'cmdname' => 'cindex',
                   'extra' => {
-                    'entry_node' => {},
+                    'element_node' => {},
                     'index_entry' => {
                       'entry_element' => {},
                       'entry_number' => 9,
@@ -1477,7 +1477,7 @@ $result_trees{'indices_in_begin_tables_lists'} = {
                   ],
                   'cmdname' => 'cindex',
                   'extra' => {
-                    'entry_node' => {},
+                    'element_node' => {},
                     'index_entry' => {
                       'entry_element' => {},
                       'entry_number' => 10,
@@ -1516,7 +1516,7 @@ $result_trees{'indices_in_begin_tables_lists'} = {
                   ],
                   'cmdname' => 'cindex',
                   'extra' => {
-                    'entry_node' => {},
+                    'element_node' => {},
                     'index_entry' => {
                       'entry_element' => {},
                       'entry_number' => 11,
@@ -1676,7 +1676,7 @@ $result_trees{'indices_in_begin_tables_lists'} = {
                       ],
                       'cmdname' => 'item',
                       'extra' => {
-                        'entry_node' => {},
+                        'element_node' => {},
                         'index_entry' => {
                           'entry_element' => {},
                           'entry_number' => 1,
@@ -1815,7 +1815,7 @@ $result_trees{'indices_in_begin_tables_lists'} = {
                       ],
                       'cmdname' => 'item',
                       'extra' => {
-                        'entry_node' => {},
+                        'element_node' => {},
                         'index_entry' => {
                           'entry_element' => {},
                           'entry_number' => 2,
@@ -1874,7 +1874,7 @@ $result_trees{'indices_in_begin_tables_lists'} = {
                       ],
                       'cmdname' => 'itemx',
                       'extra' => {
-                        'entry_node' => {},
+                        'element_node' => {},
                         'index_entry' => {
                           'entry_element' => {},
                           'entry_number' => 3,
@@ -2013,7 +2013,7 @@ $result_trees{'indices_in_begin_tables_lists'} = {
                       ],
                       'cmdname' => 'item',
                       'extra' => {
-                        'entry_node' => {},
+                        'element_node' => {},
                         'index_entry' => {
                           'entry_element' => {},
                           'entry_number' => 1,
@@ -2053,7 +2053,7 @@ $result_trees{'indices_in_begin_tables_lists'} = {
                           ],
                           'cmdname' => 'cindex',
                           'extra' => {
-                            'entry_node' => {},
+                            'element_node' => {},
                             'index_entry' => {
                               'entry_element' => {},
                               'entry_number' => 12,
@@ -2127,7 +2127,7 @@ $result_trees{'indices_in_begin_tables_lists'} = {
                       ],
                       'cmdname' => 'itemx',
                       'extra' => {
-                        'entry_node' => {},
+                        'element_node' => {},
                         'index_entry' => {
                           'entry_element' => {},
                           'entry_number' => 2,
@@ -2189,7 +2189,7 @@ $result_trees{'indices_in_begin_tables_lists'} = {
                       ],
                       'cmdname' => 'item',
                       'extra' => {
-                        'entry_node' => {},
+                        'element_node' => {},
                         'index_entry' => {
                           'entry_element' => {},
                           'entry_number' => 3,
@@ -2258,7 +2258,7 @@ $result_trees{'indices_in_begin_tables_lists'} = {
                       ],
                       'cmdname' => 'itemx',
                       'extra' => {
-                        'entry_node' => {},
+                        'element_node' => {},
                         'index_entry' => {
                           'entry_element' => {},
                           'entry_number' => 4,
@@ -2409,7 +2409,7 @@ $result_trees{'indices_in_begin_tables_lists'} = {
                       ],
                       'cmdname' => 'cindex',
                       'extra' => {
-                        'entry_node' => {},
+                        'element_node' => {},
                         'index_entry' => {
                           'entry_element' => {},
                           'entry_number' => 13,
@@ -2592,7 +2592,7 @@ $result_trees{'indices_in_begin_tables_lists'} = {
                   ],
                   'cmdname' => 'cindex',
                   'extra' => {
-                    'entry_node' => {},
+                    'element_node' => {},
                     'index_entry' => {
                       'entry_element' => {},
                       'entry_number' => 14,
@@ -2763,7 +2763,7 @@ $result_trees{'indices_in_begin_tables_lists'} = {
                       ],
                       'cmdname' => 'cindex',
                       'extra' => {
-                        'entry_node' => {},
+                        'element_node' => {},
                         'index_entry' => {
                           'entry_element' => {},
                           'entry_number' => 15,
@@ -2946,7 +2946,7 @@ $result_trees{'indices_in_begin_tables_lists'} = {
                   ],
                   'cmdname' => 'cindex',
                   'extra' => {
-                    'entry_node' => {},
+                    'element_node' => {},
                     'index_entry' => {
                       'entry_element' => {},
                       'entry_number' => 16,
@@ -3120,7 +3120,7 @@ $result_trees{'indices_in_begin_tables_lists'} = {
                   ],
                   'cmdname' => 'cindex',
                   'extra' => {
-                    'entry_node' => {},
+                    'element_node' => {},
                     'index_entry' => {
                       'entry_element' => {},
                       'entry_number' => 17,
@@ -3285,7 +3285,7 @@ $result_trees{'indices_in_begin_tables_lists'} = {
                   ],
                   'cmdname' => 'cindex',
                   'extra' => {
-                    'entry_node' => {},
+                    'element_node' => {},
                     'index_entry' => {
                       'entry_element' => {},
                       'entry_number' => 18,
@@ -3462,7 +3462,7 @@ $result_trees{'indices_in_begin_tables_lists'} = {
                       ],
                       'cmdname' => 'cindex',
                       'extra' => {
-                        'entry_node' => {},
+                        'element_node' => {},
                         'index_entry' => {
                           'entry_element' => {},
                           'entry_number' => 19,
@@ -3617,7 +3617,7 @@ $result_trees{'indices_in_begin_tables_lists'} = {
                       ],
                       'cmdname' => 'cindex',
                       'extra' => {
-                        'entry_node' => {},
+                        'element_node' => {},
                         'index_entry' => {
                           'entry_element' => {},
                           'entry_number' => 20,
@@ -3672,7 +3672,7 @@ $result_trees{'indices_in_begin_tables_lists'} = {
                       ],
                       'cmdname' => 'cindex',
                       'extra' => {
-                        'entry_node' => {},
+                        'element_node' => {},
                         'index_entry' => {
                           'entry_element' => {},
                           'entry_number' => 21,
@@ -3711,7 +3711,7 @@ $result_trees{'indices_in_begin_tables_lists'} = {
                       ],
                       'cmdname' => 'cindex',
                       'extra' => {
-                        'entry_node' => {},
+                        'element_node' => {},
                         'index_entry' => {
                           'entry_element' => {},
                           'entry_number' => 22,
@@ -4046,76 +4046,76 @@ 
$result_trees{'indices_in_begin_tables_lists'}{'contents'}[1]{'extra'}{'node_con
 
$result_trees{'indices_in_begin_tables_lists'}{'contents'}[1]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = 
$result_trees{'indices_in_begin_tables_lists'}{'contents'}[1]{'args'}[0]{'contents'}[0];
 
$result_trees{'indices_in_begin_tables_lists'}{'contents'}[3]{'extra'}{'node_content'}[0]
 = 
$result_trees{'indices_in_begin_tables_lists'}{'contents'}[3]{'args'}[0]{'contents'}[0];
 
$result_trees{'indices_in_begin_tables_lists'}{'contents'}[3]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = 
$result_trees{'indices_in_begin_tables_lists'}{'contents'}[3]{'args'}[0]{'contents'}[0];
-$result_trees{'indices_in_begin_tables_lists'}{'contents'}[4]{'contents'}[1]{'contents'}[0]{'contents'}[1]{'extra'}{'entry_node'}
 = $result_trees{'indices_in_begin_tables_lists'}{'contents'}[3];
+$result_trees{'indices_in_begin_tables_lists'}{'contents'}[4]{'contents'}[1]{'contents'}[0]{'contents'}[1]{'extra'}{'element_node'}
 = $result_trees{'indices_in_begin_tables_lists'}{'contents'}[3];
 
$result_trees{'indices_in_begin_tables_lists'}{'contents'}[4]{'contents'}[1]{'contents'}[0]{'contents'}[1]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'indices_in_begin_tables_lists'}{'contents'}[4]{'contents'}[1]{'contents'}[0]{'contents'}[1];
 
$result_trees{'indices_in_begin_tables_lists'}{'contents'}[4]{'contents'}[1]{'extra'}{'command_as_argument'}
 = 
$result_trees{'indices_in_begin_tables_lists'}{'contents'}[4]{'contents'}[1]{'args'}[0]{'contents'}[0];
-$result_trees{'indices_in_begin_tables_lists'}{'contents'}[4]{'contents'}[3]{'contents'}[0]{'contents'}[0]{'extra'}{'entry_node'}
 = $result_trees{'indices_in_begin_tables_lists'}{'contents'}[3];
+$result_trees{'indices_in_begin_tables_lists'}{'contents'}[4]{'contents'}[3]{'contents'}[0]{'contents'}[0]{'extra'}{'element_node'}
 = $result_trees{'indices_in_begin_tables_lists'}{'contents'}[3];
 
$result_trees{'indices_in_begin_tables_lists'}{'contents'}[4]{'contents'}[3]{'contents'}[0]{'contents'}[0]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'indices_in_begin_tables_lists'}{'contents'}[4]{'contents'}[3]{'contents'}[0]{'contents'}[0];
-$result_trees{'indices_in_begin_tables_lists'}{'contents'}[4]{'contents'}[3]{'contents'}[2]{'contents'}[1]{'extra'}{'entry_node'}
 = $result_trees{'indices_in_begin_tables_lists'}{'contents'}[3];
+$result_trees{'indices_in_begin_tables_lists'}{'contents'}[4]{'contents'}[3]{'contents'}[2]{'contents'}[1]{'extra'}{'element_node'}
 = $result_trees{'indices_in_begin_tables_lists'}{'contents'}[3];
 
$result_trees{'indices_in_begin_tables_lists'}{'contents'}[4]{'contents'}[3]{'contents'}[2]{'contents'}[1]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'indices_in_begin_tables_lists'}{'contents'}[4]{'contents'}[3]{'contents'}[2]{'contents'}[1];
 
$result_trees{'indices_in_begin_tables_lists'}{'contents'}[4]{'contents'}[3]{'extra'}{'command_as_argument'}
 = 
$result_trees{'indices_in_begin_tables_lists'}{'contents'}[4]{'contents'}[3]{'args'}[0]{'contents'}[0];
-$result_trees{'indices_in_begin_tables_lists'}{'contents'}[4]{'contents'}[5]{'contents'}[0]{'contents'}[1]{'contents'}[1]{'extra'}{'entry_node'}
 = $result_trees{'indices_in_begin_tables_lists'}{'contents'}[3];
+$result_trees{'indices_in_begin_tables_lists'}{'contents'}[4]{'contents'}[5]{'contents'}[0]{'contents'}[1]{'contents'}[1]{'extra'}{'element_node'}
 = $result_trees{'indices_in_begin_tables_lists'}{'contents'}[3];
 
$result_trees{'indices_in_begin_tables_lists'}{'contents'}[4]{'contents'}[5]{'contents'}[0]{'contents'}[1]{'contents'}[1]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'indices_in_begin_tables_lists'}{'contents'}[4]{'contents'}[5]{'contents'}[0]{'contents'}[1]{'contents'}[1];
 
$result_trees{'indices_in_begin_tables_lists'}{'contents'}[4]{'contents'}[5]{'extra'}{'command_as_argument'}
 = 
$result_trees{'indices_in_begin_tables_lists'}{'contents'}[4]{'contents'}[5]{'args'}[0]{'contents'}[0];
-$result_trees{'indices_in_begin_tables_lists'}{'contents'}[4]{'contents'}[9]{'contents'}[0]{'contents'}[1]{'extra'}{'entry_node'}
 = $result_trees{'indices_in_begin_tables_lists'}{'contents'}[3];
+$result_trees{'indices_in_begin_tables_lists'}{'contents'}[4]{'contents'}[9]{'contents'}[0]{'contents'}[1]{'extra'}{'element_node'}
 = $result_trees{'indices_in_begin_tables_lists'}{'contents'}[3];
 
$result_trees{'indices_in_begin_tables_lists'}{'contents'}[4]{'contents'}[9]{'contents'}[0]{'contents'}[1]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'indices_in_begin_tables_lists'}{'contents'}[4]{'contents'}[9]{'contents'}[0]{'contents'}[1];
-$result_trees{'indices_in_begin_tables_lists'}{'contents'}[4]{'contents'}[11]{'contents'}[0]{'contents'}[1]{'extra'}{'entry_node'}
 = $result_trees{'indices_in_begin_tables_lists'}{'contents'}[3];
+$result_trees{'indices_in_begin_tables_lists'}{'contents'}[4]{'contents'}[11]{'contents'}[0]{'contents'}[1]{'extra'}{'element_node'}
 = $result_trees{'indices_in_begin_tables_lists'}{'contents'}[3];
 
$result_trees{'indices_in_begin_tables_lists'}{'contents'}[4]{'contents'}[11]{'contents'}[0]{'contents'}[1]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'indices_in_begin_tables_lists'}{'contents'}[4]{'contents'}[11]{'contents'}[0]{'contents'}[1];
-$result_trees{'indices_in_begin_tables_lists'}{'contents'}[4]{'contents'}[13]{'contents'}[0]{'contents'}[0]{'extra'}{'entry_node'}
 = $result_trees{'indices_in_begin_tables_lists'}{'contents'}[3];
+$result_trees{'indices_in_begin_tables_lists'}{'contents'}[4]{'contents'}[13]{'contents'}[0]{'contents'}[0]{'extra'}{'element_node'}
 = $result_trees{'indices_in_begin_tables_lists'}{'contents'}[3];
 
$result_trees{'indices_in_begin_tables_lists'}{'contents'}[4]{'contents'}[13]{'contents'}[0]{'contents'}[0]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'indices_in_begin_tables_lists'}{'contents'}[4]{'contents'}[13]{'contents'}[0]{'contents'}[0];
-$result_trees{'indices_in_begin_tables_lists'}{'contents'}[4]{'contents'}[15]{'contents'}[0]{'contents'}[0]{'contents'}[1]{'extra'}{'entry_node'}
 = $result_trees{'indices_in_begin_tables_lists'}{'contents'}[3];
+$result_trees{'indices_in_begin_tables_lists'}{'contents'}[4]{'contents'}[15]{'contents'}[0]{'contents'}[0]{'contents'}[1]{'extra'}{'element_node'}
 = $result_trees{'indices_in_begin_tables_lists'}{'contents'}[3];
 
$result_trees{'indices_in_begin_tables_lists'}{'contents'}[4]{'contents'}[15]{'contents'}[0]{'contents'}[0]{'contents'}[1]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'indices_in_begin_tables_lists'}{'contents'}[4]{'contents'}[15]{'contents'}[0]{'contents'}[0]{'contents'}[1];
-$result_trees{'indices_in_begin_tables_lists'}{'contents'}[4]{'contents'}[17]{'contents'}[0]{'contents'}[0]{'extra'}{'entry_node'}
 = $result_trees{'indices_in_begin_tables_lists'}{'contents'}[3];
+$result_trees{'indices_in_begin_tables_lists'}{'contents'}[4]{'contents'}[17]{'contents'}[0]{'contents'}[0]{'extra'}{'element_node'}
 = $result_trees{'indices_in_begin_tables_lists'}{'contents'}[3];
 
$result_trees{'indices_in_begin_tables_lists'}{'contents'}[4]{'contents'}[17]{'contents'}[0]{'contents'}[0]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'indices_in_begin_tables_lists'}{'contents'}[4]{'contents'}[17]{'contents'}[0]{'contents'}[0];
-$result_trees{'indices_in_begin_tables_lists'}{'contents'}[4]{'contents'}[17]{'contents'}[0]{'contents'}[2]{'extra'}{'entry_node'}
 = $result_trees{'indices_in_begin_tables_lists'}{'contents'}[3];
+$result_trees{'indices_in_begin_tables_lists'}{'contents'}[4]{'contents'}[17]{'contents'}[0]{'contents'}[2]{'extra'}{'element_node'}
 = $result_trees{'indices_in_begin_tables_lists'}{'contents'}[3];
 
$result_trees{'indices_in_begin_tables_lists'}{'contents'}[4]{'contents'}[17]{'contents'}[0]{'contents'}[2]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'indices_in_begin_tables_lists'}{'contents'}[4]{'contents'}[17]{'contents'}[0]{'contents'}[2];
-$result_trees{'indices_in_begin_tables_lists'}{'contents'}[4]{'contents'}[17]{'contents'}[0]{'contents'}[3]{'extra'}{'entry_node'}
 = $result_trees{'indices_in_begin_tables_lists'}{'contents'}[3];
+$result_trees{'indices_in_begin_tables_lists'}{'contents'}[4]{'contents'}[17]{'contents'}[0]{'contents'}[3]{'extra'}{'element_node'}
 = $result_trees{'indices_in_begin_tables_lists'}{'contents'}[3];
 
$result_trees{'indices_in_begin_tables_lists'}{'contents'}[4]{'contents'}[17]{'contents'}[0]{'contents'}[3]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'indices_in_begin_tables_lists'}{'contents'}[4]{'contents'}[17]{'contents'}[0]{'contents'}[3];
-$result_trees{'indices_in_begin_tables_lists'}{'contents'}[4]{'contents'}[19]{'contents'}[0]{'contents'}[0]{'contents'}[1]{'extra'}{'entry_node'}
 = $result_trees{'indices_in_begin_tables_lists'}{'contents'}[3];
+$result_trees{'indices_in_begin_tables_lists'}{'contents'}[4]{'contents'}[19]{'contents'}[0]{'contents'}[0]{'contents'}[1]{'extra'}{'element_node'}
 = $result_trees{'indices_in_begin_tables_lists'}{'contents'}[3];
 
$result_trees{'indices_in_begin_tables_lists'}{'contents'}[4]{'contents'}[19]{'contents'}[0]{'contents'}[0]{'contents'}[1]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'indices_in_begin_tables_lists'}{'contents'}[4]{'contents'}[19]{'contents'}[0]{'contents'}[0]{'contents'}[1];
 
$result_trees{'indices_in_begin_tables_lists'}{'contents'}[4]{'contents'}[19]{'extra'}{'command_as_argument'}
 = 
$result_trees{'indices_in_begin_tables_lists'}{'contents'}[4]{'contents'}[19]{'args'}[0]{'contents'}[0];
-$result_trees{'indices_in_begin_tables_lists'}{'contents'}[4]{'contents'}[21]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'extra'}{'entry_node'}
 = $result_trees{'indices_in_begin_tables_lists'}{'contents'}[3];
+$result_trees{'indices_in_begin_tables_lists'}{'contents'}[4]{'contents'}[21]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'extra'}{'element_node'}
 = $result_trees{'indices_in_begin_tables_lists'}{'contents'}[3];
 
$result_trees{'indices_in_begin_tables_lists'}{'contents'}[4]{'contents'}[21]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'indices_in_begin_tables_lists'}{'contents'}[4]{'contents'}[21]{'contents'}[0]{'contents'}[0]{'contents'}[0];
-$result_trees{'indices_in_begin_tables_lists'}{'contents'}[4]{'contents'}[21]{'contents'}[0]{'contents'}[0]{'contents'}[2]{'extra'}{'entry_node'}
 = $result_trees{'indices_in_begin_tables_lists'}{'contents'}[3];
+$result_trees{'indices_in_begin_tables_lists'}{'contents'}[4]{'contents'}[21]{'contents'}[0]{'contents'}[0]{'contents'}[2]{'extra'}{'element_node'}
 = $result_trees{'indices_in_begin_tables_lists'}{'contents'}[3];
 
$result_trees{'indices_in_begin_tables_lists'}{'contents'}[4]{'contents'}[21]{'contents'}[0]{'contents'}[0]{'contents'}[2]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'indices_in_begin_tables_lists'}{'contents'}[4]{'contents'}[21]{'contents'}[0]{'contents'}[0]{'contents'}[2];
 
$result_trees{'indices_in_begin_tables_lists'}{'contents'}[4]{'contents'}[21]{'extra'}{'command_as_argument'}
 = 
$result_trees{'indices_in_begin_tables_lists'}{'contents'}[4]{'contents'}[21]{'args'}[0]{'contents'}[0];
-$result_trees{'indices_in_begin_tables_lists'}{'contents'}[4]{'contents'}[23]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'extra'}{'entry_node'}
 = $result_trees{'indices_in_begin_tables_lists'}{'contents'}[3];
+$result_trees{'indices_in_begin_tables_lists'}{'contents'}[4]{'contents'}[23]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'extra'}{'element_node'}
 = $result_trees{'indices_in_begin_tables_lists'}{'contents'}[3];
 
$result_trees{'indices_in_begin_tables_lists'}{'contents'}[4]{'contents'}[23]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'indices_in_begin_tables_lists'}{'contents'}[4]{'contents'}[23]{'contents'}[0]{'contents'}[0]{'contents'}[0];
-$result_trees{'indices_in_begin_tables_lists'}{'contents'}[4]{'contents'}[23]{'contents'}[0]{'contents'}[0]{'contents'}[1]{'contents'}[0]{'extra'}{'entry_node'}
 = $result_trees{'indices_in_begin_tables_lists'}{'contents'}[3];
+$result_trees{'indices_in_begin_tables_lists'}{'contents'}[4]{'contents'}[23]{'contents'}[0]{'contents'}[0]{'contents'}[1]{'contents'}[0]{'extra'}{'element_node'}
 = $result_trees{'indices_in_begin_tables_lists'}{'contents'}[3];
 
$result_trees{'indices_in_begin_tables_lists'}{'contents'}[4]{'contents'}[23]{'contents'}[0]{'contents'}[0]{'contents'}[1]{'contents'}[0]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'indices_in_begin_tables_lists'}{'contents'}[4]{'contents'}[23]{'contents'}[0]{'contents'}[0]{'contents'}[1]{'contents'}[0];
-$result_trees{'indices_in_begin_tables_lists'}{'contents'}[4]{'contents'}[23]{'contents'}[0]{'contents'}[0]{'contents'}[2]{'extra'}{'entry_node'}
 = $result_trees{'indices_in_begin_tables_lists'}{'contents'}[3];
+$result_trees{'indices_in_begin_tables_lists'}{'contents'}[4]{'contents'}[23]{'contents'}[0]{'contents'}[0]{'contents'}[2]{'extra'}{'element_node'}
 = $result_trees{'indices_in_begin_tables_lists'}{'contents'}[3];
 
$result_trees{'indices_in_begin_tables_lists'}{'contents'}[4]{'contents'}[23]{'contents'}[0]{'contents'}[0]{'contents'}[2]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'indices_in_begin_tables_lists'}{'contents'}[4]{'contents'}[23]{'contents'}[0]{'contents'}[0]{'contents'}[2];
-$result_trees{'indices_in_begin_tables_lists'}{'contents'}[4]{'contents'}[23]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'extra'}{'entry_node'}
 = $result_trees{'indices_in_begin_tables_lists'}{'contents'}[3];
+$result_trees{'indices_in_begin_tables_lists'}{'contents'}[4]{'contents'}[23]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'extra'}{'element_node'}
 = $result_trees{'indices_in_begin_tables_lists'}{'contents'}[3];
 
$result_trees{'indices_in_begin_tables_lists'}{'contents'}[4]{'contents'}[23]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'indices_in_begin_tables_lists'}{'contents'}[4]{'contents'}[23]{'contents'}[1]{'contents'}[0]{'contents'}[0];
-$result_trees{'indices_in_begin_tables_lists'}{'contents'}[4]{'contents'}[23]{'contents'}[1]{'contents'}[0]{'contents'}[2]{'extra'}{'entry_node'}
 = $result_trees{'indices_in_begin_tables_lists'}{'contents'}[3];
+$result_trees{'indices_in_begin_tables_lists'}{'contents'}[4]{'contents'}[23]{'contents'}[1]{'contents'}[0]{'contents'}[2]{'extra'}{'element_node'}
 = $result_trees{'indices_in_begin_tables_lists'}{'contents'}[3];
 
$result_trees{'indices_in_begin_tables_lists'}{'contents'}[4]{'contents'}[23]{'contents'}[1]{'contents'}[0]{'contents'}[2]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'indices_in_begin_tables_lists'}{'contents'}[4]{'contents'}[23]{'contents'}[1]{'contents'}[0]{'contents'}[2];
 
$result_trees{'indices_in_begin_tables_lists'}{'contents'}[4]{'contents'}[23]{'extra'}{'command_as_argument'}
 = 
$result_trees{'indices_in_begin_tables_lists'}{'contents'}[4]{'contents'}[23]{'args'}[0]{'contents'}[0];
-$result_trees{'indices_in_begin_tables_lists'}{'contents'}[4]{'contents'}[25]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'extra'}{'entry_node'}
 = $result_trees{'indices_in_begin_tables_lists'}{'contents'}[3];
+$result_trees{'indices_in_begin_tables_lists'}{'contents'}[4]{'contents'}[25]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'extra'}{'element_node'}
 = $result_trees{'indices_in_begin_tables_lists'}{'contents'}[3];
 
$result_trees{'indices_in_begin_tables_lists'}{'contents'}[4]{'contents'}[25]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'indices_in_begin_tables_lists'}{'contents'}[4]{'contents'}[25]{'contents'}[0]{'contents'}[0]{'contents'}[0];
 
$result_trees{'indices_in_begin_tables_lists'}{'contents'}[4]{'contents'}[25]{'extra'}{'command_as_argument'}
 = 
$result_trees{'indices_in_begin_tables_lists'}{'contents'}[4]{'contents'}[25]{'args'}[0]{'contents'}[0];
-$result_trees{'indices_in_begin_tables_lists'}{'contents'}[4]{'contents'}[27]{'contents'}[0]{'contents'}[0]{'extra'}{'entry_node'}
 = $result_trees{'indices_in_begin_tables_lists'}{'contents'}[3];
+$result_trees{'indices_in_begin_tables_lists'}{'contents'}[4]{'contents'}[27]{'contents'}[0]{'contents'}[0]{'extra'}{'element_node'}
 = $result_trees{'indices_in_begin_tables_lists'}{'contents'}[3];
 
$result_trees{'indices_in_begin_tables_lists'}{'contents'}[4]{'contents'}[27]{'contents'}[0]{'contents'}[0]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'indices_in_begin_tables_lists'}{'contents'}[4]{'contents'}[27]{'contents'}[0]{'contents'}[0];
 
$result_trees{'indices_in_begin_tables_lists'}{'contents'}[4]{'contents'}[27]{'extra'}{'command_as_argument'}
 = 
$result_trees{'indices_in_begin_tables_lists'}{'contents'}[4]{'contents'}[27]{'args'}[0]{'contents'}[0];
-$result_trees{'indices_in_begin_tables_lists'}{'contents'}[4]{'contents'}[29]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'extra'}{'entry_node'}
 = $result_trees{'indices_in_begin_tables_lists'}{'contents'}[3];
+$result_trees{'indices_in_begin_tables_lists'}{'contents'}[4]{'contents'}[29]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'extra'}{'element_node'}
 = $result_trees{'indices_in_begin_tables_lists'}{'contents'}[3];
 
$result_trees{'indices_in_begin_tables_lists'}{'contents'}[4]{'contents'}[29]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'indices_in_begin_tables_lists'}{'contents'}[4]{'contents'}[29]{'contents'}[0]{'contents'}[0]{'contents'}[0];
 
$result_trees{'indices_in_begin_tables_lists'}{'contents'}[4]{'contents'}[29]{'extra'}{'command_as_argument'}
 = 
$result_trees{'indices_in_begin_tables_lists'}{'contents'}[4]{'contents'}[29]{'args'}[0]{'contents'}[0];
-$result_trees{'indices_in_begin_tables_lists'}{'contents'}[4]{'contents'}[31]{'contents'}[0]{'contents'}[0]{'extra'}{'entry_node'}
 = $result_trees{'indices_in_begin_tables_lists'}{'contents'}[3];
+$result_trees{'indices_in_begin_tables_lists'}{'contents'}[4]{'contents'}[31]{'contents'}[0]{'contents'}[0]{'extra'}{'element_node'}
 = $result_trees{'indices_in_begin_tables_lists'}{'contents'}[3];
 
$result_trees{'indices_in_begin_tables_lists'}{'contents'}[4]{'contents'}[31]{'contents'}[0]{'contents'}[0]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'indices_in_begin_tables_lists'}{'contents'}[4]{'contents'}[31]{'contents'}[0]{'contents'}[0];
 
$result_trees{'indices_in_begin_tables_lists'}{'contents'}[4]{'contents'}[31]{'extra'}{'command_as_argument'}
 = 
$result_trees{'indices_in_begin_tables_lists'}{'contents'}[4]{'contents'}[31]{'args'}[0]{'contents'}[0];
-$result_trees{'indices_in_begin_tables_lists'}{'contents'}[4]{'contents'}[33]{'contents'}[0]{'contents'}[1]{'extra'}{'entry_node'}
 = $result_trees{'indices_in_begin_tables_lists'}{'contents'}[3];
+$result_trees{'indices_in_begin_tables_lists'}{'contents'}[4]{'contents'}[33]{'contents'}[0]{'contents'}[1]{'extra'}{'element_node'}
 = $result_trees{'indices_in_begin_tables_lists'}{'contents'}[3];
 
$result_trees{'indices_in_begin_tables_lists'}{'contents'}[4]{'contents'}[33]{'contents'}[0]{'contents'}[1]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'indices_in_begin_tables_lists'}{'contents'}[4]{'contents'}[33]{'contents'}[0]{'contents'}[1];
 
$result_trees{'indices_in_begin_tables_lists'}{'contents'}[4]{'contents'}[33]{'extra'}{'command_as_argument'}
 = 
$result_trees{'indices_in_begin_tables_lists'}{'contents'}[4]{'contents'}[33]{'args'}[0]{'contents'}[0];
-$result_trees{'indices_in_begin_tables_lists'}{'contents'}[4]{'contents'}[35]{'contents'}[0]{'contents'}[0]{'extra'}{'entry_node'}
 = $result_trees{'indices_in_begin_tables_lists'}{'contents'}[3];
+$result_trees{'indices_in_begin_tables_lists'}{'contents'}[4]{'contents'}[35]{'contents'}[0]{'contents'}[0]{'extra'}{'element_node'}
 = $result_trees{'indices_in_begin_tables_lists'}{'contents'}[3];
 
$result_trees{'indices_in_begin_tables_lists'}{'contents'}[4]{'contents'}[35]{'contents'}[0]{'contents'}[0]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'indices_in_begin_tables_lists'}{'contents'}[4]{'contents'}[35]{'contents'}[0]{'contents'}[0];
 
$result_trees{'indices_in_begin_tables_lists'}{'contents'}[4]{'contents'}[35]{'extra'}{'command_as_argument'}
 = 
$result_trees{'indices_in_begin_tables_lists'}{'contents'}[4]{'contents'}[35]{'args'}[0]{'contents'}[0];
-$result_trees{'indices_in_begin_tables_lists'}{'contents'}[4]{'contents'}[37]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'extra'}{'entry_node'}
 = $result_trees{'indices_in_begin_tables_lists'}{'contents'}[3];
+$result_trees{'indices_in_begin_tables_lists'}{'contents'}[4]{'contents'}[37]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'extra'}{'element_node'}
 = $result_trees{'indices_in_begin_tables_lists'}{'contents'}[3];
 
$result_trees{'indices_in_begin_tables_lists'}{'contents'}[4]{'contents'}[37]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'indices_in_begin_tables_lists'}{'contents'}[4]{'contents'}[37]{'contents'}[1]{'contents'}[0]{'contents'}[0];
 
$result_trees{'indices_in_begin_tables_lists'}{'contents'}[4]{'contents'}[37]{'extra'}{'command_as_argument'}
 = 
$result_trees{'indices_in_begin_tables_lists'}{'contents'}[4]{'contents'}[37]{'args'}[0]{'contents'}[0];
-$result_trees{'indices_in_begin_tables_lists'}{'contents'}[4]{'contents'}[39]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'extra'}{'entry_node'}
 = $result_trees{'indices_in_begin_tables_lists'}{'contents'}[3];
+$result_trees{'indices_in_begin_tables_lists'}{'contents'}[4]{'contents'}[39]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'extra'}{'element_node'}
 = $result_trees{'indices_in_begin_tables_lists'}{'contents'}[3];
 
$result_trees{'indices_in_begin_tables_lists'}{'contents'}[4]{'contents'}[39]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'indices_in_begin_tables_lists'}{'contents'}[4]{'contents'}[39]{'contents'}[0]{'contents'}[0]{'contents'}[0];
-$result_trees{'indices_in_begin_tables_lists'}{'contents'}[4]{'contents'}[39]{'contents'}[0]{'contents'}[0]{'contents'}[2]{'extra'}{'entry_node'}
 = $result_trees{'indices_in_begin_tables_lists'}{'contents'}[3];
+$result_trees{'indices_in_begin_tables_lists'}{'contents'}[4]{'contents'}[39]{'contents'}[0]{'contents'}[0]{'contents'}[2]{'extra'}{'element_node'}
 = $result_trees{'indices_in_begin_tables_lists'}{'contents'}[3];
 
$result_trees{'indices_in_begin_tables_lists'}{'contents'}[4]{'contents'}[39]{'contents'}[0]{'contents'}[0]{'contents'}[2]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'indices_in_begin_tables_lists'}{'contents'}[4]{'contents'}[39]{'contents'}[0]{'contents'}[0]{'contents'}[2];
-$result_trees{'indices_in_begin_tables_lists'}{'contents'}[4]{'contents'}[39]{'contents'}[0]{'contents'}[0]{'contents'}[3]{'extra'}{'entry_node'}
 = $result_trees{'indices_in_begin_tables_lists'}{'contents'}[3];
+$result_trees{'indices_in_begin_tables_lists'}{'contents'}[4]{'contents'}[39]{'contents'}[0]{'contents'}[0]{'contents'}[3]{'extra'}{'element_node'}
 = $result_trees{'indices_in_begin_tables_lists'}{'contents'}[3];
 
$result_trees{'indices_in_begin_tables_lists'}{'contents'}[4]{'contents'}[39]{'contents'}[0]{'contents'}[0]{'contents'}[3]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'indices_in_begin_tables_lists'}{'contents'}[4]{'contents'}[39]{'contents'}[0]{'contents'}[0]{'contents'}[3];
 
$result_trees{'indices_in_begin_tables_lists'}{'contents'}[4]{'contents'}[39]{'extra'}{'command_as_argument'}
 = 
$result_trees{'indices_in_begin_tables_lists'}{'contents'}[4]{'contents'}[39]{'args'}[0]{'contents'}[0];
 
$result_trees{'indices_in_begin_tables_lists'}{'contents'}[5]{'extra'}{'node_content'}[0]
 = 
$result_trees{'indices_in_begin_tables_lists'}{'contents'}[5]{'args'}[0]{'contents'}[0];
diff --git 
a/tp/t/results/converters_tests/indices_in_begin_tables_lists_entries_after_item.pl
 
b/tp/t/results/converters_tests/indices_in_begin_tables_lists_entries_after_item.pl
index 2924fa41e5..a9296246fc 100644
--- 
a/tp/t/results/converters_tests/indices_in_begin_tables_lists_entries_after_item.pl
+++ 
b/tp/t/results/converters_tests/indices_in_begin_tables_lists_entries_after_item.pl
@@ -251,7 +251,7 @@ 
$result_trees{'indices_in_begin_tables_lists_entries_after_item'} = {
                   ],
                   'cmdname' => 'cindex',
                   'extra' => {
-                    'entry_node' => {},
+                    'element_node' => {},
                     'index_entry' => {
                       'entry_element' => {},
                       'entry_number' => 1,
@@ -398,7 +398,7 @@ 
$result_trees{'indices_in_begin_tables_lists_entries_after_item'} = {
                   ],
                   'cmdname' => 'cindex',
                   'extra' => {
-                    'entry_node' => {},
+                    'element_node' => {},
                     'index_entry' => {
                       'entry_element' => {},
                       'entry_number' => 2,
@@ -469,7 +469,7 @@ 
$result_trees{'indices_in_begin_tables_lists_entries_after_item'} = {
                   ],
                   'cmdname' => 'cindex',
                   'extra' => {
-                    'entry_node' => {},
+                    'element_node' => {},
                     'index_entry' => {
                       'entry_element' => {},
                       'entry_number' => 3,
@@ -637,7 +637,7 @@ 
$result_trees{'indices_in_begin_tables_lists_entries_after_item'} = {
                   ],
                   'cmdname' => 'cindex',
                   'extra' => {
-                    'entry_node' => {},
+                    'element_node' => {},
                     'index_entry' => {
                       'entry_element' => {},
                       'entry_number' => 4,
@@ -876,7 +876,7 @@ 
$result_trees{'indices_in_begin_tables_lists_entries_after_item'} = {
                   ],
                   'cmdname' => 'cindex',
                   'extra' => {
-                    'entry_node' => {},
+                    'element_node' => {},
                     'index_entry' => {
                       'entry_element' => {},
                       'entry_number' => 5,
@@ -1028,7 +1028,7 @@ 
$result_trees{'indices_in_begin_tables_lists_entries_after_item'} = {
                   ],
                   'cmdname' => 'cindex',
                   'extra' => {
-                    'entry_node' => {},
+                    'element_node' => {},
                     'index_entry' => {
                       'entry_element' => {},
                       'entry_number' => 6,
@@ -1149,7 +1149,7 @@ 
$result_trees{'indices_in_begin_tables_lists_entries_after_item'} = {
                   ],
                   'cmdname' => 'cindex',
                   'extra' => {
-                    'entry_node' => {},
+                    'element_node' => {},
                     'index_entry' => {
                       'entry_element' => {},
                       'entry_number' => 7,
@@ -1305,7 +1305,7 @@ 
$result_trees{'indices_in_begin_tables_lists_entries_after_item'} = {
                   ],
                   'cmdname' => 'cindex',
                   'extra' => {
-                    'entry_node' => {},
+                    'element_node' => {},
                     'index_entry' => {
                       'entry_element' => {},
                       'entry_number' => 8,
@@ -1436,7 +1436,7 @@ 
$result_trees{'indices_in_begin_tables_lists_entries_after_item'} = {
                   ],
                   'cmdname' => 'cindex',
                   'extra' => {
-                    'entry_node' => {},
+                    'element_node' => {},
                     'index_entry' => {
                       'entry_element' => {},
                       'entry_number' => 9,
@@ -1491,7 +1491,7 @@ 
$result_trees{'indices_in_begin_tables_lists_entries_after_item'} = {
                   ],
                   'cmdname' => 'cindex',
                   'extra' => {
-                    'entry_node' => {},
+                    'element_node' => {},
                     'index_entry' => {
                       'entry_element' => {},
                       'entry_number' => 10,
@@ -1530,7 +1530,7 @@ 
$result_trees{'indices_in_begin_tables_lists_entries_after_item'} = {
                   ],
                   'cmdname' => 'cindex',
                   'extra' => {
-                    'entry_node' => {},
+                    'element_node' => {},
                     'index_entry' => {
                       'entry_element' => {},
                       'entry_number' => 11,
@@ -1680,7 +1680,7 @@ 
$result_trees{'indices_in_begin_tables_lists_entries_after_item'} = {
                       ],
                       'cmdname' => 'item',
                       'extra' => {
-                        'entry_node' => {},
+                        'element_node' => {},
                         'index_entry' => {
                           'entry_element' => {},
                           'entry_number' => 1,
@@ -1819,7 +1819,7 @@ 
$result_trees{'indices_in_begin_tables_lists_entries_after_item'} = {
                       ],
                       'cmdname' => 'item',
                       'extra' => {
-                        'entry_node' => {},
+                        'element_node' => {},
                         'index_entry' => {
                           'entry_element' => {},
                           'entry_number' => 2,
@@ -1878,7 +1878,7 @@ 
$result_trees{'indices_in_begin_tables_lists_entries_after_item'} = {
                       ],
                       'cmdname' => 'itemx',
                       'extra' => {
-                        'entry_node' => {},
+                        'element_node' => {},
                         'index_entry' => {
                           'entry_element' => {},
                           'entry_number' => 3,
@@ -2017,7 +2017,7 @@ 
$result_trees{'indices_in_begin_tables_lists_entries_after_item'} = {
                       ],
                       'cmdname' => 'item',
                       'extra' => {
-                        'entry_node' => {},
+                        'element_node' => {},
                         'index_entry' => {
                           'entry_element' => {},
                           'entry_number' => 1,
@@ -2057,7 +2057,7 @@ 
$result_trees{'indices_in_begin_tables_lists_entries_after_item'} = {
                           ],
                           'cmdname' => 'cindex',
                           'extra' => {
-                            'entry_node' => {},
+                            'element_node' => {},
                             'index_entry' => {
                               'entry_element' => {},
                               'entry_number' => 12,
@@ -2131,7 +2131,7 @@ 
$result_trees{'indices_in_begin_tables_lists_entries_after_item'} = {
                       ],
                       'cmdname' => 'itemx',
                       'extra' => {
-                        'entry_node' => {},
+                        'element_node' => {},
                         'index_entry' => {
                           'entry_element' => {},
                           'entry_number' => 2,
@@ -2193,7 +2193,7 @@ 
$result_trees{'indices_in_begin_tables_lists_entries_after_item'} = {
                       ],
                       'cmdname' => 'item',
                       'extra' => {
-                        'entry_node' => {},
+                        'element_node' => {},
                         'index_entry' => {
                           'entry_element' => {},
                           'entry_number' => 3,
@@ -2262,7 +2262,7 @@ 
$result_trees{'indices_in_begin_tables_lists_entries_after_item'} = {
                       ],
                       'cmdname' => 'itemx',
                       'extra' => {
-                        'entry_node' => {},
+                        'element_node' => {},
                         'index_entry' => {
                           'entry_element' => {},
                           'entry_number' => 4,
@@ -2413,7 +2413,7 @@ 
$result_trees{'indices_in_begin_tables_lists_entries_after_item'} = {
                       ],
                       'cmdname' => 'cindex',
                       'extra' => {
-                        'entry_node' => {},
+                        'element_node' => {},
                         'index_entry' => {
                           'entry_element' => {},
                           'entry_number' => 13,
@@ -2596,7 +2596,7 @@ 
$result_trees{'indices_in_begin_tables_lists_entries_after_item'} = {
                   ],
                   'cmdname' => 'cindex',
                   'extra' => {
-                    'entry_node' => {},
+                    'element_node' => {},
                     'index_entry' => {
                       'entry_element' => {},
                       'entry_number' => 14,
@@ -2767,7 +2767,7 @@ 
$result_trees{'indices_in_begin_tables_lists_entries_after_item'} = {
                       ],
                       'cmdname' => 'cindex',
                       'extra' => {
-                        'entry_node' => {},
+                        'element_node' => {},
                         'index_entry' => {
                           'entry_element' => {},
                           'entry_number' => 15,
@@ -2950,7 +2950,7 @@ 
$result_trees{'indices_in_begin_tables_lists_entries_after_item'} = {
                   ],
                   'cmdname' => 'cindex',
                   'extra' => {
-                    'entry_node' => {},
+                    'element_node' => {},
                     'index_entry' => {
                       'entry_element' => {},
                       'entry_number' => 16,
@@ -3124,7 +3124,7 @@ 
$result_trees{'indices_in_begin_tables_lists_entries_after_item'} = {
                   ],
                   'cmdname' => 'cindex',
                   'extra' => {
-                    'entry_node' => {},
+                    'element_node' => {},
                     'index_entry' => {
                       'entry_element' => {},
                       'entry_number' => 17,
@@ -3289,7 +3289,7 @@ 
$result_trees{'indices_in_begin_tables_lists_entries_after_item'} = {
                   ],
                   'cmdname' => 'cindex',
                   'extra' => {
-                    'entry_node' => {},
+                    'element_node' => {},
                     'index_entry' => {
                       'entry_element' => {},
                       'entry_number' => 18,
@@ -3466,7 +3466,7 @@ 
$result_trees{'indices_in_begin_tables_lists_entries_after_item'} = {
                       ],
                       'cmdname' => 'cindex',
                       'extra' => {
-                        'entry_node' => {},
+                        'element_node' => {},
                         'index_entry' => {
                           'entry_element' => {},
                           'entry_number' => 19,
@@ -3621,7 +3621,7 @@ 
$result_trees{'indices_in_begin_tables_lists_entries_after_item'} = {
                       ],
                       'cmdname' => 'cindex',
                       'extra' => {
-                        'entry_node' => {},
+                        'element_node' => {},
                         'index_entry' => {
                           'entry_element' => {},
                           'entry_number' => 20,
@@ -3676,7 +3676,7 @@ 
$result_trees{'indices_in_begin_tables_lists_entries_after_item'} = {
                       ],
                       'cmdname' => 'cindex',
                       'extra' => {
-                        'entry_node' => {},
+                        'element_node' => {},
                         'index_entry' => {
                           'entry_element' => {},
                           'entry_number' => 21,
@@ -3715,7 +3715,7 @@ 
$result_trees{'indices_in_begin_tables_lists_entries_after_item'} = {
                       ],
                       'cmdname' => 'cindex',
                       'extra' => {
-                        'entry_node' => {},
+                        'element_node' => {},
                         'index_entry' => {
                           'entry_element' => {},
                           'entry_number' => 22,
@@ -4050,76 +4050,76 @@ 
$result_trees{'indices_in_begin_tables_lists_entries_after_item'}{'contents'}[1]
 
$result_trees{'indices_in_begin_tables_lists_entries_after_item'}{'contents'}[1]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = 
$result_trees{'indices_in_begin_tables_lists_entries_after_item'}{'contents'}[1]{'args'}[0]{'contents'}[0];
 
$result_trees{'indices_in_begin_tables_lists_entries_after_item'}{'contents'}[3]{'extra'}{'node_content'}[0]
 = 
$result_trees{'indices_in_begin_tables_lists_entries_after_item'}{'contents'}[3]{'args'}[0]{'contents'}[0];
 
$result_trees{'indices_in_begin_tables_lists_entries_after_item'}{'contents'}[3]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = 
$result_trees{'indices_in_begin_tables_lists_entries_after_item'}{'contents'}[3]{'args'}[0]{'contents'}[0];
-$result_trees{'indices_in_begin_tables_lists_entries_after_item'}{'contents'}[4]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'extra'}{'entry_node'}
 = 
$result_trees{'indices_in_begin_tables_lists_entries_after_item'}{'contents'}[3];
+$result_trees{'indices_in_begin_tables_lists_entries_after_item'}{'contents'}[4]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'extra'}{'element_node'}
 = 
$result_trees{'indices_in_begin_tables_lists_entries_after_item'}{'contents'}[3];
 
$result_trees{'indices_in_begin_tables_lists_entries_after_item'}{'contents'}[4]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'indices_in_begin_tables_lists_entries_after_item'}{'contents'}[4]{'contents'}[1]{'contents'}[1]{'contents'}[1];
 
$result_trees{'indices_in_begin_tables_lists_entries_after_item'}{'contents'}[4]{'contents'}[1]{'extra'}{'command_as_argument'}
 = 
$result_trees{'indices_in_begin_tables_lists_entries_after_item'}{'contents'}[4]{'contents'}[1]{'args'}[0]{'contents'}[0];
-$result_trees{'indices_in_begin_tables_lists_entries_after_item'}{'contents'}[4]{'contents'}[3]{'contents'}[1]{'contents'}[1]{'extra'}{'entry_node'}
 = 
$result_trees{'indices_in_begin_tables_lists_entries_after_item'}{'contents'}[3];
+$result_trees{'indices_in_begin_tables_lists_entries_after_item'}{'contents'}[4]{'contents'}[3]{'contents'}[1]{'contents'}[1]{'extra'}{'element_node'}
 = 
$result_trees{'indices_in_begin_tables_lists_entries_after_item'}{'contents'}[3];
 
$result_trees{'indices_in_begin_tables_lists_entries_after_item'}{'contents'}[4]{'contents'}[3]{'contents'}[1]{'contents'}[1]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'indices_in_begin_tables_lists_entries_after_item'}{'contents'}[4]{'contents'}[3]{'contents'}[1]{'contents'}[1];
-$result_trees{'indices_in_begin_tables_lists_entries_after_item'}{'contents'}[4]{'contents'}[3]{'contents'}[2]{'contents'}[1]{'extra'}{'entry_node'}
 = 
$result_trees{'indices_in_begin_tables_lists_entries_after_item'}{'contents'}[3];
+$result_trees{'indices_in_begin_tables_lists_entries_after_item'}{'contents'}[4]{'contents'}[3]{'contents'}[2]{'contents'}[1]{'extra'}{'element_node'}
 = 
$result_trees{'indices_in_begin_tables_lists_entries_after_item'}{'contents'}[3];
 
$result_trees{'indices_in_begin_tables_lists_entries_after_item'}{'contents'}[4]{'contents'}[3]{'contents'}[2]{'contents'}[1]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'indices_in_begin_tables_lists_entries_after_item'}{'contents'}[4]{'contents'}[3]{'contents'}[2]{'contents'}[1];
 
$result_trees{'indices_in_begin_tables_lists_entries_after_item'}{'contents'}[4]{'contents'}[3]{'extra'}{'command_as_argument'}
 = 
$result_trees{'indices_in_begin_tables_lists_entries_after_item'}{'contents'}[4]{'contents'}[3]{'args'}[0]{'contents'}[0];
-$result_trees{'indices_in_begin_tables_lists_entries_after_item'}{'contents'}[4]{'contents'}[5]{'contents'}[1]{'contents'}[1]{'extra'}{'entry_node'}
 = 
$result_trees{'indices_in_begin_tables_lists_entries_after_item'}{'contents'}[3];
+$result_trees{'indices_in_begin_tables_lists_entries_after_item'}{'contents'}[4]{'contents'}[5]{'contents'}[1]{'contents'}[1]{'extra'}{'element_node'}
 = 
$result_trees{'indices_in_begin_tables_lists_entries_after_item'}{'contents'}[3];
 
$result_trees{'indices_in_begin_tables_lists_entries_after_item'}{'contents'}[4]{'contents'}[5]{'contents'}[1]{'contents'}[1]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'indices_in_begin_tables_lists_entries_after_item'}{'contents'}[4]{'contents'}[5]{'contents'}[1]{'contents'}[1];
 
$result_trees{'indices_in_begin_tables_lists_entries_after_item'}{'contents'}[4]{'contents'}[5]{'extra'}{'command_as_argument'}
 = 
$result_trees{'indices_in_begin_tables_lists_entries_after_item'}{'contents'}[4]{'contents'}[5]{'args'}[0]{'contents'}[0];
-$result_trees{'indices_in_begin_tables_lists_entries_after_item'}{'contents'}[4]{'contents'}[9]{'contents'}[0]{'contents'}[1]{'extra'}{'entry_node'}
 = 
$result_trees{'indices_in_begin_tables_lists_entries_after_item'}{'contents'}[3];
+$result_trees{'indices_in_begin_tables_lists_entries_after_item'}{'contents'}[4]{'contents'}[9]{'contents'}[0]{'contents'}[1]{'extra'}{'element_node'}
 = 
$result_trees{'indices_in_begin_tables_lists_entries_after_item'}{'contents'}[3];
 
$result_trees{'indices_in_begin_tables_lists_entries_after_item'}{'contents'}[4]{'contents'}[9]{'contents'}[0]{'contents'}[1]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'indices_in_begin_tables_lists_entries_after_item'}{'contents'}[4]{'contents'}[9]{'contents'}[0]{'contents'}[1];
-$result_trees{'indices_in_begin_tables_lists_entries_after_item'}{'contents'}[4]{'contents'}[11]{'contents'}[1]{'contents'}[1]{'extra'}{'entry_node'}
 = 
$result_trees{'indices_in_begin_tables_lists_entries_after_item'}{'contents'}[3];
+$result_trees{'indices_in_begin_tables_lists_entries_after_item'}{'contents'}[4]{'contents'}[11]{'contents'}[1]{'contents'}[1]{'extra'}{'element_node'}
 = 
$result_trees{'indices_in_begin_tables_lists_entries_after_item'}{'contents'}[3];
 
$result_trees{'indices_in_begin_tables_lists_entries_after_item'}{'contents'}[4]{'contents'}[11]{'contents'}[1]{'contents'}[1]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'indices_in_begin_tables_lists_entries_after_item'}{'contents'}[4]{'contents'}[11]{'contents'}[1]{'contents'}[1];
-$result_trees{'indices_in_begin_tables_lists_entries_after_item'}{'contents'}[4]{'contents'}[13]{'contents'}[0]{'contents'}[0]{'extra'}{'entry_node'}
 = 
$result_trees{'indices_in_begin_tables_lists_entries_after_item'}{'contents'}[3];
+$result_trees{'indices_in_begin_tables_lists_entries_after_item'}{'contents'}[4]{'contents'}[13]{'contents'}[0]{'contents'}[0]{'extra'}{'element_node'}
 = 
$result_trees{'indices_in_begin_tables_lists_entries_after_item'}{'contents'}[3];
 
$result_trees{'indices_in_begin_tables_lists_entries_after_item'}{'contents'}[4]{'contents'}[13]{'contents'}[0]{'contents'}[0]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'indices_in_begin_tables_lists_entries_after_item'}{'contents'}[4]{'contents'}[13]{'contents'}[0]{'contents'}[0];
-$result_trees{'indices_in_begin_tables_lists_entries_after_item'}{'contents'}[4]{'contents'}[15]{'contents'}[1]{'contents'}[1]{'extra'}{'entry_node'}
 = 
$result_trees{'indices_in_begin_tables_lists_entries_after_item'}{'contents'}[3];
+$result_trees{'indices_in_begin_tables_lists_entries_after_item'}{'contents'}[4]{'contents'}[15]{'contents'}[1]{'contents'}[1]{'extra'}{'element_node'}
 = 
$result_trees{'indices_in_begin_tables_lists_entries_after_item'}{'contents'}[3];
 
$result_trees{'indices_in_begin_tables_lists_entries_after_item'}{'contents'}[4]{'contents'}[15]{'contents'}[1]{'contents'}[1]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'indices_in_begin_tables_lists_entries_after_item'}{'contents'}[4]{'contents'}[15]{'contents'}[1]{'contents'}[1];
-$result_trees{'indices_in_begin_tables_lists_entries_after_item'}{'contents'}[4]{'contents'}[17]{'contents'}[1]{'contents'}[1]{'extra'}{'entry_node'}
 = 
$result_trees{'indices_in_begin_tables_lists_entries_after_item'}{'contents'}[3];
+$result_trees{'indices_in_begin_tables_lists_entries_after_item'}{'contents'}[4]{'contents'}[17]{'contents'}[1]{'contents'}[1]{'extra'}{'element_node'}
 = 
$result_trees{'indices_in_begin_tables_lists_entries_after_item'}{'contents'}[3];
 
$result_trees{'indices_in_begin_tables_lists_entries_after_item'}{'contents'}[4]{'contents'}[17]{'contents'}[1]{'contents'}[1]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'indices_in_begin_tables_lists_entries_after_item'}{'contents'}[4]{'contents'}[17]{'contents'}[1]{'contents'}[1];
-$result_trees{'indices_in_begin_tables_lists_entries_after_item'}{'contents'}[4]{'contents'}[17]{'contents'}[1]{'contents'}[3]{'extra'}{'entry_node'}
 = 
$result_trees{'indices_in_begin_tables_lists_entries_after_item'}{'contents'}[3];
+$result_trees{'indices_in_begin_tables_lists_entries_after_item'}{'contents'}[4]{'contents'}[17]{'contents'}[1]{'contents'}[3]{'extra'}{'element_node'}
 = 
$result_trees{'indices_in_begin_tables_lists_entries_after_item'}{'contents'}[3];
 
$result_trees{'indices_in_begin_tables_lists_entries_after_item'}{'contents'}[4]{'contents'}[17]{'contents'}[1]{'contents'}[3]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'indices_in_begin_tables_lists_entries_after_item'}{'contents'}[4]{'contents'}[17]{'contents'}[1]{'contents'}[3];
-$result_trees{'indices_in_begin_tables_lists_entries_after_item'}{'contents'}[4]{'contents'}[17]{'contents'}[1]{'contents'}[4]{'extra'}{'entry_node'}
 = 
$result_trees{'indices_in_begin_tables_lists_entries_after_item'}{'contents'}[3];
+$result_trees{'indices_in_begin_tables_lists_entries_after_item'}{'contents'}[4]{'contents'}[17]{'contents'}[1]{'contents'}[4]{'extra'}{'element_node'}
 = 
$result_trees{'indices_in_begin_tables_lists_entries_after_item'}{'contents'}[3];
 
$result_trees{'indices_in_begin_tables_lists_entries_after_item'}{'contents'}[4]{'contents'}[17]{'contents'}[1]{'contents'}[4]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'indices_in_begin_tables_lists_entries_after_item'}{'contents'}[4]{'contents'}[17]{'contents'}[1]{'contents'}[4];
-$result_trees{'indices_in_begin_tables_lists_entries_after_item'}{'contents'}[4]{'contents'}[19]{'contents'}[0]{'contents'}[0]{'contents'}[1]{'extra'}{'entry_node'}
 = 
$result_trees{'indices_in_begin_tables_lists_entries_after_item'}{'contents'}[3];
+$result_trees{'indices_in_begin_tables_lists_entries_after_item'}{'contents'}[4]{'contents'}[19]{'contents'}[0]{'contents'}[0]{'contents'}[1]{'extra'}{'element_node'}
 = 
$result_trees{'indices_in_begin_tables_lists_entries_after_item'}{'contents'}[3];
 
$result_trees{'indices_in_begin_tables_lists_entries_after_item'}{'contents'}[4]{'contents'}[19]{'contents'}[0]{'contents'}[0]{'contents'}[1]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'indices_in_begin_tables_lists_entries_after_item'}{'contents'}[4]{'contents'}[19]{'contents'}[0]{'contents'}[0]{'contents'}[1];
 
$result_trees{'indices_in_begin_tables_lists_entries_after_item'}{'contents'}[4]{'contents'}[19]{'extra'}{'command_as_argument'}
 = 
$result_trees{'indices_in_begin_tables_lists_entries_after_item'}{'contents'}[4]{'contents'}[19]{'args'}[0]{'contents'}[0];
-$result_trees{'indices_in_begin_tables_lists_entries_after_item'}{'contents'}[4]{'contents'}[21]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'extra'}{'entry_node'}
 = 
$result_trees{'indices_in_begin_tables_lists_entries_after_item'}{'contents'}[3];
+$result_trees{'indices_in_begin_tables_lists_entries_after_item'}{'contents'}[4]{'contents'}[21]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'extra'}{'element_node'}
 = 
$result_trees{'indices_in_begin_tables_lists_entries_after_item'}{'contents'}[3];
 
$result_trees{'indices_in_begin_tables_lists_entries_after_item'}{'contents'}[4]{'contents'}[21]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'indices_in_begin_tables_lists_entries_after_item'}{'contents'}[4]{'contents'}[21]{'contents'}[0]{'contents'}[0]{'contents'}[0];
-$result_trees{'indices_in_begin_tables_lists_entries_after_item'}{'contents'}[4]{'contents'}[21]{'contents'}[0]{'contents'}[0]{'contents'}[2]{'extra'}{'entry_node'}
 = 
$result_trees{'indices_in_begin_tables_lists_entries_after_item'}{'contents'}[3];
+$result_trees{'indices_in_begin_tables_lists_entries_after_item'}{'contents'}[4]{'contents'}[21]{'contents'}[0]{'contents'}[0]{'contents'}[2]{'extra'}{'element_node'}
 = 
$result_trees{'indices_in_begin_tables_lists_entries_after_item'}{'contents'}[3];
 
$result_trees{'indices_in_begin_tables_lists_entries_after_item'}{'contents'}[4]{'contents'}[21]{'contents'}[0]{'contents'}[0]{'contents'}[2]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'indices_in_begin_tables_lists_entries_after_item'}{'contents'}[4]{'contents'}[21]{'contents'}[0]{'contents'}[0]{'contents'}[2];
 
$result_trees{'indices_in_begin_tables_lists_entries_after_item'}{'contents'}[4]{'contents'}[21]{'extra'}{'command_as_argument'}
 = 
$result_trees{'indices_in_begin_tables_lists_entries_after_item'}{'contents'}[4]{'contents'}[21]{'args'}[0]{'contents'}[0];
-$result_trees{'indices_in_begin_tables_lists_entries_after_item'}{'contents'}[4]{'contents'}[23]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'extra'}{'entry_node'}
 = 
$result_trees{'indices_in_begin_tables_lists_entries_after_item'}{'contents'}[3];
+$result_trees{'indices_in_begin_tables_lists_entries_after_item'}{'contents'}[4]{'contents'}[23]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'extra'}{'element_node'}
 = 
$result_trees{'indices_in_begin_tables_lists_entries_after_item'}{'contents'}[3];
 
$result_trees{'indices_in_begin_tables_lists_entries_after_item'}{'contents'}[4]{'contents'}[23]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'indices_in_begin_tables_lists_entries_after_item'}{'contents'}[4]{'contents'}[23]{'contents'}[0]{'contents'}[0]{'contents'}[0];
-$result_trees{'indices_in_begin_tables_lists_entries_after_item'}{'contents'}[4]{'contents'}[23]{'contents'}[0]{'contents'}[0]{'contents'}[1]{'contents'}[0]{'extra'}{'entry_node'}
 = 
$result_trees{'indices_in_begin_tables_lists_entries_after_item'}{'contents'}[3];
+$result_trees{'indices_in_begin_tables_lists_entries_after_item'}{'contents'}[4]{'contents'}[23]{'contents'}[0]{'contents'}[0]{'contents'}[1]{'contents'}[0]{'extra'}{'element_node'}
 = 
$result_trees{'indices_in_begin_tables_lists_entries_after_item'}{'contents'}[3];
 
$result_trees{'indices_in_begin_tables_lists_entries_after_item'}{'contents'}[4]{'contents'}[23]{'contents'}[0]{'contents'}[0]{'contents'}[1]{'contents'}[0]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'indices_in_begin_tables_lists_entries_after_item'}{'contents'}[4]{'contents'}[23]{'contents'}[0]{'contents'}[0]{'contents'}[1]{'contents'}[0];
-$result_trees{'indices_in_begin_tables_lists_entries_after_item'}{'contents'}[4]{'contents'}[23]{'contents'}[0]{'contents'}[0]{'contents'}[2]{'extra'}{'entry_node'}
 = 
$result_trees{'indices_in_begin_tables_lists_entries_after_item'}{'contents'}[3];
+$result_trees{'indices_in_begin_tables_lists_entries_after_item'}{'contents'}[4]{'contents'}[23]{'contents'}[0]{'contents'}[0]{'contents'}[2]{'extra'}{'element_node'}
 = 
$result_trees{'indices_in_begin_tables_lists_entries_after_item'}{'contents'}[3];
 
$result_trees{'indices_in_begin_tables_lists_entries_after_item'}{'contents'}[4]{'contents'}[23]{'contents'}[0]{'contents'}[0]{'contents'}[2]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'indices_in_begin_tables_lists_entries_after_item'}{'contents'}[4]{'contents'}[23]{'contents'}[0]{'contents'}[0]{'contents'}[2];
-$result_trees{'indices_in_begin_tables_lists_entries_after_item'}{'contents'}[4]{'contents'}[23]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'extra'}{'entry_node'}
 = 
$result_trees{'indices_in_begin_tables_lists_entries_after_item'}{'contents'}[3];
+$result_trees{'indices_in_begin_tables_lists_entries_after_item'}{'contents'}[4]{'contents'}[23]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'extra'}{'element_node'}
 = 
$result_trees{'indices_in_begin_tables_lists_entries_after_item'}{'contents'}[3];
 
$result_trees{'indices_in_begin_tables_lists_entries_after_item'}{'contents'}[4]{'contents'}[23]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'indices_in_begin_tables_lists_entries_after_item'}{'contents'}[4]{'contents'}[23]{'contents'}[1]{'contents'}[0]{'contents'}[0];
-$result_trees{'indices_in_begin_tables_lists_entries_after_item'}{'contents'}[4]{'contents'}[23]{'contents'}[1]{'contents'}[0]{'contents'}[2]{'extra'}{'entry_node'}
 = 
$result_trees{'indices_in_begin_tables_lists_entries_after_item'}{'contents'}[3];
+$result_trees{'indices_in_begin_tables_lists_entries_after_item'}{'contents'}[4]{'contents'}[23]{'contents'}[1]{'contents'}[0]{'contents'}[2]{'extra'}{'element_node'}
 = 
$result_trees{'indices_in_begin_tables_lists_entries_after_item'}{'contents'}[3];
 
$result_trees{'indices_in_begin_tables_lists_entries_after_item'}{'contents'}[4]{'contents'}[23]{'contents'}[1]{'contents'}[0]{'contents'}[2]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'indices_in_begin_tables_lists_entries_after_item'}{'contents'}[4]{'contents'}[23]{'contents'}[1]{'contents'}[0]{'contents'}[2];
 
$result_trees{'indices_in_begin_tables_lists_entries_after_item'}{'contents'}[4]{'contents'}[23]{'extra'}{'command_as_argument'}
 = 
$result_trees{'indices_in_begin_tables_lists_entries_after_item'}{'contents'}[4]{'contents'}[23]{'args'}[0]{'contents'}[0];
-$result_trees{'indices_in_begin_tables_lists_entries_after_item'}{'contents'}[4]{'contents'}[25]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'extra'}{'entry_node'}
 = 
$result_trees{'indices_in_begin_tables_lists_entries_after_item'}{'contents'}[3];
+$result_trees{'indices_in_begin_tables_lists_entries_after_item'}{'contents'}[4]{'contents'}[25]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'extra'}{'element_node'}
 = 
$result_trees{'indices_in_begin_tables_lists_entries_after_item'}{'contents'}[3];
 
$result_trees{'indices_in_begin_tables_lists_entries_after_item'}{'contents'}[4]{'contents'}[25]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'indices_in_begin_tables_lists_entries_after_item'}{'contents'}[4]{'contents'}[25]{'contents'}[0]{'contents'}[0]{'contents'}[0];
 
$result_trees{'indices_in_begin_tables_lists_entries_after_item'}{'contents'}[4]{'contents'}[25]{'extra'}{'command_as_argument'}
 = 
$result_trees{'indices_in_begin_tables_lists_entries_after_item'}{'contents'}[4]{'contents'}[25]{'args'}[0]{'contents'}[0];
-$result_trees{'indices_in_begin_tables_lists_entries_after_item'}{'contents'}[4]{'contents'}[27]{'contents'}[0]{'contents'}[0]{'extra'}{'entry_node'}
 = 
$result_trees{'indices_in_begin_tables_lists_entries_after_item'}{'contents'}[3];
+$result_trees{'indices_in_begin_tables_lists_entries_after_item'}{'contents'}[4]{'contents'}[27]{'contents'}[0]{'contents'}[0]{'extra'}{'element_node'}
 = 
$result_trees{'indices_in_begin_tables_lists_entries_after_item'}{'contents'}[3];
 
$result_trees{'indices_in_begin_tables_lists_entries_after_item'}{'contents'}[4]{'contents'}[27]{'contents'}[0]{'contents'}[0]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'indices_in_begin_tables_lists_entries_after_item'}{'contents'}[4]{'contents'}[27]{'contents'}[0]{'contents'}[0];
 
$result_trees{'indices_in_begin_tables_lists_entries_after_item'}{'contents'}[4]{'contents'}[27]{'extra'}{'command_as_argument'}
 = 
$result_trees{'indices_in_begin_tables_lists_entries_after_item'}{'contents'}[4]{'contents'}[27]{'args'}[0]{'contents'}[0];
-$result_trees{'indices_in_begin_tables_lists_entries_after_item'}{'contents'}[4]{'contents'}[29]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'extra'}{'entry_node'}
 = 
$result_trees{'indices_in_begin_tables_lists_entries_after_item'}{'contents'}[3];
+$result_trees{'indices_in_begin_tables_lists_entries_after_item'}{'contents'}[4]{'contents'}[29]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'extra'}{'element_node'}
 = 
$result_trees{'indices_in_begin_tables_lists_entries_after_item'}{'contents'}[3];
 
$result_trees{'indices_in_begin_tables_lists_entries_after_item'}{'contents'}[4]{'contents'}[29]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'indices_in_begin_tables_lists_entries_after_item'}{'contents'}[4]{'contents'}[29]{'contents'}[0]{'contents'}[0]{'contents'}[0];
 
$result_trees{'indices_in_begin_tables_lists_entries_after_item'}{'contents'}[4]{'contents'}[29]{'extra'}{'command_as_argument'}
 = 
$result_trees{'indices_in_begin_tables_lists_entries_after_item'}{'contents'}[4]{'contents'}[29]{'args'}[0]{'contents'}[0];
-$result_trees{'indices_in_begin_tables_lists_entries_after_item'}{'contents'}[4]{'contents'}[31]{'contents'}[0]{'contents'}[0]{'extra'}{'entry_node'}
 = 
$result_trees{'indices_in_begin_tables_lists_entries_after_item'}{'contents'}[3];
+$result_trees{'indices_in_begin_tables_lists_entries_after_item'}{'contents'}[4]{'contents'}[31]{'contents'}[0]{'contents'}[0]{'extra'}{'element_node'}
 = 
$result_trees{'indices_in_begin_tables_lists_entries_after_item'}{'contents'}[3];
 
$result_trees{'indices_in_begin_tables_lists_entries_after_item'}{'contents'}[4]{'contents'}[31]{'contents'}[0]{'contents'}[0]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'indices_in_begin_tables_lists_entries_after_item'}{'contents'}[4]{'contents'}[31]{'contents'}[0]{'contents'}[0];
 
$result_trees{'indices_in_begin_tables_lists_entries_after_item'}{'contents'}[4]{'contents'}[31]{'extra'}{'command_as_argument'}
 = 
$result_trees{'indices_in_begin_tables_lists_entries_after_item'}{'contents'}[4]{'contents'}[31]{'args'}[0]{'contents'}[0];
-$result_trees{'indices_in_begin_tables_lists_entries_after_item'}{'contents'}[4]{'contents'}[33]{'contents'}[0]{'contents'}[1]{'extra'}{'entry_node'}
 = 
$result_trees{'indices_in_begin_tables_lists_entries_after_item'}{'contents'}[3];
+$result_trees{'indices_in_begin_tables_lists_entries_after_item'}{'contents'}[4]{'contents'}[33]{'contents'}[0]{'contents'}[1]{'extra'}{'element_node'}
 = 
$result_trees{'indices_in_begin_tables_lists_entries_after_item'}{'contents'}[3];
 
$result_trees{'indices_in_begin_tables_lists_entries_after_item'}{'contents'}[4]{'contents'}[33]{'contents'}[0]{'contents'}[1]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'indices_in_begin_tables_lists_entries_after_item'}{'contents'}[4]{'contents'}[33]{'contents'}[0]{'contents'}[1];
 
$result_trees{'indices_in_begin_tables_lists_entries_after_item'}{'contents'}[4]{'contents'}[33]{'extra'}{'command_as_argument'}
 = 
$result_trees{'indices_in_begin_tables_lists_entries_after_item'}{'contents'}[4]{'contents'}[33]{'args'}[0]{'contents'}[0];
-$result_trees{'indices_in_begin_tables_lists_entries_after_item'}{'contents'}[4]{'contents'}[35]{'contents'}[0]{'contents'}[0]{'extra'}{'entry_node'}
 = 
$result_trees{'indices_in_begin_tables_lists_entries_after_item'}{'contents'}[3];
+$result_trees{'indices_in_begin_tables_lists_entries_after_item'}{'contents'}[4]{'contents'}[35]{'contents'}[0]{'contents'}[0]{'extra'}{'element_node'}
 = 
$result_trees{'indices_in_begin_tables_lists_entries_after_item'}{'contents'}[3];
 
$result_trees{'indices_in_begin_tables_lists_entries_after_item'}{'contents'}[4]{'contents'}[35]{'contents'}[0]{'contents'}[0]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'indices_in_begin_tables_lists_entries_after_item'}{'contents'}[4]{'contents'}[35]{'contents'}[0]{'contents'}[0];
 
$result_trees{'indices_in_begin_tables_lists_entries_after_item'}{'contents'}[4]{'contents'}[35]{'extra'}{'command_as_argument'}
 = 
$result_trees{'indices_in_begin_tables_lists_entries_after_item'}{'contents'}[4]{'contents'}[35]{'args'}[0]{'contents'}[0];
-$result_trees{'indices_in_begin_tables_lists_entries_after_item'}{'contents'}[4]{'contents'}[37]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'extra'}{'entry_node'}
 = 
$result_trees{'indices_in_begin_tables_lists_entries_after_item'}{'contents'}[3];
+$result_trees{'indices_in_begin_tables_lists_entries_after_item'}{'contents'}[4]{'contents'}[37]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'extra'}{'element_node'}
 = 
$result_trees{'indices_in_begin_tables_lists_entries_after_item'}{'contents'}[3];
 
$result_trees{'indices_in_begin_tables_lists_entries_after_item'}{'contents'}[4]{'contents'}[37]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'indices_in_begin_tables_lists_entries_after_item'}{'contents'}[4]{'contents'}[37]{'contents'}[1]{'contents'}[0]{'contents'}[0];
 
$result_trees{'indices_in_begin_tables_lists_entries_after_item'}{'contents'}[4]{'contents'}[37]{'extra'}{'command_as_argument'}
 = 
$result_trees{'indices_in_begin_tables_lists_entries_after_item'}{'contents'}[4]{'contents'}[37]{'args'}[0]{'contents'}[0];
-$result_trees{'indices_in_begin_tables_lists_entries_after_item'}{'contents'}[4]{'contents'}[39]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'extra'}{'entry_node'}
 = 
$result_trees{'indices_in_begin_tables_lists_entries_after_item'}{'contents'}[3];
+$result_trees{'indices_in_begin_tables_lists_entries_after_item'}{'contents'}[4]{'contents'}[39]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'extra'}{'element_node'}
 = 
$result_trees{'indices_in_begin_tables_lists_entries_after_item'}{'contents'}[3];
 
$result_trees{'indices_in_begin_tables_lists_entries_after_item'}{'contents'}[4]{'contents'}[39]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'indices_in_begin_tables_lists_entries_after_item'}{'contents'}[4]{'contents'}[39]{'contents'}[0]{'contents'}[0]{'contents'}[0];
-$result_trees{'indices_in_begin_tables_lists_entries_after_item'}{'contents'}[4]{'contents'}[39]{'contents'}[0]{'contents'}[0]{'contents'}[2]{'extra'}{'entry_node'}
 = 
$result_trees{'indices_in_begin_tables_lists_entries_after_item'}{'contents'}[3];
+$result_trees{'indices_in_begin_tables_lists_entries_after_item'}{'contents'}[4]{'contents'}[39]{'contents'}[0]{'contents'}[0]{'contents'}[2]{'extra'}{'element_node'}
 = 
$result_trees{'indices_in_begin_tables_lists_entries_after_item'}{'contents'}[3];
 
$result_trees{'indices_in_begin_tables_lists_entries_after_item'}{'contents'}[4]{'contents'}[39]{'contents'}[0]{'contents'}[0]{'contents'}[2]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'indices_in_begin_tables_lists_entries_after_item'}{'contents'}[4]{'contents'}[39]{'contents'}[0]{'contents'}[0]{'contents'}[2];
-$result_trees{'indices_in_begin_tables_lists_entries_after_item'}{'contents'}[4]{'contents'}[39]{'contents'}[0]{'contents'}[0]{'contents'}[3]{'extra'}{'entry_node'}
 = 
$result_trees{'indices_in_begin_tables_lists_entries_after_item'}{'contents'}[3];
+$result_trees{'indices_in_begin_tables_lists_entries_after_item'}{'contents'}[4]{'contents'}[39]{'contents'}[0]{'contents'}[0]{'contents'}[3]{'extra'}{'element_node'}
 = 
$result_trees{'indices_in_begin_tables_lists_entries_after_item'}{'contents'}[3];
 
$result_trees{'indices_in_begin_tables_lists_entries_after_item'}{'contents'}[4]{'contents'}[39]{'contents'}[0]{'contents'}[0]{'contents'}[3]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'indices_in_begin_tables_lists_entries_after_item'}{'contents'}[4]{'contents'}[39]{'contents'}[0]{'contents'}[0]{'contents'}[3];
 
$result_trees{'indices_in_begin_tables_lists_entries_after_item'}{'contents'}[4]{'contents'}[39]{'extra'}{'command_as_argument'}
 = 
$result_trees{'indices_in_begin_tables_lists_entries_after_item'}{'contents'}[4]{'contents'}[39]{'args'}[0]{'contents'}[0];
 
$result_trees{'indices_in_begin_tables_lists_entries_after_item'}{'contents'}[5]{'extra'}{'node_content'}[0]
 = 
$result_trees{'indices_in_begin_tables_lists_entries_after_item'}{'contents'}[5]{'args'}[0]{'contents'}[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 36b783175a..04267b6d34 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
@@ -263,7 +263,7 @@ $result_trees{'printindex_merged_indices_code_style'} = {
           ],
           'cmdname' => 'cindex',
           'extra' => {
-            'entry_node' => {},
+            'element_node' => {},
             'index_entry' => {
               'entry_element' => {},
               'entry_number' => 1,
@@ -307,7 +307,7 @@ $result_trees{'printindex_merged_indices_code_style'} = {
           ],
           'cmdname' => 'vindex',
           'extra' => {
-            'entry_node' => {},
+            'element_node' => {},
             'index_entry' => {
               'entry_element' => {},
               'entry_number' => 1,
@@ -351,7 +351,7 @@ $result_trees{'printindex_merged_indices_code_style'} = {
           ],
           'cmdname' => 'findex',
           'extra' => {
-            'entry_node' => {},
+            'element_node' => {},
             'index_entry' => {
               'entry_element' => {},
               'entry_number' => 1,
@@ -474,7 +474,7 @@ $result_trees{'printindex_merged_indices_code_style'} = {
           ],
           'cmdname' => 'cdiindex',
           'extra' => {
-            'entry_node' => {},
+            'element_node' => {},
             'index_entry' => {
               'entry_element' => {},
               'entry_number' => 1,
@@ -597,7 +597,7 @@ $result_trees{'printindex_merged_indices_code_style'} = {
           ],
           'cmdname' => 'ddiindex',
           'extra' => {
-            'entry_node' => {},
+            'element_node' => {},
             'index_entry' => {
               'entry_element' => {},
               'entry_number' => 1,
@@ -676,15 +676,15 @@ 
$result_trees{'printindex_merged_indices_code_style'}{'contents'}[1]{'extra'}{'n
 
$result_trees{'printindex_merged_indices_code_style'}{'contents'}[1]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = 
$result_trees{'printindex_merged_indices_code_style'}{'contents'}[1]{'args'}[0]{'contents'}[0];
 
$result_trees{'printindex_merged_indices_code_style'}{'contents'}[3]{'extra'}{'node_content'}[0]
 = 
$result_trees{'printindex_merged_indices_code_style'}{'contents'}[3]{'args'}[0]{'contents'}[0];
 
$result_trees{'printindex_merged_indices_code_style'}{'contents'}[3]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = 
$result_trees{'printindex_merged_indices_code_style'}{'contents'}[3]{'args'}[0]{'contents'}[0];
-$result_trees{'printindex_merged_indices_code_style'}{'contents'}[4]{'contents'}[5]{'extra'}{'entry_node'}
 = $result_trees{'printindex_merged_indices_code_style'}{'contents'}[3];
+$result_trees{'printindex_merged_indices_code_style'}{'contents'}[4]{'contents'}[5]{'extra'}{'element_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_element'}
 = 
$result_trees{'printindex_merged_indices_code_style'}{'contents'}[4]{'contents'}[5];
-$result_trees{'printindex_merged_indices_code_style'}{'contents'}[4]{'contents'}[7]{'extra'}{'entry_node'}
 = $result_trees{'printindex_merged_indices_code_style'}{'contents'}[3];
+$result_trees{'printindex_merged_indices_code_style'}{'contents'}[4]{'contents'}[7]{'extra'}{'element_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_element'}
 = 
$result_trees{'printindex_merged_indices_code_style'}{'contents'}[4]{'contents'}[7];
-$result_trees{'printindex_merged_indices_code_style'}{'contents'}[4]{'contents'}[9]{'extra'}{'entry_node'}
 = $result_trees{'printindex_merged_indices_code_style'}{'contents'}[3];
+$result_trees{'printindex_merged_indices_code_style'}{'contents'}[4]{'contents'}[9]{'extra'}{'element_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_element'}
 = 
$result_trees{'printindex_merged_indices_code_style'}{'contents'}[4]{'contents'}[9];
-$result_trees{'printindex_merged_indices_code_style'}{'contents'}[4]{'contents'}[15]{'extra'}{'entry_node'}
 = $result_trees{'printindex_merged_indices_code_style'}{'contents'}[3];
+$result_trees{'printindex_merged_indices_code_style'}{'contents'}[4]{'contents'}[15]{'extra'}{'element_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_element'}
 = 
$result_trees{'printindex_merged_indices_code_style'}{'contents'}[4]{'contents'}[15];
-$result_trees{'printindex_merged_indices_code_style'}{'contents'}[4]{'contents'}[21]{'extra'}{'entry_node'}
 = $result_trees{'printindex_merged_indices_code_style'}{'contents'}[3];
+$result_trees{'printindex_merged_indices_code_style'}{'contents'}[4]{'contents'}[21]{'extra'}{'element_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_element'}
 = 
$result_trees{'printindex_merged_indices_code_style'}{'contents'}[4]{'contents'}[21];
 
 $result_texis{'printindex_merged_indices_code_style'} = '@node Top
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 b8ee7f508a..feefe02784 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
@@ -609,7 +609,7 @@ $result_trees{'references_to_top_no_top_output'} = {
           ],
           'cmdname' => 'cindex',
           'extra' => {
-            'entry_node' => {},
+            'element_node' => {},
             'index_entry' => {
               'entry_element' => {},
               'entry_number' => 1,
@@ -944,7 +944,7 @@ $result_trees{'references_to_top_no_top_output'} = {
           ],
           'cmdname' => 'cindex',
           'extra' => {
-            'entry_node' => {},
+            'element_node' => {},
             'index_entry' => {
               'entry_element' => {},
               'entry_number' => 2,
@@ -1207,7 +1207,7 @@ 
$result_trees{'references_to_top_no_top_output'}{'contents'}[2]{'contents'}[12]{
 
$result_trees{'references_to_top_no_top_output'}{'contents'}[2]{'contents'}[12]{'extra'}{'float_section'}
 = $result_trees{'references_to_top_no_top_output'}{'contents'}[2];
 
$result_trees{'references_to_top_no_top_output'}{'contents'}[2]{'contents'}[12]{'extra'}{'node_content'}[0]
 = 
$result_trees{'references_to_top_no_top_output'}{'contents'}[2]{'contents'}[12]{'args'}[1]{'contents'}[0];
 
$result_trees{'references_to_top_no_top_output'}{'contents'}[2]{'contents'}[12]{'extra'}{'type'}{'content'}[0]
 = 
$result_trees{'references_to_top_no_top_output'}{'contents'}[2]{'contents'}[12]{'args'}[0]{'contents'}[0];
-$result_trees{'references_to_top_no_top_output'}{'contents'}[2]{'contents'}[14]{'extra'}{'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'}{'element_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_element'}
 = 
$result_trees{'references_to_top_no_top_output'}{'contents'}[2]{'contents'}[14];
 
$result_trees{'references_to_top_no_top_output'}{'contents'}[3]{'extra'}{'node_content'}[0]
 = 
$result_trees{'references_to_top_no_top_output'}{'contents'}[3]{'args'}[0]{'contents'}[0];
 
$result_trees{'references_to_top_no_top_output'}{'contents'}[3]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = 
$result_trees{'references_to_top_no_top_output'}{'contents'}[3]{'args'}[0]{'contents'}[0];
@@ -1223,7 +1223,7 @@ 
$result_trees{'references_to_top_no_top_output'}{'contents'}[4]{'contents'}[1]{'
 
$result_trees{'references_to_top_no_top_output'}{'contents'}[4]{'contents'}[1]{'contents'}[8]{'extra'}{'node_argument'}{'node_content'}[0]
 = 
$result_trees{'references_to_top_no_top_output'}{'contents'}[4]{'contents'}[1]{'contents'}[8]{'args'}[0]{'contents'}[0];
 
$result_trees{'references_to_top_no_top_output'}{'contents'}[4]{'contents'}[1]{'contents'}[10]{'extra'}{'label'}
 = 
$result_trees{'references_to_top_no_top_output'}{'contents'}[2]{'contents'}[6]{'contents'}[1];
 
$result_trees{'references_to_top_no_top_output'}{'contents'}[4]{'contents'}[1]{'contents'}[10]{'extra'}{'node_argument'}{'node_content'}[0]
 = 
$result_trees{'references_to_top_no_top_output'}{'contents'}[4]{'contents'}[1]{'contents'}[10]{'args'}[0]{'contents'}[0];
-$result_trees{'references_to_top_no_top_output'}{'contents'}[4]{'contents'}[3]{'extra'}{'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'}{'element_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_element'}
 = 
$result_trees{'references_to_top_no_top_output'}{'contents'}[4]{'contents'}[3];
 
$result_trees{'references_to_top_no_top_output'}{'contents'}[4]{'contents'}[7]{'contents'}[1]{'extra'}{'float'}
 = 
$result_trees{'references_to_top_no_top_output'}{'contents'}[4]{'contents'}[7];
 
$result_trees{'references_to_top_no_top_output'}{'contents'}[4]{'contents'}[7]{'extra'}{'caption'}
 = 
$result_trees{'references_to_top_no_top_output'}{'contents'}[4]{'contents'}[7]{'contents'}[1];
diff --git a/tp/t/results/converters_tests/test_deftypefnnewline.pl 
b/tp/t/results/converters_tests/test_deftypefnnewline.pl
index 7b83021a0c..7d53049e41 100644
--- a/tp/t/results/converters_tests/test_deftypefnnewline.pl
+++ b/tp/t/results/converters_tests/test_deftypefnnewline.pl
@@ -310,7 +310,7 @@ $result_trees{'test_deftypefnnewline'} = {
                   'name' => {},
                   'type' => {}
                 },
-                'entry_node' => {},
+                'element_node' => {},
                 'index_entry' => {
                   'entry_element' => {},
                   'entry_number' => 1,
@@ -446,7 +446,7 @@ $result_trees{'test_deftypefnnewline'} = {
                   'name' => {},
                   'type' => {}
                 },
-                'entry_node' => {},
+                'element_node' => {},
                 'index_entry' => {
                   'entry_element' => {},
                   'entry_number' => 2,
@@ -627,7 +627,7 @@ $result_trees{'test_deftypefnnewline'} = {
                   'name' => {},
                   'type' => {}
                 },
-                'entry_node' => {},
+                'element_node' => {},
                 'index_entry' => {
                   'entry_element' => {},
                   'entry_number' => 3,
@@ -795,7 +795,7 @@ $result_trees{'test_deftypefnnewline'} = {
                   'name' => {},
                   'type' => {}
                 },
-                'entry_node' => {},
+                'element_node' => {},
                 'index_entry' => {
                   'entry_element' => {},
                   'entry_number' => 4,
@@ -963,7 +963,7 @@ $result_trees{'test_deftypefnnewline'} = {
                   'name' => {},
                   'type' => {}
                 },
-                'entry_node' => {},
+                'element_node' => {},
                 'index_entry' => {
                   'entry_element' => {},
                   'entry_number' => 1,
@@ -1144,7 +1144,7 @@ $result_trees{'test_deftypefnnewline'} = {
                   'name' => {},
                   'type' => {}
                 },
-                'entry_node' => {},
+                'element_node' => {},
                 'index_entry' => {
                   'entry_element' => {},
                   'entry_number' => 2,
@@ -1266,7 +1266,7 @@ $result_trees{'test_deftypefnnewline'} = {
                   'category' => {},
                   'name' => {}
                 },
-                'entry_node' => {},
+                'element_node' => {},
                 'index_entry' => {
                   'entry_element' => {},
                   'entry_number' => 5,
@@ -1459,7 +1459,7 @@ $result_trees{'test_deftypefnnewline'} = {
                   'name' => {},
                   'type' => {}
                 },
-                'entry_node' => {},
+                'element_node' => {},
                 'index_entry' => {
                   'entry_element' => {},
                   'entry_number' => 6,
@@ -1595,7 +1595,7 @@ $result_trees{'test_deftypefnnewline'} = {
                   'name' => {},
                   'type' => {}
                 },
-                'entry_node' => {},
+                'element_node' => {},
                 'index_entry' => {
                   'entry_element' => {},
                   'entry_number' => 7,
@@ -1776,7 +1776,7 @@ $result_trees{'test_deftypefnnewline'} = {
                   'name' => {},
                   'type' => {}
                 },
-                'entry_node' => {},
+                'element_node' => {},
                 'index_entry' => {
                   'entry_element' => {},
                   'entry_number' => 8,
@@ -1944,7 +1944,7 @@ $result_trees{'test_deftypefnnewline'} = {
                   'name' => {},
                   'type' => {}
                 },
-                'entry_node' => {},
+                'element_node' => {},
                 'index_entry' => {
                   'entry_element' => {},
                   'entry_number' => 9,
@@ -2112,7 +2112,7 @@ $result_trees{'test_deftypefnnewline'} = {
                   'name' => {},
                   'type' => {}
                 },
-                'entry_node' => {},
+                'element_node' => {},
                 'index_entry' => {
                   'entry_element' => {},
                   'entry_number' => 3,
@@ -2293,7 +2293,7 @@ $result_trees{'test_deftypefnnewline'} = {
                   'name' => {},
                   'type' => {}
                 },
-                'entry_node' => {},
+                'element_node' => {},
                 'index_entry' => {
                   'entry_element' => {},
                   'entry_number' => 4,
@@ -2415,7 +2415,7 @@ $result_trees{'test_deftypefnnewline'} = {
                   'category' => {},
                   'name' => {}
                 },
-                'entry_node' => {},
+                'element_node' => {},
                 'index_entry' => {
                   'entry_element' => {},
                   'entry_number' => 10,
@@ -2513,13 +2513,13 @@ 
$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'}{'entry_node'}
 = $result_trees{'test_deftypefnnewline'}{'contents'}[3];
+$result_trees{'test_deftypefnnewline'}{'contents'}[4]{'contents'}[1]{'contents'}[0]{'extra'}{'element_node'}
 = $result_trees{'test_deftypefnnewline'}{'contents'}[3];
 
$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'}[3]{'contents'}[0]{'extra'}{'def_index_element'}
 = 
$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'}{'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'}{'entry_node'}
 = $result_trees{'test_deftypefnnewline'}{'contents'}[3];
+$result_trees{'test_deftypefnnewline'}{'contents'}[4]{'contents'}[3]{'contents'}[0]{'extra'}{'element_node'}
 = $result_trees{'test_deftypefnnewline'}{'contents'}[3];
 
$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'}[5]{'contents'}[0]{'extra'}{'def_index_element'}{'contents'}[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'}{'def_index_element'}{'contents'}[2]
 = 
$result_trees{'test_deftypefnnewline'}{'contents'}[4]{'contents'}[5]{'contents'}[0]{'args'}[0]{'contents'}[2];
@@ -2529,7 +2529,7 @@ 
$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'}{'entry_node'}
 = $result_trees{'test_deftypefnnewline'}{'contents'}[3];
+$result_trees{'test_deftypefnnewline'}{'contents'}[4]{'contents'}[5]{'contents'}[0]{'extra'}{'element_node'}
 = $result_trees{'test_deftypefnnewline'}{'contents'}[3];
 
$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'}[7]{'contents'}[0]{'extra'}{'def_index_element'}{'contents'}[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'}{'def_index_element'}{'contents'}[2]
 = 
$result_trees{'test_deftypefnnewline'}{'contents'}[4]{'contents'}[7]{'contents'}[0]{'args'}[0]{'contents'}[2];
@@ -2539,7 +2539,7 @@ 
$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'}{'entry_node'}
 = $result_trees{'test_deftypefnnewline'}{'contents'}[3];
+$result_trees{'test_deftypefnnewline'}{'contents'}[4]{'contents'}[7]{'contents'}[0]{'extra'}{'element_node'}
 = $result_trees{'test_deftypefnnewline'}{'contents'}[3];
 
$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'}[9]{'contents'}[0]{'extra'}{'def_index_element'}{'contents'}[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'}{'def_index_element'}{'contents'}[2]
 = 
$result_trees{'test_deftypefnnewline'}{'contents'}[4]{'contents'}[9]{'contents'}[0]{'args'}[0]{'contents'}[2];
@@ -2549,7 +2549,7 @@ 
$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'}{'entry_node'}
 = $result_trees{'test_deftypefnnewline'}{'contents'}[3];
+$result_trees{'test_deftypefnnewline'}{'contents'}[4]{'contents'}[9]{'contents'}[0]{'extra'}{'element_node'}
 = $result_trees{'test_deftypefnnewline'}{'contents'}[3];
 
$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'}[11]{'contents'}[0]{'extra'}{'def_index_element'}{'contents'}[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'}{'def_index_element'}{'contents'}[2]
 = 
$result_trees{'test_deftypefnnewline'}{'contents'}[4]{'contents'}[11]{'contents'}[0]{'args'}[0]{'contents'}[2];
@@ -2559,24 +2559,24 @@ 
$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'}{'entry_node'}
 = $result_trees{'test_deftypefnnewline'}{'contents'}[3];
+$result_trees{'test_deftypefnnewline'}{'contents'}[4]{'contents'}[11]{'contents'}[0]{'extra'}{'element_node'}
 = $result_trees{'test_deftypefnnewline'}{'contents'}[3];
 
$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'}[13]{'contents'}[0]{'extra'}{'def_index_element'}
 = 
$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'}{'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'}{'entry_node'}
 = $result_trees{'test_deftypefnnewline'}{'contents'}[3];
+$result_trees{'test_deftypefnnewline'}{'contents'}[4]{'contents'}[13]{'contents'}[0]{'extra'}{'element_node'}
 = $result_trees{'test_deftypefnnewline'}{'contents'}[3];
 
$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'}[17]{'contents'}[0]{'extra'}{'def_index_element'}
 = 
$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'}{'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'}{'entry_node'}
 = $result_trees{'test_deftypefnnewline'}{'contents'}[3];
+$result_trees{'test_deftypefnnewline'}{'contents'}[4]{'contents'}[17]{'contents'}[0]{'extra'}{'element_node'}
 = $result_trees{'test_deftypefnnewline'}{'contents'}[3];
 
$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'}[19]{'contents'}[0]{'extra'}{'def_index_element'}
 = 
$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'}{'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'}{'entry_node'}
 = $result_trees{'test_deftypefnnewline'}{'contents'}[3];
+$result_trees{'test_deftypefnnewline'}{'contents'}[4]{'contents'}[19]{'contents'}[0]{'extra'}{'element_node'}
 = $result_trees{'test_deftypefnnewline'}{'contents'}[3];
 
$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'}[21]{'contents'}[0]{'extra'}{'def_index_element'}{'contents'}[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'}{'def_index_element'}{'contents'}[2]
 = 
$result_trees{'test_deftypefnnewline'}{'contents'}[4]{'contents'}[21]{'contents'}[0]{'args'}[0]{'contents'}[2];
@@ -2586,7 +2586,7 @@ 
$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'}{'entry_node'}
 = $result_trees{'test_deftypefnnewline'}{'contents'}[3];
+$result_trees{'test_deftypefnnewline'}{'contents'}[4]{'contents'}[21]{'contents'}[0]{'extra'}{'element_node'}
 = $result_trees{'test_deftypefnnewline'}{'contents'}[3];
 
$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'}[23]{'contents'}[0]{'extra'}{'def_index_element'}{'contents'}[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'}{'def_index_element'}{'contents'}[2]
 = 
$result_trees{'test_deftypefnnewline'}{'contents'}[4]{'contents'}[23]{'contents'}[0]{'args'}[0]{'contents'}[2];
@@ -2596,7 +2596,7 @@ 
$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'}{'entry_node'}
 = $result_trees{'test_deftypefnnewline'}{'contents'}[3];
+$result_trees{'test_deftypefnnewline'}{'contents'}[4]{'contents'}[23]{'contents'}[0]{'extra'}{'element_node'}
 = $result_trees{'test_deftypefnnewline'}{'contents'}[3];
 
$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'}[25]{'contents'}[0]{'extra'}{'def_index_element'}{'contents'}[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'}{'def_index_element'}{'contents'}[2]
 = 
$result_trees{'test_deftypefnnewline'}{'contents'}[4]{'contents'}[25]{'contents'}[0]{'args'}[0]{'contents'}[2];
@@ -2606,7 +2606,7 @@ 
$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'}{'entry_node'}
 = $result_trees{'test_deftypefnnewline'}{'contents'}[3];
+$result_trees{'test_deftypefnnewline'}{'contents'}[4]{'contents'}[25]{'contents'}[0]{'extra'}{'element_node'}
 = $result_trees{'test_deftypefnnewline'}{'contents'}[3];
 
$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'}[27]{'contents'}[0]{'extra'}{'def_index_element'}{'contents'}[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'}{'def_index_element'}{'contents'}[2]
 = 
$result_trees{'test_deftypefnnewline'}{'contents'}[4]{'contents'}[27]{'contents'}[0]{'args'}[0]{'contents'}[2];
@@ -2616,12 +2616,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'}{'entry_node'}
 = $result_trees{'test_deftypefnnewline'}{'contents'}[3];
+$result_trees{'test_deftypefnnewline'}{'contents'}[4]{'contents'}[27]{'contents'}[0]{'extra'}{'element_node'}
 = $result_trees{'test_deftypefnnewline'}{'contents'}[3];
 
$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'}[29]{'contents'}[0]{'extra'}{'def_index_element'}
 = 
$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'}{'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'}{'entry_node'}
 = $result_trees{'test_deftypefnnewline'}{'contents'}[3];
+$result_trees{'test_deftypefnnewline'}{'contents'}[4]{'contents'}[29]{'contents'}[0]{'extra'}{'element_node'}
 = $result_trees{'test_deftypefnnewline'}{'contents'}[3];
 
$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_texis{'test_deftypefnnewline'} = '@setfilename 
test_deftypefnnewline.info
diff --git a/tp/t/results/coverage/punctuation_in_line_commands.pl 
b/tp/t/results/coverage/punctuation_in_line_commands.pl
index 4aa79e010a..056ef87e6f 100644
--- a/tp/t/results/coverage/punctuation_in_line_commands.pl
+++ b/tp/t/results/coverage/punctuation_in_line_commands.pl
@@ -634,7 +634,7 @@ $result_trees{'punctuation_in_line_commands'} = {
           ],
           'cmdname' => 'cindex',
           'extra' => {
-            'entry_node' => {},
+            'element_node' => {},
             'index_entry' => {
               'entry_element' => {},
               'entry_number' => 1,
@@ -843,7 +843,7 @@ 
$result_trees{'punctuation_in_line_commands'}{'contents'}[2]{'contents'}[7]{'ext
 
$result_trees{'punctuation_in_line_commands'}{'contents'}[2]{'contents'}[7]{'extra'}{'node_content'}[0]
 = 
$result_trees{'punctuation_in_line_commands'}{'contents'}[2]{'contents'}[7]{'args'}[1]{'contents'}[0];
 
$result_trees{'punctuation_in_line_commands'}{'contents'}[2]{'contents'}[7]{'extra'}{'type'}{'content'}[0]
 = 
$result_trees{'punctuation_in_line_commands'}{'contents'}[2]{'contents'}[7]{'args'}[0]{'contents'}[0];
 
$result_trees{'punctuation_in_line_commands'}{'contents'}[2]{'contents'}[9]{'extra'}{'type'}{'content'}[0]
 = 
$result_trees{'punctuation_in_line_commands'}{'contents'}[2]{'contents'}[9]{'args'}[0]{'contents'}[0];
-$result_trees{'punctuation_in_line_commands'}{'contents'}[2]{'contents'}[11]{'extra'}{'entry_node'}
 = $result_trees{'punctuation_in_line_commands'}{'contents'}[1];
+$result_trees{'punctuation_in_line_commands'}{'contents'}[2]{'contents'}[11]{'extra'}{'element_node'}
 = $result_trees{'punctuation_in_line_commands'}{'contents'}[1];
 
$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_texis{'punctuation_in_line_commands'} = '
diff --git a/tp/t/results/coverage_braces/contain_plain_text_nestings.pl 
b/tp/t/results/coverage_braces/contain_plain_text_nestings.pl
index 1d24831899..0b11961e70 100644
--- a/tp/t/results/coverage_braces/contain_plain_text_nestings.pl
+++ b/tp/t/results/coverage_braces/contain_plain_text_nestings.pl
@@ -343,7 +343,7 @@ $result_trees{'contain_plain_text_nestings'} = {
               ],
               'cmdname' => 'cindex',
               'extra' => {
-                'entry_node' => {},
+                'element_node' => {},
                 'index_entry' => {
                   'entry_element' => {},
                   'entry_number' => 1,
@@ -661,7 +661,7 @@ $result_trees{'contain_plain_text_nestings'} = {
               ],
               'cmdname' => 'cindex',
               'extra' => {
-                'entry_node' => {},
+                'element_node' => {},
                 'index_entry' => {
                   'entry_element' => {},
                   'entry_number' => 2,
@@ -744,7 +744,7 @@ 
$result_trees{'contain_plain_text_nestings'}{'contents'}[1]{'extra'}{'node_conte
 
$result_trees{'contain_plain_text_nestings'}{'contents'}[1]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = 
$result_trees{'contain_plain_text_nestings'}{'contents'}[1]{'args'}[0]{'contents'}[0];
 
$result_trees{'contain_plain_text_nestings'}{'contents'}[3]{'extra'}{'node_content'}[0]
 = 
$result_trees{'contain_plain_text_nestings'}{'contents'}[3]{'args'}[0]{'contents'}[0];
 
$result_trees{'contain_plain_text_nestings'}{'contents'}[3]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = 
$result_trees{'contain_plain_text_nestings'}{'contents'}[3]{'args'}[0]{'contents'}[0];
-$result_trees{'contain_plain_text_nestings'}{'contents'}[4]{'contents'}[1]{'contents'}[7]{'extra'}{'entry_node'}
 = $result_trees{'contain_plain_text_nestings'}{'contents'}[3];
+$result_trees{'contain_plain_text_nestings'}{'contents'}[4]{'contents'}[1]{'contents'}[7]{'extra'}{'element_node'}
 = $result_trees{'contain_plain_text_nestings'}{'contents'}[3];
 
$result_trees{'contain_plain_text_nestings'}{'contents'}[4]{'contents'}[1]{'contents'}[7]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'contain_plain_text_nestings'}{'contents'}[4]{'contents'}[1]{'contents'}[7];
 
$result_trees{'contain_plain_text_nestings'}{'contents'}[4]{'contents'}[4]{'contents'}[1]{'args'}[0]{'contents'}[0]{'extra'}{'label'}
 = $result_trees{'contain_plain_text_nestings'}{'contents'}[1];
 
$result_trees{'contain_plain_text_nestings'}{'contents'}[4]{'contents'}[4]{'contents'}[1]{'args'}[0]{'contents'}[0]{'extra'}{'node_argument'}{'node_content'}[0]
 = 
$result_trees{'contain_plain_text_nestings'}{'contents'}[4]{'contents'}[4]{'contents'}[1]{'args'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0];
@@ -754,7 +754,7 @@ 
$result_trees{'contain_plain_text_nestings'}{'contents'}[4]{'contents'}[4]{'cont
 
$result_trees{'contain_plain_text_nestings'}{'contents'}[4]{'contents'}[4]{'contents'}[5]{'args'}[0]{'contents'}[0]{'extra'}{'node_argument'}{'node_content'}[0]
 = 
$result_trees{'contain_plain_text_nestings'}{'contents'}[4]{'contents'}[4]{'contents'}[5]{'args'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0];
 
$result_trees{'contain_plain_text_nestings'}{'contents'}[4]{'contents'}[4]{'contents'}[7]{'args'}[0]{'contents'}[2]{'args'}[0]{'contents'}[0]{'extra'}{'label'}
 = $result_trees{'contain_plain_text_nestings'}{'contents'}[1];
 
$result_trees{'contain_plain_text_nestings'}{'contents'}[4]{'contents'}[4]{'contents'}[7]{'args'}[0]{'contents'}[2]{'args'}[0]{'contents'}[0]{'extra'}{'node_argument'}{'node_content'}[0]
 = 
$result_trees{'contain_plain_text_nestings'}{'contents'}[4]{'contents'}[4]{'contents'}[7]{'args'}[0]{'contents'}[2]{'args'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0];
-$result_trees{'contain_plain_text_nestings'}{'contents'}[4]{'contents'}[4]{'contents'}[7]{'extra'}{'entry_node'}
 = $result_trees{'contain_plain_text_nestings'}{'contents'}[3];
+$result_trees{'contain_plain_text_nestings'}{'contents'}[4]{'contents'}[4]{'contents'}[7]{'extra'}{'element_node'}
 = $result_trees{'contain_plain_text_nestings'}{'contents'}[3];
 
$result_trees{'contain_plain_text_nestings'}{'contents'}[4]{'contents'}[4]{'contents'}[7]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'contain_plain_text_nestings'}{'contents'}[4]{'contents'}[4]{'contents'}[7];
 
 $result_texis{'contain_plain_text_nestings'} = '@node Top
diff --git a/tp/t/results/def/all_commands_delimiters_printindex.pl 
b/tp/t/results/def/all_commands_delimiters_printindex.pl
index 142d437a6e..c4fa81f027 100644
--- a/tp/t/results/def/all_commands_delimiters_printindex.pl
+++ b/tp/t/results/def/all_commands_delimiters_printindex.pl
@@ -449,7 +449,7 @@ $result_trees{'all_commands_delimiters_printindex'} = {
                   'category' => {},
                   'name' => {}
                 },
-                'entry_node' => {},
+                'element_node' => {},
                 'index_entry' => {
                   'entry_element' => {},
                   'entry_number' => 1,
@@ -843,7 +843,7 @@ $result_trees{'all_commands_delimiters_printindex'} = {
                   'category' => {},
                   'name' => {}
                 },
-                'entry_node' => {},
+                'element_node' => {},
                 'index_entry' => {
                   'entry_element' => {},
                   'entry_number' => 1,
@@ -1078,7 +1078,7 @@ $result_trees{'all_commands_delimiters_printindex'} = {
                   'name' => {},
                   'type' => {}
                 },
-                'entry_node' => {},
+                'element_node' => {},
                 'index_entry' => {
                   'entry_element' => {},
                   'entry_number' => 2,
@@ -1581,7 +1581,7 @@ $result_trees{'all_commands_delimiters_printindex'} = {
                   'name' => {},
                   'type' => {}
                 },
-                'entry_node' => {},
+                'element_node' => {},
                 'index_entry' => {
                   'entry_element' => {},
                   'entry_number' => 3,
@@ -1736,7 +1736,7 @@ $result_trees{'all_commands_delimiters_printindex'} = {
                   'name' => {},
                   'type' => {}
                 },
-                'entry_node' => {},
+                'element_node' => {},
                 'index_entry' => {
                   'entry_element' => {},
                   'entry_number' => 4,
@@ -2051,7 +2051,7 @@ $result_trees{'all_commands_delimiters_printindex'} = {
                   'name' => {},
                   'type' => {}
                 },
-                'entry_node' => {},
+                'element_node' => {},
                 'index_entry' => {
                   'entry_element' => {},
                   'entry_number' => 5,
@@ -2423,7 +2423,7 @@ $result_trees{'all_commands_delimiters_printindex'} = {
                   'name' => {},
                   'type' => {}
                 },
-                'entry_node' => {},
+                'element_node' => {},
                 'index_entry' => {
                   'entry_element' => {},
                   'entry_number' => 2,
@@ -2807,7 +2807,7 @@ $result_trees{'all_commands_delimiters_printindex'} = {
                   'category' => {},
                   'name' => {}
                 },
-                'entry_node' => {},
+                'element_node' => {},
                 'index_entry' => {
                   'entry_element' => {},
                   'entry_number' => 1,
@@ -3179,7 +3179,7 @@ $result_trees{'all_commands_delimiters_printindex'} = {
                   'class' => {},
                   'name' => {}
                 },
-                'entry_node' => {},
+                'element_node' => {},
                 'index_entry' => {
                   'entry_element' => {},
                   'entry_number' => 3,
@@ -3598,7 +3598,7 @@ $result_trees{'all_commands_delimiters_printindex'} = {
                   'name' => {},
                   'type' => {}
                 },
-                'entry_node' => {},
+                'element_node' => {},
                 'index_entry' => {
                   'entry_element' => {},
                   'entry_number' => 4,
@@ -3978,7 +3978,7 @@ $result_trees{'all_commands_delimiters_printindex'} = {
                   'class' => {},
                   'name' => {}
                 },
-                'entry_node' => {},
+                'element_node' => {},
                 'index_entry' => {
                   'entry_element' => {},
                   'entry_number' => 6,
@@ -4387,7 +4387,7 @@ $result_trees{'all_commands_delimiters_printindex'} = {
                   'name' => {},
                   'type' => {}
                 },
-                'entry_node' => {},
+                'element_node' => {},
                 'index_entry' => {
                   'entry_element' => {},
                   'entry_number' => 7,
@@ -4582,7 +4582,7 @@ $result_trees{'all_commands_delimiters_printindex'} = {
                   'name' => {},
                   'type' => {}
                 },
-                'entry_node' => {},
+                'element_node' => {},
                 'index_entry' => {
                   'entry_element' => {},
                   'entry_number' => 8,
@@ -4797,7 +4797,7 @@ $result_trees{'all_commands_delimiters_printindex'} = {
                   'name' => {},
                   'type' => {}
                 },
-                'entry_node' => {},
+                'element_node' => {},
                 'index_entry' => {
                   'entry_element' => {},
                   'entry_number' => 9,
@@ -5012,7 +5012,7 @@ $result_trees{'all_commands_delimiters_printindex'} = {
                   'name' => {},
                   'type' => {}
                 },
-                'entry_node' => {},
+                'element_node' => {},
                 'index_entry' => {
                   'entry_element' => {},
                   'entry_number' => 10,
@@ -5207,7 +5207,7 @@ $result_trees{'all_commands_delimiters_printindex'} = {
                   'name' => {},
                   'type' => {}
                 },
-                'entry_node' => {},
+                'element_node' => {},
                 'index_entry' => {
                   'entry_element' => {},
                   'entry_number' => 11,
@@ -5402,7 +5402,7 @@ $result_trees{'all_commands_delimiters_printindex'} = {
                   'name' => {},
                   'type' => {}
                 },
-                'entry_node' => {},
+                'element_node' => {},
                 'index_entry' => {
                   'entry_element' => {},
                   'entry_number' => 12,
@@ -5617,7 +5617,7 @@ $result_trees{'all_commands_delimiters_printindex'} = {
                   'name' => {},
                   'type' => {}
                 },
-                'entry_node' => {},
+                'element_node' => {},
                 'index_entry' => {
                   'entry_element' => {},
                   'entry_number' => 13,
@@ -5832,7 +5832,7 @@ $result_trees{'all_commands_delimiters_printindex'} = {
                   'name' => {},
                   'type' => {}
                 },
-                'entry_node' => {},
+                'element_node' => {},
                 'index_entry' => {
                   'entry_element' => {},
                   'entry_number' => 14,
@@ -6027,7 +6027,7 @@ $result_trees{'all_commands_delimiters_printindex'} = {
                   'name' => {},
                   'type' => {}
                 },
-                'entry_node' => {},
+                'element_node' => {},
                 'index_entry' => {
                   'entry_element' => {},
                   'entry_number' => 15,
@@ -6222,7 +6222,7 @@ $result_trees{'all_commands_delimiters_printindex'} = {
                   'name' => {},
                   'type' => {}
                 },
-                'entry_node' => {},
+                'element_node' => {},
                 'index_entry' => {
                   'entry_element' => {},
                   'entry_number' => 16,
@@ -6437,7 +6437,7 @@ $result_trees{'all_commands_delimiters_printindex'} = {
                   'name' => {},
                   'type' => {}
                 },
-                'entry_node' => {},
+                'element_node' => {},
                 'index_entry' => {
                   'entry_element' => {},
                   'entry_number' => 17,
@@ -6652,7 +6652,7 @@ $result_trees{'all_commands_delimiters_printindex'} = {
                   'name' => {},
                   'type' => {}
                 },
-                'entry_node' => {},
+                'element_node' => {},
                 'index_entry' => {
                   'entry_element' => {},
                   'entry_number' => 18,
@@ -6847,7 +6847,7 @@ $result_trees{'all_commands_delimiters_printindex'} = {
                   'name' => {},
                   'type' => {}
                 },
-                'entry_node' => {},
+                'element_node' => {},
                 'index_entry' => {
                   'entry_element' => {},
                   'entry_number' => 19,
@@ -7042,7 +7042,7 @@ $result_trees{'all_commands_delimiters_printindex'} = {
                   'name' => {},
                   'type' => {}
                 },
-                'entry_node' => {},
+                'element_node' => {},
                 'index_entry' => {
                   'entry_element' => {},
                   'entry_number' => 20,
@@ -7270,7 +7270,7 @@ $result_trees{'all_commands_delimiters_printindex'} = {
                   'name' => {},
                   'type' => {}
                 },
-                'entry_node' => {},
+                'element_node' => {},
                 'index_entry' => {
                   'entry_element' => {},
                   'entry_number' => 21,
@@ -7422,7 +7422,7 @@ $result_trees{'all_commands_delimiters_printindex'} = {
                   'category' => {},
                   'name' => {}
                 },
-                'entry_node' => {},
+                'element_node' => {},
                 'index_entry' => {
                   'entry_element' => {},
                   'entry_number' => 22,
@@ -7616,7 +7616,7 @@ $result_trees{'all_commands_delimiters_printindex'} = {
                   'category' => {},
                   'name' => {}
                 },
-                'entry_node' => {},
+                'element_node' => {},
                 'index_entry' => {
                   'entry_element' => {},
                   'entry_number' => 23,
@@ -7810,7 +7810,7 @@ $result_trees{'all_commands_delimiters_printindex'} = {
                   'category' => {},
                   'name' => {}
                 },
-                'entry_node' => {},
+                'element_node' => {},
                 'index_entry' => {
                   'entry_element' => {},
                   'entry_number' => 24,
@@ -8004,7 +8004,7 @@ $result_trees{'all_commands_delimiters_printindex'} = {
                   'category' => {},
                   'name' => {}
                 },
-                'entry_node' => {},
+                'element_node' => {},
                 'index_entry' => {
                   'entry_element' => {},
                   'entry_number' => 5,
@@ -8198,7 +8198,7 @@ $result_trees{'all_commands_delimiters_printindex'} = {
                   'category' => {},
                   'name' => {}
                 },
-                'entry_node' => {},
+                'element_node' => {},
                 'index_entry' => {
                   'entry_element' => {},
                   'entry_number' => 6,
@@ -8421,7 +8421,7 @@ $result_trees{'all_commands_delimiters_printindex'} = {
                   'name' => {},
                   'type' => {}
                 },
-                'entry_node' => {},
+                'element_node' => {},
                 'index_entry' => {
                   'entry_element' => {},
                   'entry_number' => 25,
@@ -8644,7 +8644,7 @@ $result_trees{'all_commands_delimiters_printindex'} = {
                   'name' => {},
                   'type' => {}
                 },
-                'entry_node' => {},
+                'element_node' => {},
                 'index_entry' => {
                   'entry_element' => {},
                   'entry_number' => 26,
@@ -8867,7 +8867,7 @@ $result_trees{'all_commands_delimiters_printindex'} = {
                   'name' => {},
                   'type' => {}
                 },
-                'entry_node' => {},
+                'element_node' => {},
                 'index_entry' => {
                   'entry_element' => {},
                   'entry_number' => 7,
@@ -9090,7 +9090,7 @@ $result_trees{'all_commands_delimiters_printindex'} = {
                   'name' => {},
                   'type' => {}
                 },
-                'entry_node' => {},
+                'element_node' => {},
                 'index_entry' => {
                   'entry_element' => {},
                   'entry_number' => 8,
@@ -9284,7 +9284,7 @@ $result_trees{'all_commands_delimiters_printindex'} = {
                   'category' => {},
                   'name' => {}
                 },
-                'entry_node' => {},
+                'element_node' => {},
                 'index_entry' => {
                   'entry_element' => {},
                   'entry_number' => 2,
@@ -9478,7 +9478,7 @@ $result_trees{'all_commands_delimiters_printindex'} = {
                   'category' => {},
                   'name' => {}
                 },
-                'entry_node' => {},
+                'element_node' => {},
                 'index_entry' => {
                   'entry_element' => {},
                   'entry_number' => 3,
@@ -9701,7 +9701,7 @@ $result_trees{'all_commands_delimiters_printindex'} = {
                   'class' => {},
                   'name' => {}
                 },
-                'entry_node' => {},
+                'element_node' => {},
                 'index_entry' => {
                   'entry_element' => {},
                   'entry_number' => 9,
@@ -9923,7 +9923,7 @@ $result_trees{'all_commands_delimiters_printindex'} = {
                   'category' => {},
                   'name' => {}
                 },
-                'entry_node' => {},
+                'element_node' => {},
                 'index_entry' => {
                   'entry_element' => {},
                   'entry_number' => 4,
@@ -10193,7 +10193,7 @@ $result_trees{'all_commands_delimiters_printindex'} = {
                   'name' => {},
                   'type' => {}
                 },
-                'entry_node' => {},
+                'element_node' => {},
                 'index_entry' => {
                   'entry_element' => {},
                   'entry_number' => 10,
@@ -10463,7 +10463,7 @@ $result_trees{'all_commands_delimiters_printindex'} = {
                   'name' => {},
                   'type' => {}
                 },
-                'entry_node' => {},
+                'element_node' => {},
                 'index_entry' => {
                   'entry_element' => {},
                   'entry_number' => 11,
@@ -10704,7 +10704,7 @@ $result_trees{'all_commands_delimiters_printindex'} = {
                   'class' => {},
                   'name' => {}
                 },
-                'entry_node' => {},
+                'element_node' => {},
                 'index_entry' => {
                   'entry_element' => {},
                   'entry_number' => 27,
@@ -10945,7 +10945,7 @@ $result_trees{'all_commands_delimiters_printindex'} = {
                   'class' => {},
                   'name' => {}
                 },
-                'entry_node' => {},
+                'element_node' => {},
                 'index_entry' => {
                   'entry_element' => {},
                   'entry_number' => 28,
@@ -11215,7 +11215,7 @@ $result_trees{'all_commands_delimiters_printindex'} = {
                   'name' => {},
                   'type' => {}
                 },
-                'entry_node' => {},
+                'element_node' => {},
                 'index_entry' => {
                   'entry_element' => {},
                   'entry_number' => 29,
@@ -11485,7 +11485,7 @@ $result_trees{'all_commands_delimiters_printindex'} = {
                   'name' => {},
                   'type' => {}
                 },
-                'entry_node' => {},
+                'element_node' => {},
                 'index_entry' => {
                   'entry_element' => {},
                   'entry_number' => 30,
@@ -11749,7 +11749,7 @@ $result_trees{'all_commands_delimiters_printindex'} = {
                   'name' => {},
                   'type' => {}
                 },
-                'entry_node' => {},
+                'element_node' => {},
                 'index_entry' => {
                   'entry_element' => {},
                   'entry_number' => 31,
@@ -12013,7 +12013,7 @@ $result_trees{'all_commands_delimiters_printindex'} = {
                   'name' => {},
                   'type' => {}
                 },
-                'entry_node' => {},
+                'element_node' => {},
                 'index_entry' => {
                   'entry_element' => {},
                   'entry_number' => 32,
@@ -12312,53 +12312,53 @@ 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'extra'}{'nod
 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[2]{'contents'}[1]{'contents'}[0]{'extra'}{'def_index_element'}
 = 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[2]{'contents'}[1]{'contents'}[0]{'args'}[0]{'contents'}[2];
 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[2]{'contents'}[1]{'contents'}[0]{'extra'}{'def_parsed_hash'}{'category'}
 = 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[2]{'contents'}[1]{'contents'}[0]{'args'}[0]{'contents'}[0];
 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[2]{'contents'}[1]{'contents'}[0]{'extra'}{'def_parsed_hash'}{'name'}
 = 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[2]{'contents'}[1]{'contents'}[0]{'args'}[0]{'contents'}[2];
-$result_trees{'all_commands_delimiters_printindex'}{'contents'}[2]{'contents'}[1]{'contents'}[0]{'extra'}{'entry_node'}
 = $result_trees{'all_commands_delimiters_printindex'}{'contents'}[2];
+$result_trees{'all_commands_delimiters_printindex'}{'contents'}[2]{'contents'}[1]{'contents'}[0]{'extra'}{'element_node'}
 = $result_trees{'all_commands_delimiters_printindex'}{'contents'}[2];
 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[2]{'contents'}[1]{'contents'}[0]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[2]{'contents'}[1]{'contents'}[0];
 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[2]{'contents'}[3]{'contents'}[0]{'extra'}{'def_index_element'}
 = 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[2]{'contents'}[3]{'contents'}[0]{'args'}[0]{'contents'}[2];
 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[2]{'contents'}[3]{'contents'}[0]{'extra'}{'def_parsed_hash'}{'category'}
 = 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[2]{'contents'}[3]{'contents'}[0]{'args'}[0]{'contents'}[0];
 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[2]{'contents'}[3]{'contents'}[0]{'extra'}{'def_parsed_hash'}{'name'}
 = 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[2]{'contents'}[3]{'contents'}[0]{'args'}[0]{'contents'}[2];
-$result_trees{'all_commands_delimiters_printindex'}{'contents'}[2]{'contents'}[3]{'contents'}[0]{'extra'}{'entry_node'}
 = $result_trees{'all_commands_delimiters_printindex'}{'contents'}[2];
+$result_trees{'all_commands_delimiters_printindex'}{'contents'}[2]{'contents'}[3]{'contents'}[0]{'extra'}{'element_node'}
 = $result_trees{'all_commands_delimiters_printindex'}{'contents'}[2];
 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[2]{'contents'}[3]{'contents'}[0]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[2]{'contents'}[3]{'contents'}[0];
 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[2]{'contents'}[5]{'contents'}[0]{'extra'}{'def_index_element'}
 = 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[2]{'contents'}[5]{'contents'}[0]{'args'}[0]{'contents'}[4];
 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[2]{'contents'}[5]{'contents'}[0]{'extra'}{'def_parsed_hash'}{'category'}
 = 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[2]{'contents'}[5]{'contents'}[0]{'args'}[0]{'contents'}[0];
 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[2]{'contents'}[5]{'contents'}[0]{'extra'}{'def_parsed_hash'}{'name'}
 = 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[2]{'contents'}[5]{'contents'}[0]{'args'}[0]{'contents'}[4];
 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[2]{'contents'}[5]{'contents'}[0]{'extra'}{'def_parsed_hash'}{'type'}
 = 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[2]{'contents'}[5]{'contents'}[0]{'args'}[0]{'contents'}[2];
-$result_trees{'all_commands_delimiters_printindex'}{'contents'}[2]{'contents'}[5]{'contents'}[0]{'extra'}{'entry_node'}
 = $result_trees{'all_commands_delimiters_printindex'}{'contents'}[2];
+$result_trees{'all_commands_delimiters_printindex'}{'contents'}[2]{'contents'}[5]{'contents'}[0]{'extra'}{'element_node'}
 = $result_trees{'all_commands_delimiters_printindex'}{'contents'}[2];
 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[2]{'contents'}[5]{'contents'}[0]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[2]{'contents'}[5]{'contents'}[0];
 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[2]{'contents'}[7]{'contents'}[0]{'extra'}{'def_index_element'}
 = 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[2]{'contents'}[7]{'contents'}[0]{'args'}[0]{'contents'}[4];
 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[2]{'contents'}[7]{'contents'}[0]{'extra'}{'def_parsed_hash'}{'category'}
 = 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[2]{'contents'}[7]{'contents'}[0]{'args'}[0]{'contents'}[0];
 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[2]{'contents'}[7]{'contents'}[0]{'extra'}{'def_parsed_hash'}{'name'}
 = 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[2]{'contents'}[7]{'contents'}[0]{'args'}[0]{'contents'}[4];
 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[2]{'contents'}[7]{'contents'}[0]{'extra'}{'def_parsed_hash'}{'type'}
 = 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[2]{'contents'}[7]{'contents'}[0]{'args'}[0]{'contents'}[2];
-$result_trees{'all_commands_delimiters_printindex'}{'contents'}[2]{'contents'}[7]{'contents'}[0]{'extra'}{'entry_node'}
 = $result_trees{'all_commands_delimiters_printindex'}{'contents'}[2];
+$result_trees{'all_commands_delimiters_printindex'}{'contents'}[2]{'contents'}[7]{'contents'}[0]{'extra'}{'element_node'}
 = $result_trees{'all_commands_delimiters_printindex'}{'contents'}[2];
 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[2]{'contents'}[7]{'contents'}[0]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[2]{'contents'}[7]{'contents'}[0];
 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[2]{'contents'}[9]{'contents'}[0]{'extra'}{'def_index_element'}
 = 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[2]{'contents'}[9]{'contents'}[0]{'args'}[0]{'contents'}[4];
 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[2]{'contents'}[9]{'contents'}[0]{'extra'}{'def_parsed_hash'}{'category'}
 = 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[2]{'contents'}[9]{'contents'}[0]{'args'}[0]{'contents'}[0];
 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[2]{'contents'}[9]{'contents'}[0]{'extra'}{'def_parsed_hash'}{'name'}
 = 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[2]{'contents'}[9]{'contents'}[0]{'args'}[0]{'contents'}[4];
 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[2]{'contents'}[9]{'contents'}[0]{'extra'}{'def_parsed_hash'}{'type'}
 = 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[2]{'contents'}[9]{'contents'}[0]{'args'}[0]{'contents'}[2];
-$result_trees{'all_commands_delimiters_printindex'}{'contents'}[2]{'contents'}[9]{'contents'}[0]{'extra'}{'entry_node'}
 = $result_trees{'all_commands_delimiters_printindex'}{'contents'}[2];
+$result_trees{'all_commands_delimiters_printindex'}{'contents'}[2]{'contents'}[9]{'contents'}[0]{'extra'}{'element_node'}
 = $result_trees{'all_commands_delimiters_printindex'}{'contents'}[2];
 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[2]{'contents'}[9]{'contents'}[0]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[2]{'contents'}[9]{'contents'}[0];
 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[2]{'contents'}[11]{'contents'}[0]{'extra'}{'def_index_element'}
 = 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[2]{'contents'}[11]{'contents'}[0]{'args'}[0]{'contents'}[4];
 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[2]{'contents'}[11]{'contents'}[0]{'extra'}{'def_parsed_hash'}{'category'}
 = 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[2]{'contents'}[11]{'contents'}[0]{'args'}[0]{'contents'}[0];
 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[2]{'contents'}[11]{'contents'}[0]{'extra'}{'def_parsed_hash'}{'name'}
 = 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[2]{'contents'}[11]{'contents'}[0]{'args'}[0]{'contents'}[4];
 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[2]{'contents'}[11]{'contents'}[0]{'extra'}{'def_parsed_hash'}{'type'}
 = 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[2]{'contents'}[11]{'contents'}[0]{'args'}[0]{'contents'}[2];
-$result_trees{'all_commands_delimiters_printindex'}{'contents'}[2]{'contents'}[11]{'contents'}[0]{'extra'}{'entry_node'}
 = $result_trees{'all_commands_delimiters_printindex'}{'contents'}[2];
+$result_trees{'all_commands_delimiters_printindex'}{'contents'}[2]{'contents'}[11]{'contents'}[0]{'extra'}{'element_node'}
 = $result_trees{'all_commands_delimiters_printindex'}{'contents'}[2];
 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[2]{'contents'}[11]{'contents'}[0]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[2]{'contents'}[11]{'contents'}[0];
 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[2]{'contents'}[13]{'contents'}[0]{'extra'}{'def_index_element'}
 = 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[2]{'contents'}[13]{'contents'}[0]{'args'}[0]{'contents'}[4];
 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[2]{'contents'}[13]{'contents'}[0]{'extra'}{'def_parsed_hash'}{'category'}
 = 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[2]{'contents'}[13]{'contents'}[0]{'args'}[0]{'contents'}[0];
 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[2]{'contents'}[13]{'contents'}[0]{'extra'}{'def_parsed_hash'}{'name'}
 = 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[2]{'contents'}[13]{'contents'}[0]{'args'}[0]{'contents'}[4];
 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[2]{'contents'}[13]{'contents'}[0]{'extra'}{'def_parsed_hash'}{'type'}
 = 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[2]{'contents'}[13]{'contents'}[0]{'args'}[0]{'contents'}[2];
-$result_trees{'all_commands_delimiters_printindex'}{'contents'}[2]{'contents'}[13]{'contents'}[0]{'extra'}{'entry_node'}
 = $result_trees{'all_commands_delimiters_printindex'}{'contents'}[2];
+$result_trees{'all_commands_delimiters_printindex'}{'contents'}[2]{'contents'}[13]{'contents'}[0]{'extra'}{'element_node'}
 = $result_trees{'all_commands_delimiters_printindex'}{'contents'}[2];
 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[2]{'contents'}[13]{'contents'}[0]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[2]{'contents'}[13]{'contents'}[0];
 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[2]{'contents'}[15]{'contents'}[0]{'extra'}{'def_index_element'}
 = 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[2]{'contents'}[15]{'contents'}[0]{'args'}[0]{'contents'}[2];
 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[2]{'contents'}[15]{'contents'}[0]{'extra'}{'def_parsed_hash'}{'category'}
 = 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[2]{'contents'}[15]{'contents'}[0]{'args'}[0]{'contents'}[0];
 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[2]{'contents'}[15]{'contents'}[0]{'extra'}{'def_parsed_hash'}{'name'}
 = 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[2]{'contents'}[15]{'contents'}[0]{'args'}[0]{'contents'}[2];
-$result_trees{'all_commands_delimiters_printindex'}{'contents'}[2]{'contents'}[15]{'contents'}[0]{'extra'}{'entry_node'}
 = $result_trees{'all_commands_delimiters_printindex'}{'contents'}[2];
+$result_trees{'all_commands_delimiters_printindex'}{'contents'}[2]{'contents'}[15]{'contents'}[0]{'extra'}{'element_node'}
 = $result_trees{'all_commands_delimiters_printindex'}{'contents'}[2];
 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[2]{'contents'}[15]{'contents'}[0]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[2]{'contents'}[15]{'contents'}[0];
 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[2]{'contents'}[17]{'contents'}[0]{'extra'}{'def_index_element'}
 = 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[2]{'contents'}[17]{'contents'}[0]{'args'}[0]{'contents'}[4];
 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[2]{'contents'}[17]{'contents'}[0]{'extra'}{'def_parsed_hash'}{'category'}
 = 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[2]{'contents'}[17]{'contents'}[0]{'args'}[0]{'contents'}[0];
 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[2]{'contents'}[17]{'contents'}[0]{'extra'}{'def_parsed_hash'}{'class'}
 = 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[2]{'contents'}[17]{'contents'}[0]{'args'}[0]{'contents'}[2];
 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[2]{'contents'}[17]{'contents'}[0]{'extra'}{'def_parsed_hash'}{'name'}
 = 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[2]{'contents'}[17]{'contents'}[0]{'args'}[0]{'contents'}[4];
-$result_trees{'all_commands_delimiters_printindex'}{'contents'}[2]{'contents'}[17]{'contents'}[0]{'extra'}{'entry_node'}
 = $result_trees{'all_commands_delimiters_printindex'}{'contents'}[2];
+$result_trees{'all_commands_delimiters_printindex'}{'contents'}[2]{'contents'}[17]{'contents'}[0]{'extra'}{'element_node'}
 = $result_trees{'all_commands_delimiters_printindex'}{'contents'}[2];
 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[2]{'contents'}[17]{'contents'}[0]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[2]{'contents'}[17]{'contents'}[0];
 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[2]{'contents'}[19]{'contents'}[0]{'extra'}{'def_index_element'}{'contents'}[0]
 = 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[2]{'contents'}[19]{'contents'}[0]{'args'}[0]{'contents'}[6];
 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[2]{'contents'}[19]{'contents'}[0]{'extra'}{'def_index_element'}{'contents'}[2]
 = 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[2]{'contents'}[19]{'contents'}[0]{'args'}[0]{'contents'}[2];
@@ -12368,7 +12368,7 @@ 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[2]{'contents'}[1
 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[2]{'contents'}[19]{'contents'}[0]{'extra'}{'def_parsed_hash'}{'class'}
 = 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[2]{'contents'}[19]{'contents'}[0]{'args'}[0]{'contents'}[2];
 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[2]{'contents'}[19]{'contents'}[0]{'extra'}{'def_parsed_hash'}{'name'}
 = 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[2]{'contents'}[19]{'contents'}[0]{'args'}[0]{'contents'}[6];
 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[2]{'contents'}[19]{'contents'}[0]{'extra'}{'def_parsed_hash'}{'type'}
 = 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[2]{'contents'}[19]{'contents'}[0]{'args'}[0]{'contents'}[4];
-$result_trees{'all_commands_delimiters_printindex'}{'contents'}[2]{'contents'}[19]{'contents'}[0]{'extra'}{'entry_node'}
 = $result_trees{'all_commands_delimiters_printindex'}{'contents'}[2];
+$result_trees{'all_commands_delimiters_printindex'}{'contents'}[2]{'contents'}[19]{'contents'}[0]{'extra'}{'element_node'}
 = $result_trees{'all_commands_delimiters_printindex'}{'contents'}[2];
 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[2]{'contents'}[19]{'contents'}[0]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[2]{'contents'}[19]{'contents'}[0];
 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[2]{'contents'}[21]{'contents'}[0]{'extra'}{'def_index_element'}{'contents'}[0]
 = 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[2]{'contents'}[21]{'contents'}[0]{'args'}[0]{'contents'}[4];
 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[2]{'contents'}[21]{'contents'}[0]{'extra'}{'def_index_element'}{'contents'}[2]
 = 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[2]{'contents'}[21]{'contents'}[0]{'args'}[0]{'contents'}[2];
@@ -12377,7 +12377,7 @@ 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[2]{'contents'}[2
 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[2]{'contents'}[21]{'contents'}[0]{'extra'}{'def_parsed_hash'}{'category'}
 = 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[2]{'contents'}[21]{'contents'}[0]{'args'}[0]{'contents'}[0];
 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[2]{'contents'}[21]{'contents'}[0]{'extra'}{'def_parsed_hash'}{'class'}
 = 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[2]{'contents'}[21]{'contents'}[0]{'args'}[0]{'contents'}[2];
 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[2]{'contents'}[21]{'contents'}[0]{'extra'}{'def_parsed_hash'}{'name'}
 = 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[2]{'contents'}[21]{'contents'}[0]{'args'}[0]{'contents'}[4];
-$result_trees{'all_commands_delimiters_printindex'}{'contents'}[2]{'contents'}[21]{'contents'}[0]{'extra'}{'entry_node'}
 = $result_trees{'all_commands_delimiters_printindex'}{'contents'}[2];
+$result_trees{'all_commands_delimiters_printindex'}{'contents'}[2]{'contents'}[21]{'contents'}[0]{'extra'}{'element_node'}
 = $result_trees{'all_commands_delimiters_printindex'}{'contents'}[2];
 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[2]{'contents'}[21]{'contents'}[0]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[2]{'contents'}[21]{'contents'}[0];
 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[2]{'contents'}[23]{'contents'}[0]{'extra'}{'def_index_element'}{'contents'}[0]
 = 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[2]{'contents'}[23]{'contents'}[0]{'args'}[0]{'contents'}[6];
 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[2]{'contents'}[23]{'contents'}[0]{'extra'}{'def_index_element'}{'contents'}[2]
 = 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[2]{'contents'}[23]{'contents'}[0]{'args'}[0]{'contents'}[2];
@@ -12387,7 +12387,7 @@ 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[2]{'contents'}[2
 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[2]{'contents'}[23]{'contents'}[0]{'extra'}{'def_parsed_hash'}{'class'}
 = 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[2]{'contents'}[23]{'contents'}[0]{'args'}[0]{'contents'}[2];
 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[2]{'contents'}[23]{'contents'}[0]{'extra'}{'def_parsed_hash'}{'name'}
 = 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[2]{'contents'}[23]{'contents'}[0]{'args'}[0]{'contents'}[6];
 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[2]{'contents'}[23]{'contents'}[0]{'extra'}{'def_parsed_hash'}{'type'}
 = 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[2]{'contents'}[23]{'contents'}[0]{'args'}[0]{'contents'}[4];
-$result_trees{'all_commands_delimiters_printindex'}{'contents'}[2]{'contents'}[23]{'contents'}[0]{'extra'}{'entry_node'}
 = $result_trees{'all_commands_delimiters_printindex'}{'contents'}[2];
+$result_trees{'all_commands_delimiters_printindex'}{'contents'}[2]{'contents'}[23]{'contents'}[0]{'extra'}{'element_node'}
 = $result_trees{'all_commands_delimiters_printindex'}{'contents'}[2];
 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[2]{'contents'}[23]{'contents'}[0]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[2]{'contents'}[23]{'contents'}[0];
 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[2]{'contents'}[25]{'contents'}[0]{'extra'}{'def_index_element'}{'contents'}[0]
 = 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[2]{'contents'}[25]{'contents'}[0]{'args'}[0]{'contents'}[6];
 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[2]{'contents'}[25]{'contents'}[0]{'extra'}{'def_index_element'}{'contents'}[2]
 = 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[2]{'contents'}[25]{'contents'}[0]{'args'}[0]{'contents'}[2];
@@ -12397,7 +12397,7 @@ 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[2]{'contents'}[2
 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[2]{'contents'}[25]{'contents'}[0]{'extra'}{'def_parsed_hash'}{'class'}
 = 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[2]{'contents'}[25]{'contents'}[0]{'args'}[0]{'contents'}[2];
 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[2]{'contents'}[25]{'contents'}[0]{'extra'}{'def_parsed_hash'}{'name'}
 = 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[2]{'contents'}[25]{'contents'}[0]{'args'}[0]{'contents'}[6];
 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[2]{'contents'}[25]{'contents'}[0]{'extra'}{'def_parsed_hash'}{'type'}
 = 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[2]{'contents'}[25]{'contents'}[0]{'args'}[0]{'contents'}[4];
-$result_trees{'all_commands_delimiters_printindex'}{'contents'}[2]{'contents'}[25]{'contents'}[0]{'extra'}{'entry_node'}
 = $result_trees{'all_commands_delimiters_printindex'}{'contents'}[2];
+$result_trees{'all_commands_delimiters_printindex'}{'contents'}[2]{'contents'}[25]{'contents'}[0]{'extra'}{'element_node'}
 = $result_trees{'all_commands_delimiters_printindex'}{'contents'}[2];
 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[2]{'contents'}[25]{'contents'}[0]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[2]{'contents'}[25]{'contents'}[0];
 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[2]{'contents'}[27]{'contents'}[0]{'extra'}{'def_index_element'}{'contents'}[0]
 = 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[2]{'contents'}[27]{'contents'}[0]{'args'}[0]{'contents'}[6];
 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[2]{'contents'}[27]{'contents'}[0]{'extra'}{'def_index_element'}{'contents'}[2]
 = 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[2]{'contents'}[27]{'contents'}[0]{'args'}[0]{'contents'}[2];
@@ -12407,7 +12407,7 @@ 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[2]{'contents'}[2
 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[2]{'contents'}[27]{'contents'}[0]{'extra'}{'def_parsed_hash'}{'class'}
 = 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[2]{'contents'}[27]{'contents'}[0]{'args'}[0]{'contents'}[2];
 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[2]{'contents'}[27]{'contents'}[0]{'extra'}{'def_parsed_hash'}{'name'}
 = 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[2]{'contents'}[27]{'contents'}[0]{'args'}[0]{'contents'}[6];
 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[2]{'contents'}[27]{'contents'}[0]{'extra'}{'def_parsed_hash'}{'type'}
 = 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[2]{'contents'}[27]{'contents'}[0]{'args'}[0]{'contents'}[4];
-$result_trees{'all_commands_delimiters_printindex'}{'contents'}[2]{'contents'}[27]{'contents'}[0]{'extra'}{'entry_node'}
 = $result_trees{'all_commands_delimiters_printindex'}{'contents'}[2];
+$result_trees{'all_commands_delimiters_printindex'}{'contents'}[2]{'contents'}[27]{'contents'}[0]{'extra'}{'element_node'}
 = $result_trees{'all_commands_delimiters_printindex'}{'contents'}[2];
 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[2]{'contents'}[27]{'contents'}[0]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[2]{'contents'}[27]{'contents'}[0];
 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[2]{'contents'}[29]{'contents'}[0]{'extra'}{'def_index_element'}{'contents'}[0]
 = 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[2]{'contents'}[29]{'contents'}[0]{'args'}[0]{'contents'}[6];
 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[2]{'contents'}[29]{'contents'}[0]{'extra'}{'def_index_element'}{'contents'}[2]
 = 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[2]{'contents'}[29]{'contents'}[0]{'args'}[0]{'contents'}[2];
@@ -12417,7 +12417,7 @@ 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[2]{'contents'}[2
 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[2]{'contents'}[29]{'contents'}[0]{'extra'}{'def_parsed_hash'}{'class'}
 = 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[2]{'contents'}[29]{'contents'}[0]{'args'}[0]{'contents'}[2];
 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[2]{'contents'}[29]{'contents'}[0]{'extra'}{'def_parsed_hash'}{'name'}
 = 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[2]{'contents'}[29]{'contents'}[0]{'args'}[0]{'contents'}[6];
 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[2]{'contents'}[29]{'contents'}[0]{'extra'}{'def_parsed_hash'}{'type'}
 = 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[2]{'contents'}[29]{'contents'}[0]{'args'}[0]{'contents'}[4];
-$result_trees{'all_commands_delimiters_printindex'}{'contents'}[2]{'contents'}[29]{'contents'}[0]{'extra'}{'entry_node'}
 = $result_trees{'all_commands_delimiters_printindex'}{'contents'}[2];
+$result_trees{'all_commands_delimiters_printindex'}{'contents'}[2]{'contents'}[29]{'contents'}[0]{'extra'}{'element_node'}
 = $result_trees{'all_commands_delimiters_printindex'}{'contents'}[2];
 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[2]{'contents'}[29]{'contents'}[0]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[2]{'contents'}[29]{'contents'}[0];
 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[2]{'contents'}[31]{'contents'}[0]{'extra'}{'def_index_element'}{'contents'}[0]
 = 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[2]{'contents'}[31]{'contents'}[0]{'args'}[0]{'contents'}[6];
 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[2]{'contents'}[31]{'contents'}[0]{'extra'}{'def_index_element'}{'contents'}[2]
 = 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[2]{'contents'}[31]{'contents'}[0]{'args'}[0]{'contents'}[2];
@@ -12427,7 +12427,7 @@ 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[2]{'contents'}[3
 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[2]{'contents'}[31]{'contents'}[0]{'extra'}{'def_parsed_hash'}{'class'}
 = 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[2]{'contents'}[31]{'contents'}[0]{'args'}[0]{'contents'}[2];
 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[2]{'contents'}[31]{'contents'}[0]{'extra'}{'def_parsed_hash'}{'name'}
 = 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[2]{'contents'}[31]{'contents'}[0]{'args'}[0]{'contents'}[6];
 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[2]{'contents'}[31]{'contents'}[0]{'extra'}{'def_parsed_hash'}{'type'}
 = 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[2]{'contents'}[31]{'contents'}[0]{'args'}[0]{'contents'}[4];
-$result_trees{'all_commands_delimiters_printindex'}{'contents'}[2]{'contents'}[31]{'contents'}[0]{'extra'}{'entry_node'}
 = $result_trees{'all_commands_delimiters_printindex'}{'contents'}[2];
+$result_trees{'all_commands_delimiters_printindex'}{'contents'}[2]{'contents'}[31]{'contents'}[0]{'extra'}{'element_node'}
 = $result_trees{'all_commands_delimiters_printindex'}{'contents'}[2];
 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[2]{'contents'}[31]{'contents'}[0]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[2]{'contents'}[31]{'contents'}[0];
 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[2]{'contents'}[33]{'contents'}[0]{'extra'}{'def_index_element'}{'contents'}[0]
 = 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[2]{'contents'}[33]{'contents'}[0]{'args'}[0]{'contents'}[6];
 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[2]{'contents'}[33]{'contents'}[0]{'extra'}{'def_index_element'}{'contents'}[2]
 = 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[2]{'contents'}[33]{'contents'}[0]{'args'}[0]{'contents'}[2];
@@ -12437,7 +12437,7 @@ 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[2]{'contents'}[3
 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[2]{'contents'}[33]{'contents'}[0]{'extra'}{'def_parsed_hash'}{'class'}
 = 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[2]{'contents'}[33]{'contents'}[0]{'args'}[0]{'contents'}[2];
 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[2]{'contents'}[33]{'contents'}[0]{'extra'}{'def_parsed_hash'}{'name'}
 = 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[2]{'contents'}[33]{'contents'}[0]{'args'}[0]{'contents'}[6];
 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[2]{'contents'}[33]{'contents'}[0]{'extra'}{'def_parsed_hash'}{'type'}
 = 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[2]{'contents'}[33]{'contents'}[0]{'args'}[0]{'contents'}[4];
-$result_trees{'all_commands_delimiters_printindex'}{'contents'}[2]{'contents'}[33]{'contents'}[0]{'extra'}{'entry_node'}
 = $result_trees{'all_commands_delimiters_printindex'}{'contents'}[2];
+$result_trees{'all_commands_delimiters_printindex'}{'contents'}[2]{'contents'}[33]{'contents'}[0]{'extra'}{'element_node'}
 = $result_trees{'all_commands_delimiters_printindex'}{'contents'}[2];
 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[2]{'contents'}[33]{'contents'}[0]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[2]{'contents'}[33]{'contents'}[0];
 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[2]{'contents'}[35]{'contents'}[0]{'extra'}{'def_index_element'}{'contents'}[0]
 = 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[2]{'contents'}[35]{'contents'}[0]{'args'}[0]{'contents'}[6];
 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[2]{'contents'}[35]{'contents'}[0]{'extra'}{'def_index_element'}{'contents'}[2]
 = 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[2]{'contents'}[35]{'contents'}[0]{'args'}[0]{'contents'}[2];
@@ -12447,7 +12447,7 @@ 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[2]{'contents'}[3
 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[2]{'contents'}[35]{'contents'}[0]{'extra'}{'def_parsed_hash'}{'class'}
 = 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[2]{'contents'}[35]{'contents'}[0]{'args'}[0]{'contents'}[2];
 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[2]{'contents'}[35]{'contents'}[0]{'extra'}{'def_parsed_hash'}{'name'}
 = 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[2]{'contents'}[35]{'contents'}[0]{'args'}[0]{'contents'}[6];
 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[2]{'contents'}[35]{'contents'}[0]{'extra'}{'def_parsed_hash'}{'type'}
 = 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[2]{'contents'}[35]{'contents'}[0]{'args'}[0]{'contents'}[4];
-$result_trees{'all_commands_delimiters_printindex'}{'contents'}[2]{'contents'}[35]{'contents'}[0]{'extra'}{'entry_node'}
 = $result_trees{'all_commands_delimiters_printindex'}{'contents'}[2];
+$result_trees{'all_commands_delimiters_printindex'}{'contents'}[2]{'contents'}[35]{'contents'}[0]{'extra'}{'element_node'}
 = $result_trees{'all_commands_delimiters_printindex'}{'contents'}[2];
 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[2]{'contents'}[35]{'contents'}[0]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[2]{'contents'}[35]{'contents'}[0];
 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[2]{'contents'}[37]{'contents'}[0]{'extra'}{'def_index_element'}{'contents'}[0]
 = 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[2]{'contents'}[37]{'contents'}[0]{'args'}[0]{'contents'}[6];
 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[2]{'contents'}[37]{'contents'}[0]{'extra'}{'def_index_element'}{'contents'}[2]
 = 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[2]{'contents'}[37]{'contents'}[0]{'args'}[0]{'contents'}[2];
@@ -12457,7 +12457,7 @@ 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[2]{'contents'}[3
 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[2]{'contents'}[37]{'contents'}[0]{'extra'}{'def_parsed_hash'}{'class'}
 = 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[2]{'contents'}[37]{'contents'}[0]{'args'}[0]{'contents'}[2];
 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[2]{'contents'}[37]{'contents'}[0]{'extra'}{'def_parsed_hash'}{'name'}
 = 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[2]{'contents'}[37]{'contents'}[0]{'args'}[0]{'contents'}[6];
 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[2]{'contents'}[37]{'contents'}[0]{'extra'}{'def_parsed_hash'}{'type'}
 = 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[2]{'contents'}[37]{'contents'}[0]{'args'}[0]{'contents'}[4];
-$result_trees{'all_commands_delimiters_printindex'}{'contents'}[2]{'contents'}[37]{'contents'}[0]{'extra'}{'entry_node'}
 = $result_trees{'all_commands_delimiters_printindex'}{'contents'}[2];
+$result_trees{'all_commands_delimiters_printindex'}{'contents'}[2]{'contents'}[37]{'contents'}[0]{'extra'}{'element_node'}
 = $result_trees{'all_commands_delimiters_printindex'}{'contents'}[2];
 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[2]{'contents'}[37]{'contents'}[0]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[2]{'contents'}[37]{'contents'}[0];
 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[2]{'contents'}[39]{'contents'}[0]{'extra'}{'def_index_element'}{'contents'}[0]
 = 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[2]{'contents'}[39]{'contents'}[0]{'args'}[0]{'contents'}[6];
 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[2]{'contents'}[39]{'contents'}[0]{'extra'}{'def_index_element'}{'contents'}[2]
 = 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[2]{'contents'}[39]{'contents'}[0]{'args'}[0]{'contents'}[2];
@@ -12467,7 +12467,7 @@ 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[2]{'contents'}[3
 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[2]{'contents'}[39]{'contents'}[0]{'extra'}{'def_parsed_hash'}{'class'}
 = 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[2]{'contents'}[39]{'contents'}[0]{'args'}[0]{'contents'}[2];
 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[2]{'contents'}[39]{'contents'}[0]{'extra'}{'def_parsed_hash'}{'name'}
 = 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[2]{'contents'}[39]{'contents'}[0]{'args'}[0]{'contents'}[6];
 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[2]{'contents'}[39]{'contents'}[0]{'extra'}{'def_parsed_hash'}{'type'}
 = 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[2]{'contents'}[39]{'contents'}[0]{'args'}[0]{'contents'}[4];
-$result_trees{'all_commands_delimiters_printindex'}{'contents'}[2]{'contents'}[39]{'contents'}[0]{'extra'}{'entry_node'}
 = $result_trees{'all_commands_delimiters_printindex'}{'contents'}[2];
+$result_trees{'all_commands_delimiters_printindex'}{'contents'}[2]{'contents'}[39]{'contents'}[0]{'extra'}{'element_node'}
 = $result_trees{'all_commands_delimiters_printindex'}{'contents'}[2];
 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[2]{'contents'}[39]{'contents'}[0]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[2]{'contents'}[39]{'contents'}[0];
 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[2]{'contents'}[41]{'contents'}[0]{'extra'}{'def_index_element'}{'contents'}[0]
 = 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[2]{'contents'}[41]{'contents'}[0]{'args'}[0]{'contents'}[6];
 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[2]{'contents'}[41]{'contents'}[0]{'extra'}{'def_index_element'}{'contents'}[2]
 = 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[2]{'contents'}[41]{'contents'}[0]{'args'}[0]{'contents'}[2];
@@ -12477,7 +12477,7 @@ 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[2]{'contents'}[4
 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[2]{'contents'}[41]{'contents'}[0]{'extra'}{'def_parsed_hash'}{'class'}
 = 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[2]{'contents'}[41]{'contents'}[0]{'args'}[0]{'contents'}[2];
 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[2]{'contents'}[41]{'contents'}[0]{'extra'}{'def_parsed_hash'}{'name'}
 = 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[2]{'contents'}[41]{'contents'}[0]{'args'}[0]{'contents'}[6];
 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[2]{'contents'}[41]{'contents'}[0]{'extra'}{'def_parsed_hash'}{'type'}
 = 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[2]{'contents'}[41]{'contents'}[0]{'args'}[0]{'contents'}[4];
-$result_trees{'all_commands_delimiters_printindex'}{'contents'}[2]{'contents'}[41]{'contents'}[0]{'extra'}{'entry_node'}
 = $result_trees{'all_commands_delimiters_printindex'}{'contents'}[2];
+$result_trees{'all_commands_delimiters_printindex'}{'contents'}[2]{'contents'}[41]{'contents'}[0]{'extra'}{'element_node'}
 = $result_trees{'all_commands_delimiters_printindex'}{'contents'}[2];
 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[2]{'contents'}[41]{'contents'}[0]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[2]{'contents'}[41]{'contents'}[0];
 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[2]{'contents'}[43]{'contents'}[0]{'extra'}{'def_index_element'}{'contents'}[0]
 = 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[2]{'contents'}[43]{'contents'}[0]{'args'}[0]{'contents'}[6];
 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[2]{'contents'}[43]{'contents'}[0]{'extra'}{'def_index_element'}{'contents'}[2]
 = 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[2]{'contents'}[43]{'contents'}[0]{'args'}[0]{'contents'}[2];
@@ -12487,7 +12487,7 @@ 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[2]{'contents'}[4
 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[2]{'contents'}[43]{'contents'}[0]{'extra'}{'def_parsed_hash'}{'class'}
 = 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[2]{'contents'}[43]{'contents'}[0]{'args'}[0]{'contents'}[2];
 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[2]{'contents'}[43]{'contents'}[0]{'extra'}{'def_parsed_hash'}{'name'}
 = 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[2]{'contents'}[43]{'contents'}[0]{'args'}[0]{'contents'}[6];
 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[2]{'contents'}[43]{'contents'}[0]{'extra'}{'def_parsed_hash'}{'type'}
 = 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[2]{'contents'}[43]{'contents'}[0]{'args'}[0]{'contents'}[4];
-$result_trees{'all_commands_delimiters_printindex'}{'contents'}[2]{'contents'}[43]{'contents'}[0]{'extra'}{'entry_node'}
 = $result_trees{'all_commands_delimiters_printindex'}{'contents'}[2];
+$result_trees{'all_commands_delimiters_printindex'}{'contents'}[2]{'contents'}[43]{'contents'}[0]{'extra'}{'element_node'}
 = $result_trees{'all_commands_delimiters_printindex'}{'contents'}[2];
 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[2]{'contents'}[43]{'contents'}[0]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[2]{'contents'}[43]{'contents'}[0];
 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[2]{'contents'}[45]{'contents'}[0]{'extra'}{'def_index_element'}{'contents'}[0]
 = 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[2]{'contents'}[45]{'contents'}[0]{'args'}[0]{'contents'}[6];
 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[2]{'contents'}[45]{'contents'}[0]{'extra'}{'def_index_element'}{'contents'}[2]
 = 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[2]{'contents'}[45]{'contents'}[0]{'args'}[0]{'contents'}[2];
@@ -12497,7 +12497,7 @@ 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[2]{'contents'}[4
 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[2]{'contents'}[45]{'contents'}[0]{'extra'}{'def_parsed_hash'}{'class'}
 = 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[2]{'contents'}[45]{'contents'}[0]{'args'}[0]{'contents'}[2];
 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[2]{'contents'}[45]{'contents'}[0]{'extra'}{'def_parsed_hash'}{'name'}
 = 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[2]{'contents'}[45]{'contents'}[0]{'args'}[0]{'contents'}[6];
 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[2]{'contents'}[45]{'contents'}[0]{'extra'}{'def_parsed_hash'}{'type'}
 = 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[2]{'contents'}[45]{'contents'}[0]{'args'}[0]{'contents'}[4];
-$result_trees{'all_commands_delimiters_printindex'}{'contents'}[2]{'contents'}[45]{'contents'}[0]{'extra'}{'entry_node'}
 = $result_trees{'all_commands_delimiters_printindex'}{'contents'}[2];
+$result_trees{'all_commands_delimiters_printindex'}{'contents'}[2]{'contents'}[45]{'contents'}[0]{'extra'}{'element_node'}
 = $result_trees{'all_commands_delimiters_printindex'}{'contents'}[2];
 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[2]{'contents'}[45]{'contents'}[0]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[2]{'contents'}[45]{'contents'}[0];
 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[2]{'contents'}[47]{'contents'}[0]{'extra'}{'def_index_element'}{'contents'}[0]
 = 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[2]{'contents'}[47]{'contents'}[0]{'args'}[0]{'contents'}[6];
 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[2]{'contents'}[47]{'contents'}[0]{'extra'}{'def_index_element'}{'contents'}[2]
 = 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[2]{'contents'}[47]{'contents'}[0]{'args'}[0]{'contents'}[2];
@@ -12507,7 +12507,7 @@ 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[2]{'contents'}[4
 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[2]{'contents'}[47]{'contents'}[0]{'extra'}{'def_parsed_hash'}{'class'}
 = 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[2]{'contents'}[47]{'contents'}[0]{'args'}[0]{'contents'}[2];
 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[2]{'contents'}[47]{'contents'}[0]{'extra'}{'def_parsed_hash'}{'name'}
 = 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[2]{'contents'}[47]{'contents'}[0]{'args'}[0]{'contents'}[6];
 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[2]{'contents'}[47]{'contents'}[0]{'extra'}{'def_parsed_hash'}{'type'}
 = 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[2]{'contents'}[47]{'contents'}[0]{'args'}[0]{'contents'}[4];
-$result_trees{'all_commands_delimiters_printindex'}{'contents'}[2]{'contents'}[47]{'contents'}[0]{'extra'}{'entry_node'}
 = $result_trees{'all_commands_delimiters_printindex'}{'contents'}[2];
+$result_trees{'all_commands_delimiters_printindex'}{'contents'}[2]{'contents'}[47]{'contents'}[0]{'extra'}{'element_node'}
 = $result_trees{'all_commands_delimiters_printindex'}{'contents'}[2];
 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[2]{'contents'}[47]{'contents'}[0]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[2]{'contents'}[47]{'contents'}[0];
 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[2]{'contents'}[49]{'contents'}[0]{'extra'}{'def_index_element'}{'contents'}[0]
 = 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[2]{'contents'}[49]{'contents'}[0]{'args'}[0]{'contents'}[6];
 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[2]{'contents'}[49]{'contents'}[0]{'extra'}{'def_index_element'}{'contents'}[2]
 = 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[2]{'contents'}[49]{'contents'}[0]{'args'}[0]{'contents'}[2];
@@ -12517,7 +12517,7 @@ 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[2]{'contents'}[4
 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[2]{'contents'}[49]{'contents'}[0]{'extra'}{'def_parsed_hash'}{'class'}
 = 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[2]{'contents'}[49]{'contents'}[0]{'args'}[0]{'contents'}[2];
 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[2]{'contents'}[49]{'contents'}[0]{'extra'}{'def_parsed_hash'}{'name'}
 = 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[2]{'contents'}[49]{'contents'}[0]{'args'}[0]{'contents'}[6];
 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[2]{'contents'}[49]{'contents'}[0]{'extra'}{'def_parsed_hash'}{'type'}
 = 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[2]{'contents'}[49]{'contents'}[0]{'args'}[0]{'contents'}[4];
-$result_trees{'all_commands_delimiters_printindex'}{'contents'}[2]{'contents'}[49]{'contents'}[0]{'extra'}{'entry_node'}
 = $result_trees{'all_commands_delimiters_printindex'}{'contents'}[2];
+$result_trees{'all_commands_delimiters_printindex'}{'contents'}[2]{'contents'}[49]{'contents'}[0]{'extra'}{'element_node'}
 = $result_trees{'all_commands_delimiters_printindex'}{'contents'}[2];
 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[2]{'contents'}[49]{'contents'}[0]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[2]{'contents'}[49]{'contents'}[0];
 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[2]{'contents'}[51]{'contents'}[0]{'extra'}{'def_index_element'}{'contents'}[0]
 = 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[2]{'contents'}[51]{'contents'}[0]{'args'}[0]{'contents'}[6];
 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[2]{'contents'}[51]{'contents'}[0]{'extra'}{'def_index_element'}{'contents'}[2]
 = 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[2]{'contents'}[51]{'contents'}[0]{'args'}[0]{'contents'}[2];
@@ -12527,77 +12527,77 @@ 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[2]{'contents'}[5
 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[2]{'contents'}[51]{'contents'}[0]{'extra'}{'def_parsed_hash'}{'class'}
 = 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[2]{'contents'}[51]{'contents'}[0]{'args'}[0]{'contents'}[2];
 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[2]{'contents'}[51]{'contents'}[0]{'extra'}{'def_parsed_hash'}{'name'}
 = 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[2]{'contents'}[51]{'contents'}[0]{'args'}[0]{'contents'}[6];
 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[2]{'contents'}[51]{'contents'}[0]{'extra'}{'def_parsed_hash'}{'type'}
 = 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[2]{'contents'}[51]{'contents'}[0]{'args'}[0]{'contents'}[4];
-$result_trees{'all_commands_delimiters_printindex'}{'contents'}[2]{'contents'}[51]{'contents'}[0]{'extra'}{'entry_node'}
 = $result_trees{'all_commands_delimiters_printindex'}{'contents'}[2];
+$result_trees{'all_commands_delimiters_printindex'}{'contents'}[2]{'contents'}[51]{'contents'}[0]{'extra'}{'element_node'}
 = $result_trees{'all_commands_delimiters_printindex'}{'contents'}[2];
 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[2]{'contents'}[51]{'contents'}[0]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[2]{'contents'}[51]{'contents'}[0];
 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[2]{'contents'}[53]{'contents'}[0]{'extra'}{'def_index_element'}
 = 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[2]{'contents'}[53]{'contents'}[0]{'args'}[0]{'contents'}[2];
 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[2]{'contents'}[53]{'contents'}[0]{'extra'}{'def_parsed_hash'}{'category'}
 = 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[2]{'contents'}[53]{'contents'}[0]{'args'}[0]{'contents'}[0];
 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[2]{'contents'}[53]{'contents'}[0]{'extra'}{'def_parsed_hash'}{'name'}
 = 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[2]{'contents'}[53]{'contents'}[0]{'args'}[0]{'contents'}[2];
-$result_trees{'all_commands_delimiters_printindex'}{'contents'}[2]{'contents'}[53]{'contents'}[0]{'extra'}{'entry_node'}
 = $result_trees{'all_commands_delimiters_printindex'}{'contents'}[2];
+$result_trees{'all_commands_delimiters_printindex'}{'contents'}[2]{'contents'}[53]{'contents'}[0]{'extra'}{'element_node'}
 = $result_trees{'all_commands_delimiters_printindex'}{'contents'}[2];
 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[2]{'contents'}[53]{'contents'}[0]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[2]{'contents'}[53]{'contents'}[0];
 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[2]{'contents'}[55]{'contents'}[0]{'extra'}{'def_index_element'}
 = 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[2]{'contents'}[55]{'contents'}[0]{'args'}[0]{'contents'}[2];
 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[2]{'contents'}[55]{'contents'}[0]{'extra'}{'def_parsed_hash'}{'category'}
 = 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[2]{'contents'}[55]{'contents'}[0]{'args'}[0]{'contents'}[0];
 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[2]{'contents'}[55]{'contents'}[0]{'extra'}{'def_parsed_hash'}{'name'}
 = 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[2]{'contents'}[55]{'contents'}[0]{'args'}[0]{'contents'}[2];
-$result_trees{'all_commands_delimiters_printindex'}{'contents'}[2]{'contents'}[55]{'contents'}[0]{'extra'}{'entry_node'}
 = $result_trees{'all_commands_delimiters_printindex'}{'contents'}[2];
+$result_trees{'all_commands_delimiters_printindex'}{'contents'}[2]{'contents'}[55]{'contents'}[0]{'extra'}{'element_node'}
 = $result_trees{'all_commands_delimiters_printindex'}{'contents'}[2];
 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[2]{'contents'}[55]{'contents'}[0]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[2]{'contents'}[55]{'contents'}[0];
 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[2]{'contents'}[57]{'contents'}[0]{'extra'}{'def_index_element'}
 = 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[2]{'contents'}[57]{'contents'}[0]{'args'}[0]{'contents'}[2];
 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[2]{'contents'}[57]{'contents'}[0]{'extra'}{'def_parsed_hash'}{'category'}
 = 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[2]{'contents'}[57]{'contents'}[0]{'args'}[0]{'contents'}[0];
 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[2]{'contents'}[57]{'contents'}[0]{'extra'}{'def_parsed_hash'}{'name'}
 = 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[2]{'contents'}[57]{'contents'}[0]{'args'}[0]{'contents'}[2];
-$result_trees{'all_commands_delimiters_printindex'}{'contents'}[2]{'contents'}[57]{'contents'}[0]{'extra'}{'entry_node'}
 = $result_trees{'all_commands_delimiters_printindex'}{'contents'}[2];
+$result_trees{'all_commands_delimiters_printindex'}{'contents'}[2]{'contents'}[57]{'contents'}[0]{'extra'}{'element_node'}
 = $result_trees{'all_commands_delimiters_printindex'}{'contents'}[2];
 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[2]{'contents'}[57]{'contents'}[0]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[2]{'contents'}[57]{'contents'}[0];
 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[2]{'contents'}[59]{'contents'}[0]{'extra'}{'def_index_element'}
 = 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[2]{'contents'}[59]{'contents'}[0]{'args'}[0]{'contents'}[2];
 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[2]{'contents'}[59]{'contents'}[0]{'extra'}{'def_parsed_hash'}{'category'}
 = 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[2]{'contents'}[59]{'contents'}[0]{'args'}[0]{'contents'}[0];
 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[2]{'contents'}[59]{'contents'}[0]{'extra'}{'def_parsed_hash'}{'name'}
 = 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[2]{'contents'}[59]{'contents'}[0]{'args'}[0]{'contents'}[2];
-$result_trees{'all_commands_delimiters_printindex'}{'contents'}[2]{'contents'}[59]{'contents'}[0]{'extra'}{'entry_node'}
 = $result_trees{'all_commands_delimiters_printindex'}{'contents'}[2];
+$result_trees{'all_commands_delimiters_printindex'}{'contents'}[2]{'contents'}[59]{'contents'}[0]{'extra'}{'element_node'}
 = $result_trees{'all_commands_delimiters_printindex'}{'contents'}[2];
 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[2]{'contents'}[59]{'contents'}[0]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[2]{'contents'}[59]{'contents'}[0];
 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[2]{'contents'}[61]{'contents'}[0]{'extra'}{'def_index_element'}
 = 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[2]{'contents'}[61]{'contents'}[0]{'args'}[0]{'contents'}[2];
 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[2]{'contents'}[61]{'contents'}[0]{'extra'}{'def_parsed_hash'}{'category'}
 = 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[2]{'contents'}[61]{'contents'}[0]{'args'}[0]{'contents'}[0];
 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[2]{'contents'}[61]{'contents'}[0]{'extra'}{'def_parsed_hash'}{'name'}
 = 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[2]{'contents'}[61]{'contents'}[0]{'args'}[0]{'contents'}[2];
-$result_trees{'all_commands_delimiters_printindex'}{'contents'}[2]{'contents'}[61]{'contents'}[0]{'extra'}{'entry_node'}
 = $result_trees{'all_commands_delimiters_printindex'}{'contents'}[2];
+$result_trees{'all_commands_delimiters_printindex'}{'contents'}[2]{'contents'}[61]{'contents'}[0]{'extra'}{'element_node'}
 = $result_trees{'all_commands_delimiters_printindex'}{'contents'}[2];
 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[2]{'contents'}[61]{'contents'}[0]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[2]{'contents'}[61]{'contents'}[0];
 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[2]{'contents'}[63]{'contents'}[0]{'extra'}{'def_index_element'}
 = 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[2]{'contents'}[63]{'contents'}[0]{'args'}[0]{'contents'}[4];
 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[2]{'contents'}[63]{'contents'}[0]{'extra'}{'def_parsed_hash'}{'category'}
 = 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[2]{'contents'}[63]{'contents'}[0]{'args'}[0]{'contents'}[0];
 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[2]{'contents'}[63]{'contents'}[0]{'extra'}{'def_parsed_hash'}{'name'}
 = 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[2]{'contents'}[63]{'contents'}[0]{'args'}[0]{'contents'}[4];
 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[2]{'contents'}[63]{'contents'}[0]{'extra'}{'def_parsed_hash'}{'type'}
 = 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[2]{'contents'}[63]{'contents'}[0]{'args'}[0]{'contents'}[2];
-$result_trees{'all_commands_delimiters_printindex'}{'contents'}[2]{'contents'}[63]{'contents'}[0]{'extra'}{'entry_node'}
 = $result_trees{'all_commands_delimiters_printindex'}{'contents'}[2];
+$result_trees{'all_commands_delimiters_printindex'}{'contents'}[2]{'contents'}[63]{'contents'}[0]{'extra'}{'element_node'}
 = $result_trees{'all_commands_delimiters_printindex'}{'contents'}[2];
 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[2]{'contents'}[63]{'contents'}[0]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[2]{'contents'}[63]{'contents'}[0];
 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[2]{'contents'}[65]{'contents'}[0]{'extra'}{'def_index_element'}
 = 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[2]{'contents'}[65]{'contents'}[0]{'args'}[0]{'contents'}[4];
 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[2]{'contents'}[65]{'contents'}[0]{'extra'}{'def_parsed_hash'}{'category'}
 = 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[2]{'contents'}[65]{'contents'}[0]{'args'}[0]{'contents'}[0];
 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[2]{'contents'}[65]{'contents'}[0]{'extra'}{'def_parsed_hash'}{'name'}
 = 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[2]{'contents'}[65]{'contents'}[0]{'args'}[0]{'contents'}[4];
 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[2]{'contents'}[65]{'contents'}[0]{'extra'}{'def_parsed_hash'}{'type'}
 = 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[2]{'contents'}[65]{'contents'}[0]{'args'}[0]{'contents'}[2];
-$result_trees{'all_commands_delimiters_printindex'}{'contents'}[2]{'contents'}[65]{'contents'}[0]{'extra'}{'entry_node'}
 = $result_trees{'all_commands_delimiters_printindex'}{'contents'}[2];
+$result_trees{'all_commands_delimiters_printindex'}{'contents'}[2]{'contents'}[65]{'contents'}[0]{'extra'}{'element_node'}
 = $result_trees{'all_commands_delimiters_printindex'}{'contents'}[2];
 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[2]{'contents'}[65]{'contents'}[0]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[2]{'contents'}[65]{'contents'}[0];
 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[2]{'contents'}[67]{'contents'}[0]{'extra'}{'def_index_element'}
 = 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[2]{'contents'}[67]{'contents'}[0]{'args'}[0]{'contents'}[4];
 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[2]{'contents'}[67]{'contents'}[0]{'extra'}{'def_parsed_hash'}{'category'}
 = 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[2]{'contents'}[67]{'contents'}[0]{'args'}[0]{'contents'}[0];
 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[2]{'contents'}[67]{'contents'}[0]{'extra'}{'def_parsed_hash'}{'name'}
 = 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[2]{'contents'}[67]{'contents'}[0]{'args'}[0]{'contents'}[4];
 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[2]{'contents'}[67]{'contents'}[0]{'extra'}{'def_parsed_hash'}{'type'}
 = 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[2]{'contents'}[67]{'contents'}[0]{'args'}[0]{'contents'}[2];
-$result_trees{'all_commands_delimiters_printindex'}{'contents'}[2]{'contents'}[67]{'contents'}[0]{'extra'}{'entry_node'}
 = $result_trees{'all_commands_delimiters_printindex'}{'contents'}[2];
+$result_trees{'all_commands_delimiters_printindex'}{'contents'}[2]{'contents'}[67]{'contents'}[0]{'extra'}{'element_node'}
 = $result_trees{'all_commands_delimiters_printindex'}{'contents'}[2];
 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[2]{'contents'}[67]{'contents'}[0]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[2]{'contents'}[67]{'contents'}[0];
 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[2]{'contents'}[69]{'contents'}[0]{'extra'}{'def_index_element'}
 = 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[2]{'contents'}[69]{'contents'}[0]{'args'}[0]{'contents'}[4];
 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[2]{'contents'}[69]{'contents'}[0]{'extra'}{'def_parsed_hash'}{'category'}
 = 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[2]{'contents'}[69]{'contents'}[0]{'args'}[0]{'contents'}[0];
 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[2]{'contents'}[69]{'contents'}[0]{'extra'}{'def_parsed_hash'}{'name'}
 = 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[2]{'contents'}[69]{'contents'}[0]{'args'}[0]{'contents'}[4];
 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[2]{'contents'}[69]{'contents'}[0]{'extra'}{'def_parsed_hash'}{'type'}
 = 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[2]{'contents'}[69]{'contents'}[0]{'args'}[0]{'contents'}[2];
-$result_trees{'all_commands_delimiters_printindex'}{'contents'}[2]{'contents'}[69]{'contents'}[0]{'extra'}{'entry_node'}
 = $result_trees{'all_commands_delimiters_printindex'}{'contents'}[2];
+$result_trees{'all_commands_delimiters_printindex'}{'contents'}[2]{'contents'}[69]{'contents'}[0]{'extra'}{'element_node'}
 = $result_trees{'all_commands_delimiters_printindex'}{'contents'}[2];
 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[2]{'contents'}[69]{'contents'}[0]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[2]{'contents'}[69]{'contents'}[0];
 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[2]{'contents'}[71]{'contents'}[0]{'extra'}{'def_index_element'}
 = 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[2]{'contents'}[71]{'contents'}[0]{'args'}[0]{'contents'}[2];
 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[2]{'contents'}[71]{'contents'}[0]{'extra'}{'def_parsed_hash'}{'category'}
 = 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[2]{'contents'}[71]{'contents'}[0]{'args'}[0]{'contents'}[0];
 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[2]{'contents'}[71]{'contents'}[0]{'extra'}{'def_parsed_hash'}{'name'}
 = 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[2]{'contents'}[71]{'contents'}[0]{'args'}[0]{'contents'}[2];
-$result_trees{'all_commands_delimiters_printindex'}{'contents'}[2]{'contents'}[71]{'contents'}[0]{'extra'}{'entry_node'}
 = $result_trees{'all_commands_delimiters_printindex'}{'contents'}[2];
+$result_trees{'all_commands_delimiters_printindex'}{'contents'}[2]{'contents'}[71]{'contents'}[0]{'extra'}{'element_node'}
 = $result_trees{'all_commands_delimiters_printindex'}{'contents'}[2];
 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[2]{'contents'}[71]{'contents'}[0]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[2]{'contents'}[71]{'contents'}[0];
 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[2]{'contents'}[73]{'contents'}[0]{'extra'}{'def_index_element'}
 = 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[2]{'contents'}[73]{'contents'}[0]{'args'}[0]{'contents'}[2];
 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[2]{'contents'}[73]{'contents'}[0]{'extra'}{'def_parsed_hash'}{'category'}
 = 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[2]{'contents'}[73]{'contents'}[0]{'args'}[0]{'contents'}[0];
 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[2]{'contents'}[73]{'contents'}[0]{'extra'}{'def_parsed_hash'}{'name'}
 = 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[2]{'contents'}[73]{'contents'}[0]{'args'}[0]{'contents'}[2];
-$result_trees{'all_commands_delimiters_printindex'}{'contents'}[2]{'contents'}[73]{'contents'}[0]{'extra'}{'entry_node'}
 = $result_trees{'all_commands_delimiters_printindex'}{'contents'}[2];
+$result_trees{'all_commands_delimiters_printindex'}{'contents'}[2]{'contents'}[73]{'contents'}[0]{'extra'}{'element_node'}
 = $result_trees{'all_commands_delimiters_printindex'}{'contents'}[2];
 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[2]{'contents'}[73]{'contents'}[0]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[2]{'contents'}[73]{'contents'}[0];
 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[2]{'contents'}[75]{'contents'}[0]{'extra'}{'def_index_element'}
 = 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[2]{'contents'}[75]{'contents'}[0]{'args'}[0]{'contents'}[4];
 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[2]{'contents'}[75]{'contents'}[0]{'extra'}{'def_parsed_hash'}{'category'}
 = 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[2]{'contents'}[75]{'contents'}[0]{'args'}[0]{'contents'}[0];
 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[2]{'contents'}[75]{'contents'}[0]{'extra'}{'def_parsed_hash'}{'class'}
 = 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[2]{'contents'}[75]{'contents'}[0]{'args'}[0]{'contents'}[2];
 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[2]{'contents'}[75]{'contents'}[0]{'extra'}{'def_parsed_hash'}{'name'}
 = 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[2]{'contents'}[75]{'contents'}[0]{'args'}[0]{'contents'}[4];
-$result_trees{'all_commands_delimiters_printindex'}{'contents'}[2]{'contents'}[75]{'contents'}[0]{'extra'}{'entry_node'}
 = $result_trees{'all_commands_delimiters_printindex'}{'contents'}[2];
+$result_trees{'all_commands_delimiters_printindex'}{'contents'}[2]{'contents'}[75]{'contents'}[0]{'extra'}{'element_node'}
 = $result_trees{'all_commands_delimiters_printindex'}{'contents'}[2];
 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[2]{'contents'}[75]{'contents'}[0]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[2]{'contents'}[75]{'contents'}[0];
 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[2]{'contents'}[77]{'contents'}[0]{'extra'}{'def_index_element'}
 = 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[2]{'contents'}[77]{'contents'}[0]{'args'}[0]{'contents'}[2];
 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[2]{'contents'}[77]{'contents'}[0]{'extra'}{'def_parsed_hash'}{'category'}
 = 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[2]{'contents'}[77]{'contents'}[0]{'args'}[0]{'contents'}[0];
 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[2]{'contents'}[77]{'contents'}[0]{'extra'}{'def_parsed_hash'}{'name'}
 = 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[2]{'contents'}[77]{'contents'}[0]{'args'}[0]{'contents'}[2];
-$result_trees{'all_commands_delimiters_printindex'}{'contents'}[2]{'contents'}[77]{'contents'}[0]{'extra'}{'entry_node'}
 = $result_trees{'all_commands_delimiters_printindex'}{'contents'}[2];
+$result_trees{'all_commands_delimiters_printindex'}{'contents'}[2]{'contents'}[77]{'contents'}[0]{'extra'}{'element_node'}
 = $result_trees{'all_commands_delimiters_printindex'}{'contents'}[2];
 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[2]{'contents'}[77]{'contents'}[0]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[2]{'contents'}[77]{'contents'}[0];
 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[2]{'contents'}[79]{'contents'}[0]{'extra'}{'def_index_element'}{'contents'}[0]
 = 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[2]{'contents'}[79]{'contents'}[0]{'args'}[0]{'contents'}[6];
 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[2]{'contents'}[79]{'contents'}[0]{'extra'}{'def_index_element'}{'contents'}[2]
 = 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[2]{'contents'}[79]{'contents'}[0]{'args'}[0]{'contents'}[2];
@@ -12607,7 +12607,7 @@ 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[2]{'contents'}[7
 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[2]{'contents'}[79]{'contents'}[0]{'extra'}{'def_parsed_hash'}{'class'}
 = 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[2]{'contents'}[79]{'contents'}[0]{'args'}[0]{'contents'}[2];
 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[2]{'contents'}[79]{'contents'}[0]{'extra'}{'def_parsed_hash'}{'name'}
 = 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[2]{'contents'}[79]{'contents'}[0]{'args'}[0]{'contents'}[6];
 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[2]{'contents'}[79]{'contents'}[0]{'extra'}{'def_parsed_hash'}{'type'}
 = 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[2]{'contents'}[79]{'contents'}[0]{'args'}[0]{'contents'}[4];
-$result_trees{'all_commands_delimiters_printindex'}{'contents'}[2]{'contents'}[79]{'contents'}[0]{'extra'}{'entry_node'}
 = $result_trees{'all_commands_delimiters_printindex'}{'contents'}[2];
+$result_trees{'all_commands_delimiters_printindex'}{'contents'}[2]{'contents'}[79]{'contents'}[0]{'extra'}{'element_node'}
 = $result_trees{'all_commands_delimiters_printindex'}{'contents'}[2];
 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[2]{'contents'}[79]{'contents'}[0]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[2]{'contents'}[79]{'contents'}[0];
 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[2]{'contents'}[81]{'contents'}[0]{'extra'}{'def_index_element'}{'contents'}[0]
 = 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[2]{'contents'}[81]{'contents'}[0]{'args'}[0]{'contents'}[6];
 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[2]{'contents'}[81]{'contents'}[0]{'extra'}{'def_index_element'}{'contents'}[2]
 = 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[2]{'contents'}[81]{'contents'}[0]{'args'}[0]{'contents'}[2];
@@ -12617,7 +12617,7 @@ 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[2]{'contents'}[8
 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[2]{'contents'}[81]{'contents'}[0]{'extra'}{'def_parsed_hash'}{'class'}
 = 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[2]{'contents'}[81]{'contents'}[0]{'args'}[0]{'contents'}[2];
 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[2]{'contents'}[81]{'contents'}[0]{'extra'}{'def_parsed_hash'}{'name'}
 = 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[2]{'contents'}[81]{'contents'}[0]{'args'}[0]{'contents'}[6];
 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[2]{'contents'}[81]{'contents'}[0]{'extra'}{'def_parsed_hash'}{'type'}
 = 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[2]{'contents'}[81]{'contents'}[0]{'args'}[0]{'contents'}[4];
-$result_trees{'all_commands_delimiters_printindex'}{'contents'}[2]{'contents'}[81]{'contents'}[0]{'extra'}{'entry_node'}
 = $result_trees{'all_commands_delimiters_printindex'}{'contents'}[2];
+$result_trees{'all_commands_delimiters_printindex'}{'contents'}[2]{'contents'}[81]{'contents'}[0]{'extra'}{'element_node'}
 = $result_trees{'all_commands_delimiters_printindex'}{'contents'}[2];
 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[2]{'contents'}[81]{'contents'}[0]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[2]{'contents'}[81]{'contents'}[0];
 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[2]{'contents'}[83]{'contents'}[0]{'extra'}{'def_index_element'}{'contents'}[0]
 = 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[2]{'contents'}[83]{'contents'}[0]{'args'}[0]{'contents'}[4];
 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[2]{'contents'}[83]{'contents'}[0]{'extra'}{'def_index_element'}{'contents'}[2]
 = 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[2]{'contents'}[83]{'contents'}[0]{'args'}[0]{'contents'}[2];
@@ -12626,7 +12626,7 @@ 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[2]{'contents'}[8
 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[2]{'contents'}[83]{'contents'}[0]{'extra'}{'def_parsed_hash'}{'category'}
 = 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[2]{'contents'}[83]{'contents'}[0]{'args'}[0]{'contents'}[0];
 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[2]{'contents'}[83]{'contents'}[0]{'extra'}{'def_parsed_hash'}{'class'}
 = 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[2]{'contents'}[83]{'contents'}[0]{'args'}[0]{'contents'}[2];
 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[2]{'contents'}[83]{'contents'}[0]{'extra'}{'def_parsed_hash'}{'name'}
 = 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[2]{'contents'}[83]{'contents'}[0]{'args'}[0]{'contents'}[4];
-$result_trees{'all_commands_delimiters_printindex'}{'contents'}[2]{'contents'}[83]{'contents'}[0]{'extra'}{'entry_node'}
 = $result_trees{'all_commands_delimiters_printindex'}{'contents'}[2];
+$result_trees{'all_commands_delimiters_printindex'}{'contents'}[2]{'contents'}[83]{'contents'}[0]{'extra'}{'element_node'}
 = $result_trees{'all_commands_delimiters_printindex'}{'contents'}[2];
 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[2]{'contents'}[83]{'contents'}[0]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[2]{'contents'}[83]{'contents'}[0];
 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[2]{'contents'}[85]{'contents'}[0]{'extra'}{'def_index_element'}{'contents'}[0]
 = 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[2]{'contents'}[85]{'contents'}[0]{'args'}[0]{'contents'}[4];
 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[2]{'contents'}[85]{'contents'}[0]{'extra'}{'def_index_element'}{'contents'}[2]
 = 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[2]{'contents'}[85]{'contents'}[0]{'args'}[0]{'contents'}[2];
@@ -12635,7 +12635,7 @@ 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[2]{'contents'}[8
 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[2]{'contents'}[85]{'contents'}[0]{'extra'}{'def_parsed_hash'}{'category'}
 = 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[2]{'contents'}[85]{'contents'}[0]{'args'}[0]{'contents'}[0];
 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[2]{'contents'}[85]{'contents'}[0]{'extra'}{'def_parsed_hash'}{'class'}
 = 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[2]{'contents'}[85]{'contents'}[0]{'args'}[0]{'contents'}[2];
 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[2]{'contents'}[85]{'contents'}[0]{'extra'}{'def_parsed_hash'}{'name'}
 = 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[2]{'contents'}[85]{'contents'}[0]{'args'}[0]{'contents'}[4];
-$result_trees{'all_commands_delimiters_printindex'}{'contents'}[2]{'contents'}[85]{'contents'}[0]{'extra'}{'entry_node'}
 = $result_trees{'all_commands_delimiters_printindex'}{'contents'}[2];
+$result_trees{'all_commands_delimiters_printindex'}{'contents'}[2]{'contents'}[85]{'contents'}[0]{'extra'}{'element_node'}
 = $result_trees{'all_commands_delimiters_printindex'}{'contents'}[2];
 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[2]{'contents'}[85]{'contents'}[0]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[2]{'contents'}[85]{'contents'}[0];
 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[2]{'contents'}[87]{'contents'}[0]{'extra'}{'def_index_element'}{'contents'}[0]
 = 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[2]{'contents'}[87]{'contents'}[0]{'args'}[0]{'contents'}[6];
 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[2]{'contents'}[87]{'contents'}[0]{'extra'}{'def_index_element'}{'contents'}[2]
 = 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[2]{'contents'}[87]{'contents'}[0]{'args'}[0]{'contents'}[2];
@@ -12645,7 +12645,7 @@ 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[2]{'contents'}[8
 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[2]{'contents'}[87]{'contents'}[0]{'extra'}{'def_parsed_hash'}{'class'}
 = 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[2]{'contents'}[87]{'contents'}[0]{'args'}[0]{'contents'}[2];
 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[2]{'contents'}[87]{'contents'}[0]{'extra'}{'def_parsed_hash'}{'name'}
 = 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[2]{'contents'}[87]{'contents'}[0]{'args'}[0]{'contents'}[6];
 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[2]{'contents'}[87]{'contents'}[0]{'extra'}{'def_parsed_hash'}{'type'}
 = 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[2]{'contents'}[87]{'contents'}[0]{'args'}[0]{'contents'}[4];
-$result_trees{'all_commands_delimiters_printindex'}{'contents'}[2]{'contents'}[87]{'contents'}[0]{'extra'}{'entry_node'}
 = $result_trees{'all_commands_delimiters_printindex'}{'contents'}[2];
+$result_trees{'all_commands_delimiters_printindex'}{'contents'}[2]{'contents'}[87]{'contents'}[0]{'extra'}{'element_node'}
 = $result_trees{'all_commands_delimiters_printindex'}{'contents'}[2];
 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[2]{'contents'}[87]{'contents'}[0]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[2]{'contents'}[87]{'contents'}[0];
 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[2]{'contents'}[89]{'contents'}[0]{'extra'}{'def_index_element'}{'contents'}[0]
 = 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[2]{'contents'}[89]{'contents'}[0]{'args'}[0]{'contents'}[6];
 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[2]{'contents'}[89]{'contents'}[0]{'extra'}{'def_index_element'}{'contents'}[2]
 = 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[2]{'contents'}[89]{'contents'}[0]{'args'}[0]{'contents'}[2];
@@ -12655,19 +12655,19 @@ 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[2]{'contents'}[8
 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[2]{'contents'}[89]{'contents'}[0]{'extra'}{'def_parsed_hash'}{'class'}
 = 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[2]{'contents'}[89]{'contents'}[0]{'args'}[0]{'contents'}[2];
 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[2]{'contents'}[89]{'contents'}[0]{'extra'}{'def_parsed_hash'}{'name'}
 = 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[2]{'contents'}[89]{'contents'}[0]{'args'}[0]{'contents'}[6];
 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[2]{'contents'}[89]{'contents'}[0]{'extra'}{'def_parsed_hash'}{'type'}
 = 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[2]{'contents'}[89]{'contents'}[0]{'args'}[0]{'contents'}[4];
-$result_trees{'all_commands_delimiters_printindex'}{'contents'}[2]{'contents'}[89]{'contents'}[0]{'extra'}{'entry_node'}
 = $result_trees{'all_commands_delimiters_printindex'}{'contents'}[2];
+$result_trees{'all_commands_delimiters_printindex'}{'contents'}[2]{'contents'}[89]{'contents'}[0]{'extra'}{'element_node'}
 = $result_trees{'all_commands_delimiters_printindex'}{'contents'}[2];
 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[2]{'contents'}[89]{'contents'}[0]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[2]{'contents'}[89]{'contents'}[0];
 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[2]{'contents'}[91]{'contents'}[0]{'extra'}{'def_index_element'}
 = 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[2]{'contents'}[91]{'contents'}[0]{'args'}[0]{'contents'}[4];
 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[2]{'contents'}[91]{'contents'}[0]{'extra'}{'def_parsed_hash'}{'category'}
 = 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[2]{'contents'}[91]{'contents'}[0]{'args'}[0]{'contents'}[0];
 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[2]{'contents'}[91]{'contents'}[0]{'extra'}{'def_parsed_hash'}{'name'}
 = 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[2]{'contents'}[91]{'contents'}[0]{'args'}[0]{'contents'}[4];
 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[2]{'contents'}[91]{'contents'}[0]{'extra'}{'def_parsed_hash'}{'type'}
 = 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[2]{'contents'}[91]{'contents'}[0]{'args'}[0]{'contents'}[2];
-$result_trees{'all_commands_delimiters_printindex'}{'contents'}[2]{'contents'}[91]{'contents'}[0]{'extra'}{'entry_node'}
 = $result_trees{'all_commands_delimiters_printindex'}{'contents'}[2];
+$result_trees{'all_commands_delimiters_printindex'}{'contents'}[2]{'contents'}[91]{'contents'}[0]{'extra'}{'element_node'}
 = $result_trees{'all_commands_delimiters_printindex'}{'contents'}[2];
 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[2]{'contents'}[91]{'contents'}[0]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[2]{'contents'}[91]{'contents'}[0];
 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[2]{'contents'}[93]{'contents'}[0]{'extra'}{'def_index_element'}
 = 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[2]{'contents'}[93]{'contents'}[0]{'args'}[0]{'contents'}[4];
 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[2]{'contents'}[93]{'contents'}[0]{'extra'}{'def_parsed_hash'}{'category'}
 = 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[2]{'contents'}[93]{'contents'}[0]{'args'}[0]{'contents'}[0];
 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[2]{'contents'}[93]{'contents'}[0]{'extra'}{'def_parsed_hash'}{'name'}
 = 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[2]{'contents'}[93]{'contents'}[0]{'args'}[0]{'contents'}[4];
 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[2]{'contents'}[93]{'contents'}[0]{'extra'}{'def_parsed_hash'}{'type'}
 = 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[2]{'contents'}[93]{'contents'}[0]{'args'}[0]{'contents'}[2];
-$result_trees{'all_commands_delimiters_printindex'}{'contents'}[2]{'contents'}[93]{'contents'}[0]{'extra'}{'entry_node'}
 = $result_trees{'all_commands_delimiters_printindex'}{'contents'}[2];
+$result_trees{'all_commands_delimiters_printindex'}{'contents'}[2]{'contents'}[93]{'contents'}[0]{'extra'}{'element_node'}
 = $result_trees{'all_commands_delimiters_printindex'}{'contents'}[2];
 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[2]{'contents'}[93]{'contents'}[0]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[2]{'contents'}[93]{'contents'}[0];
 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[2]{'extra'}{'node_content'}[0]
 = 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[2]{'args'}[0]{'contents'}[0];
 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[2]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[2]{'args'}[0]{'contents'}[0];
diff --git a/tp/t/results/def/all_commands_printindex.pl 
b/tp/t/results/def/all_commands_printindex.pl
index 36f03bcee6..58191afde4 100644
--- a/tp/t/results/def/all_commands_printindex.pl
+++ b/tp/t/results/def/all_commands_printindex.pl
@@ -120,7 +120,7 @@ $result_trees{'all_commands_printindex'} = {
                   'category' => {},
                   'name' => {}
                 },
-                'entry_node' => {},
+                'element_node' => {},
                 'index_entry' => {
                   'entry_element' => {},
                   'entry_number' => 1,
@@ -255,7 +255,7 @@ $result_trees{'all_commands_printindex'} = {
                   'category' => {},
                   'name' => {}
                 },
-                'entry_node' => {},
+                'element_node' => {},
                 'index_entry' => {
                   'entry_element' => {},
                   'entry_number' => 1,
@@ -377,7 +377,7 @@ $result_trees{'all_commands_printindex'} = {
                   'category' => {},
                   'name' => {}
                 },
-                'entry_node' => {},
+                'element_node' => {},
                 'index_entry' => {
                   'entry_element' => {},
                   'entry_number' => 2,
@@ -526,7 +526,7 @@ $result_trees{'all_commands_printindex'} = {
                   'name' => {},
                   'type' => {}
                 },
-                'entry_node' => {},
+                'element_node' => {},
                 'index_entry' => {
                   'entry_element' => {},
                   'entry_number' => 3,
@@ -662,7 +662,7 @@ $result_trees{'all_commands_printindex'} = {
                   'name' => {},
                   'type' => {}
                 },
-                'entry_node' => {},
+                'element_node' => {},
                 'index_entry' => {
                   'entry_element' => {},
                   'entry_number' => 4,
@@ -843,7 +843,7 @@ $result_trees{'all_commands_printindex'} = {
                   'name' => {},
                   'type' => {}
                 },
-                'entry_node' => {},
+                'element_node' => {},
                 'index_entry' => {
                   'entry_element' => {},
                   'entry_number' => 5,
@@ -1011,7 +1011,7 @@ $result_trees{'all_commands_printindex'} = {
                   'name' => {},
                   'type' => {}
                 },
-                'entry_node' => {},
+                'element_node' => {},
                 'index_entry' => {
                   'entry_element' => {},
                   'entry_number' => 6,
@@ -1147,7 +1147,7 @@ $result_trees{'all_commands_printindex'} = {
                   'name' => {},
                   'type' => {}
                 },
-                'entry_node' => {},
+                'element_node' => {},
                 'index_entry' => {
                   'entry_element' => {},
                   'entry_number' => 2,
@@ -1283,7 +1283,7 @@ $result_trees{'all_commands_printindex'} = {
                   'class' => {},
                   'name' => {}
                 },
-                'entry_node' => {},
+                'element_node' => {},
                 'index_entry' => {
                   'entry_element' => {},
                   'entry_number' => 3,
@@ -1432,7 +1432,7 @@ $result_trees{'all_commands_printindex'} = {
                   'class' => {},
                   'name' => {}
                 },
-                'entry_node' => {},
+                'element_node' => {},
                 'index_entry' => {
                   'entry_element' => {},
                   'entry_number' => 4,
@@ -1600,7 +1600,7 @@ $result_trees{'all_commands_printindex'} = {
                   'name' => {},
                   'type' => {}
                 },
-                'entry_node' => {},
+                'element_node' => {},
                 'index_entry' => {
                   'entry_element' => {},
                   'entry_number' => 5,
@@ -1781,7 +1781,7 @@ $result_trees{'all_commands_printindex'} = {
                   'name' => {},
                   'type' => {}
                 },
-                'entry_node' => {},
+                'element_node' => {},
                 'index_entry' => {
                   'entry_element' => {},
                   'entry_number' => 6,
@@ -1948,7 +1948,7 @@ $result_trees{'all_commands_printindex'} = {
                   'class' => {},
                   'name' => {}
                 },
-                'entry_node' => {},
+                'element_node' => {},
                 'index_entry' => {
                   'entry_element' => {},
                   'entry_number' => 7,
@@ -2102,7 +2102,7 @@ $result_trees{'all_commands_printindex'} = {
                   'class' => {},
                   'name' => {}
                 },
-                'entry_node' => {},
+                'element_node' => {},
                 'index_entry' => {
                   'entry_element' => {},
                   'entry_number' => 8,
@@ -2237,7 +2237,7 @@ $result_trees{'all_commands_printindex'} = {
                   'category' => {},
                   'name' => {}
                 },
-                'entry_node' => {},
+                'element_node' => {},
                 'index_entry' => {
                   'entry_element' => {},
                   'entry_number' => 1,
@@ -2377,7 +2377,7 @@ $result_trees{'all_commands_printindex'} = {
                   'category' => {},
                   'name' => {}
                 },
-                'entry_node' => {},
+                'element_node' => {},
                 'index_entry' => {
                   'entry_element' => {},
                   'entry_number' => 9,
@@ -2517,7 +2517,7 @@ $result_trees{'all_commands_printindex'} = {
                   'category' => {},
                   'name' => {}
                 },
-                'entry_node' => {},
+                'element_node' => {},
                 'index_entry' => {
                   'entry_element' => {},
                   'entry_number' => 10,
@@ -2657,7 +2657,7 @@ $result_trees{'all_commands_printindex'} = {
                   'category' => {},
                   'name' => {}
                 },
-                'entry_node' => {},
+                'element_node' => {},
                 'index_entry' => {
                   'entry_element' => {},
                   'entry_number' => 11,
@@ -2784,7 +2784,7 @@ $result_trees{'all_commands_printindex'} = {
                   'category' => {},
                   'name' => {}
                 },
-                'entry_node' => {},
+                'element_node' => {},
                 'index_entry' => {
                   'entry_element' => {},
                   'entry_number' => 7,
@@ -2937,7 +2937,7 @@ $result_trees{'all_commands_printindex'} = {
                   'category' => {},
                   'name' => {}
                 },
-                'entry_node' => {},
+                'element_node' => {},
                 'index_entry' => {
                   'entry_element' => {},
                   'entry_number' => 8,
@@ -3064,7 +3064,7 @@ $result_trees{'all_commands_printindex'} = {
                   'category' => {},
                   'name' => {}
                 },
-                'entry_node' => {},
+                'element_node' => {},
                 'index_entry' => {
                   'entry_element' => {},
                   'entry_number' => 9,
@@ -3218,7 +3218,7 @@ $result_trees{'all_commands_printindex'} = {
                   'name' => {},
                   'type' => {}
                 },
-                'entry_node' => {},
+                'element_node' => {},
                 'index_entry' => {
                   'entry_element' => {},
                   'entry_number' => 12,
@@ -3359,7 +3359,7 @@ $result_trees{'all_commands_printindex'} = {
                   'name' => {},
                   'type' => {}
                 },
-                'entry_node' => {},
+                'element_node' => {},
                 'index_entry' => {
                   'entry_element' => {},
                   'entry_number' => 10,
@@ -3518,7 +3518,7 @@ $result_trees{'all_commands_printindex'} = {
                   'class' => {},
                   'name' => {}
                 },
-                'entry_node' => {},
+                'element_node' => {},
                 'index_entry' => {
                   'entry_element' => {},
                   'entry_number' => 11,
@@ -3691,7 +3691,7 @@ $result_trees{'all_commands_printindex'} = {
                   'name' => {},
                   'type' => {}
                 },
-                'entry_node' => {},
+                'element_node' => {},
                 'index_entry' => {
                   'entry_element' => {},
                   'entry_number' => 12,
@@ -3863,7 +3863,7 @@ $result_trees{'all_commands_printindex'} = {
                   'class' => {},
                   'name' => {}
                 },
-                'entry_node' => {},
+                'element_node' => {},
                 'index_entry' => {
                   'entry_element' => {},
                   'entry_number' => 13,
@@ -4049,7 +4049,7 @@ $result_trees{'all_commands_printindex'} = {
                   'name' => {},
                   'type' => {}
                 },
-                'entry_node' => {},
+                'element_node' => {},
                 'index_entry' => {
                   'entry_element' => {},
                   'entry_number' => 14,
@@ -4362,29 +4362,29 @@ 
$result_trees{'all_commands_printindex'}{'contents'}[1]{'extra'}{'nodes_manuals'
 
$result_trees{'all_commands_printindex'}{'contents'}[2]{'contents'}[1]{'contents'}[0]{'extra'}{'def_index_element'}
 = 
$result_trees{'all_commands_printindex'}{'contents'}[2]{'contents'}[1]{'contents'}[0]{'args'}[0]{'contents'}[2];
 
$result_trees{'all_commands_printindex'}{'contents'}[2]{'contents'}[1]{'contents'}[0]{'extra'}{'def_parsed_hash'}{'category'}
 = 
$result_trees{'all_commands_printindex'}{'contents'}[2]{'contents'}[1]{'contents'}[0]{'args'}[0]{'contents'}[0];
 
$result_trees{'all_commands_printindex'}{'contents'}[2]{'contents'}[1]{'contents'}[0]{'extra'}{'def_parsed_hash'}{'name'}
 = 
$result_trees{'all_commands_printindex'}{'contents'}[2]{'contents'}[1]{'contents'}[0]{'args'}[0]{'contents'}[2];
-$result_trees{'all_commands_printindex'}{'contents'}[2]{'contents'}[1]{'contents'}[0]{'extra'}{'entry_node'}
 = $result_trees{'all_commands_printindex'}{'contents'}[2];
+$result_trees{'all_commands_printindex'}{'contents'}[2]{'contents'}[1]{'contents'}[0]{'extra'}{'element_node'}
 = $result_trees{'all_commands_printindex'}{'contents'}[2];
 
$result_trees{'all_commands_printindex'}{'contents'}[2]{'contents'}[1]{'contents'}[0]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'all_commands_printindex'}{'contents'}[2]{'contents'}[1]{'contents'}[0];
 
$result_trees{'all_commands_printindex'}{'contents'}[2]{'contents'}[3]{'contents'}[0]{'extra'}{'def_index_element'}
 = 
$result_trees{'all_commands_printindex'}{'contents'}[2]{'contents'}[3]{'contents'}[0]{'args'}[0]{'contents'}[2];
 
$result_trees{'all_commands_printindex'}{'contents'}[2]{'contents'}[3]{'contents'}[0]{'extra'}{'def_parsed_hash'}{'category'}
 = 
$result_trees{'all_commands_printindex'}{'contents'}[2]{'contents'}[3]{'contents'}[0]{'args'}[0]{'contents'}[0];
 
$result_trees{'all_commands_printindex'}{'contents'}[2]{'contents'}[3]{'contents'}[0]{'extra'}{'def_parsed_hash'}{'name'}
 = 
$result_trees{'all_commands_printindex'}{'contents'}[2]{'contents'}[3]{'contents'}[0]{'args'}[0]{'contents'}[2];
-$result_trees{'all_commands_printindex'}{'contents'}[2]{'contents'}[3]{'contents'}[0]{'extra'}{'entry_node'}
 = $result_trees{'all_commands_printindex'}{'contents'}[2];
+$result_trees{'all_commands_printindex'}{'contents'}[2]{'contents'}[3]{'contents'}[0]{'extra'}{'element_node'}
 = $result_trees{'all_commands_printindex'}{'contents'}[2];
 
$result_trees{'all_commands_printindex'}{'contents'}[2]{'contents'}[3]{'contents'}[0]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'all_commands_printindex'}{'contents'}[2]{'contents'}[3]{'contents'}[0];
 
$result_trees{'all_commands_printindex'}{'contents'}[2]{'contents'}[5]{'contents'}[0]{'extra'}{'def_index_element'}
 = 
$result_trees{'all_commands_printindex'}{'contents'}[2]{'contents'}[5]{'contents'}[0]{'args'}[0]{'contents'}[2];
 
$result_trees{'all_commands_printindex'}{'contents'}[2]{'contents'}[5]{'contents'}[0]{'extra'}{'def_parsed_hash'}{'category'}
 = 
$result_trees{'all_commands_printindex'}{'contents'}[2]{'contents'}[5]{'contents'}[0]{'args'}[0]{'contents'}[0];
 
$result_trees{'all_commands_printindex'}{'contents'}[2]{'contents'}[5]{'contents'}[0]{'extra'}{'def_parsed_hash'}{'name'}
 = 
$result_trees{'all_commands_printindex'}{'contents'}[2]{'contents'}[5]{'contents'}[0]{'args'}[0]{'contents'}[2];
-$result_trees{'all_commands_printindex'}{'contents'}[2]{'contents'}[5]{'contents'}[0]{'extra'}{'entry_node'}
 = $result_trees{'all_commands_printindex'}{'contents'}[2];
+$result_trees{'all_commands_printindex'}{'contents'}[2]{'contents'}[5]{'contents'}[0]{'extra'}{'element_node'}
 = $result_trees{'all_commands_printindex'}{'contents'}[2];
 
$result_trees{'all_commands_printindex'}{'contents'}[2]{'contents'}[5]{'contents'}[0]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'all_commands_printindex'}{'contents'}[2]{'contents'}[5]{'contents'}[0];
 
$result_trees{'all_commands_printindex'}{'contents'}[2]{'contents'}[7]{'contents'}[0]{'extra'}{'def_index_element'}
 = 
$result_trees{'all_commands_printindex'}{'contents'}[2]{'contents'}[7]{'contents'}[0]{'args'}[0]{'contents'}[4];
 
$result_trees{'all_commands_printindex'}{'contents'}[2]{'contents'}[7]{'contents'}[0]{'extra'}{'def_parsed_hash'}{'category'}
 = 
$result_trees{'all_commands_printindex'}{'contents'}[2]{'contents'}[7]{'contents'}[0]{'args'}[0]{'contents'}[0];
 
$result_trees{'all_commands_printindex'}{'contents'}[2]{'contents'}[7]{'contents'}[0]{'extra'}{'def_parsed_hash'}{'name'}
 = 
$result_trees{'all_commands_printindex'}{'contents'}[2]{'contents'}[7]{'contents'}[0]{'args'}[0]{'contents'}[4];
 
$result_trees{'all_commands_printindex'}{'contents'}[2]{'contents'}[7]{'contents'}[0]{'extra'}{'def_parsed_hash'}{'type'}
 = 
$result_trees{'all_commands_printindex'}{'contents'}[2]{'contents'}[7]{'contents'}[0]{'args'}[0]{'contents'}[2];
-$result_trees{'all_commands_printindex'}{'contents'}[2]{'contents'}[7]{'contents'}[0]{'extra'}{'entry_node'}
 = $result_trees{'all_commands_printindex'}{'contents'}[2];
+$result_trees{'all_commands_printindex'}{'contents'}[2]{'contents'}[7]{'contents'}[0]{'extra'}{'element_node'}
 = $result_trees{'all_commands_printindex'}{'contents'}[2];
 
$result_trees{'all_commands_printindex'}{'contents'}[2]{'contents'}[7]{'contents'}[0]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'all_commands_printindex'}{'contents'}[2]{'contents'}[7]{'contents'}[0];
 
$result_trees{'all_commands_printindex'}{'contents'}[2]{'contents'}[9]{'contents'}[0]{'extra'}{'def_index_element'}
 = 
$result_trees{'all_commands_printindex'}{'contents'}[2]{'contents'}[9]{'contents'}[0]{'args'}[0]{'contents'}[4];
 
$result_trees{'all_commands_printindex'}{'contents'}[2]{'contents'}[9]{'contents'}[0]{'extra'}{'def_parsed_hash'}{'category'}
 = 
$result_trees{'all_commands_printindex'}{'contents'}[2]{'contents'}[9]{'contents'}[0]{'args'}[0]{'contents'}[0];
 
$result_trees{'all_commands_printindex'}{'contents'}[2]{'contents'}[9]{'contents'}[0]{'extra'}{'def_parsed_hash'}{'name'}
 = 
$result_trees{'all_commands_printindex'}{'contents'}[2]{'contents'}[9]{'contents'}[0]{'args'}[0]{'contents'}[4];
 
$result_trees{'all_commands_printindex'}{'contents'}[2]{'contents'}[9]{'contents'}[0]{'extra'}{'def_parsed_hash'}{'type'}
 = 
$result_trees{'all_commands_printindex'}{'contents'}[2]{'contents'}[9]{'contents'}[0]{'args'}[0]{'contents'}[2];
-$result_trees{'all_commands_printindex'}{'contents'}[2]{'contents'}[9]{'contents'}[0]{'extra'}{'entry_node'}
 = $result_trees{'all_commands_printindex'}{'contents'}[2];
+$result_trees{'all_commands_printindex'}{'contents'}[2]{'contents'}[9]{'contents'}[0]{'extra'}{'element_node'}
 = $result_trees{'all_commands_printindex'}{'contents'}[2];
 
$result_trees{'all_commands_printindex'}{'contents'}[2]{'contents'}[9]{'contents'}[0]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'all_commands_printindex'}{'contents'}[2]{'contents'}[9]{'contents'}[0];
 
$result_trees{'all_commands_printindex'}{'contents'}[2]{'contents'}[11]{'contents'}[0]{'extra'}{'def_index_element'}{'contents'}[0]
 = 
$result_trees{'all_commands_printindex'}{'contents'}[2]{'contents'}[11]{'contents'}[0]{'args'}[0]{'contents'}[6];
 
$result_trees{'all_commands_printindex'}{'contents'}[2]{'contents'}[11]{'contents'}[0]{'extra'}{'def_index_element'}{'contents'}[2]
 = 
$result_trees{'all_commands_printindex'}{'contents'}[2]{'contents'}[11]{'contents'}[0]{'args'}[0]{'contents'}[2];
@@ -4394,7 +4394,7 @@ 
$result_trees{'all_commands_printindex'}{'contents'}[2]{'contents'}[11]{'content
 
$result_trees{'all_commands_printindex'}{'contents'}[2]{'contents'}[11]{'contents'}[0]{'extra'}{'def_parsed_hash'}{'class'}
 = 
$result_trees{'all_commands_printindex'}{'contents'}[2]{'contents'}[11]{'contents'}[0]{'args'}[0]{'contents'}[2];
 
$result_trees{'all_commands_printindex'}{'contents'}[2]{'contents'}[11]{'contents'}[0]{'extra'}{'def_parsed_hash'}{'name'}
 = 
$result_trees{'all_commands_printindex'}{'contents'}[2]{'contents'}[11]{'contents'}[0]{'args'}[0]{'contents'}[6];
 
$result_trees{'all_commands_printindex'}{'contents'}[2]{'contents'}[11]{'contents'}[0]{'extra'}{'def_parsed_hash'}{'type'}
 = 
$result_trees{'all_commands_printindex'}{'contents'}[2]{'contents'}[11]{'contents'}[0]{'args'}[0]{'contents'}[4];
-$result_trees{'all_commands_printindex'}{'contents'}[2]{'contents'}[11]{'contents'}[0]{'extra'}{'entry_node'}
 = $result_trees{'all_commands_printindex'}{'contents'}[2];
+$result_trees{'all_commands_printindex'}{'contents'}[2]{'contents'}[11]{'contents'}[0]{'extra'}{'element_node'}
 = $result_trees{'all_commands_printindex'}{'contents'}[2];
 
$result_trees{'all_commands_printindex'}{'contents'}[2]{'contents'}[11]{'contents'}[0]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'all_commands_printindex'}{'contents'}[2]{'contents'}[11]{'contents'}[0];
 
$result_trees{'all_commands_printindex'}{'contents'}[2]{'contents'}[13]{'contents'}[0]{'extra'}{'def_index_element'}{'contents'}[0]
 = 
$result_trees{'all_commands_printindex'}{'contents'}[2]{'contents'}[13]{'contents'}[0]{'args'}[0]{'contents'}[6];
 
$result_trees{'all_commands_printindex'}{'contents'}[2]{'contents'}[13]{'contents'}[0]{'extra'}{'def_index_element'}{'contents'}[2]
 = 
$result_trees{'all_commands_printindex'}{'contents'}[2]{'contents'}[13]{'contents'}[0]{'args'}[0]{'contents'}[2];
@@ -4404,25 +4404,25 @@ 
$result_trees{'all_commands_printindex'}{'contents'}[2]{'contents'}[13]{'content
 
$result_trees{'all_commands_printindex'}{'contents'}[2]{'contents'}[13]{'contents'}[0]{'extra'}{'def_parsed_hash'}{'class'}
 = 
$result_trees{'all_commands_printindex'}{'contents'}[2]{'contents'}[13]{'contents'}[0]{'args'}[0]{'contents'}[2];
 
$result_trees{'all_commands_printindex'}{'contents'}[2]{'contents'}[13]{'contents'}[0]{'extra'}{'def_parsed_hash'}{'name'}
 = 
$result_trees{'all_commands_printindex'}{'contents'}[2]{'contents'}[13]{'contents'}[0]{'args'}[0]{'contents'}[6];
 
$result_trees{'all_commands_printindex'}{'contents'}[2]{'contents'}[13]{'contents'}[0]{'extra'}{'def_parsed_hash'}{'type'}
 = 
$result_trees{'all_commands_printindex'}{'contents'}[2]{'contents'}[13]{'contents'}[0]{'args'}[0]{'contents'}[4];
-$result_trees{'all_commands_printindex'}{'contents'}[2]{'contents'}[13]{'contents'}[0]{'extra'}{'entry_node'}
 = $result_trees{'all_commands_printindex'}{'contents'}[2];
+$result_trees{'all_commands_printindex'}{'contents'}[2]{'contents'}[13]{'contents'}[0]{'extra'}{'element_node'}
 = $result_trees{'all_commands_printindex'}{'contents'}[2];
 
$result_trees{'all_commands_printindex'}{'contents'}[2]{'contents'}[13]{'contents'}[0]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'all_commands_printindex'}{'contents'}[2]{'contents'}[13]{'contents'}[0];
 
$result_trees{'all_commands_printindex'}{'contents'}[2]{'contents'}[15]{'contents'}[0]{'extra'}{'def_index_element'}
 = 
$result_trees{'all_commands_printindex'}{'contents'}[2]{'contents'}[15]{'contents'}[0]{'args'}[0]{'contents'}[4];
 
$result_trees{'all_commands_printindex'}{'contents'}[2]{'contents'}[15]{'contents'}[0]{'extra'}{'def_parsed_hash'}{'category'}
 = 
$result_trees{'all_commands_printindex'}{'contents'}[2]{'contents'}[15]{'contents'}[0]{'args'}[0]{'contents'}[0];
 
$result_trees{'all_commands_printindex'}{'contents'}[2]{'contents'}[15]{'contents'}[0]{'extra'}{'def_parsed_hash'}{'name'}
 = 
$result_trees{'all_commands_printindex'}{'contents'}[2]{'contents'}[15]{'contents'}[0]{'args'}[0]{'contents'}[4];
 
$result_trees{'all_commands_printindex'}{'contents'}[2]{'contents'}[15]{'contents'}[0]{'extra'}{'def_parsed_hash'}{'type'}
 = 
$result_trees{'all_commands_printindex'}{'contents'}[2]{'contents'}[15]{'contents'}[0]{'args'}[0]{'contents'}[2];
-$result_trees{'all_commands_printindex'}{'contents'}[2]{'contents'}[15]{'contents'}[0]{'extra'}{'entry_node'}
 = $result_trees{'all_commands_printindex'}{'contents'}[2];
+$result_trees{'all_commands_printindex'}{'contents'}[2]{'contents'}[15]{'contents'}[0]{'extra'}{'element_node'}
 = $result_trees{'all_commands_printindex'}{'contents'}[2];
 
$result_trees{'all_commands_printindex'}{'contents'}[2]{'contents'}[15]{'contents'}[0]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'all_commands_printindex'}{'contents'}[2]{'contents'}[15]{'contents'}[0];
 
$result_trees{'all_commands_printindex'}{'contents'}[2]{'contents'}[17]{'contents'}[0]{'extra'}{'def_index_element'}
 = 
$result_trees{'all_commands_printindex'}{'contents'}[2]{'contents'}[17]{'contents'}[0]{'args'}[0]{'contents'}[4];
 
$result_trees{'all_commands_printindex'}{'contents'}[2]{'contents'}[17]{'contents'}[0]{'extra'}{'def_parsed_hash'}{'category'}
 = 
$result_trees{'all_commands_printindex'}{'contents'}[2]{'contents'}[17]{'contents'}[0]{'args'}[0]{'contents'}[0];
 
$result_trees{'all_commands_printindex'}{'contents'}[2]{'contents'}[17]{'contents'}[0]{'extra'}{'def_parsed_hash'}{'class'}
 = 
$result_trees{'all_commands_printindex'}{'contents'}[2]{'contents'}[17]{'contents'}[0]{'args'}[0]{'contents'}[2];
 
$result_trees{'all_commands_printindex'}{'contents'}[2]{'contents'}[17]{'contents'}[0]{'extra'}{'def_parsed_hash'}{'name'}
 = 
$result_trees{'all_commands_printindex'}{'contents'}[2]{'contents'}[17]{'contents'}[0]{'args'}[0]{'contents'}[4];
-$result_trees{'all_commands_printindex'}{'contents'}[2]{'contents'}[17]{'contents'}[0]{'extra'}{'entry_node'}
 = $result_trees{'all_commands_printindex'}{'contents'}[2];
+$result_trees{'all_commands_printindex'}{'contents'}[2]{'contents'}[17]{'contents'}[0]{'extra'}{'element_node'}
 = $result_trees{'all_commands_printindex'}{'contents'}[2];
 
$result_trees{'all_commands_printindex'}{'contents'}[2]{'contents'}[17]{'contents'}[0]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'all_commands_printindex'}{'contents'}[2]{'contents'}[17]{'contents'}[0];
 
$result_trees{'all_commands_printindex'}{'contents'}[2]{'contents'}[19]{'contents'}[0]{'extra'}{'def_index_element'}
 = 
$result_trees{'all_commands_printindex'}{'contents'}[2]{'contents'}[19]{'contents'}[0]{'args'}[0]{'contents'}[4];
 
$result_trees{'all_commands_printindex'}{'contents'}[2]{'contents'}[19]{'contents'}[0]{'extra'}{'def_parsed_hash'}{'category'}
 = 
$result_trees{'all_commands_printindex'}{'contents'}[2]{'contents'}[19]{'contents'}[0]{'args'}[0]{'contents'}[0];
 
$result_trees{'all_commands_printindex'}{'contents'}[2]{'contents'}[19]{'contents'}[0]{'extra'}{'def_parsed_hash'}{'class'}
 = 
$result_trees{'all_commands_printindex'}{'contents'}[2]{'contents'}[19]{'contents'}[0]{'args'}[0]{'contents'}[2];
 
$result_trees{'all_commands_printindex'}{'contents'}[2]{'contents'}[19]{'contents'}[0]{'extra'}{'def_parsed_hash'}{'name'}
 = 
$result_trees{'all_commands_printindex'}{'contents'}[2]{'contents'}[19]{'contents'}[0]{'args'}[0]{'contents'}[4];
-$result_trees{'all_commands_printindex'}{'contents'}[2]{'contents'}[19]{'contents'}[0]{'extra'}{'entry_node'}
 = $result_trees{'all_commands_printindex'}{'contents'}[2];
+$result_trees{'all_commands_printindex'}{'contents'}[2]{'contents'}[19]{'contents'}[0]{'extra'}{'element_node'}
 = $result_trees{'all_commands_printindex'}{'contents'}[2];
 
$result_trees{'all_commands_printindex'}{'contents'}[2]{'contents'}[19]{'contents'}[0]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'all_commands_printindex'}{'contents'}[2]{'contents'}[19]{'contents'}[0];
 
$result_trees{'all_commands_printindex'}{'contents'}[2]{'contents'}[21]{'contents'}[0]{'extra'}{'def_index_element'}{'contents'}[0]
 = 
$result_trees{'all_commands_printindex'}{'contents'}[2]{'contents'}[21]{'contents'}[0]{'args'}[0]{'contents'}[6];
 
$result_trees{'all_commands_printindex'}{'contents'}[2]{'contents'}[21]{'contents'}[0]{'extra'}{'def_index_element'}{'contents'}[2]
 = 
$result_trees{'all_commands_printindex'}{'contents'}[2]{'contents'}[21]{'contents'}[0]{'args'}[0]{'contents'}[2];
@@ -4432,7 +4432,7 @@ 
$result_trees{'all_commands_printindex'}{'contents'}[2]{'contents'}[21]{'content
 
$result_trees{'all_commands_printindex'}{'contents'}[2]{'contents'}[21]{'contents'}[0]{'extra'}{'def_parsed_hash'}{'class'}
 = 
$result_trees{'all_commands_printindex'}{'contents'}[2]{'contents'}[21]{'contents'}[0]{'args'}[0]{'contents'}[2];
 
$result_trees{'all_commands_printindex'}{'contents'}[2]{'contents'}[21]{'contents'}[0]{'extra'}{'def_parsed_hash'}{'name'}
 = 
$result_trees{'all_commands_printindex'}{'contents'}[2]{'contents'}[21]{'contents'}[0]{'args'}[0]{'contents'}[6];
 
$result_trees{'all_commands_printindex'}{'contents'}[2]{'contents'}[21]{'contents'}[0]{'extra'}{'def_parsed_hash'}{'type'}
 = 
$result_trees{'all_commands_printindex'}{'contents'}[2]{'contents'}[21]{'contents'}[0]{'args'}[0]{'contents'}[4];
-$result_trees{'all_commands_printindex'}{'contents'}[2]{'contents'}[21]{'contents'}[0]{'extra'}{'entry_node'}
 = $result_trees{'all_commands_printindex'}{'contents'}[2];
+$result_trees{'all_commands_printindex'}{'contents'}[2]{'contents'}[21]{'contents'}[0]{'extra'}{'element_node'}
 = $result_trees{'all_commands_printindex'}{'contents'}[2];
 
$result_trees{'all_commands_printindex'}{'contents'}[2]{'contents'}[21]{'contents'}[0]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'all_commands_printindex'}{'contents'}[2]{'contents'}[21]{'contents'}[0];
 
$result_trees{'all_commands_printindex'}{'contents'}[2]{'contents'}[23]{'contents'}[0]{'extra'}{'def_index_element'}{'contents'}[0]
 = 
$result_trees{'all_commands_printindex'}{'contents'}[2]{'contents'}[23]{'contents'}[0]{'args'}[0]{'contents'}[6];
 
$result_trees{'all_commands_printindex'}{'contents'}[2]{'contents'}[23]{'contents'}[0]{'extra'}{'def_index_element'}{'contents'}[2]
 = 
$result_trees{'all_commands_printindex'}{'contents'}[2]{'contents'}[23]{'contents'}[0]{'args'}[0]{'contents'}[2];
@@ -4442,7 +4442,7 @@ 
$result_trees{'all_commands_printindex'}{'contents'}[2]{'contents'}[23]{'content
 
$result_trees{'all_commands_printindex'}{'contents'}[2]{'contents'}[23]{'contents'}[0]{'extra'}{'def_parsed_hash'}{'class'}
 = 
$result_trees{'all_commands_printindex'}{'contents'}[2]{'contents'}[23]{'contents'}[0]{'args'}[0]{'contents'}[2];
 
$result_trees{'all_commands_printindex'}{'contents'}[2]{'contents'}[23]{'contents'}[0]{'extra'}{'def_parsed_hash'}{'name'}
 = 
$result_trees{'all_commands_printindex'}{'contents'}[2]{'contents'}[23]{'contents'}[0]{'args'}[0]{'contents'}[6];
 
$result_trees{'all_commands_printindex'}{'contents'}[2]{'contents'}[23]{'contents'}[0]{'extra'}{'def_parsed_hash'}{'type'}
 = 
$result_trees{'all_commands_printindex'}{'contents'}[2]{'contents'}[23]{'contents'}[0]{'args'}[0]{'contents'}[4];
-$result_trees{'all_commands_printindex'}{'contents'}[2]{'contents'}[23]{'contents'}[0]{'extra'}{'entry_node'}
 = $result_trees{'all_commands_printindex'}{'contents'}[2];
+$result_trees{'all_commands_printindex'}{'contents'}[2]{'contents'}[23]{'contents'}[0]{'extra'}{'element_node'}
 = $result_trees{'all_commands_printindex'}{'contents'}[2];
 
$result_trees{'all_commands_printindex'}{'contents'}[2]{'contents'}[23]{'contents'}[0]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'all_commands_printindex'}{'contents'}[2]{'contents'}[23]{'contents'}[0];
 
$result_trees{'all_commands_printindex'}{'contents'}[2]{'contents'}[25]{'contents'}[0]{'extra'}{'def_index_element'}{'contents'}[0]
 = 
$result_trees{'all_commands_printindex'}{'contents'}[2]{'contents'}[25]{'contents'}[0]{'args'}[0]{'contents'}[4];
 
$result_trees{'all_commands_printindex'}{'contents'}[2]{'contents'}[25]{'contents'}[0]{'extra'}{'def_index_element'}{'contents'}[2]
 = 
$result_trees{'all_commands_printindex'}{'contents'}[2]{'contents'}[25]{'contents'}[0]{'args'}[0]{'contents'}[2];
@@ -4451,7 +4451,7 @@ 
$result_trees{'all_commands_printindex'}{'contents'}[2]{'contents'}[25]{'content
 
$result_trees{'all_commands_printindex'}{'contents'}[2]{'contents'}[25]{'contents'}[0]{'extra'}{'def_parsed_hash'}{'category'}
 = 
$result_trees{'all_commands_printindex'}{'contents'}[2]{'contents'}[25]{'contents'}[0]{'args'}[0]{'contents'}[0];
 
$result_trees{'all_commands_printindex'}{'contents'}[2]{'contents'}[25]{'contents'}[0]{'extra'}{'def_parsed_hash'}{'class'}
 = 
$result_trees{'all_commands_printindex'}{'contents'}[2]{'contents'}[25]{'contents'}[0]{'args'}[0]{'contents'}[2];
 
$result_trees{'all_commands_printindex'}{'contents'}[2]{'contents'}[25]{'contents'}[0]{'extra'}{'def_parsed_hash'}{'name'}
 = 
$result_trees{'all_commands_printindex'}{'contents'}[2]{'contents'}[25]{'contents'}[0]{'args'}[0]{'contents'}[4];
-$result_trees{'all_commands_printindex'}{'contents'}[2]{'contents'}[25]{'contents'}[0]{'extra'}{'entry_node'}
 = $result_trees{'all_commands_printindex'}{'contents'}[2];
+$result_trees{'all_commands_printindex'}{'contents'}[2]{'contents'}[25]{'contents'}[0]{'extra'}{'element_node'}
 = $result_trees{'all_commands_printindex'}{'contents'}[2];
 
$result_trees{'all_commands_printindex'}{'contents'}[2]{'contents'}[25]{'contents'}[0]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'all_commands_printindex'}{'contents'}[2]{'contents'}[25]{'contents'}[0];
 
$result_trees{'all_commands_printindex'}{'contents'}[2]{'contents'}[27]{'contents'}[0]{'extra'}{'def_index_element'}{'contents'}[0]
 = 
$result_trees{'all_commands_printindex'}{'contents'}[2]{'contents'}[27]{'contents'}[0]{'args'}[0]{'contents'}[4];
 
$result_trees{'all_commands_printindex'}{'contents'}[2]{'contents'}[27]{'contents'}[0]{'extra'}{'def_index_element'}{'contents'}[2]
 = 
$result_trees{'all_commands_printindex'}{'contents'}[2]{'contents'}[27]{'contents'}[0]{'args'}[0]{'contents'}[2];
@@ -4460,54 +4460,54 @@ 
$result_trees{'all_commands_printindex'}{'contents'}[2]{'contents'}[27]{'content
 
$result_trees{'all_commands_printindex'}{'contents'}[2]{'contents'}[27]{'contents'}[0]{'extra'}{'def_parsed_hash'}{'category'}
 = 
$result_trees{'all_commands_printindex'}{'contents'}[2]{'contents'}[27]{'contents'}[0]{'args'}[0]{'contents'}[0];
 
$result_trees{'all_commands_printindex'}{'contents'}[2]{'contents'}[27]{'contents'}[0]{'extra'}{'def_parsed_hash'}{'class'}
 = 
$result_trees{'all_commands_printindex'}{'contents'}[2]{'contents'}[27]{'contents'}[0]{'args'}[0]{'contents'}[2];
 
$result_trees{'all_commands_printindex'}{'contents'}[2]{'contents'}[27]{'contents'}[0]{'extra'}{'def_parsed_hash'}{'name'}
 = 
$result_trees{'all_commands_printindex'}{'contents'}[2]{'contents'}[27]{'contents'}[0]{'args'}[0]{'contents'}[4];
-$result_trees{'all_commands_printindex'}{'contents'}[2]{'contents'}[27]{'contents'}[0]{'extra'}{'entry_node'}
 = $result_trees{'all_commands_printindex'}{'contents'}[2];
+$result_trees{'all_commands_printindex'}{'contents'}[2]{'contents'}[27]{'contents'}[0]{'extra'}{'element_node'}
 = $result_trees{'all_commands_printindex'}{'contents'}[2];
 
$result_trees{'all_commands_printindex'}{'contents'}[2]{'contents'}[27]{'contents'}[0]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'all_commands_printindex'}{'contents'}[2]{'contents'}[27]{'contents'}[0];
 
$result_trees{'all_commands_printindex'}{'contents'}[2]{'contents'}[29]{'contents'}[0]{'extra'}{'def_index_element'}
 = 
$result_trees{'all_commands_printindex'}{'contents'}[2]{'contents'}[29]{'contents'}[0]{'args'}[0]{'contents'}[2];
 
$result_trees{'all_commands_printindex'}{'contents'}[2]{'contents'}[29]{'contents'}[0]{'extra'}{'def_parsed_hash'}{'category'}
 = 
$result_trees{'all_commands_printindex'}{'contents'}[2]{'contents'}[29]{'contents'}[0]{'args'}[0]{'contents'}[0];
 
$result_trees{'all_commands_printindex'}{'contents'}[2]{'contents'}[29]{'contents'}[0]{'extra'}{'def_parsed_hash'}{'name'}
 = 
$result_trees{'all_commands_printindex'}{'contents'}[2]{'contents'}[29]{'contents'}[0]{'args'}[0]{'contents'}[2];
-$result_trees{'all_commands_printindex'}{'contents'}[2]{'contents'}[29]{'contents'}[0]{'extra'}{'entry_node'}
 = $result_trees{'all_commands_printindex'}{'contents'}[2];
+$result_trees{'all_commands_printindex'}{'contents'}[2]{'contents'}[29]{'contents'}[0]{'extra'}{'element_node'}
 = $result_trees{'all_commands_printindex'}{'contents'}[2];
 
$result_trees{'all_commands_printindex'}{'contents'}[2]{'contents'}[29]{'contents'}[0]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'all_commands_printindex'}{'contents'}[2]{'contents'}[29]{'contents'}[0];
 
$result_trees{'all_commands_printindex'}{'contents'}[2]{'contents'}[31]{'contents'}[0]{'extra'}{'def_index_element'}
 = 
$result_trees{'all_commands_printindex'}{'contents'}[2]{'contents'}[31]{'contents'}[0]{'args'}[0]{'contents'}[2];
 
$result_trees{'all_commands_printindex'}{'contents'}[2]{'contents'}[31]{'contents'}[0]{'extra'}{'def_parsed_hash'}{'category'}
 = 
$result_trees{'all_commands_printindex'}{'contents'}[2]{'contents'}[31]{'contents'}[0]{'args'}[0]{'contents'}[0];
 
$result_trees{'all_commands_printindex'}{'contents'}[2]{'contents'}[31]{'contents'}[0]{'extra'}{'def_parsed_hash'}{'name'}
 = 
$result_trees{'all_commands_printindex'}{'contents'}[2]{'contents'}[31]{'contents'}[0]{'args'}[0]{'contents'}[2];
-$result_trees{'all_commands_printindex'}{'contents'}[2]{'contents'}[31]{'contents'}[0]{'extra'}{'entry_node'}
 = $result_trees{'all_commands_printindex'}{'contents'}[2];
+$result_trees{'all_commands_printindex'}{'contents'}[2]{'contents'}[31]{'contents'}[0]{'extra'}{'element_node'}
 = $result_trees{'all_commands_printindex'}{'contents'}[2];
 
$result_trees{'all_commands_printindex'}{'contents'}[2]{'contents'}[31]{'contents'}[0]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'all_commands_printindex'}{'contents'}[2]{'contents'}[31]{'contents'}[0];
 
$result_trees{'all_commands_printindex'}{'contents'}[2]{'contents'}[33]{'contents'}[0]{'extra'}{'def_index_element'}
 = 
$result_trees{'all_commands_printindex'}{'contents'}[2]{'contents'}[33]{'contents'}[0]{'args'}[0]{'contents'}[2];
 
$result_trees{'all_commands_printindex'}{'contents'}[2]{'contents'}[33]{'contents'}[0]{'extra'}{'def_parsed_hash'}{'category'}
 = 
$result_trees{'all_commands_printindex'}{'contents'}[2]{'contents'}[33]{'contents'}[0]{'args'}[0]{'contents'}[0];
 
$result_trees{'all_commands_printindex'}{'contents'}[2]{'contents'}[33]{'contents'}[0]{'extra'}{'def_parsed_hash'}{'name'}
 = 
$result_trees{'all_commands_printindex'}{'contents'}[2]{'contents'}[33]{'contents'}[0]{'args'}[0]{'contents'}[2];
-$result_trees{'all_commands_printindex'}{'contents'}[2]{'contents'}[33]{'contents'}[0]{'extra'}{'entry_node'}
 = $result_trees{'all_commands_printindex'}{'contents'}[2];
+$result_trees{'all_commands_printindex'}{'contents'}[2]{'contents'}[33]{'contents'}[0]{'extra'}{'element_node'}
 = $result_trees{'all_commands_printindex'}{'contents'}[2];
 
$result_trees{'all_commands_printindex'}{'contents'}[2]{'contents'}[33]{'contents'}[0]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'all_commands_printindex'}{'contents'}[2]{'contents'}[33]{'contents'}[0];
 
$result_trees{'all_commands_printindex'}{'contents'}[2]{'contents'}[35]{'contents'}[0]{'extra'}{'def_index_element'}
 = 
$result_trees{'all_commands_printindex'}{'contents'}[2]{'contents'}[35]{'contents'}[0]{'args'}[0]{'contents'}[2];
 
$result_trees{'all_commands_printindex'}{'contents'}[2]{'contents'}[35]{'contents'}[0]{'extra'}{'def_parsed_hash'}{'category'}
 = 
$result_trees{'all_commands_printindex'}{'contents'}[2]{'contents'}[35]{'contents'}[0]{'args'}[0]{'contents'}[0];
 
$result_trees{'all_commands_printindex'}{'contents'}[2]{'contents'}[35]{'contents'}[0]{'extra'}{'def_parsed_hash'}{'name'}
 = 
$result_trees{'all_commands_printindex'}{'contents'}[2]{'contents'}[35]{'contents'}[0]{'args'}[0]{'contents'}[2];
-$result_trees{'all_commands_printindex'}{'contents'}[2]{'contents'}[35]{'contents'}[0]{'extra'}{'entry_node'}
 = $result_trees{'all_commands_printindex'}{'contents'}[2];
+$result_trees{'all_commands_printindex'}{'contents'}[2]{'contents'}[35]{'contents'}[0]{'extra'}{'element_node'}
 = $result_trees{'all_commands_printindex'}{'contents'}[2];
 
$result_trees{'all_commands_printindex'}{'contents'}[2]{'contents'}[35]{'contents'}[0]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'all_commands_printindex'}{'contents'}[2]{'contents'}[35]{'contents'}[0];
 
$result_trees{'all_commands_printindex'}{'contents'}[2]{'contents'}[37]{'contents'}[0]{'extra'}{'def_index_element'}
 = 
$result_trees{'all_commands_printindex'}{'contents'}[2]{'contents'}[37]{'contents'}[0]{'args'}[0]{'contents'}[2];
 
$result_trees{'all_commands_printindex'}{'contents'}[2]{'contents'}[37]{'contents'}[0]{'extra'}{'def_parsed_hash'}{'category'}
 = 
$result_trees{'all_commands_printindex'}{'contents'}[2]{'contents'}[37]{'contents'}[0]{'args'}[0]{'contents'}[0];
 
$result_trees{'all_commands_printindex'}{'contents'}[2]{'contents'}[37]{'contents'}[0]{'extra'}{'def_parsed_hash'}{'name'}
 = 
$result_trees{'all_commands_printindex'}{'contents'}[2]{'contents'}[37]{'contents'}[0]{'args'}[0]{'contents'}[2];
-$result_trees{'all_commands_printindex'}{'contents'}[2]{'contents'}[37]{'contents'}[0]{'extra'}{'entry_node'}
 = $result_trees{'all_commands_printindex'}{'contents'}[2];
+$result_trees{'all_commands_printindex'}{'contents'}[2]{'contents'}[37]{'contents'}[0]{'extra'}{'element_node'}
 = $result_trees{'all_commands_printindex'}{'contents'}[2];
 
$result_trees{'all_commands_printindex'}{'contents'}[2]{'contents'}[37]{'contents'}[0]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'all_commands_printindex'}{'contents'}[2]{'contents'}[37]{'contents'}[0];
 
$result_trees{'all_commands_printindex'}{'contents'}[2]{'contents'}[39]{'contents'}[0]{'extra'}{'def_index_element'}
 = 
$result_trees{'all_commands_printindex'}{'contents'}[2]{'contents'}[39]{'contents'}[0]{'args'}[0]{'contents'}[2];
 
$result_trees{'all_commands_printindex'}{'contents'}[2]{'contents'}[39]{'contents'}[0]{'extra'}{'def_parsed_hash'}{'category'}
 = 
$result_trees{'all_commands_printindex'}{'contents'}[2]{'contents'}[39]{'contents'}[0]{'args'}[0]{'contents'}[0];
 
$result_trees{'all_commands_printindex'}{'contents'}[2]{'contents'}[39]{'contents'}[0]{'extra'}{'def_parsed_hash'}{'name'}
 = 
$result_trees{'all_commands_printindex'}{'contents'}[2]{'contents'}[39]{'contents'}[0]{'args'}[0]{'contents'}[2];
-$result_trees{'all_commands_printindex'}{'contents'}[2]{'contents'}[39]{'contents'}[0]{'extra'}{'entry_node'}
 = $result_trees{'all_commands_printindex'}{'contents'}[2];
+$result_trees{'all_commands_printindex'}{'contents'}[2]{'contents'}[39]{'contents'}[0]{'extra'}{'element_node'}
 = $result_trees{'all_commands_printindex'}{'contents'}[2];
 
$result_trees{'all_commands_printindex'}{'contents'}[2]{'contents'}[39]{'contents'}[0]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'all_commands_printindex'}{'contents'}[2]{'contents'}[39]{'contents'}[0];
 
$result_trees{'all_commands_printindex'}{'contents'}[2]{'contents'}[41]{'contents'}[0]{'extra'}{'def_index_element'}
 = 
$result_trees{'all_commands_printindex'}{'contents'}[2]{'contents'}[41]{'contents'}[0]{'args'}[0]{'contents'}[2];
 
$result_trees{'all_commands_printindex'}{'contents'}[2]{'contents'}[41]{'contents'}[0]{'extra'}{'def_parsed_hash'}{'category'}
 = 
$result_trees{'all_commands_printindex'}{'contents'}[2]{'contents'}[41]{'contents'}[0]{'args'}[0]{'contents'}[0];
 
$result_trees{'all_commands_printindex'}{'contents'}[2]{'contents'}[41]{'contents'}[0]{'extra'}{'def_parsed_hash'}{'name'}
 = 
$result_trees{'all_commands_printindex'}{'contents'}[2]{'contents'}[41]{'contents'}[0]{'args'}[0]{'contents'}[2];
-$result_trees{'all_commands_printindex'}{'contents'}[2]{'contents'}[41]{'contents'}[0]{'extra'}{'entry_node'}
 = $result_trees{'all_commands_printindex'}{'contents'}[2];
+$result_trees{'all_commands_printindex'}{'contents'}[2]{'contents'}[41]{'contents'}[0]{'extra'}{'element_node'}
 = $result_trees{'all_commands_printindex'}{'contents'}[2];
 
$result_trees{'all_commands_printindex'}{'contents'}[2]{'contents'}[41]{'contents'}[0]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'all_commands_printindex'}{'contents'}[2]{'contents'}[41]{'contents'}[0];
 
$result_trees{'all_commands_printindex'}{'contents'}[2]{'contents'}[43]{'contents'}[0]{'extra'}{'def_index_element'}
 = 
$result_trees{'all_commands_printindex'}{'contents'}[2]{'contents'}[43]{'contents'}[0]{'args'}[0]{'contents'}[4];
 
$result_trees{'all_commands_printindex'}{'contents'}[2]{'contents'}[43]{'contents'}[0]{'extra'}{'def_parsed_hash'}{'category'}
 = 
$result_trees{'all_commands_printindex'}{'contents'}[2]{'contents'}[43]{'contents'}[0]{'args'}[0]{'contents'}[0];
 
$result_trees{'all_commands_printindex'}{'contents'}[2]{'contents'}[43]{'contents'}[0]{'extra'}{'def_parsed_hash'}{'name'}
 = 
$result_trees{'all_commands_printindex'}{'contents'}[2]{'contents'}[43]{'contents'}[0]{'args'}[0]{'contents'}[4];
 
$result_trees{'all_commands_printindex'}{'contents'}[2]{'contents'}[43]{'contents'}[0]{'extra'}{'def_parsed_hash'}{'type'}
 = 
$result_trees{'all_commands_printindex'}{'contents'}[2]{'contents'}[43]{'contents'}[0]{'args'}[0]{'contents'}[2];
-$result_trees{'all_commands_printindex'}{'contents'}[2]{'contents'}[43]{'contents'}[0]{'extra'}{'entry_node'}
 = $result_trees{'all_commands_printindex'}{'contents'}[2];
+$result_trees{'all_commands_printindex'}{'contents'}[2]{'contents'}[43]{'contents'}[0]{'extra'}{'element_node'}
 = $result_trees{'all_commands_printindex'}{'contents'}[2];
 
$result_trees{'all_commands_printindex'}{'contents'}[2]{'contents'}[43]{'contents'}[0]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'all_commands_printindex'}{'contents'}[2]{'contents'}[43]{'contents'}[0];
 
$result_trees{'all_commands_printindex'}{'contents'}[2]{'contents'}[45]{'contents'}[0]{'extra'}{'def_index_element'}
 = 
$result_trees{'all_commands_printindex'}{'contents'}[2]{'contents'}[45]{'contents'}[0]{'args'}[0]{'contents'}[4];
 
$result_trees{'all_commands_printindex'}{'contents'}[2]{'contents'}[45]{'contents'}[0]{'extra'}{'def_parsed_hash'}{'category'}
 = 
$result_trees{'all_commands_printindex'}{'contents'}[2]{'contents'}[45]{'contents'}[0]{'args'}[0]{'contents'}[0];
 
$result_trees{'all_commands_printindex'}{'contents'}[2]{'contents'}[45]{'contents'}[0]{'extra'}{'def_parsed_hash'}{'name'}
 = 
$result_trees{'all_commands_printindex'}{'contents'}[2]{'contents'}[45]{'contents'}[0]{'args'}[0]{'contents'}[4];
 
$result_trees{'all_commands_printindex'}{'contents'}[2]{'contents'}[45]{'contents'}[0]{'extra'}{'def_parsed_hash'}{'type'}
 = 
$result_trees{'all_commands_printindex'}{'contents'}[2]{'contents'}[45]{'contents'}[0]{'args'}[0]{'contents'}[2];
-$result_trees{'all_commands_printindex'}{'contents'}[2]{'contents'}[45]{'contents'}[0]{'extra'}{'entry_node'}
 = $result_trees{'all_commands_printindex'}{'contents'}[2];
+$result_trees{'all_commands_printindex'}{'contents'}[2]{'contents'}[45]{'contents'}[0]{'extra'}{'element_node'}
 = $result_trees{'all_commands_printindex'}{'contents'}[2];
 
$result_trees{'all_commands_printindex'}{'contents'}[2]{'contents'}[45]{'contents'}[0]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'all_commands_printindex'}{'contents'}[2]{'contents'}[45]{'contents'}[0];
 
$result_trees{'all_commands_printindex'}{'contents'}[2]{'contents'}[47]{'contents'}[0]{'extra'}{'def_index_element'}{'contents'}[0]
 = 
$result_trees{'all_commands_printindex'}{'contents'}[2]{'contents'}[47]{'contents'}[0]{'args'}[0]{'contents'}[4];
 
$result_trees{'all_commands_printindex'}{'contents'}[2]{'contents'}[47]{'contents'}[0]{'extra'}{'def_index_element'}{'contents'}[2]
 = 
$result_trees{'all_commands_printindex'}{'contents'}[2]{'contents'}[47]{'contents'}[0]{'args'}[0]{'contents'}[2];
@@ -4516,7 +4516,7 @@ 
$result_trees{'all_commands_printindex'}{'contents'}[2]{'contents'}[47]{'content
 
$result_trees{'all_commands_printindex'}{'contents'}[2]{'contents'}[47]{'contents'}[0]{'extra'}{'def_parsed_hash'}{'category'}
 = 
$result_trees{'all_commands_printindex'}{'contents'}[2]{'contents'}[47]{'contents'}[0]{'args'}[0]{'contents'}[0];
 
$result_trees{'all_commands_printindex'}{'contents'}[2]{'contents'}[47]{'contents'}[0]{'extra'}{'def_parsed_hash'}{'class'}
 = 
$result_trees{'all_commands_printindex'}{'contents'}[2]{'contents'}[47]{'contents'}[0]{'args'}[0]{'contents'}[2];
 
$result_trees{'all_commands_printindex'}{'contents'}[2]{'contents'}[47]{'contents'}[0]{'extra'}{'def_parsed_hash'}{'name'}
 = 
$result_trees{'all_commands_printindex'}{'contents'}[2]{'contents'}[47]{'contents'}[0]{'args'}[0]{'contents'}[4];
-$result_trees{'all_commands_printindex'}{'contents'}[2]{'contents'}[47]{'contents'}[0]{'extra'}{'entry_node'}
 = $result_trees{'all_commands_printindex'}{'contents'}[2];
+$result_trees{'all_commands_printindex'}{'contents'}[2]{'contents'}[47]{'contents'}[0]{'extra'}{'element_node'}
 = $result_trees{'all_commands_printindex'}{'contents'}[2];
 
$result_trees{'all_commands_printindex'}{'contents'}[2]{'contents'}[47]{'contents'}[0]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'all_commands_printindex'}{'contents'}[2]{'contents'}[47]{'contents'}[0];
 
$result_trees{'all_commands_printindex'}{'contents'}[2]{'contents'}[49]{'contents'}[0]{'extra'}{'def_index_element'}{'contents'}[0]
 = 
$result_trees{'all_commands_printindex'}{'contents'}[2]{'contents'}[49]{'contents'}[0]{'args'}[0]{'contents'}[6];
 
$result_trees{'all_commands_printindex'}{'contents'}[2]{'contents'}[49]{'contents'}[0]{'extra'}{'def_index_element'}{'contents'}[2]
 = 
$result_trees{'all_commands_printindex'}{'contents'}[2]{'contents'}[49]{'contents'}[0]{'args'}[0]{'contents'}[2];
@@ -4526,7 +4526,7 @@ 
$result_trees{'all_commands_printindex'}{'contents'}[2]{'contents'}[49]{'content
 
$result_trees{'all_commands_printindex'}{'contents'}[2]{'contents'}[49]{'contents'}[0]{'extra'}{'def_parsed_hash'}{'class'}
 = 
$result_trees{'all_commands_printindex'}{'contents'}[2]{'contents'}[49]{'contents'}[0]{'args'}[0]{'contents'}[2];
 
$result_trees{'all_commands_printindex'}{'contents'}[2]{'contents'}[49]{'contents'}[0]{'extra'}{'def_parsed_hash'}{'name'}
 = 
$result_trees{'all_commands_printindex'}{'contents'}[2]{'contents'}[49]{'contents'}[0]{'args'}[0]{'contents'}[6];
 
$result_trees{'all_commands_printindex'}{'contents'}[2]{'contents'}[49]{'contents'}[0]{'extra'}{'def_parsed_hash'}{'type'}
 = 
$result_trees{'all_commands_printindex'}{'contents'}[2]{'contents'}[49]{'contents'}[0]{'args'}[0]{'contents'}[4];
-$result_trees{'all_commands_printindex'}{'contents'}[2]{'contents'}[49]{'contents'}[0]{'extra'}{'entry_node'}
 = $result_trees{'all_commands_printindex'}{'contents'}[2];
+$result_trees{'all_commands_printindex'}{'contents'}[2]{'contents'}[49]{'contents'}[0]{'extra'}{'element_node'}
 = $result_trees{'all_commands_printindex'}{'contents'}[2];
 
$result_trees{'all_commands_printindex'}{'contents'}[2]{'contents'}[49]{'contents'}[0]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'all_commands_printindex'}{'contents'}[2]{'contents'}[49]{'contents'}[0];
 
$result_trees{'all_commands_printindex'}{'contents'}[2]{'contents'}[51]{'contents'}[0]{'extra'}{'def_index_element'}{'contents'}[0]
 = 
$result_trees{'all_commands_printindex'}{'contents'}[2]{'contents'}[51]{'contents'}[0]{'args'}[0]{'contents'}[4];
 
$result_trees{'all_commands_printindex'}{'contents'}[2]{'contents'}[51]{'contents'}[0]{'extra'}{'def_index_element'}{'contents'}[2]
 = 
$result_trees{'all_commands_printindex'}{'contents'}[2]{'contents'}[51]{'contents'}[0]{'args'}[0]{'contents'}[2];
@@ -4535,7 +4535,7 @@ 
$result_trees{'all_commands_printindex'}{'contents'}[2]{'contents'}[51]{'content
 
$result_trees{'all_commands_printindex'}{'contents'}[2]{'contents'}[51]{'contents'}[0]{'extra'}{'def_parsed_hash'}{'category'}
 = 
$result_trees{'all_commands_printindex'}{'contents'}[2]{'contents'}[51]{'contents'}[0]{'args'}[0]{'contents'}[0];
 
$result_trees{'all_commands_printindex'}{'contents'}[2]{'contents'}[51]{'contents'}[0]{'extra'}{'def_parsed_hash'}{'class'}
 = 
$result_trees{'all_commands_printindex'}{'contents'}[2]{'contents'}[51]{'contents'}[0]{'args'}[0]{'contents'}[2];
 
$result_trees{'all_commands_printindex'}{'contents'}[2]{'contents'}[51]{'contents'}[0]{'extra'}{'def_parsed_hash'}{'name'}
 = 
$result_trees{'all_commands_printindex'}{'contents'}[2]{'contents'}[51]{'contents'}[0]{'args'}[0]{'contents'}[4];
-$result_trees{'all_commands_printindex'}{'contents'}[2]{'contents'}[51]{'contents'}[0]{'extra'}{'entry_node'}
 = $result_trees{'all_commands_printindex'}{'contents'}[2];
+$result_trees{'all_commands_printindex'}{'contents'}[2]{'contents'}[51]{'contents'}[0]{'extra'}{'element_node'}
 = $result_trees{'all_commands_printindex'}{'contents'}[2];
 
$result_trees{'all_commands_printindex'}{'contents'}[2]{'contents'}[51]{'contents'}[0]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'all_commands_printindex'}{'contents'}[2]{'contents'}[51]{'contents'}[0];
 
$result_trees{'all_commands_printindex'}{'contents'}[2]{'contents'}[53]{'contents'}[0]{'extra'}{'def_index_element'}{'contents'}[0]
 = 
$result_trees{'all_commands_printindex'}{'contents'}[2]{'contents'}[53]{'contents'}[0]{'args'}[0]{'contents'}[6];
 
$result_trees{'all_commands_printindex'}{'contents'}[2]{'contents'}[53]{'contents'}[0]{'extra'}{'def_index_element'}{'contents'}[2]
 = 
$result_trees{'all_commands_printindex'}{'contents'}[2]{'contents'}[53]{'contents'}[0]{'args'}[0]{'contents'}[2];
@@ -4545,7 +4545,7 @@ 
$result_trees{'all_commands_printindex'}{'contents'}[2]{'contents'}[53]{'content
 
$result_trees{'all_commands_printindex'}{'contents'}[2]{'contents'}[53]{'contents'}[0]{'extra'}{'def_parsed_hash'}{'class'}
 = 
$result_trees{'all_commands_printindex'}{'contents'}[2]{'contents'}[53]{'contents'}[0]{'args'}[0]{'contents'}[2];
 
$result_trees{'all_commands_printindex'}{'contents'}[2]{'contents'}[53]{'contents'}[0]{'extra'}{'def_parsed_hash'}{'name'}
 = 
$result_trees{'all_commands_printindex'}{'contents'}[2]{'contents'}[53]{'contents'}[0]{'args'}[0]{'contents'}[6];
 
$result_trees{'all_commands_printindex'}{'contents'}[2]{'contents'}[53]{'contents'}[0]{'extra'}{'def_parsed_hash'}{'type'}
 = 
$result_trees{'all_commands_printindex'}{'contents'}[2]{'contents'}[53]{'contents'}[0]{'args'}[0]{'contents'}[4];
-$result_trees{'all_commands_printindex'}{'contents'}[2]{'contents'}[53]{'contents'}[0]{'extra'}{'entry_node'}
 = $result_trees{'all_commands_printindex'}{'contents'}[2];
+$result_trees{'all_commands_printindex'}{'contents'}[2]{'contents'}[53]{'contents'}[0]{'extra'}{'element_node'}
 = $result_trees{'all_commands_printindex'}{'contents'}[2];
 
$result_trees{'all_commands_printindex'}{'contents'}[2]{'contents'}[53]{'contents'}[0]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'all_commands_printindex'}{'contents'}[2]{'contents'}[53]{'contents'}[0];
 
$result_trees{'all_commands_printindex'}{'contents'}[2]{'extra'}{'node_content'}[0]
 = 
$result_trees{'all_commands_printindex'}{'contents'}[2]{'args'}[0]{'contents'}[0];
 
$result_trees{'all_commands_printindex'}{'contents'}[2]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = 
$result_trees{'all_commands_printindex'}{'contents'}[2]{'args'}[0]{'contents'}[0];
diff --git a/tp/t/results/def/omit_def_space.pl 
b/tp/t/results/def/omit_def_space.pl
index 14741de880..49ed1ec831 100644
--- a/tp/t/results/def/omit_def_space.pl
+++ b/tp/t/results/def/omit_def_space.pl
@@ -207,7 +207,7 @@ $result_trees{'omit_def_space'} = {
                   'category' => {},
                   'name' => {}
                 },
-                'entry_node' => {},
+                'element_node' => {},
                 'index_entry' => {
                   'entry_element' => {},
                   'entry_number' => 1,
@@ -297,7 +297,7 @@ $result_trees{'omit_def_space'} = {
                   'category' => {},
                   'name' => {}
                 },
-                'entry_node' => {},
+                'element_node' => {},
                 'index_entry' => {
                   'entry_element' => {},
                   'entry_number' => 2,
@@ -411,12 +411,12 @@ 
$result_trees{'omit_def_space'}{'contents'}[1]{'extra'}{'nodes_manuals'}[0]{'nod
 
$result_trees{'omit_def_space'}{'contents'}[2]{'contents'}[3]{'contents'}[0]{'extra'}{'def_index_element'}
 = 
$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'}{'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'}{'entry_node'}
 = $result_trees{'omit_def_space'}{'contents'}[2];
+$result_trees{'omit_def_space'}{'contents'}[2]{'contents'}[3]{'contents'}[0]{'extra'}{'element_node'}
 = $result_trees{'omit_def_space'}{'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'}[1]{'extra'}{'def_index_element'}
 = 
$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'}{'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'}{'entry_node'}
 = $result_trees{'omit_def_space'}{'contents'}[2];
+$result_trees{'omit_def_space'}{'contents'}[2]{'contents'}[3]{'contents'}[1]{'extra'}{'element_node'}
 = $result_trees{'omit_def_space'}{'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]{'extra'}{'node_content'}[0] = 
$result_trees{'omit_def_space'}{'contents'}[2]{'args'}[0]{'contents'}[0];
 
$result_trees{'omit_def_space'}{'contents'}[2]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = $result_trees{'omit_def_space'}{'contents'}[2]{'args'}[0]{'contents'}[0];
diff --git a/tp/t/results/def/ref_in_def.pl b/tp/t/results/def/ref_in_def.pl
index cc3e8fc762..30caa6e9e6 100644
--- a/tp/t/results/def/ref_in_def.pl
+++ b/tp/t/results/def/ref_in_def.pl
@@ -268,7 +268,7 @@ $result_trees{'ref_in_def'} = {
                   'category' => {},
                   'name' => {}
                 },
-                'entry_node' => {},
+                'element_node' => {},
                 'index_entry' => {
                   'entry_element' => {},
                   'entry_number' => 1,
@@ -486,7 +486,7 @@ $result_trees{'ref_in_def'} = {
                   'category' => {},
                   'name' => {}
                 },
-                'entry_node' => {},
+                'element_node' => {},
                 'index_entry' => {
                   'entry_element' => {},
                   'entry_number' => 2,
@@ -618,7 +618,7 @@ 
$result_trees{'ref_in_def'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'args'}
 
$result_trees{'ref_in_def'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'extra'}{'def_index_element'}
 = 
$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'}{'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'}{'entry_node'}
 = $result_trees{'ref_in_def'}{'contents'}[1];
+$result_trees{'ref_in_def'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'extra'}{'element_node'}
 = $result_trees{'ref_in_def'}{'contents'}[1];
 
$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'}[1]{'args'}[0]{'contents'}[0]{'extra'}{'label'}
 = 
$result_trees{'ref_in_def'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'args'}[0]{'contents'}[0]{'extra'}{'label'};
 
$result_trees{'ref_in_def'}{'contents'}[1]{'contents'}[1]{'contents'}[1]{'args'}[0]{'contents'}[0]{'extra'}{'node_argument'}{'node_content'}[0]
 = 
$result_trees{'ref_in_def'}{'contents'}[1]{'contents'}[1]{'contents'}[1]{'args'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0];
@@ -633,7 +633,7 @@ 
$result_trees{'ref_in_def'}{'contents'}[1]{'contents'}[1]{'contents'}[1]{'args'}
 
$result_trees{'ref_in_def'}{'contents'}[1]{'contents'}[1]{'contents'}[1]{'extra'}{'def_index_element'}
 = 
$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'}{'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'}{'entry_node'}
 = $result_trees{'ref_in_def'}{'contents'}[1];
+$result_trees{'ref_in_def'}{'contents'}[1]{'contents'}[1]{'contents'}[1]{'extra'}{'element_node'}
 = $result_trees{'ref_in_def'}{'contents'}[1];
 
$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'}[3] = 
$result_trees{'ref_in_def'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'args'}[0]{'contents'}[0]{'extra'}{'label'};
 $result_trees{'ref_in_def'}{'contents'}[1]{'extra'}{'node_content'}[0] = 
$result_trees{'ref_in_def'}{'contents'}[1]{'args'}[0]{'contents'}[0];
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 9bc4baa92c..02602136f9 100644
--- a/tp/t/results/def/space_in_def_for_index.pl
+++ b/tp/t/results/def/space_in_def_for_index.pl
@@ -200,7 +200,7 @@ $result_trees{'space_in_def_for_index'} = {
                   'category' => {},
                   'name' => {}
                 },
-                'entry_node' => {},
+                'element_node' => {},
                 'index_entry' => {
                   'entry_element' => {},
                   'entry_number' => 1,
@@ -290,7 +290,7 @@ $result_trees{'space_in_def_for_index'} = {
                   'category' => {},
                   'name' => {}
                 },
-                'entry_node' => {},
+                'element_node' => {},
                 'index_entry' => {
                   'entry_element' => {},
                   'entry_number' => 2,
@@ -429,12 +429,12 @@ 
$result_trees{'space_in_def_for_index'}{'contents'}[1]{'extra'}{'nodes_manuals'}
 
$result_trees{'space_in_def_for_index'}{'contents'}[2]{'contents'}[1]{'contents'}[0]{'extra'}{'def_index_element'}
 = 
$result_trees{'space_in_def_for_index'}{'contents'}[2]{'contents'}[1]{'contents'}[0]{'args'}[0]{'contents'}[2];
 
$result_trees{'space_in_def_for_index'}{'contents'}[2]{'contents'}[1]{'contents'}[0]{'extra'}{'def_parsed_hash'}{'category'}
 = 
$result_trees{'space_in_def_for_index'}{'contents'}[2]{'contents'}[1]{'contents'}[0]{'args'}[0]{'contents'}[0];
 
$result_trees{'space_in_def_for_index'}{'contents'}[2]{'contents'}[1]{'contents'}[0]{'extra'}{'def_parsed_hash'}{'name'}
 = 
$result_trees{'space_in_def_for_index'}{'contents'}[2]{'contents'}[1]{'contents'}[0]{'args'}[0]{'contents'}[2];
-$result_trees{'space_in_def_for_index'}{'contents'}[2]{'contents'}[1]{'contents'}[0]{'extra'}{'entry_node'}
 = $result_trees{'space_in_def_for_index'}{'contents'}[2];
+$result_trees{'space_in_def_for_index'}{'contents'}[2]{'contents'}[1]{'contents'}[0]{'extra'}{'element_node'}
 = $result_trees{'space_in_def_for_index'}{'contents'}[2];
 
$result_trees{'space_in_def_for_index'}{'contents'}[2]{'contents'}[1]{'contents'}[0]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'space_in_def_for_index'}{'contents'}[2]{'contents'}[1]{'contents'}[0];
 
$result_trees{'space_in_def_for_index'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'extra'}{'def_index_element'}
 = 
$result_trees{'space_in_def_for_index'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'args'}[0]{'contents'}[2];
 
$result_trees{'space_in_def_for_index'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'extra'}{'def_parsed_hash'}{'category'}
 = 
$result_trees{'space_in_def_for_index'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'args'}[0]{'contents'}[0];
 
$result_trees{'space_in_def_for_index'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'extra'}{'def_parsed_hash'}{'name'}
 = 
$result_trees{'space_in_def_for_index'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'args'}[0]{'contents'}[2];
-$result_trees{'space_in_def_for_index'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'extra'}{'entry_node'}
 = $result_trees{'space_in_def_for_index'}{'contents'}[2];
+$result_trees{'space_in_def_for_index'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'extra'}{'element_node'}
 = $result_trees{'space_in_def_for_index'}{'contents'}[2];
 
$result_trees{'space_in_def_for_index'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'space_in_def_for_index'}{'contents'}[2]{'contents'}[1]{'contents'}[1];
 
$result_trees{'space_in_def_for_index'}{'contents'}[2]{'extra'}{'node_content'}[0]
 = 
$result_trees{'space_in_def_for_index'}{'contents'}[2]{'args'}[0]{'contents'}[0];
 
$result_trees{'space_in_def_for_index'}{'contents'}[2]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = 
$result_trees{'space_in_def_for_index'}{'contents'}[2]{'args'}[0]{'contents'}[0];
diff --git a/tp/t/results/float/cindex_in_caption.pl 
b/tp/t/results/float/cindex_in_caption.pl
index 045c45a432..bea904676b 100644
--- a/tp/t/results/float/cindex_in_caption.pl
+++ b/tp/t/results/float/cindex_in_caption.pl
@@ -193,7 +193,7 @@ $result_trees{'cindex_in_caption'} = {
                           ],
                           'cmdname' => 'cindex',
                           'extra' => {
-                            'entry_node' => {},
+                            'element_node' => {},
                             'index_entry' => {
                               'entry_element' => {},
                               'entry_number' => 1,
@@ -369,7 +369,7 @@ $result_trees{'cindex_in_caption'} = {
 $result_trees{'cindex_in_caption'}{'contents'}[1]{'extra'}{'node_content'}[0] 
= $result_trees{'cindex_in_caption'}{'contents'}[1]{'args'}[0]{'contents'}[0];
 
$result_trees{'cindex_in_caption'}{'contents'}[1]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = $result_trees{'cindex_in_caption'}{'contents'}[1]{'args'}[0]{'contents'}[0];
 
$result_trees{'cindex_in_caption'}{'contents'}[2]{'contents'}[1]{'extra'}{'type'}{'content'}[0]
 = 
$result_trees{'cindex_in_caption'}{'contents'}[2]{'contents'}[1]{'args'}[0]{'contents'}[0];
-$result_trees{'cindex_in_caption'}{'contents'}[2]{'contents'}[3]{'contents'}[1]{'args'}[0]{'contents'}[0]{'contents'}[1]{'extra'}{'entry_node'}
 = $result_trees{'cindex_in_caption'}{'contents'}[2];
+$result_trees{'cindex_in_caption'}{'contents'}[2]{'contents'}[3]{'contents'}[1]{'args'}[0]{'contents'}[0]{'contents'}[1]{'extra'}{'element_node'}
 = $result_trees{'cindex_in_caption'}{'contents'}[2];
 
$result_trees{'cindex_in_caption'}{'contents'}[2]{'contents'}[3]{'contents'}[1]{'args'}[0]{'contents'}[0]{'contents'}[1]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'cindex_in_caption'}{'contents'}[2]{'contents'}[3]{'contents'}[1]{'args'}[0]{'contents'}[0]{'contents'}[1];
 
$result_trees{'cindex_in_caption'}{'contents'}[2]{'contents'}[3]{'contents'}[1]{'extra'}{'float'}
 = $result_trees{'cindex_in_caption'}{'contents'}[2]{'contents'}[3];
 
$result_trees{'cindex_in_caption'}{'contents'}[2]{'contents'}[3]{'extra'}{'caption'}
 = 
$result_trees{'cindex_in_caption'}{'contents'}[2]{'contents'}[3]{'contents'}[1];
diff --git a/tp/t/results/float/complex_float.pl 
b/tp/t/results/float/complex_float.pl
index 8b5d55f608..6000346d3d 100644
--- a/tp/t/results/float/complex_float.pl
+++ b/tp/t/results/float/complex_float.pl
@@ -474,7 +474,7 @@ $result_trees{'complex_float'} = {
                   ],
                   'cmdname' => 'cindex',
                   'extra' => {
-                    'entry_node' => {},
+                    'element_node' => {},
                     'index_entry' => {
                       'entry_element' => {},
                       'entry_number' => 1,
@@ -1582,7 +1582,7 @@ $result_trees{'complex_float'} = {
                           ],
                           'cmdname' => 'cindex',
                           'extra' => {
-                            'entry_node' => {},
+                            'element_node' => {},
                             'index_entry' => {
                               'entry_element' => {},
                               'entry_number' => 2,
@@ -2971,7 +2971,7 @@ $result_trees{'complex_float'} = {
                           ],
                           'cmdname' => 'cindex',
                           'extra' => {
-                            'entry_node' => {},
+                            'element_node' => {},
                             'index_entry' => {
                               'entry_element' => {},
                               'entry_number' => 3,
@@ -3596,7 +3596,7 @@ 
$result_trees{'complex_float'}{'contents'}[1]{'extra'}{'node_content'}[0] = $res
 
$result_trees{'complex_float'}{'contents'}[1]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = $result_trees{'complex_float'}{'contents'}[1]{'args'}[0]{'contents'}[0];
 
$result_trees{'complex_float'}{'contents'}[2]{'contents'}[2]{'extra'}{'type'}{'content'}[0]
 = 
$result_trees{'complex_float'}{'contents'}[2]{'contents'}[2]{'args'}[0]{'contents'}[0];
 
$result_trees{'complex_float'}{'contents'}[2]{'contents'}[5]{'contents'}[0]{'extra'}{'menu_entry_node_label'}{'node_content'}[0]
 = 
$result_trees{'complex_float'}{'contents'}[2]{'contents'}[5]{'contents'}[0]{'contents'}[1]{'contents'}[0];
-$result_trees{'complex_float'}{'contents'}[2]{'contents'}[7]{'contents'}[4]{'contents'}[1]{'extra'}{'entry_node'}
 = $result_trees{'complex_float'}{'contents'}[1];
+$result_trees{'complex_float'}{'contents'}[2]{'contents'}[7]{'contents'}[4]{'contents'}[1]{'extra'}{'element_node'}
 = $result_trees{'complex_float'}{'contents'}[1];
 
$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'}[7]{'extra'}{'command_as_argument'}
 = 
$result_trees{'complex_float'}{'contents'}[2]{'contents'}[7]{'contents'}[7]{'args'}[0]{'contents'}[0];
 
$result_trees{'complex_float'}{'contents'}[2]{'contents'}[7]{'contents'}[10]{'extra'}{'command_as_argument'}
 = 
$result_trees{'complex_float'}{'contents'}[2]{'contents'}[7]{'contents'}[10]{'args'}[0]{'contents'}[0];
@@ -3606,7 +3606,7 @@ 
$result_trees{'complex_float'}{'contents'}[2]{'contents'}[7]{'contents'}[16]{'ar
 
$result_trees{'complex_float'}{'contents'}[2]{'contents'}[7]{'contents'}[16]{'args'}[0]{'contents'}[7]{'extra'}{'command_as_argument'}
 = 
$result_trees{'complex_float'}{'contents'}[2]{'contents'}[7]{'contents'}[16]{'args'}[0]{'contents'}[7]{'args'}[0]{'contents'}[0];
 
$result_trees{'complex_float'}{'contents'}[2]{'contents'}[7]{'contents'}[16]{'args'}[0]{'contents'}[10]{'extra'}{'prototypes'}[0]{'contents'}[0]
 = 
$result_trees{'complex_float'}{'contents'}[2]{'contents'}[7]{'contents'}[16]{'args'}[0]{'contents'}[10]{'args'}[0]{'contents'}[0]{'contents'}[0];
 
$result_trees{'complex_float'}{'contents'}[2]{'contents'}[7]{'contents'}[16]{'args'}[0]{'contents'}[10]{'extra'}{'prototypes'}[1]{'contents'}[0]
 = 
$result_trees{'complex_float'}{'contents'}[2]{'contents'}[7]{'contents'}[16]{'args'}[0]{'contents'}[10]{'args'}[0]{'contents'}[2]{'contents'}[0];
-$result_trees{'complex_float'}{'contents'}[2]{'contents'}[7]{'contents'}[16]{'args'}[0]{'contents'}[11]{'contents'}[1]{'extra'}{'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'}{'element_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_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'}[14]{'extra'}{'command_as_argument'}
 = 
$result_trees{'complex_float'}{'contents'}[2]{'contents'}[7]{'contents'}[16]{'args'}[0]{'contents'}[14]{'args'}[0]{'contents'}[0];
 
$result_trees{'complex_float'}{'contents'}[2]{'contents'}[7]{'contents'}[16]{'args'}[0]{'contents'}[16]{'contents'}[1]{'extra'}{'label'}
 = $result_trees{'complex_float'}{'contents'}[1];
@@ -3623,7 +3623,7 @@ 
$result_trees{'complex_float'}{'contents'}[3]{'extra'}{'nodes_manuals'}[0]{'node
 
$result_trees{'complex_float'}{'contents'}[4]{'contents'}[1]{'contents'}[3]{'args'}[0]{'contents'}[4]{'extra'}{'command_as_argument'}
 = 
$result_trees{'complex_float'}{'contents'}[4]{'contents'}[1]{'contents'}[3]{'args'}[0]{'contents'}[4]{'args'}[0]{'contents'}[0];
 
$result_trees{'complex_float'}{'contents'}[4]{'contents'}[1]{'contents'}[3]{'args'}[0]{'contents'}[7]{'extra'}{'prototypes'}[0]{'contents'}[0]
 = 
$result_trees{'complex_float'}{'contents'}[4]{'contents'}[1]{'contents'}[3]{'args'}[0]{'contents'}[7]{'args'}[0]{'contents'}[0]{'contents'}[0];
 
$result_trees{'complex_float'}{'contents'}[4]{'contents'}[1]{'contents'}[3]{'args'}[0]{'contents'}[7]{'extra'}{'prototypes'}[1]{'contents'}[0]
 = 
$result_trees{'complex_float'}{'contents'}[4]{'contents'}[1]{'contents'}[3]{'args'}[0]{'contents'}[7]{'args'}[0]{'contents'}[2]{'contents'}[0];
-$result_trees{'complex_float'}{'contents'}[4]{'contents'}[1]{'contents'}[3]{'args'}[0]{'contents'}[8]{'contents'}[1]{'extra'}{'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'}{'element_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_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'}[11]{'extra'}{'command_as_argument'}
 = 
$result_trees{'complex_float'}{'contents'}[4]{'contents'}[1]{'contents'}[3]{'args'}[0]{'contents'}[11]{'args'}[0]{'contents'}[0];
 
$result_trees{'complex_float'}{'contents'}[4]{'contents'}[1]{'contents'}[3]{'args'}[0]{'contents'}[13]{'extra'}{'node_content'}[0]
 = 
$result_trees{'complex_float'}{'contents'}[4]{'contents'}[1]{'contents'}[3]{'args'}[0]{'contents'}[13]{'args'}[0]{'contents'}[0];
diff --git a/tp/t/results/float/float_copying.pl 
b/tp/t/results/float/float_copying.pl
index 0303829fc6..6a4338d284 100644
--- a/tp/t/results/float/float_copying.pl
+++ b/tp/t/results/float/float_copying.pl
@@ -161,7 +161,7 @@ $result_trees{'float_copying'} = {
                                           ],
                                           'cmdname' => 'cindex',
                                           'extra' => {
-                                            'entry_region' => 'copying',
+                                            'element_region' => 'copying',
                                             'index_entry' => {
                                               'entry_element' => {},
                                               'entry_number' => 1,
@@ -200,7 +200,7 @@ $result_trees{'float_copying'} = {
                                           ],
                                           'cmdname' => 'findex',
                                           'extra' => {
-                                            'entry_region' => 'copying',
+                                            'element_region' => 'copying',
                                             'index_entry' => {
                                               'entry_element' => {},
                                               'entry_number' => 1,
@@ -392,7 +392,7 @@ $result_trees{'float_copying'} = {
                               ],
                               'cmdname' => 'cindex',
                               'extra' => {
-                                'entry_region' => 'copying',
+                                'element_region' => 'copying',
                                 'index_entry' => {
                                   'entry_element' => {},
                                   'entry_number' => 2,
@@ -431,7 +431,7 @@ $result_trees{'float_copying'} = {
                               ],
                               'cmdname' => 'findex',
                               'extra' => {
-                                'entry_region' => 'copying',
+                                'element_region' => 'copying',
                                 'index_entry' => {
                                   'entry_element' => {},
                                   'entry_number' => 2,
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 bad8b45ba5..0d34c83e9d 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
@@ -1060,7 +1060,7 @@ $result_trees{'char_latin1_latin1_in_refs'} = {
           ],
           'cmdname' => 'cindex',
           'extra' => {
-            'entry_node' => {},
+            'element_node' => {},
             'index_entry' => {
               'entry_element' => {},
               'entry_number' => 1,
@@ -1099,7 +1099,7 @@ $result_trees{'char_latin1_latin1_in_refs'} = {
           ],
           'cmdname' => 'cindex',
           'extra' => {
-            'entry_node' => {},
+            'element_node' => {},
             'index_entry' => {
               'entry_element' => {},
               'entry_number' => 2,
@@ -1138,7 +1138,7 @@ $result_trees{'char_latin1_latin1_in_refs'} = {
           ],
           'cmdname' => 'cindex',
           'extra' => {
-            'entry_node' => {},
+            'element_node' => {},
             'index_entry' => {
               'entry_element' => {},
               'entry_number' => 3,
@@ -1177,7 +1177,7 @@ $result_trees{'char_latin1_latin1_in_refs'} = {
           ],
           'cmdname' => 'cindex',
           'extra' => {
-            'entry_node' => {},
+            'element_node' => {},
             'index_entry' => {
               'entry_element' => {},
               'entry_number' => 4,
@@ -1216,7 +1216,7 @@ $result_trees{'char_latin1_latin1_in_refs'} = {
           ],
           'cmdname' => 'cindex',
           'extra' => {
-            'entry_node' => {},
+            'element_node' => {},
             'index_entry' => {
               'entry_element' => {},
               'entry_number' => 5,
@@ -1255,7 +1255,7 @@ $result_trees{'char_latin1_latin1_in_refs'} = {
           ],
           'cmdname' => 'cindex',
           'extra' => {
-            'entry_node' => {},
+            'element_node' => {},
             'index_entry' => {
               'entry_element' => {},
               'entry_number' => 6,
@@ -1333,17 +1333,17 @@ 
$result_trees{'char_latin1_latin1_in_refs'}{'contents'}[12]{'contents'}[1]{'cont
 
$result_trees{'char_latin1_latin1_in_refs'}{'contents'}[12]{'contents'}[1]{'contents'}[6]{'extra'}{'node_argument'}{'node_content'}[0]
 = 
$result_trees{'char_latin1_latin1_in_refs'}{'contents'}[12]{'contents'}[1]{'contents'}[6]{'args'}[0]{'contents'}[0];
 
$result_trees{'char_latin1_latin1_in_refs'}{'contents'}[12]{'contents'}[1]{'contents'}[8]{'extra'}{'label'}
 = $result_trees{'char_latin1_latin1_in_refs'}{'contents'}[11];
 
$result_trees{'char_latin1_latin1_in_refs'}{'contents'}[12]{'contents'}[1]{'contents'}[8]{'extra'}{'node_argument'}{'node_content'}[0]
 = 
$result_trees{'char_latin1_latin1_in_refs'}{'contents'}[12]{'contents'}[1]{'contents'}[8]{'args'}[0]{'contents'}[0];
-$result_trees{'char_latin1_latin1_in_refs'}{'contents'}[12]{'contents'}[3]{'extra'}{'entry_node'}
 = $result_trees{'char_latin1_latin1_in_refs'}{'contents'}[11];
+$result_trees{'char_latin1_latin1_in_refs'}{'contents'}[12]{'contents'}[3]{'extra'}{'element_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_element'}
 = $result_trees{'char_latin1_latin1_in_refs'}{'contents'}[12]{'contents'}[3];
-$result_trees{'char_latin1_latin1_in_refs'}{'contents'}[12]{'contents'}[4]{'extra'}{'entry_node'}
 = $result_trees{'char_latin1_latin1_in_refs'}{'contents'}[11];
+$result_trees{'char_latin1_latin1_in_refs'}{'contents'}[12]{'contents'}[4]{'extra'}{'element_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_element'}
 = $result_trees{'char_latin1_latin1_in_refs'}{'contents'}[12]{'contents'}[4];
-$result_trees{'char_latin1_latin1_in_refs'}{'contents'}[12]{'contents'}[5]{'extra'}{'entry_node'}
 = $result_trees{'char_latin1_latin1_in_refs'}{'contents'}[11];
+$result_trees{'char_latin1_latin1_in_refs'}{'contents'}[12]{'contents'}[5]{'extra'}{'element_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_element'}
 = $result_trees{'char_latin1_latin1_in_refs'}{'contents'}[12]{'contents'}[5];
-$result_trees{'char_latin1_latin1_in_refs'}{'contents'}[12]{'contents'}[6]{'extra'}{'entry_node'}
 = $result_trees{'char_latin1_latin1_in_refs'}{'contents'}[11];
+$result_trees{'char_latin1_latin1_in_refs'}{'contents'}[12]{'contents'}[6]{'extra'}{'element_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_element'}
 = $result_trees{'char_latin1_latin1_in_refs'}{'contents'}[12]{'contents'}[6];
-$result_trees{'char_latin1_latin1_in_refs'}{'contents'}[12]{'contents'}[7]{'extra'}{'entry_node'}
 = $result_trees{'char_latin1_latin1_in_refs'}{'contents'}[11];
+$result_trees{'char_latin1_latin1_in_refs'}{'contents'}[12]{'contents'}[7]{'extra'}{'element_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_element'}
 = $result_trees{'char_latin1_latin1_in_refs'}{'contents'}[12]{'contents'}[7];
-$result_trees{'char_latin1_latin1_in_refs'}{'contents'}[12]{'contents'}[8]{'extra'}{'entry_node'}
 = $result_trees{'char_latin1_latin1_in_refs'}{'contents'}[11];
+$result_trees{'char_latin1_latin1_in_refs'}{'contents'}[12]{'contents'}[8]{'extra'}{'element_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_element'}
 = $result_trees{'char_latin1_latin1_in_refs'}{'contents'}[12]{'contents'}[8];
 
 $result_texis{'char_latin1_latin1_in_refs'} = '\\input texinfo
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 652b3a5a10..8601b7f952 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
@@ -1060,7 +1060,7 @@ $result_trees{'char_latin1_utf8_in_refs'} = {
           ],
           'cmdname' => 'cindex',
           'extra' => {
-            'entry_node' => {},
+            'element_node' => {},
             'index_entry' => {
               'entry_element' => {},
               'entry_number' => 1,
@@ -1099,7 +1099,7 @@ $result_trees{'char_latin1_utf8_in_refs'} = {
           ],
           'cmdname' => 'cindex',
           'extra' => {
-            'entry_node' => {},
+            'element_node' => {},
             'index_entry' => {
               'entry_element' => {},
               'entry_number' => 2,
@@ -1138,7 +1138,7 @@ $result_trees{'char_latin1_utf8_in_refs'} = {
           ],
           'cmdname' => 'cindex',
           'extra' => {
-            'entry_node' => {},
+            'element_node' => {},
             'index_entry' => {
               'entry_element' => {},
               'entry_number' => 3,
@@ -1177,7 +1177,7 @@ $result_trees{'char_latin1_utf8_in_refs'} = {
           ],
           'cmdname' => 'cindex',
           'extra' => {
-            'entry_node' => {},
+            'element_node' => {},
             'index_entry' => {
               'entry_element' => {},
               'entry_number' => 4,
@@ -1216,7 +1216,7 @@ $result_trees{'char_latin1_utf8_in_refs'} = {
           ],
           'cmdname' => 'cindex',
           'extra' => {
-            'entry_node' => {},
+            'element_node' => {},
             'index_entry' => {
               'entry_element' => {},
               'entry_number' => 5,
@@ -1255,7 +1255,7 @@ $result_trees{'char_latin1_utf8_in_refs'} = {
           ],
           'cmdname' => 'cindex',
           'extra' => {
-            'entry_node' => {},
+            'element_node' => {},
             'index_entry' => {
               'entry_element' => {},
               'entry_number' => 6,
@@ -1333,17 +1333,17 @@ 
$result_trees{'char_latin1_utf8_in_refs'}{'contents'}[12]{'contents'}[1]{'conten
 
$result_trees{'char_latin1_utf8_in_refs'}{'contents'}[12]{'contents'}[1]{'contents'}[6]{'extra'}{'node_argument'}{'node_content'}[0]
 = 
$result_trees{'char_latin1_utf8_in_refs'}{'contents'}[12]{'contents'}[1]{'contents'}[6]{'args'}[0]{'contents'}[0];
 
$result_trees{'char_latin1_utf8_in_refs'}{'contents'}[12]{'contents'}[1]{'contents'}[8]{'extra'}{'label'}
 = $result_trees{'char_latin1_utf8_in_refs'}{'contents'}[11];
 
$result_trees{'char_latin1_utf8_in_refs'}{'contents'}[12]{'contents'}[1]{'contents'}[8]{'extra'}{'node_argument'}{'node_content'}[0]
 = 
$result_trees{'char_latin1_utf8_in_refs'}{'contents'}[12]{'contents'}[1]{'contents'}[8]{'args'}[0]{'contents'}[0];
-$result_trees{'char_latin1_utf8_in_refs'}{'contents'}[12]{'contents'}[3]{'extra'}{'entry_node'}
 = $result_trees{'char_latin1_utf8_in_refs'}{'contents'}[11];
+$result_trees{'char_latin1_utf8_in_refs'}{'contents'}[12]{'contents'}[3]{'extra'}{'element_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_element'}
 = $result_trees{'char_latin1_utf8_in_refs'}{'contents'}[12]{'contents'}[3];
-$result_trees{'char_latin1_utf8_in_refs'}{'contents'}[12]{'contents'}[4]{'extra'}{'entry_node'}
 = $result_trees{'char_latin1_utf8_in_refs'}{'contents'}[11];
+$result_trees{'char_latin1_utf8_in_refs'}{'contents'}[12]{'contents'}[4]{'extra'}{'element_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_element'}
 = $result_trees{'char_latin1_utf8_in_refs'}{'contents'}[12]{'contents'}[4];
-$result_trees{'char_latin1_utf8_in_refs'}{'contents'}[12]{'contents'}[5]{'extra'}{'entry_node'}
 = $result_trees{'char_latin1_utf8_in_refs'}{'contents'}[11];
+$result_trees{'char_latin1_utf8_in_refs'}{'contents'}[12]{'contents'}[5]{'extra'}{'element_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_element'}
 = $result_trees{'char_latin1_utf8_in_refs'}{'contents'}[12]{'contents'}[5];
-$result_trees{'char_latin1_utf8_in_refs'}{'contents'}[12]{'contents'}[6]{'extra'}{'entry_node'}
 = $result_trees{'char_latin1_utf8_in_refs'}{'contents'}[11];
+$result_trees{'char_latin1_utf8_in_refs'}{'contents'}[12]{'contents'}[6]{'extra'}{'element_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_element'}
 = $result_trees{'char_latin1_utf8_in_refs'}{'contents'}[12]{'contents'}[6];
-$result_trees{'char_latin1_utf8_in_refs'}{'contents'}[12]{'contents'}[7]{'extra'}{'entry_node'}
 = $result_trees{'char_latin1_utf8_in_refs'}{'contents'}[11];
+$result_trees{'char_latin1_utf8_in_refs'}{'contents'}[12]{'contents'}[7]{'extra'}{'element_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_element'}
 = $result_trees{'char_latin1_utf8_in_refs'}{'contents'}[12]{'contents'}[7];
-$result_trees{'char_latin1_utf8_in_refs'}{'contents'}[12]{'contents'}[8]{'extra'}{'entry_node'}
 = $result_trees{'char_latin1_utf8_in_refs'}{'contents'}[11];
+$result_trees{'char_latin1_utf8_in_refs'}{'contents'}[12]{'contents'}[8]{'extra'}{'element_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_element'}
 = $result_trees{'char_latin1_utf8_in_refs'}{'contents'}[12]{'contents'}[8];
 
 $result_texis{'char_latin1_utf8_in_refs'} = '\\input texinfo
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 4792f1387b..943c2d301c 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
@@ -440,7 +440,7 @@ $result_trees{'char_latin2_latin2_in_refs'} = {
           ],
           'cmdname' => 'cindex',
           'extra' => {
-            'entry_node' => {},
+            'element_node' => {},
             'index_entry' => {
               'entry_element' => {},
               'entry_number' => 1,
@@ -498,7 +498,7 @@ 
$result_trees{'char_latin2_latin2_in_refs'}{'contents'}[2]{'contents'}[1]{'conte
 
$result_trees{'char_latin2_latin2_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[0]{'extra'}{'node_argument'}{'node_content'}[0]
 = 
$result_trees{'char_latin2_latin2_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[0]{'args'}[0]{'contents'}[0];
 
$result_trees{'char_latin2_latin2_in_refs'}{'contents'}[2]{'contents'}[6]{'contents'}[0]{'extra'}{'menu_entry_node_label'}{'node_content'}[0]
 = 
$result_trees{'char_latin2_latin2_in_refs'}{'contents'}[2]{'contents'}[6]{'contents'}[0]{'contents'}[1]{'contents'}[0];
 $result_trees{'char_latin2_latin2_in_refs'}{'contents'}[3] = 
$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'}{'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'}{'element_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_element'}
 = $result_trees{'char_latin2_latin2_in_refs'}{'contents'}[4]{'contents'}[1];
 
 $result_texis{'char_latin2_latin2_in_refs'} = '\\input texinfo
diff --git a/tp/t/results/formats_encodings/sample_utf8.pl 
b/tp/t/results/formats_encodings/sample_utf8.pl
index ec183806f3..b2f50eed04 100644
--- a/tp/t/results/formats_encodings/sample_utf8.pl
+++ b/tp/t/results/formats_encodings/sample_utf8.pl
@@ -885,7 +885,7 @@ $result_trees{'sample_utf8'} = {
           ],
           'cmdname' => 'cindex',
           'extra' => {
-            'entry_node' => {},
+            'element_node' => {},
             'index_entry' => {
               'entry_element' => {},
               'entry_number' => 1,
@@ -935,7 +935,7 @@ $result_trees{'sample_utf8'} = {
               ],
               'cmdname' => 'cindex',
               'extra' => {
-                'entry_node' => {},
+                'element_node' => {},
                 'index_entry' => {
                   'entry_element' => {},
                   'entry_number' => 2,
@@ -974,7 +974,7 @@ $result_trees{'sample_utf8'} = {
               ],
               'cmdname' => 'cindex',
               'extra' => {
-                'entry_node' => {},
+                'element_node' => {},
                 'index_entry' => {
                   'entry_element' => {},
                   'entry_number' => 3,
@@ -1013,7 +1013,7 @@ $result_trees{'sample_utf8'} = {
               ],
               'cmdname' => 'cindex',
               'extra' => {
-                'entry_node' => {},
+                'element_node' => {},
                 'index_entry' => {
                   'entry_element' => {},
                   'entry_number' => 4,
@@ -1428,13 +1428,13 @@ 
$result_trees{'sample_utf8'}{'contents'}[2]{'contents'}[3]{'contents'}[1]{'extra
 
$result_trees{'sample_utf8'}{'contents'}[2]{'contents'}[3]{'contents'}[2]{'extra'}{'menu_entry_node_label'}{'node_content'}[0]
 = 
$result_trees{'sample_utf8'}{'contents'}[2]{'contents'}[3]{'contents'}[2]{'contents'}[1]{'contents'}[0];
 $result_trees{'sample_utf8'}{'contents'}[3]{'extra'}{'node_content'}[0] = 
$result_trees{'sample_utf8'}{'contents'}[3]{'args'}[0]{'contents'}[0];
 
$result_trees{'sample_utf8'}{'contents'}[3]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = $result_trees{'sample_utf8'}{'contents'}[3]{'args'}[0]{'contents'}[0];
-$result_trees{'sample_utf8'}{'contents'}[4]{'contents'}[1]{'extra'}{'entry_node'}
 = $result_trees{'sample_utf8'}{'contents'}[3];
+$result_trees{'sample_utf8'}{'contents'}[4]{'contents'}[1]{'extra'}{'element_node'}
 = $result_trees{'sample_utf8'}{'contents'}[3];
 
$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'}[3]{'contents'}[1]{'extra'}{'entry_node'}
 = $result_trees{'sample_utf8'}{'contents'}[3];
+$result_trees{'sample_utf8'}{'contents'}[4]{'contents'}[3]{'contents'}[1]{'extra'}{'element_node'}
 = $result_trees{'sample_utf8'}{'contents'}[3];
 
$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'}[2]{'extra'}{'entry_node'}
 = $result_trees{'sample_utf8'}{'contents'}[3];
+$result_trees{'sample_utf8'}{'contents'}[4]{'contents'}[3]{'contents'}[2]{'extra'}{'element_node'}
 = $result_trees{'sample_utf8'}{'contents'}[3];
 
$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'}[3]{'extra'}{'entry_node'}
 = $result_trees{'sample_utf8'}{'contents'}[3];
+$result_trees{'sample_utf8'}{'contents'}[4]{'contents'}[3]{'contents'}[3]{'extra'}{'element_node'}
 = $result_trees{'sample_utf8'}{'contents'}[3];
 
$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'}[5]{'extra'}{'node_content'}[0] = 
$result_trees{'sample_utf8'}{'contents'}[5]{'args'}[0]{'contents'}[0];
 
$result_trees{'sample_utf8'}{'contents'}[5]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = $result_trees{'sample_utf8'}{'contents'}[5]{'args'}[0]{'contents'}[0];
diff --git a/tp/t/results/heading/heading_in_copying.pl 
b/tp/t/results/heading/heading_in_copying.pl
index 10c98cd1c2..358c452054 100644
--- a/tp/t/results/heading/heading_in_copying.pl
+++ b/tp/t/results/heading/heading_in_copying.pl
@@ -100,7 +100,7 @@ $result_trees{'heading_in_copying'} = {
               ],
               'cmdname' => 'cindex',
               'extra' => {
-                'entry_region' => 'copying',
+                'element_region' => 'copying',
                 'index_entry' => {
                   'entry_element' => {},
                   'entry_number' => 1,
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 c8b8e5d1bf..c5ab024c2a 100644
--- a/tp/t/results/html_tests/deftypefnnewline_for_copying_after.pl
+++ b/tp/t/results/html_tests/deftypefnnewline_for_copying_after.pl
@@ -98,7 +98,7 @@ $result_trees{'deftypefnnewline_for_copying_after'} = {
                       'name' => {},
                       'type' => {}
                     },
-                    'entry_region' => 'copying',
+                    'element_region' => 'copying',
                     'index_entry' => {
                       'entry_element' => {},
                       'entry_number' => 1,
@@ -520,7 +520,7 @@ $result_trees{'deftypefnnewline_for_copying_after'} = {
                   'name' => {},
                   'type' => {}
                 },
-                'entry_node' => {},
+                'element_node' => {},
                 'index_entry' => {
                   'entry_element' => {},
                   'entry_number' => 2,
@@ -628,7 +628,7 @@ 
$result_trees{'deftypefnnewline_for_copying_after'}{'contents'}[4]{'contents'}[1
 
$result_trees{'deftypefnnewline_for_copying_after'}{'contents'}[4]{'contents'}[1]{'contents'}[0]{'extra'}{'def_parsed_hash'}{'category'}
 = 
$result_trees{'deftypefnnewline_for_copying_after'}{'contents'}[4]{'contents'}[1]{'contents'}[0]{'args'}[0]{'contents'}[0];
 
$result_trees{'deftypefnnewline_for_copying_after'}{'contents'}[4]{'contents'}[1]{'contents'}[0]{'extra'}{'def_parsed_hash'}{'name'}
 = 
$result_trees{'deftypefnnewline_for_copying_after'}{'contents'}[4]{'contents'}[1]{'contents'}[0]{'args'}[0]{'contents'}[4];
 
$result_trees{'deftypefnnewline_for_copying_after'}{'contents'}[4]{'contents'}[1]{'contents'}[0]{'extra'}{'def_parsed_hash'}{'type'}
 = 
$result_trees{'deftypefnnewline_for_copying_after'}{'contents'}[4]{'contents'}[1]{'contents'}[0]{'args'}[0]{'contents'}[2];
-$result_trees{'deftypefnnewline_for_copying_after'}{'contents'}[4]{'contents'}[1]{'contents'}[0]{'extra'}{'entry_node'}
 = $result_trees{'deftypefnnewline_for_copying_after'}{'contents'}[3];
+$result_trees{'deftypefnnewline_for_copying_after'}{'contents'}[4]{'contents'}[1]{'contents'}[0]{'extra'}{'element_node'}
 = $result_trees{'deftypefnnewline_for_copying_after'}{'contents'}[3];
 
$result_trees{'deftypefnnewline_for_copying_after'}{'contents'}[4]{'contents'}[1]{'contents'}[0]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'deftypefnnewline_for_copying_after'}{'contents'}[4]{'contents'}[1]{'contents'}[0];
 
 $result_texis{'deftypefnnewline_for_copying_after'} = '@copying
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 fa3aede537..4f60c2656c 100644
--- a/tp/t/results/html_tests/deftypefnnewline_for_copying_before.pl
+++ b/tp/t/results/html_tests/deftypefnnewline_for_copying_before.pl
@@ -142,7 +142,7 @@ $result_trees{'deftypefnnewline_for_copying_before'} = {
                       'name' => {},
                       'type' => {}
                     },
-                    'entry_region' => 'copying',
+                    'element_region' => 'copying',
                     'index_entry' => {
                       'entry_element' => {},
                       'entry_number' => 1,
@@ -485,7 +485,7 @@ $result_trees{'deftypefnnewline_for_copying_before'} = {
                   'name' => {},
                   'type' => {}
                 },
-                'entry_node' => {},
+                'element_node' => {},
                 'index_entry' => {
                   'entry_element' => {},
                   'entry_number' => 2,
@@ -593,7 +593,7 @@ 
$result_trees{'deftypefnnewline_for_copying_before'}{'contents'}[4]{'contents'}[
 
$result_trees{'deftypefnnewline_for_copying_before'}{'contents'}[4]{'contents'}[1]{'contents'}[0]{'extra'}{'def_parsed_hash'}{'category'}
 = 
$result_trees{'deftypefnnewline_for_copying_before'}{'contents'}[4]{'contents'}[1]{'contents'}[0]{'args'}[0]{'contents'}[0];
 
$result_trees{'deftypefnnewline_for_copying_before'}{'contents'}[4]{'contents'}[1]{'contents'}[0]{'extra'}{'def_parsed_hash'}{'name'}
 = 
$result_trees{'deftypefnnewline_for_copying_before'}{'contents'}[4]{'contents'}[1]{'contents'}[0]{'args'}[0]{'contents'}[4];
 
$result_trees{'deftypefnnewline_for_copying_before'}{'contents'}[4]{'contents'}[1]{'contents'}[0]{'extra'}{'def_parsed_hash'}{'type'}
 = 
$result_trees{'deftypefnnewline_for_copying_before'}{'contents'}[4]{'contents'}[1]{'contents'}[0]{'args'}[0]{'contents'}[2];
-$result_trees{'deftypefnnewline_for_copying_before'}{'contents'}[4]{'contents'}[1]{'contents'}[0]{'extra'}{'entry_node'}
 = $result_trees{'deftypefnnewline_for_copying_before'}{'contents'}[3];
+$result_trees{'deftypefnnewline_for_copying_before'}{'contents'}[4]{'contents'}[1]{'contents'}[0]{'extra'}{'element_node'}
 = $result_trees{'deftypefnnewline_for_copying_before'}{'contents'}[3];
 
$result_trees{'deftypefnnewline_for_copying_before'}{'contents'}[4]{'contents'}[1]{'contents'}[0]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'deftypefnnewline_for_copying_before'}{'contents'}[4]{'contents'}[1]{'contents'}[0];
 
 $result_texis{'deftypefnnewline_for_copying_before'} = '
diff --git a/tp/t/results/html_tests/float_copying.pl 
b/tp/t/results/html_tests/float_copying.pl
index e348693585..01de5b792f 100644
--- a/tp/t/results/html_tests/float_copying.pl
+++ b/tp/t/results/html_tests/float_copying.pl
@@ -218,7 +218,7 @@ $result_trees{'float_copying'} = {
                                           ],
                                           'cmdname' => 'cindex',
                                           'extra' => {
-                                            'entry_region' => 'copying',
+                                            'element_region' => 'copying',
                                             'index_entry' => {
                                               'entry_element' => {},
                                               'entry_number' => 1,
@@ -257,7 +257,7 @@ $result_trees{'float_copying'} = {
                                           ],
                                           'cmdname' => 'findex',
                                           'extra' => {
-                                            'entry_region' => 'copying',
+                                            'element_region' => 'copying',
                                             'index_entry' => {
                                               'entry_element' => {},
                                               'entry_number' => 1,
@@ -449,7 +449,7 @@ $result_trees{'float_copying'} = {
                               ],
                               'cmdname' => 'cindex',
                               'extra' => {
-                                'entry_region' => 'copying',
+                                'element_region' => 'copying',
                                 'index_entry' => {
                                   'entry_element' => {},
                                   'entry_number' => 2,
@@ -488,7 +488,7 @@ $result_trees{'float_copying'} = {
                               ],
                               'cmdname' => 'findex',
                               'extra' => {
-                                'entry_region' => 'copying',
+                                'element_region' => 'copying',
                                 'index_entry' => {
                                   'entry_element' => {},
                                   'entry_number' => 2,
@@ -720,7 +720,7 @@ $result_trees{'float_copying'} = {
           ],
           'cmdname' => 'cindex',
           'extra' => {
-            'entry_node' => {},
+            'element_node' => {},
             'index_entry' => {
               'entry_element' => {},
               'entry_number' => 3,
@@ -1122,7 +1122,7 @@ $result_trees{'float_copying'} = {
           ],
           'cmdname' => 'cindex',
           'extra' => {
-            'entry_node' => {},
+            'element_node' => {},
             'index_entry' => {
               'entry_element' => {},
               'entry_number' => 4,
@@ -1396,7 +1396,7 @@ 
$result_trees{'float_copying'}{'contents'}[0]{'contents'}[1]{'contents'}[2]{'con
 
$result_trees{'float_copying'}{'contents'}[0]{'contents'}[1]{'contents'}[2]{'contents'}[1]{'extra'}{'type'}{'content'}[0]
 = 
$result_trees{'float_copying'}{'contents'}[0]{'contents'}[1]{'contents'}[2]{'contents'}[1]{'args'}[0]{'contents'}[0];
 $result_trees{'float_copying'}{'contents'}[1]{'extra'}{'node_content'}[0] = 
$result_trees{'float_copying'}{'contents'}[1]{'args'}[0]{'contents'}[0];
 
$result_trees{'float_copying'}{'contents'}[1]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = $result_trees{'float_copying'}{'contents'}[1]{'args'}[0]{'contents'}[0];
-$result_trees{'float_copying'}{'contents'}[2]{'contents'}[1]{'extra'}{'entry_node'}
 = $result_trees{'float_copying'}{'contents'}[1];
+$result_trees{'float_copying'}{'contents'}[2]{'contents'}[1]{'extra'}{'element_node'}
 = $result_trees{'float_copying'}{'contents'}[1];
 
$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'}[3]{'contents'}[1]{'extra'}{'label'}
 = 
$result_trees{'float_copying'}{'contents'}[0]{'contents'}[1]{'contents'}[2]{'contents'}[1]{'contents'}[3]{'args'}[0]{'contents'}[2];
 
$result_trees{'float_copying'}{'contents'}[2]{'contents'}[3]{'contents'}[1]{'extra'}{'node_argument'}{'node_content'}[0]
 = 
$result_trees{'float_copying'}{'contents'}[2]{'contents'}[3]{'contents'}[1]{'args'}[0]{'contents'}[0];
@@ -1408,7 +1408,7 @@ 
$result_trees{'float_copying'}{'contents'}[4]{'contents'}[3]{'contents'}[1]{'ext
 
$result_trees{'float_copying'}{'contents'}[4]{'contents'}[3]{'contents'}[1]{'extra'}{'node_argument'}{'node_content'}[0]
 = 
$result_trees{'float_copying'}{'contents'}[4]{'contents'}[3]{'contents'}[1]{'args'}[0]{'contents'}[0];
 
$result_trees{'float_copying'}{'contents'}[4]{'contents'}[5]{'contents'}[1]{'extra'}{'label'}
 = 
$result_trees{'float_copying'}{'contents'}[0]{'contents'}[1]{'contents'}[2]{'contents'}[1];
 
$result_trees{'float_copying'}{'contents'}[4]{'contents'}[5]{'contents'}[1]{'extra'}{'node_argument'}{'node_content'}[0]
 = 
$result_trees{'float_copying'}{'contents'}[4]{'contents'}[5]{'contents'}[1]{'args'}[0]{'contents'}[0];
-$result_trees{'float_copying'}{'contents'}[4]{'contents'}[7]{'extra'}{'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'}{'element_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_element'}
 = $result_trees{'float_copying'}{'contents'}[4]{'contents'}[7];
 
$result_trees{'float_copying'}{'contents'}[4]{'contents'}[13]{'extra'}{'type'}{'content'}[0]
 = 
$result_trees{'float_copying'}{'contents'}[4]{'contents'}[13]{'args'}[0]{'contents'}[0];
 
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 963e024acf..6830c2dc55 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
@@ -82,7 +82,7 @@ $result_trees{'index_and_node_same_name'} = {
           ],
           'cmdname' => 'cindex',
           'extra' => {
-            'entry_node' => {},
+            'element_node' => {},
             'index_entry' => {
               'entry_element' => {},
               'entry_number' => 1,
@@ -171,7 +171,7 @@ $result_trees{'index_and_node_same_name'} = {
   ],
   'type' => 'document_root'
 };
-$result_trees{'index_and_node_same_name'}{'contents'}[2]{'contents'}[1]{'extra'}{'entry_node'}
 = $result_trees{'index_and_node_same_name'}{'contents'}[2];
+$result_trees{'index_and_node_same_name'}{'contents'}[2]{'contents'}[1]{'extra'}{'element_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_element'}
 = $result_trees{'index_and_node_same_name'}{'contents'}[2]{'contents'}[1];
 
$result_trees{'index_and_node_same_name'}{'contents'}[2]{'extra'}{'node_content'}[0]
 = 
$result_trees{'index_and_node_same_name'}{'contents'}[2]{'args'}[0]{'contents'}[0];
 
$result_trees{'index_and_node_same_name'}{'contents'}[2]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = 
$result_trees{'index_and_node_same_name'}{'contents'}[2]{'args'}[0]{'contents'}[0];
diff --git a/tp/t/results/indices/complex_recursive_synindex.pl 
b/tp/t/results/indices/complex_recursive_synindex.pl
index 7731f494a0..c8e51e3260 100644
--- a/tp/t/results/indices/complex_recursive_synindex.pl
+++ b/tp/t/results/indices/complex_recursive_synindex.pl
@@ -410,7 +410,7 @@ $result_trees{'complex_recursive_synindex'} = {
           ],
           'cmdname' => 'eeeindex',
           'extra' => {
-            'entry_node' => {},
+            'element_node' => {},
             'index_entry' => {
               'entry_element' => {},
               'entry_number' => 1,
@@ -523,7 +523,7 @@ $result_trees{'complex_recursive_synindex'} = {
           ],
           'cmdname' => 'cccindex',
           'extra' => {
-            'entry_node' => {},
+            'element_node' => {},
             'index_entry' => {
               'entry_element' => {},
               'entry_number' => 1,
@@ -562,7 +562,7 @@ $result_trees{'complex_recursive_synindex'} = {
           ],
           'cmdname' => 'bbbindex',
           'extra' => {
-            'entry_node' => {},
+            'element_node' => {},
             'index_entry' => {
               'entry_element' => {},
               'entry_number' => 1,
@@ -601,7 +601,7 @@ $result_trees{'complex_recursive_synindex'} = {
           ],
           'cmdname' => 'aaaindex',
           'extra' => {
-            'entry_node' => {},
+            'element_node' => {},
             'index_entry' => {
               'entry_element' => {},
               'entry_number' => 1,
@@ -640,7 +640,7 @@ $result_trees{'complex_recursive_synindex'} = {
           ],
           'cmdname' => 'dddindex',
           'extra' => {
-            'entry_node' => {},
+            'element_node' => {},
             'index_entry' => {
               'entry_element' => {},
               'entry_number' => 1,
@@ -679,7 +679,7 @@ $result_trees{'complex_recursive_synindex'} = {
           ],
           'cmdname' => 'eeeindex',
           'extra' => {
-            'entry_node' => {},
+            'element_node' => {},
             'index_entry' => {
               'entry_element' => {},
               'entry_number' => 2,
@@ -971,17 +971,17 @@ $result_trees{'complex_recursive_synindex'} = {
 };
 
$result_trees{'complex_recursive_synindex'}{'contents'}[1]{'extra'}{'node_content'}[0]
 = 
$result_trees{'complex_recursive_synindex'}{'contents'}[1]{'args'}[0]{'contents'}[0];
 
$result_trees{'complex_recursive_synindex'}{'contents'}[1]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = 
$result_trees{'complex_recursive_synindex'}{'contents'}[1]{'args'}[0]{'contents'}[0];
-$result_trees{'complex_recursive_synindex'}{'contents'}[2]{'contents'}[12]{'extra'}{'entry_node'}
 = $result_trees{'complex_recursive_synindex'}{'contents'}[2];
+$result_trees{'complex_recursive_synindex'}{'contents'}[2]{'contents'}[12]{'extra'}{'element_node'}
 = $result_trees{'complex_recursive_synindex'}{'contents'}[2];
 
$result_trees{'complex_recursive_synindex'}{'contents'}[2]{'contents'}[12]{'extra'}{'index_entry'}{'entry_element'}
 = $result_trees{'complex_recursive_synindex'}{'contents'}[2]{'contents'}[12];
-$result_trees{'complex_recursive_synindex'}{'contents'}[2]{'contents'}[17]{'extra'}{'entry_node'}
 = $result_trees{'complex_recursive_synindex'}{'contents'}[2];
+$result_trees{'complex_recursive_synindex'}{'contents'}[2]{'contents'}[17]{'extra'}{'element_node'}
 = $result_trees{'complex_recursive_synindex'}{'contents'}[2];
 
$result_trees{'complex_recursive_synindex'}{'contents'}[2]{'contents'}[17]{'extra'}{'index_entry'}{'entry_element'}
 = $result_trees{'complex_recursive_synindex'}{'contents'}[2]{'contents'}[17];
-$result_trees{'complex_recursive_synindex'}{'contents'}[2]{'contents'}[18]{'extra'}{'entry_node'}
 = $result_trees{'complex_recursive_synindex'}{'contents'}[2];
+$result_trees{'complex_recursive_synindex'}{'contents'}[2]{'contents'}[18]{'extra'}{'element_node'}
 = $result_trees{'complex_recursive_synindex'}{'contents'}[2];
 
$result_trees{'complex_recursive_synindex'}{'contents'}[2]{'contents'}[18]{'extra'}{'index_entry'}{'entry_element'}
 = $result_trees{'complex_recursive_synindex'}{'contents'}[2]{'contents'}[18];
-$result_trees{'complex_recursive_synindex'}{'contents'}[2]{'contents'}[19]{'extra'}{'entry_node'}
 = $result_trees{'complex_recursive_synindex'}{'contents'}[2];
+$result_trees{'complex_recursive_synindex'}{'contents'}[2]{'contents'}[19]{'extra'}{'element_node'}
 = $result_trees{'complex_recursive_synindex'}{'contents'}[2];
 
$result_trees{'complex_recursive_synindex'}{'contents'}[2]{'contents'}[19]{'extra'}{'index_entry'}{'entry_element'}
 = $result_trees{'complex_recursive_synindex'}{'contents'}[2]{'contents'}[19];
-$result_trees{'complex_recursive_synindex'}{'contents'}[2]{'contents'}[20]{'extra'}{'entry_node'}
 = $result_trees{'complex_recursive_synindex'}{'contents'}[2];
+$result_trees{'complex_recursive_synindex'}{'contents'}[2]{'contents'}[20]{'extra'}{'element_node'}
 = $result_trees{'complex_recursive_synindex'}{'contents'}[2];
 
$result_trees{'complex_recursive_synindex'}{'contents'}[2]{'contents'}[20]{'extra'}{'index_entry'}{'entry_element'}
 = $result_trees{'complex_recursive_synindex'}{'contents'}[2]{'contents'}[20];
-$result_trees{'complex_recursive_synindex'}{'contents'}[2]{'contents'}[21]{'extra'}{'entry_node'}
 = $result_trees{'complex_recursive_synindex'}{'contents'}[2];
+$result_trees{'complex_recursive_synindex'}{'contents'}[2]{'contents'}[21]{'extra'}{'element_node'}
 = $result_trees{'complex_recursive_synindex'}{'contents'}[2];
 
$result_trees{'complex_recursive_synindex'}{'contents'}[2]{'contents'}[21]{'extra'}{'index_entry'}{'entry_element'}
 = $result_trees{'complex_recursive_synindex'}{'contents'}[2]{'contents'}[21];
 
$result_trees{'complex_recursive_synindex'}{'contents'}[2]{'extra'}{'node_content'}[0]
 = 
$result_trees{'complex_recursive_synindex'}{'contents'}[2]{'args'}[0]{'contents'}[0];
 
$result_trees{'complex_recursive_synindex'}{'contents'}[2]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = 
$result_trees{'complex_recursive_synindex'}{'contents'}[2]{'args'}[0]{'contents'}[0];
diff --git a/tp/t/results/indices/def_syn_indices.pl 
b/tp/t/results/indices/def_syn_indices.pl
index d5274bc32d..6191800fb1 100644
--- a/tp/t/results/indices/def_syn_indices.pl
+++ b/tp/t/results/indices/def_syn_indices.pl
@@ -276,7 +276,7 @@ $result_trees{'def_syn_indices'} = {
           ],
           'cmdname' => 'trucindex',
           'extra' => {
-            'entry_node' => {},
+            'element_node' => {},
             'index_entry' => {
               'entry_element' => {},
               'entry_number' => 1,
@@ -434,7 +434,7 @@ $result_trees{'def_syn_indices'} = {
           ],
           'cmdname' => 'codeidxindex',
           'extra' => {
-            'entry_node' => {},
+            'element_node' => {},
             'index_entry' => {
               'entry_element' => {},
               'entry_number' => 1,
@@ -478,7 +478,7 @@ $result_trees{'def_syn_indices'} = {
           ],
           'cmdname' => 'cindex',
           'extra' => {
-            'entry_node' => {},
+            'element_node' => {},
             'index_entry' => {
               'entry_element' => {},
               'entry_number' => 1,
@@ -562,7 +562,7 @@ $result_trees{'def_syn_indices'} = {
           ],
           'cmdname' => 'kindex',
           'extra' => {
-            'entry_node' => {},
+            'element_node' => {},
             'index_entry' => {
               'entry_element' => {},
               'entry_number' => 1,
@@ -601,7 +601,7 @@ $result_trees{'def_syn_indices'} = {
           ],
           'cmdname' => 'pindex',
           'extra' => {
-            'entry_node' => {},
+            'element_node' => {},
             'index_entry' => {
               'entry_element' => {},
               'entry_number' => 1,
@@ -833,7 +833,7 @@ $result_trees{'def_syn_indices'} = {
           ],
           'cmdname' => 'defgindex',
           'extra' => {
-            'entry_node' => {},
+            'element_node' => {},
             'index_entry' => {
               'entry_element' => {},
               'entry_number' => 1,
@@ -877,7 +877,7 @@ $result_trees{'def_syn_indices'} = {
           ],
           'cmdname' => 'abcindex',
           'extra' => {
-            'entry_node' => {},
+            'element_node' => {},
             'index_entry' => {
               'entry_element' => {},
               'entry_number' => 1,
@@ -1349,19 +1349,19 @@ 
$result_trees{'def_syn_indices'}{'contents'}[1]{'extra'}{'node_content'}[0] = $r
 
$result_trees{'def_syn_indices'}{'contents'}[1]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = $result_trees{'def_syn_indices'}{'contents'}[1]{'args'}[0]{'contents'}[0];
 $result_trees{'def_syn_indices'}{'contents'}[3]{'extra'}{'node_content'}[0] = 
$result_trees{'def_syn_indices'}{'contents'}[3]{'args'}[0]{'contents'}[0];
 
$result_trees{'def_syn_indices'}{'contents'}[3]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = $result_trees{'def_syn_indices'}{'contents'}[3]{'args'}[0]{'contents'}[0];
-$result_trees{'def_syn_indices'}{'contents'}[4]{'contents'}[3]{'extra'}{'entry_node'}
 = $result_trees{'def_syn_indices'}{'contents'}[3];
+$result_trees{'def_syn_indices'}{'contents'}[4]{'contents'}[3]{'extra'}{'element_node'}
 = $result_trees{'def_syn_indices'}{'contents'}[3];
 
$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'}[7]{'extra'}{'entry_node'}
 = $result_trees{'def_syn_indices'}{'contents'}[3];
+$result_trees{'def_syn_indices'}{'contents'}[4]{'contents'}[7]{'extra'}{'element_node'}
 = $result_trees{'def_syn_indices'}{'contents'}[3];
 
$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'}[9]{'extra'}{'entry_node'}
 = $result_trees{'def_syn_indices'}{'contents'}[3];
+$result_trees{'def_syn_indices'}{'contents'}[4]{'contents'}[9]{'extra'}{'element_node'}
 = $result_trees{'def_syn_indices'}{'contents'}[3];
 
$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'}[13]{'extra'}{'entry_node'}
 = $result_trees{'def_syn_indices'}{'contents'}[3];
+$result_trees{'def_syn_indices'}{'contents'}[4]{'contents'}[13]{'extra'}{'element_node'}
 = $result_trees{'def_syn_indices'}{'contents'}[3];
 
$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'}[14]{'extra'}{'entry_node'}
 = $result_trees{'def_syn_indices'}{'contents'}[3];
+$result_trees{'def_syn_indices'}{'contents'}[4]{'contents'}[14]{'extra'}{'element_node'}
 = $result_trees{'def_syn_indices'}{'contents'}[3];
 
$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'}[24]{'extra'}{'entry_node'}
 = $result_trees{'def_syn_indices'}{'contents'}[3];
+$result_trees{'def_syn_indices'}{'contents'}[4]{'contents'}[24]{'extra'}{'element_node'}
 = $result_trees{'def_syn_indices'}{'contents'}[3];
 
$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'}[26]{'extra'}{'entry_node'}
 = $result_trees{'def_syn_indices'}{'contents'}[3];
+$result_trees{'def_syn_indices'}{'contents'}[4]{'contents'}[26]{'extra'}{'element_node'}
 = $result_trees{'def_syn_indices'}{'contents'}[3];
 
$result_trees{'def_syn_indices'}{'contents'}[4]{'contents'}[26]{'extra'}{'index_entry'}{'entry_element'}
 = $result_trees{'def_syn_indices'}{'contents'}[4]{'contents'}[26];
 
 $result_texis{'def_syn_indices'} = '@syncodeindex cp fn
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 783d9d7fed..a022327ed9 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
@@ -142,7 +142,7 @@ 
$result_trees{'default_cp_index_and_one_letter_syncodeindex'} = {
           ],
           'cmdname' => 'cindex',
           'extra' => {
-            'entry_node' => {},
+            'element_node' => {},
             'index_entry' => {
               'entry_element' => {},
               'entry_number' => 1,
@@ -181,7 +181,7 @@ 
$result_trees{'default_cp_index_and_one_letter_syncodeindex'} = {
           ],
           'cmdname' => 'cpindex',
           'extra' => {
-            'entry_node' => {},
+            'element_node' => {},
             'index_entry' => {
               'entry_element' => {},
               'entry_number' => 2,
@@ -272,9 +272,9 @@ 
$result_trees{'default_cp_index_and_one_letter_syncodeindex'} = {
 };
 
$result_trees{'default_cp_index_and_one_letter_syncodeindex'}{'contents'}[1]{'extra'}{'node_content'}[0]
 = 
$result_trees{'default_cp_index_and_one_letter_syncodeindex'}{'contents'}[1]{'args'}[0]{'contents'}[0];
 
$result_trees{'default_cp_index_and_one_letter_syncodeindex'}{'contents'}[1]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = 
$result_trees{'default_cp_index_and_one_letter_syncodeindex'}{'contents'}[1]{'args'}[0]{'contents'}[0];
-$result_trees{'default_cp_index_and_one_letter_syncodeindex'}{'contents'}[2]{'contents'}[3]{'extra'}{'entry_node'}
 = $result_trees{'default_cp_index_and_one_letter_syncodeindex'}{'contents'}[2];
+$result_trees{'default_cp_index_and_one_letter_syncodeindex'}{'contents'}[2]{'contents'}[3]{'extra'}{'element_node'}
 = $result_trees{'default_cp_index_and_one_letter_syncodeindex'}{'contents'}[2];
 
$result_trees{'default_cp_index_and_one_letter_syncodeindex'}{'contents'}[2]{'contents'}[3]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'default_cp_index_and_one_letter_syncodeindex'}{'contents'}[2]{'contents'}[3];
-$result_trees{'default_cp_index_and_one_letter_syncodeindex'}{'contents'}[2]{'contents'}[4]{'extra'}{'entry_node'}
 = $result_trees{'default_cp_index_and_one_letter_syncodeindex'}{'contents'}[2];
+$result_trees{'default_cp_index_and_one_letter_syncodeindex'}{'contents'}[2]{'contents'}[4]{'extra'}{'element_node'}
 = $result_trees{'default_cp_index_and_one_letter_syncodeindex'}{'contents'}[2];
 
$result_trees{'default_cp_index_and_one_letter_syncodeindex'}{'contents'}[2]{'contents'}[4]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'default_cp_index_and_one_letter_syncodeindex'}{'contents'}[2]{'contents'}[4];
 
$result_trees{'default_cp_index_and_one_letter_syncodeindex'}{'contents'}[2]{'extra'}{'node_content'}[0]
 = 
$result_trees{'default_cp_index_and_one_letter_syncodeindex'}{'contents'}[2]{'args'}[0]{'contents'}[0];
 
$result_trees{'default_cp_index_and_one_letter_syncodeindex'}{'contents'}[2]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = 
$result_trees{'default_cp_index_and_one_letter_syncodeindex'}{'contents'}[2]{'args'}[0]{'contents'}[0];
diff --git a/tp/t/results/indices/double_index_entry.pl 
b/tp/t/results/indices/double_index_entry.pl
index 8aa248a073..b0f313e1f0 100644
--- a/tp/t/results/indices/double_index_entry.pl
+++ b/tp/t/results/indices/double_index_entry.pl
@@ -59,7 +59,7 @@ $result_trees{'double_index_entry'} = {
           ],
           'cmdname' => 'cindex',
           'extra' => {
-            'entry_node' => {},
+            'element_node' => {},
             'index_entry' => {
               'entry_element' => {},
               'entry_number' => 1,
@@ -117,7 +117,7 @@ $result_trees{'double_index_entry'} = {
           ],
           'cmdname' => 'cindex',
           'extra' => {
-            'entry_node' => {},
+            'element_node' => {},
             'index_entry' => {
               'entry_element' => {},
               'entry_number' => 2,
@@ -331,7 +331,7 @@ $result_trees{'double_index_entry'} = {
           ],
           'cmdname' => 'cindex',
           'extra' => {
-            'entry_node' => {},
+            'element_node' => {},
             'index_entry' => {
               'entry_element' => {},
               'entry_number' => 3,
@@ -428,14 +428,14 @@ $result_trees{'double_index_entry'} = {
   ],
   'type' => 'document_root'
 };
-$result_trees{'double_index_entry'}{'contents'}[1]{'contents'}[1]{'extra'}{'entry_node'}
 = $result_trees{'double_index_entry'}{'contents'}[1];
+$result_trees{'double_index_entry'}{'contents'}[1]{'contents'}[1]{'extra'}{'element_node'}
 = $result_trees{'double_index_entry'}{'contents'}[1];
 
$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'}[5]{'extra'}{'entry_node'}
 = $result_trees{'double_index_entry'}{'contents'}[1];
+$result_trees{'double_index_entry'}{'contents'}[1]{'contents'}[5]{'extra'}{'element_node'}
 = $result_trees{'double_index_entry'}{'contents'}[1];
 
$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'}[7]{'contents'}[0]{'extra'}{'menu_entry_node_label'}{'node_content'}[0]
 = 
$result_trees{'double_index_entry'}{'contents'}[1]{'contents'}[7]{'contents'}[0]{'contents'}[1]{'contents'}[0];
 $result_trees{'double_index_entry'}{'contents'}[1]{'extra'}{'node_content'}[0] 
= $result_trees{'double_index_entry'}{'contents'}[1]{'args'}[0]{'contents'}[0];
 
$result_trees{'double_index_entry'}{'contents'}[1]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = $result_trees{'double_index_entry'}{'contents'}[1]{'args'}[0]{'contents'}[0];
-$result_trees{'double_index_entry'}{'contents'}[2]{'contents'}[1]{'extra'}{'entry_node'}
 = $result_trees{'double_index_entry'}{'contents'}[2];
+$result_trees{'double_index_entry'}{'contents'}[2]{'contents'}[1]{'extra'}{'element_node'}
 = $result_trees{'double_index_entry'}{'contents'}[2];
 
$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]{'extra'}{'node_content'}[0] 
= $result_trees{'double_index_entry'}{'contents'}[2]{'args'}[0]{'contents'}[0];
 
$result_trees{'double_index_entry'}{'contents'}[2]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = $result_trees{'double_index_entry'}{'contents'}[2]{'args'}[0]{'contents'}[0];
diff --git a/tp/t/results/indices/double_seeentry_seealso.pl 
b/tp/t/results/indices/double_seeentry_seealso.pl
index 46d9343f6a..5f9ef746cd 100644
--- a/tp/t/results/indices/double_seeentry_seealso.pl
+++ b/tp/t/results/indices/double_seeentry_seealso.pl
@@ -227,7 +227,7 @@ $result_trees{'double_seeentry_seealso'} = {
           ],
           'cmdname' => 'cindex',
           'extra' => {
-            'entry_node' => {},
+            'element_node' => {},
             'index_entry' => {
               'entry_element' => {},
               'entry_number' => 1,
@@ -311,7 +311,7 @@ $result_trees{'double_seeentry_seealso'} = {
           ],
           'cmdname' => 'cindex',
           'extra' => {
-            'entry_node' => {},
+            'element_node' => {},
             'index_entry' => {
               'entry_element' => {},
               'entry_number' => 2,
@@ -395,7 +395,7 @@ $result_trees{'double_seeentry_seealso'} = {
           ],
           'cmdname' => 'cindex',
           'extra' => {
-            'entry_node' => {},
+            'element_node' => {},
             'index_entry' => {
               'entry_element' => {},
               'entry_number' => 3,
@@ -450,7 +450,7 @@ $result_trees{'double_seeentry_seealso'} = {
           ],
           'cmdname' => 'cindex',
           'extra' => {
-            'entry_node' => {},
+            'element_node' => {},
             'index_entry' => {
               'entry_element' => {},
               'entry_number' => 4,
@@ -586,17 +586,17 @@ 
$result_trees{'double_seeentry_seealso'}{'contents'}[1]{'extra'}{'node_content'}
 
$result_trees{'double_seeentry_seealso'}{'contents'}[1]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = 
$result_trees{'double_seeentry_seealso'}{'contents'}[1]{'args'}[0]{'contents'}[0];
 
$result_trees{'double_seeentry_seealso'}{'contents'}[3]{'extra'}{'node_content'}[0]
 = 
$result_trees{'double_seeentry_seealso'}{'contents'}[3]{'args'}[0]{'contents'}[0];
 
$result_trees{'double_seeentry_seealso'}{'contents'}[3]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = 
$result_trees{'double_seeentry_seealso'}{'contents'}[3]{'args'}[0]{'contents'}[0];
-$result_trees{'double_seeentry_seealso'}{'contents'}[4]{'contents'}[1]{'extra'}{'entry_node'}
 = $result_trees{'double_seeentry_seealso'}{'contents'}[3];
+$result_trees{'double_seeentry_seealso'}{'contents'}[4]{'contents'}[1]{'extra'}{'element_node'}
 = $result_trees{'double_seeentry_seealso'}{'contents'}[3];
 
$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'}{'seeentry'}
 = 
$result_trees{'double_seeentry_seealso'}{'contents'}[4]{'contents'}[1]{'args'}[0]{'contents'}[4];
-$result_trees{'double_seeentry_seealso'}{'contents'}[4]{'contents'}[2]{'extra'}{'entry_node'}
 = $result_trees{'double_seeentry_seealso'}{'contents'}[3];
+$result_trees{'double_seeentry_seealso'}{'contents'}[4]{'contents'}[2]{'extra'}{'element_node'}
 = $result_trees{'double_seeentry_seealso'}{'contents'}[3];
 
$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'}{'seealso'}
 = 
$result_trees{'double_seeentry_seealso'}{'contents'}[4]{'contents'}[2]{'args'}[0]{'contents'}[4];
-$result_trees{'double_seeentry_seealso'}{'contents'}[4]{'contents'}[3]{'extra'}{'entry_node'}
 = $result_trees{'double_seeentry_seealso'}{'contents'}[3];
+$result_trees{'double_seeentry_seealso'}{'contents'}[4]{'contents'}[3]{'extra'}{'element_node'}
 = $result_trees{'double_seeentry_seealso'}{'contents'}[3];
 
$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'}{'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'}[4]{'extra'}{'entry_node'}
 = $result_trees{'double_seeentry_seealso'}{'contents'}[3];
+$result_trees{'double_seeentry_seealso'}{'contents'}[4]{'contents'}[4]{'extra'}{'element_node'}
 = $result_trees{'double_seeentry_seealso'}{'contents'}[3];
 
$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'}{'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'}{'extra'}{'seeentry'}
 = 
$result_trees{'double_seeentry_seealso'}{'contents'}[4]{'contents'}[4]{'extra'}{'subentry'}{'args'}[0]{'contents'}[2];
diff --git a/tp/t/results/indices/double_syncodeindex.pl 
b/tp/t/results/indices/double_syncodeindex.pl
index 6935e7a14d..b8e2ad7933 100644
--- a/tp/t/results/indices/double_syncodeindex.pl
+++ b/tp/t/results/indices/double_syncodeindex.pl
@@ -178,7 +178,7 @@ $result_trees{'double_syncodeindex'} = {
           ],
           'cmdname' => 'cindex',
           'extra' => {
-            'entry_node' => {},
+            'element_node' => {},
             'index_entry' => {
               'entry_element' => {},
               'entry_number' => 1,
@@ -217,7 +217,7 @@ $result_trees{'double_syncodeindex'} = {
           ],
           'cmdname' => 'findex',
           'extra' => {
-            'entry_node' => {},
+            'element_node' => {},
             'index_entry' => {
               'entry_element' => {},
               'entry_number' => 1,
@@ -342,9 +342,9 @@ $result_trees{'double_syncodeindex'} = {
 };
 
$result_trees{'double_syncodeindex'}{'contents'}[1]{'extra'}{'node_content'}[0] 
= $result_trees{'double_syncodeindex'}{'contents'}[1]{'args'}[0]{'contents'}[0];
 
$result_trees{'double_syncodeindex'}{'contents'}[1]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = 
$result_trees{'double_syncodeindex'}{'contents'}[1]{'args'}[0]{'contents'}[0];
-$result_trees{'double_syncodeindex'}{'contents'}[2]{'contents'}[1]{'extra'}{'entry_node'}
 = $result_trees{'double_syncodeindex'}{'contents'}[2];
+$result_trees{'double_syncodeindex'}{'contents'}[2]{'contents'}[1]{'extra'}{'element_node'}
 = $result_trees{'double_syncodeindex'}{'contents'}[2];
 
$result_trees{'double_syncodeindex'}{'contents'}[2]{'contents'}[1]{'extra'}{'index_entry'}{'entry_element'}
 = $result_trees{'double_syncodeindex'}{'contents'}[2]{'contents'}[1];
-$result_trees{'double_syncodeindex'}{'contents'}[2]{'contents'}[2]{'extra'}{'entry_node'}
 = $result_trees{'double_syncodeindex'}{'contents'}[2];
+$result_trees{'double_syncodeindex'}{'contents'}[2]{'contents'}[2]{'extra'}{'element_node'}
 = $result_trees{'double_syncodeindex'}{'contents'}[2];
 
$result_trees{'double_syncodeindex'}{'contents'}[2]{'contents'}[2]{'extra'}{'index_entry'}{'entry_element'}
 = $result_trees{'double_syncodeindex'}{'contents'}[2]{'contents'}[2];
 
$result_trees{'double_syncodeindex'}{'contents'}[2]{'extra'}{'node_content'}[0] 
= $result_trees{'double_syncodeindex'}{'contents'}[2]{'args'}[0]{'contents'}[0];
 
$result_trees{'double_syncodeindex'}{'contents'}[2]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = 
$result_trees{'double_syncodeindex'}{'contents'}[2]{'args'}[0]{'contents'}[0];
diff --git a/tp/t/results/indices/empty_string_index_entry.pl 
b/tp/t/results/indices/empty_string_index_entry.pl
index 5e215590ce..46def321db 100644
--- a/tp/t/results/indices/empty_string_index_entry.pl
+++ b/tp/t/results/indices/empty_string_index_entry.pl
@@ -112,7 +112,7 @@ $result_trees{'empty_string_index_entry'} = {
           ],
           'cmdname' => 'findex',
           'extra' => {
-            'entry_node' => {},
+            'element_node' => {},
             'index_entry' => {
               'entry_element' => {},
               'entry_number' => 1,
@@ -195,7 +195,7 @@ $result_trees{'empty_string_index_entry'} = {
                       ],
                       'cmdname' => 'item',
                       'extra' => {
-                        'entry_node' => {},
+                        'element_node' => {},
                         'index_entry' => {
                           'entry_element' => {},
                           'entry_number' => 2,
@@ -376,7 +376,7 @@ $result_trees{'empty_string_index_entry'} = {
                   'category' => {},
                   'name' => {}
                 },
-                'entry_node' => {},
+                'element_node' => {},
                 'index_entry' => {
                   'entry_element' => {},
                   'entry_number' => 3,
@@ -494,7 +494,7 @@ $result_trees{'empty_string_index_entry'} = {
                   'category' => {},
                   'name' => {}
                 },
-                'entry_node' => {},
+                'element_node' => {},
                 'index_entry' => {
                   'entry_element' => {},
                   'entry_number' => 4,
@@ -630,20 +630,20 @@ $result_trees{'empty_string_index_entry'} = {
 };
 
$result_trees{'empty_string_index_entry'}{'contents'}[1]{'extra'}{'node_content'}[0]
 = 
$result_trees{'empty_string_index_entry'}{'contents'}[1]{'args'}[0]{'contents'}[0];
 
$result_trees{'empty_string_index_entry'}{'contents'}[1]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = 
$result_trees{'empty_string_index_entry'}{'contents'}[1]{'args'}[0]{'contents'}[0];
-$result_trees{'empty_string_index_entry'}{'contents'}[2]{'contents'}[1]{'extra'}{'entry_node'}
 = $result_trees{'empty_string_index_entry'}{'contents'}[2];
+$result_trees{'empty_string_index_entry'}{'contents'}[2]{'contents'}[1]{'extra'}{'element_node'}
 = $result_trees{'empty_string_index_entry'}{'contents'}[2];
 
$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'}[3]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'extra'}{'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'}{'element_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_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]{'extra'}{'command_as_argument'}
 = 
$result_trees{'empty_string_index_entry'}{'contents'}[2]{'contents'}[3]{'args'}[0]{'contents'}[0];
 
$result_trees{'empty_string_index_entry'}{'contents'}[2]{'contents'}[5]{'contents'}[0]{'extra'}{'def_index_element'}
 = 
$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'}{'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'}{'entry_node'}
 = $result_trees{'empty_string_index_entry'}{'contents'}[2];
+$result_trees{'empty_string_index_entry'}{'contents'}[2]{'contents'}[5]{'contents'}[0]{'extra'}{'element_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_element'}
 = 
$result_trees{'empty_string_index_entry'}{'contents'}[2]{'contents'}[5]{'contents'}[0];
 
$result_trees{'empty_string_index_entry'}{'contents'}[2]{'contents'}[5]{'contents'}[1]{'extra'}{'def_index_element'}
 = 
$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'}{'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'}{'entry_node'}
 = $result_trees{'empty_string_index_entry'}{'contents'}[2];
+$result_trees{'empty_string_index_entry'}{'contents'}[2]{'contents'}[5]{'contents'}[1]{'extra'}{'element_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_element'}
 = 
$result_trees{'empty_string_index_entry'}{'contents'}[2]{'contents'}[5]{'contents'}[1];
 
$result_trees{'empty_string_index_entry'}{'contents'}[2]{'extra'}{'node_content'}[0]
 = 
$result_trees{'empty_string_index_entry'}{'contents'}[2]{'args'}[0]{'contents'}[0];
 
$result_trees{'empty_string_index_entry'}{'contents'}[2]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = 
$result_trees{'empty_string_index_entry'}{'contents'}[2]{'args'}[0]{'contents'}[0];
diff --git a/tp/t/results/indices/encoding_index_ascii.pl 
b/tp/t/results/indices/encoding_index_ascii.pl
index 5188e36959..62e832745a 100644
--- a/tp/t/results/indices/encoding_index_ascii.pl
+++ b/tp/t/results/indices/encoding_index_ascii.pl
@@ -255,7 +255,7 @@ $result_trees{'encoding_index_ascii'} = {
           ],
           'cmdname' => 'cindex',
           'extra' => {
-            'entry_node' => {},
+            'element_node' => {},
             'index_entry' => {
               'entry_element' => {},
               'entry_number' => 1,
@@ -366,7 +366,7 @@ $result_trees{'encoding_index_ascii'} = {
           ],
           'cmdname' => 'cindex',
           'extra' => {
-            'entry_node' => {},
+            'element_node' => {},
             'index_entry' => {
               'entry_element' => {},
               'entry_number' => 2,
@@ -495,7 +495,7 @@ $result_trees{'encoding_index_ascii'} = {
           ],
           'cmdname' => 'cindex',
           'extra' => {
-            'entry_node' => {},
+            'element_node' => {},
             'index_entry' => {
               'entry_element' => {},
               'entry_number' => 3,
@@ -534,7 +534,7 @@ $result_trees{'encoding_index_ascii'} = {
           ],
           'cmdname' => 'cindex',
           'extra' => {
-            'entry_node' => {},
+            'element_node' => {},
             'index_entry' => {
               'entry_element' => {},
               'entry_number' => 4,
@@ -573,7 +573,7 @@ $result_trees{'encoding_index_ascii'} = {
           ],
           'cmdname' => 'cindex',
           'extra' => {
-            'entry_node' => {},
+            'element_node' => {},
             'index_entry' => {
               'entry_element' => {},
               'entry_number' => 5,
@@ -612,7 +612,7 @@ $result_trees{'encoding_index_ascii'} = {
           ],
           'cmdname' => 'cindex',
           'extra' => {
-            'entry_node' => {},
+            'element_node' => {},
             'index_entry' => {
               'entry_element' => {},
               'entry_number' => 6,
@@ -651,7 +651,7 @@ $result_trees{'encoding_index_ascii'} = {
           ],
           'cmdname' => 'cindex',
           'extra' => {
-            'entry_node' => {},
+            'element_node' => {},
             'index_entry' => {
               'entry_element' => {},
               'entry_number' => 7,
@@ -690,7 +690,7 @@ $result_trees{'encoding_index_ascii'} = {
           ],
           'cmdname' => 'cindex',
           'extra' => {
-            'entry_node' => {},
+            'element_node' => {},
             'index_entry' => {
               'entry_element' => {},
               'entry_number' => 8,
@@ -729,7 +729,7 @@ $result_trees{'encoding_index_ascii'} = {
           ],
           'cmdname' => 'cindex',
           'extra' => {
-            'entry_node' => {},
+            'element_node' => {},
             'index_entry' => {
               'entry_element' => {},
               'entry_number' => 9,
@@ -768,7 +768,7 @@ $result_trees{'encoding_index_ascii'} = {
           ],
           'cmdname' => 'cindex',
           'extra' => {
-            'entry_node' => {},
+            'element_node' => {},
             'index_entry' => {
               'entry_element' => {},
               'entry_number' => 10,
@@ -807,7 +807,7 @@ $result_trees{'encoding_index_ascii'} = {
           ],
           'cmdname' => 'cindex',
           'extra' => {
-            'entry_node' => {},
+            'element_node' => {},
             'index_entry' => {
               'entry_element' => {},
               'entry_number' => 11,
@@ -846,7 +846,7 @@ $result_trees{'encoding_index_ascii'} = {
           ],
           'cmdname' => 'cindex',
           'extra' => {
-            'entry_node' => {},
+            'element_node' => {},
             'index_entry' => {
               'entry_element' => {},
               'entry_number' => 12,
@@ -885,7 +885,7 @@ $result_trees{'encoding_index_ascii'} = {
           ],
           'cmdname' => 'cindex',
           'extra' => {
-            'entry_node' => {},
+            'element_node' => {},
             'index_entry' => {
               'entry_element' => {},
               'entry_number' => 13,
@@ -924,7 +924,7 @@ $result_trees{'encoding_index_ascii'} = {
           ],
           'cmdname' => 'cindex',
           'extra' => {
-            'entry_node' => {},
+            'element_node' => {},
             'index_entry' => {
               'entry_element' => {},
               'entry_number' => 14,
@@ -963,7 +963,7 @@ $result_trees{'encoding_index_ascii'} = {
           ],
           'cmdname' => 'cindex',
           'extra' => {
-            'entry_node' => {},
+            'element_node' => {},
             'index_entry' => {
               'entry_element' => {},
               'entry_number' => 15,
@@ -1002,7 +1002,7 @@ $result_trees{'encoding_index_ascii'} = {
           ],
           'cmdname' => 'cindex',
           'extra' => {
-            'entry_node' => {},
+            'element_node' => {},
             'index_entry' => {
               'entry_element' => {},
               'entry_number' => 16,
@@ -1041,7 +1041,7 @@ $result_trees{'encoding_index_ascii'} = {
           ],
           'cmdname' => 'cindex',
           'extra' => {
-            'entry_node' => {},
+            'element_node' => {},
             'index_entry' => {
               'entry_element' => {},
               'entry_number' => 17,
@@ -1080,7 +1080,7 @@ $result_trees{'encoding_index_ascii'} = {
           ],
           'cmdname' => 'cindex',
           'extra' => {
-            'entry_node' => {},
+            'element_node' => {},
             'index_entry' => {
               'entry_element' => {},
               'entry_number' => 18,
@@ -1119,7 +1119,7 @@ $result_trees{'encoding_index_ascii'} = {
           ],
           'cmdname' => 'cindex',
           'extra' => {
-            'entry_node' => {},
+            'element_node' => {},
             'index_entry' => {
               'entry_element' => {},
               'entry_number' => 19,
@@ -1158,7 +1158,7 @@ $result_trees{'encoding_index_ascii'} = {
           ],
           'cmdname' => 'cindex',
           'extra' => {
-            'entry_node' => {},
+            'element_node' => {},
             'index_entry' => {
               'entry_element' => {},
               'entry_number' => 20,
@@ -1197,7 +1197,7 @@ $result_trees{'encoding_index_ascii'} = {
           ],
           'cmdname' => 'cindex',
           'extra' => {
-            'entry_node' => {},
+            'element_node' => {},
             'index_entry' => {
               'entry_element' => {},
               'entry_number' => 21,
@@ -1236,7 +1236,7 @@ $result_trees{'encoding_index_ascii'} = {
           ],
           'cmdname' => 'cindex',
           'extra' => {
-            'entry_node' => {},
+            'element_node' => {},
             'index_entry' => {
               'entry_element' => {},
               'entry_number' => 22,
@@ -1275,7 +1275,7 @@ $result_trees{'encoding_index_ascii'} = {
           ],
           'cmdname' => 'cindex',
           'extra' => {
-            'entry_node' => {},
+            'element_node' => {},
             'index_entry' => {
               'entry_element' => {},
               'entry_number' => 23,
@@ -1314,7 +1314,7 @@ $result_trees{'encoding_index_ascii'} = {
           ],
           'cmdname' => 'cindex',
           'extra' => {
-            'entry_node' => {},
+            'element_node' => {},
             'index_entry' => {
               'entry_element' => {},
               'entry_number' => 24,
@@ -1353,7 +1353,7 @@ $result_trees{'encoding_index_ascii'} = {
           ],
           'cmdname' => 'cindex',
           'extra' => {
-            'entry_node' => {},
+            'element_node' => {},
             'index_entry' => {
               'entry_element' => {},
               'entry_number' => 25,
@@ -1392,7 +1392,7 @@ $result_trees{'encoding_index_ascii'} = {
           ],
           'cmdname' => 'cindex',
           'extra' => {
-            'entry_node' => {},
+            'element_node' => {},
             'index_entry' => {
               'entry_element' => {},
               'entry_number' => 26,
@@ -1431,7 +1431,7 @@ $result_trees{'encoding_index_ascii'} = {
           ],
           'cmdname' => 'cindex',
           'extra' => {
-            'entry_node' => {},
+            'element_node' => {},
             'index_entry' => {
               'entry_element' => {},
               'entry_number' => 27,
@@ -1470,7 +1470,7 @@ $result_trees{'encoding_index_ascii'} = {
           ],
           'cmdname' => 'cindex',
           'extra' => {
-            'entry_node' => {},
+            'element_node' => {},
             'index_entry' => {
               'entry_element' => {},
               'entry_number' => 28,
@@ -1509,7 +1509,7 @@ $result_trees{'encoding_index_ascii'} = {
           ],
           'cmdname' => 'cindex',
           'extra' => {
-            'entry_node' => {},
+            'element_node' => {},
             'index_entry' => {
               'entry_element' => {},
               'entry_number' => 29,
@@ -1548,7 +1548,7 @@ $result_trees{'encoding_index_ascii'} = {
           ],
           'cmdname' => 'cindex',
           'extra' => {
-            'entry_node' => {},
+            'element_node' => {},
             'index_entry' => {
               'entry_element' => {},
               'entry_number' => 30,
@@ -1587,7 +1587,7 @@ $result_trees{'encoding_index_ascii'} = {
           ],
           'cmdname' => 'cindex',
           'extra' => {
-            'entry_node' => {},
+            'element_node' => {},
             'index_entry' => {
               'entry_element' => {},
               'entry_number' => 31,
@@ -1636,7 +1636,7 @@ $result_trees{'encoding_index_ascii'} = {
           ],
           'cmdname' => 'cindex',
           'extra' => {
-            'entry_node' => {},
+            'element_node' => {},
             'index_entry' => {
               'entry_element' => {},
               'entry_number' => 32,
@@ -1685,7 +1685,7 @@ $result_trees{'encoding_index_ascii'} = {
           ],
           'cmdname' => 'cindex',
           'extra' => {
-            'entry_node' => {},
+            'element_node' => {},
             'index_entry' => {
               'entry_element' => {},
               'entry_number' => 33,
@@ -1763,7 +1763,7 @@ $result_trees{'encoding_index_ascii'} = {
           ],
           'cmdname' => 'cindex',
           'extra' => {
-            'entry_node' => {},
+            'element_node' => {},
             'index_entry' => {
               'entry_element' => {},
               'entry_number' => 34,
@@ -1871,7 +1871,7 @@ $result_trees{'encoding_index_ascii'} = {
           ],
           'cmdname' => 'cindex',
           'extra' => {
-            'entry_node' => {},
+            'element_node' => {},
             'index_entry' => {
               'entry_element' => {},
               'entry_number' => 35,
@@ -1920,7 +1920,7 @@ $result_trees{'encoding_index_ascii'} = {
           ],
           'cmdname' => 'cindex',
           'extra' => {
-            'entry_node' => {},
+            'element_node' => {},
             'index_entry' => {
               'entry_element' => {},
               'entry_number' => 36,
@@ -1969,7 +1969,7 @@ $result_trees{'encoding_index_ascii'} = {
           ],
           'cmdname' => 'cindex',
           'extra' => {
-            'entry_node' => {},
+            'element_node' => {},
             'index_entry' => {
               'entry_element' => {},
               'entry_number' => 37,
@@ -2018,7 +2018,7 @@ $result_trees{'encoding_index_ascii'} = {
           ],
           'cmdname' => 'cindex',
           'extra' => {
-            'entry_node' => {},
+            'element_node' => {},
             'index_entry' => {
               'entry_element' => {},
               'entry_number' => 38,
@@ -2067,7 +2067,7 @@ $result_trees{'encoding_index_ascii'} = {
           ],
           'cmdname' => 'cindex',
           'extra' => {
-            'entry_node' => {},
+            'element_node' => {},
             'index_entry' => {
               'entry_element' => {},
               'entry_number' => 39,
@@ -2116,7 +2116,7 @@ $result_trees{'encoding_index_ascii'} = {
           ],
           'cmdname' => 'cindex',
           'extra' => {
-            'entry_node' => {},
+            'element_node' => {},
             'index_entry' => {
               'entry_element' => {},
               'entry_number' => 40,
@@ -2165,7 +2165,7 @@ $result_trees{'encoding_index_ascii'} = {
           ],
           'cmdname' => 'cindex',
           'extra' => {
-            'entry_node' => {},
+            'element_node' => {},
             'index_entry' => {
               'entry_element' => {},
               'entry_number' => 41,
@@ -2214,7 +2214,7 @@ $result_trees{'encoding_index_ascii'} = {
           ],
           'cmdname' => 'cindex',
           'extra' => {
-            'entry_node' => {},
+            'element_node' => {},
             'index_entry' => {
               'entry_element' => {},
               'entry_number' => 42,
@@ -2253,7 +2253,7 @@ $result_trees{'encoding_index_ascii'} = {
           ],
           'cmdname' => 'cindex',
           'extra' => {
-            'entry_node' => {},
+            'element_node' => {},
             'index_entry' => {
               'entry_element' => {},
               'entry_number' => 43,
@@ -2292,7 +2292,7 @@ $result_trees{'encoding_index_ascii'} = {
           ],
           'cmdname' => 'cindex',
           'extra' => {
-            'entry_node' => {},
+            'element_node' => {},
             'index_entry' => {
               'entry_element' => {},
               'entry_number' => 44,
@@ -2341,7 +2341,7 @@ $result_trees{'encoding_index_ascii'} = {
           ],
           'cmdname' => 'cindex',
           'extra' => {
-            'entry_node' => {},
+            'element_node' => {},
             'index_entry' => {
               'entry_element' => {},
               'entry_number' => 45,
@@ -2390,7 +2390,7 @@ $result_trees{'encoding_index_ascii'} = {
           ],
           'cmdname' => 'cindex',
           'extra' => {
-            'entry_node' => {},
+            'element_node' => {},
             'index_entry' => {
               'entry_element' => {},
               'entry_number' => 46,
@@ -2439,7 +2439,7 @@ $result_trees{'encoding_index_ascii'} = {
           ],
           'cmdname' => 'cindex',
           'extra' => {
-            'entry_node' => {},
+            'element_node' => {},
             'index_entry' => {
               'entry_element' => {},
               'entry_number' => 47,
@@ -2478,7 +2478,7 @@ $result_trees{'encoding_index_ascii'} = {
           ],
           'cmdname' => 'cindex',
           'extra' => {
-            'entry_node' => {},
+            'element_node' => {},
             'index_entry' => {
               'entry_element' => {},
               'entry_number' => 48,
@@ -2517,7 +2517,7 @@ $result_trees{'encoding_index_ascii'} = {
           ],
           'cmdname' => 'cindex',
           'extra' => {
-            'entry_node' => {},
+            'element_node' => {},
             'index_entry' => {
               'entry_element' => {},
               'entry_number' => 49,
@@ -2556,7 +2556,7 @@ $result_trees{'encoding_index_ascii'} = {
           ],
           'cmdname' => 'cindex',
           'extra' => {
-            'entry_node' => {},
+            'element_node' => {},
             'index_entry' => {
               'entry_element' => {},
               'entry_number' => 50,
@@ -2595,7 +2595,7 @@ $result_trees{'encoding_index_ascii'} = {
           ],
           'cmdname' => 'cindex',
           'extra' => {
-            'entry_node' => {},
+            'element_node' => {},
             'index_entry' => {
               'entry_element' => {},
               'entry_number' => 51,
@@ -2634,7 +2634,7 @@ $result_trees{'encoding_index_ascii'} = {
           ],
           'cmdname' => 'cindex',
           'extra' => {
-            'entry_node' => {},
+            'element_node' => {},
             'index_entry' => {
               'entry_element' => {},
               'entry_number' => 52,
@@ -2673,7 +2673,7 @@ $result_trees{'encoding_index_ascii'} = {
           ],
           'cmdname' => 'cindex',
           'extra' => {
-            'entry_node' => {},
+            'element_node' => {},
             'index_entry' => {
               'entry_element' => {},
               'entry_number' => 53,
@@ -2712,7 +2712,7 @@ $result_trees{'encoding_index_ascii'} = {
           ],
           'cmdname' => 'cindex',
           'extra' => {
-            'entry_node' => {},
+            'element_node' => {},
             'index_entry' => {
               'entry_element' => {},
               'entry_number' => 54,
@@ -2751,7 +2751,7 @@ $result_trees{'encoding_index_ascii'} = {
           ],
           'cmdname' => 'cindex',
           'extra' => {
-            'entry_node' => {},
+            'element_node' => {},
             'index_entry' => {
               'entry_element' => {},
               'entry_number' => 55,
@@ -2842,115 +2842,115 @@ $result_trees{'encoding_index_ascii'} = {
 };
 
$result_trees{'encoding_index_ascii'}{'contents'}[1]{'extra'}{'node_content'}[0]
 = 
$result_trees{'encoding_index_ascii'}{'contents'}[1]{'args'}[0]{'contents'}[0];
 
$result_trees{'encoding_index_ascii'}{'contents'}[1]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = 
$result_trees{'encoding_index_ascii'}{'contents'}[1]{'args'}[0]{'contents'}[0];
-$result_trees{'encoding_index_ascii'}{'contents'}[3]{'contents'}[1]{'extra'}{'entry_node'}
 = $result_trees{'encoding_index_ascii'}{'contents'}[3];
+$result_trees{'encoding_index_ascii'}{'contents'}[3]{'contents'}[1]{'extra'}{'element_node'}
 = $result_trees{'encoding_index_ascii'}{'contents'}[3];
 
$result_trees{'encoding_index_ascii'}{'contents'}[3]{'contents'}[1]{'extra'}{'index_entry'}{'entry_element'}
 = $result_trees{'encoding_index_ascii'}{'contents'}[3]{'contents'}[1];
-$result_trees{'encoding_index_ascii'}{'contents'}[3]{'contents'}[2]{'extra'}{'entry_node'}
 = $result_trees{'encoding_index_ascii'}{'contents'}[3];
+$result_trees{'encoding_index_ascii'}{'contents'}[3]{'contents'}[2]{'extra'}{'element_node'}
 = $result_trees{'encoding_index_ascii'}{'contents'}[3];
 
$result_trees{'encoding_index_ascii'}{'contents'}[3]{'contents'}[2]{'extra'}{'index_entry'}{'entry_element'}
 = $result_trees{'encoding_index_ascii'}{'contents'}[3]{'contents'}[2];
-$result_trees{'encoding_index_ascii'}{'contents'}[3]{'contents'}[3]{'extra'}{'entry_node'}
 = $result_trees{'encoding_index_ascii'}{'contents'}[3];
+$result_trees{'encoding_index_ascii'}{'contents'}[3]{'contents'}[3]{'extra'}{'element_node'}
 = $result_trees{'encoding_index_ascii'}{'contents'}[3];
 
$result_trees{'encoding_index_ascii'}{'contents'}[3]{'contents'}[3]{'extra'}{'index_entry'}{'entry_element'}
 = $result_trees{'encoding_index_ascii'}{'contents'}[3]{'contents'}[3];
-$result_trees{'encoding_index_ascii'}{'contents'}[3]{'contents'}[4]{'extra'}{'entry_node'}
 = $result_trees{'encoding_index_ascii'}{'contents'}[3];
+$result_trees{'encoding_index_ascii'}{'contents'}[3]{'contents'}[4]{'extra'}{'element_node'}
 = $result_trees{'encoding_index_ascii'}{'contents'}[3];
 
$result_trees{'encoding_index_ascii'}{'contents'}[3]{'contents'}[4]{'extra'}{'index_entry'}{'entry_element'}
 = $result_trees{'encoding_index_ascii'}{'contents'}[3]{'contents'}[4];
-$result_trees{'encoding_index_ascii'}{'contents'}[3]{'contents'}[5]{'extra'}{'entry_node'}
 = $result_trees{'encoding_index_ascii'}{'contents'}[3];
+$result_trees{'encoding_index_ascii'}{'contents'}[3]{'contents'}[5]{'extra'}{'element_node'}
 = $result_trees{'encoding_index_ascii'}{'contents'}[3];
 
$result_trees{'encoding_index_ascii'}{'contents'}[3]{'contents'}[5]{'extra'}{'index_entry'}{'entry_element'}
 = $result_trees{'encoding_index_ascii'}{'contents'}[3]{'contents'}[5];
-$result_trees{'encoding_index_ascii'}{'contents'}[3]{'contents'}[6]{'extra'}{'entry_node'}
 = $result_trees{'encoding_index_ascii'}{'contents'}[3];
+$result_trees{'encoding_index_ascii'}{'contents'}[3]{'contents'}[6]{'extra'}{'element_node'}
 = $result_trees{'encoding_index_ascii'}{'contents'}[3];
 
$result_trees{'encoding_index_ascii'}{'contents'}[3]{'contents'}[6]{'extra'}{'index_entry'}{'entry_element'}
 = $result_trees{'encoding_index_ascii'}{'contents'}[3]{'contents'}[6];
-$result_trees{'encoding_index_ascii'}{'contents'}[3]{'contents'}[7]{'extra'}{'entry_node'}
 = $result_trees{'encoding_index_ascii'}{'contents'}[3];
+$result_trees{'encoding_index_ascii'}{'contents'}[3]{'contents'}[7]{'extra'}{'element_node'}
 = $result_trees{'encoding_index_ascii'}{'contents'}[3];
 
$result_trees{'encoding_index_ascii'}{'contents'}[3]{'contents'}[7]{'extra'}{'index_entry'}{'entry_element'}
 = $result_trees{'encoding_index_ascii'}{'contents'}[3]{'contents'}[7];
-$result_trees{'encoding_index_ascii'}{'contents'}[3]{'contents'}[8]{'extra'}{'entry_node'}
 = $result_trees{'encoding_index_ascii'}{'contents'}[3];
+$result_trees{'encoding_index_ascii'}{'contents'}[3]{'contents'}[8]{'extra'}{'element_node'}
 = $result_trees{'encoding_index_ascii'}{'contents'}[3];
 
$result_trees{'encoding_index_ascii'}{'contents'}[3]{'contents'}[8]{'extra'}{'index_entry'}{'entry_element'}
 = $result_trees{'encoding_index_ascii'}{'contents'}[3]{'contents'}[8];
-$result_trees{'encoding_index_ascii'}{'contents'}[3]{'contents'}[9]{'extra'}{'entry_node'}
 = $result_trees{'encoding_index_ascii'}{'contents'}[3];
+$result_trees{'encoding_index_ascii'}{'contents'}[3]{'contents'}[9]{'extra'}{'element_node'}
 = $result_trees{'encoding_index_ascii'}{'contents'}[3];
 
$result_trees{'encoding_index_ascii'}{'contents'}[3]{'contents'}[9]{'extra'}{'index_entry'}{'entry_element'}
 = $result_trees{'encoding_index_ascii'}{'contents'}[3]{'contents'}[9];
-$result_trees{'encoding_index_ascii'}{'contents'}[3]{'contents'}[10]{'extra'}{'entry_node'}
 = $result_trees{'encoding_index_ascii'}{'contents'}[3];
+$result_trees{'encoding_index_ascii'}{'contents'}[3]{'contents'}[10]{'extra'}{'element_node'}
 = $result_trees{'encoding_index_ascii'}{'contents'}[3];
 
$result_trees{'encoding_index_ascii'}{'contents'}[3]{'contents'}[10]{'extra'}{'index_entry'}{'entry_element'}
 = $result_trees{'encoding_index_ascii'}{'contents'}[3]{'contents'}[10];
-$result_trees{'encoding_index_ascii'}{'contents'}[3]{'contents'}[11]{'extra'}{'entry_node'}
 = $result_trees{'encoding_index_ascii'}{'contents'}[3];
+$result_trees{'encoding_index_ascii'}{'contents'}[3]{'contents'}[11]{'extra'}{'element_node'}
 = $result_trees{'encoding_index_ascii'}{'contents'}[3];
 
$result_trees{'encoding_index_ascii'}{'contents'}[3]{'contents'}[11]{'extra'}{'index_entry'}{'entry_element'}
 = $result_trees{'encoding_index_ascii'}{'contents'}[3]{'contents'}[11];
-$result_trees{'encoding_index_ascii'}{'contents'}[3]{'contents'}[12]{'extra'}{'entry_node'}
 = $result_trees{'encoding_index_ascii'}{'contents'}[3];
+$result_trees{'encoding_index_ascii'}{'contents'}[3]{'contents'}[12]{'extra'}{'element_node'}
 = $result_trees{'encoding_index_ascii'}{'contents'}[3];
 
$result_trees{'encoding_index_ascii'}{'contents'}[3]{'contents'}[12]{'extra'}{'index_entry'}{'entry_element'}
 = $result_trees{'encoding_index_ascii'}{'contents'}[3]{'contents'}[12];
-$result_trees{'encoding_index_ascii'}{'contents'}[3]{'contents'}[13]{'extra'}{'entry_node'}
 = $result_trees{'encoding_index_ascii'}{'contents'}[3];
+$result_trees{'encoding_index_ascii'}{'contents'}[3]{'contents'}[13]{'extra'}{'element_node'}
 = $result_trees{'encoding_index_ascii'}{'contents'}[3];
 
$result_trees{'encoding_index_ascii'}{'contents'}[3]{'contents'}[13]{'extra'}{'index_entry'}{'entry_element'}
 = $result_trees{'encoding_index_ascii'}{'contents'}[3]{'contents'}[13];
-$result_trees{'encoding_index_ascii'}{'contents'}[3]{'contents'}[14]{'extra'}{'entry_node'}
 = $result_trees{'encoding_index_ascii'}{'contents'}[3];
+$result_trees{'encoding_index_ascii'}{'contents'}[3]{'contents'}[14]{'extra'}{'element_node'}
 = $result_trees{'encoding_index_ascii'}{'contents'}[3];
 
$result_trees{'encoding_index_ascii'}{'contents'}[3]{'contents'}[14]{'extra'}{'index_entry'}{'entry_element'}
 = $result_trees{'encoding_index_ascii'}{'contents'}[3]{'contents'}[14];
-$result_trees{'encoding_index_ascii'}{'contents'}[3]{'contents'}[15]{'extra'}{'entry_node'}
 = $result_trees{'encoding_index_ascii'}{'contents'}[3];
+$result_trees{'encoding_index_ascii'}{'contents'}[3]{'contents'}[15]{'extra'}{'element_node'}
 = $result_trees{'encoding_index_ascii'}{'contents'}[3];
 
$result_trees{'encoding_index_ascii'}{'contents'}[3]{'contents'}[15]{'extra'}{'index_entry'}{'entry_element'}
 = $result_trees{'encoding_index_ascii'}{'contents'}[3]{'contents'}[15];
-$result_trees{'encoding_index_ascii'}{'contents'}[3]{'contents'}[16]{'extra'}{'entry_node'}
 = $result_trees{'encoding_index_ascii'}{'contents'}[3];
+$result_trees{'encoding_index_ascii'}{'contents'}[3]{'contents'}[16]{'extra'}{'element_node'}
 = $result_trees{'encoding_index_ascii'}{'contents'}[3];
 
$result_trees{'encoding_index_ascii'}{'contents'}[3]{'contents'}[16]{'extra'}{'index_entry'}{'entry_element'}
 = $result_trees{'encoding_index_ascii'}{'contents'}[3]{'contents'}[16];
-$result_trees{'encoding_index_ascii'}{'contents'}[3]{'contents'}[17]{'extra'}{'entry_node'}
 = $result_trees{'encoding_index_ascii'}{'contents'}[3];
+$result_trees{'encoding_index_ascii'}{'contents'}[3]{'contents'}[17]{'extra'}{'element_node'}
 = $result_trees{'encoding_index_ascii'}{'contents'}[3];
 
$result_trees{'encoding_index_ascii'}{'contents'}[3]{'contents'}[17]{'extra'}{'index_entry'}{'entry_element'}
 = $result_trees{'encoding_index_ascii'}{'contents'}[3]{'contents'}[17];
-$result_trees{'encoding_index_ascii'}{'contents'}[3]{'contents'}[18]{'extra'}{'entry_node'}
 = $result_trees{'encoding_index_ascii'}{'contents'}[3];
+$result_trees{'encoding_index_ascii'}{'contents'}[3]{'contents'}[18]{'extra'}{'element_node'}
 = $result_trees{'encoding_index_ascii'}{'contents'}[3];
 
$result_trees{'encoding_index_ascii'}{'contents'}[3]{'contents'}[18]{'extra'}{'index_entry'}{'entry_element'}
 = $result_trees{'encoding_index_ascii'}{'contents'}[3]{'contents'}[18];
-$result_trees{'encoding_index_ascii'}{'contents'}[3]{'contents'}[19]{'extra'}{'entry_node'}
 = $result_trees{'encoding_index_ascii'}{'contents'}[3];
+$result_trees{'encoding_index_ascii'}{'contents'}[3]{'contents'}[19]{'extra'}{'element_node'}
 = $result_trees{'encoding_index_ascii'}{'contents'}[3];
 
$result_trees{'encoding_index_ascii'}{'contents'}[3]{'contents'}[19]{'extra'}{'index_entry'}{'entry_element'}
 = $result_trees{'encoding_index_ascii'}{'contents'}[3]{'contents'}[19];
-$result_trees{'encoding_index_ascii'}{'contents'}[3]{'contents'}[20]{'extra'}{'entry_node'}
 = $result_trees{'encoding_index_ascii'}{'contents'}[3];
+$result_trees{'encoding_index_ascii'}{'contents'}[3]{'contents'}[20]{'extra'}{'element_node'}
 = $result_trees{'encoding_index_ascii'}{'contents'}[3];
 
$result_trees{'encoding_index_ascii'}{'contents'}[3]{'contents'}[20]{'extra'}{'index_entry'}{'entry_element'}
 = $result_trees{'encoding_index_ascii'}{'contents'}[3]{'contents'}[20];
-$result_trees{'encoding_index_ascii'}{'contents'}[3]{'contents'}[21]{'extra'}{'entry_node'}
 = $result_trees{'encoding_index_ascii'}{'contents'}[3];
+$result_trees{'encoding_index_ascii'}{'contents'}[3]{'contents'}[21]{'extra'}{'element_node'}
 = $result_trees{'encoding_index_ascii'}{'contents'}[3];
 
$result_trees{'encoding_index_ascii'}{'contents'}[3]{'contents'}[21]{'extra'}{'index_entry'}{'entry_element'}
 = $result_trees{'encoding_index_ascii'}{'contents'}[3]{'contents'}[21];
-$result_trees{'encoding_index_ascii'}{'contents'}[3]{'contents'}[22]{'extra'}{'entry_node'}
 = $result_trees{'encoding_index_ascii'}{'contents'}[3];
+$result_trees{'encoding_index_ascii'}{'contents'}[3]{'contents'}[22]{'extra'}{'element_node'}
 = $result_trees{'encoding_index_ascii'}{'contents'}[3];
 
$result_trees{'encoding_index_ascii'}{'contents'}[3]{'contents'}[22]{'extra'}{'index_entry'}{'entry_element'}
 = $result_trees{'encoding_index_ascii'}{'contents'}[3]{'contents'}[22];
-$result_trees{'encoding_index_ascii'}{'contents'}[3]{'contents'}[23]{'extra'}{'entry_node'}
 = $result_trees{'encoding_index_ascii'}{'contents'}[3];
+$result_trees{'encoding_index_ascii'}{'contents'}[3]{'contents'}[23]{'extra'}{'element_node'}
 = $result_trees{'encoding_index_ascii'}{'contents'}[3];
 
$result_trees{'encoding_index_ascii'}{'contents'}[3]{'contents'}[23]{'extra'}{'index_entry'}{'entry_element'}
 = $result_trees{'encoding_index_ascii'}{'contents'}[3]{'contents'}[23];
-$result_trees{'encoding_index_ascii'}{'contents'}[3]{'contents'}[24]{'extra'}{'entry_node'}
 = $result_trees{'encoding_index_ascii'}{'contents'}[3];
+$result_trees{'encoding_index_ascii'}{'contents'}[3]{'contents'}[24]{'extra'}{'element_node'}
 = $result_trees{'encoding_index_ascii'}{'contents'}[3];
 
$result_trees{'encoding_index_ascii'}{'contents'}[3]{'contents'}[24]{'extra'}{'index_entry'}{'entry_element'}
 = $result_trees{'encoding_index_ascii'}{'contents'}[3]{'contents'}[24];
-$result_trees{'encoding_index_ascii'}{'contents'}[3]{'contents'}[25]{'extra'}{'entry_node'}
 = $result_trees{'encoding_index_ascii'}{'contents'}[3];
+$result_trees{'encoding_index_ascii'}{'contents'}[3]{'contents'}[25]{'extra'}{'element_node'}
 = $result_trees{'encoding_index_ascii'}{'contents'}[3];
 
$result_trees{'encoding_index_ascii'}{'contents'}[3]{'contents'}[25]{'extra'}{'index_entry'}{'entry_element'}
 = $result_trees{'encoding_index_ascii'}{'contents'}[3]{'contents'}[25];
-$result_trees{'encoding_index_ascii'}{'contents'}[3]{'contents'}[26]{'extra'}{'entry_node'}
 = $result_trees{'encoding_index_ascii'}{'contents'}[3];
+$result_trees{'encoding_index_ascii'}{'contents'}[3]{'contents'}[26]{'extra'}{'element_node'}
 = $result_trees{'encoding_index_ascii'}{'contents'}[3];
 
$result_trees{'encoding_index_ascii'}{'contents'}[3]{'contents'}[26]{'extra'}{'index_entry'}{'entry_element'}
 = $result_trees{'encoding_index_ascii'}{'contents'}[3]{'contents'}[26];
-$result_trees{'encoding_index_ascii'}{'contents'}[3]{'contents'}[27]{'extra'}{'entry_node'}
 = $result_trees{'encoding_index_ascii'}{'contents'}[3];
+$result_trees{'encoding_index_ascii'}{'contents'}[3]{'contents'}[27]{'extra'}{'element_node'}
 = $result_trees{'encoding_index_ascii'}{'contents'}[3];
 
$result_trees{'encoding_index_ascii'}{'contents'}[3]{'contents'}[27]{'extra'}{'index_entry'}{'entry_element'}
 = $result_trees{'encoding_index_ascii'}{'contents'}[3]{'contents'}[27];
-$result_trees{'encoding_index_ascii'}{'contents'}[3]{'contents'}[28]{'extra'}{'entry_node'}
 = $result_trees{'encoding_index_ascii'}{'contents'}[3];
+$result_trees{'encoding_index_ascii'}{'contents'}[3]{'contents'}[28]{'extra'}{'element_node'}
 = $result_trees{'encoding_index_ascii'}{'contents'}[3];
 
$result_trees{'encoding_index_ascii'}{'contents'}[3]{'contents'}[28]{'extra'}{'index_entry'}{'entry_element'}
 = $result_trees{'encoding_index_ascii'}{'contents'}[3]{'contents'}[28];
-$result_trees{'encoding_index_ascii'}{'contents'}[3]{'contents'}[29]{'extra'}{'entry_node'}
 = $result_trees{'encoding_index_ascii'}{'contents'}[3];
+$result_trees{'encoding_index_ascii'}{'contents'}[3]{'contents'}[29]{'extra'}{'element_node'}
 = $result_trees{'encoding_index_ascii'}{'contents'}[3];
 
$result_trees{'encoding_index_ascii'}{'contents'}[3]{'contents'}[29]{'extra'}{'index_entry'}{'entry_element'}
 = $result_trees{'encoding_index_ascii'}{'contents'}[3]{'contents'}[29];
-$result_trees{'encoding_index_ascii'}{'contents'}[3]{'contents'}[30]{'extra'}{'entry_node'}
 = $result_trees{'encoding_index_ascii'}{'contents'}[3];
+$result_trees{'encoding_index_ascii'}{'contents'}[3]{'contents'}[30]{'extra'}{'element_node'}
 = $result_trees{'encoding_index_ascii'}{'contents'}[3];
 
$result_trees{'encoding_index_ascii'}{'contents'}[3]{'contents'}[30]{'extra'}{'index_entry'}{'entry_element'}
 = $result_trees{'encoding_index_ascii'}{'contents'}[3]{'contents'}[30];
-$result_trees{'encoding_index_ascii'}{'contents'}[3]{'contents'}[31]{'extra'}{'entry_node'}
 = $result_trees{'encoding_index_ascii'}{'contents'}[3];
+$result_trees{'encoding_index_ascii'}{'contents'}[3]{'contents'}[31]{'extra'}{'element_node'}
 = $result_trees{'encoding_index_ascii'}{'contents'}[3];
 
$result_trees{'encoding_index_ascii'}{'contents'}[3]{'contents'}[31]{'extra'}{'index_entry'}{'entry_element'}
 = $result_trees{'encoding_index_ascii'}{'contents'}[3]{'contents'}[31];
-$result_trees{'encoding_index_ascii'}{'contents'}[3]{'contents'}[32]{'extra'}{'entry_node'}
 = $result_trees{'encoding_index_ascii'}{'contents'}[3];
+$result_trees{'encoding_index_ascii'}{'contents'}[3]{'contents'}[32]{'extra'}{'element_node'}
 = $result_trees{'encoding_index_ascii'}{'contents'}[3];
 
$result_trees{'encoding_index_ascii'}{'contents'}[3]{'contents'}[32]{'extra'}{'index_entry'}{'entry_element'}
 = $result_trees{'encoding_index_ascii'}{'contents'}[3]{'contents'}[32];
-$result_trees{'encoding_index_ascii'}{'contents'}[3]{'contents'}[33]{'extra'}{'entry_node'}
 = $result_trees{'encoding_index_ascii'}{'contents'}[3];
+$result_trees{'encoding_index_ascii'}{'contents'}[3]{'contents'}[33]{'extra'}{'element_node'}
 = $result_trees{'encoding_index_ascii'}{'contents'}[3];
 
$result_trees{'encoding_index_ascii'}{'contents'}[3]{'contents'}[33]{'extra'}{'index_entry'}{'entry_element'}
 = $result_trees{'encoding_index_ascii'}{'contents'}[3]{'contents'}[33];
-$result_trees{'encoding_index_ascii'}{'contents'}[3]{'contents'}[34]{'extra'}{'entry_node'}
 = $result_trees{'encoding_index_ascii'}{'contents'}[3];
+$result_trees{'encoding_index_ascii'}{'contents'}[3]{'contents'}[34]{'extra'}{'element_node'}
 = $result_trees{'encoding_index_ascii'}{'contents'}[3];
 
$result_trees{'encoding_index_ascii'}{'contents'}[3]{'contents'}[34]{'extra'}{'index_entry'}{'entry_element'}
 = $result_trees{'encoding_index_ascii'}{'contents'}[3]{'contents'}[34];
-$result_trees{'encoding_index_ascii'}{'contents'}[3]{'contents'}[35]{'extra'}{'entry_node'}
 = $result_trees{'encoding_index_ascii'}{'contents'}[3];
+$result_trees{'encoding_index_ascii'}{'contents'}[3]{'contents'}[35]{'extra'}{'element_node'}
 = $result_trees{'encoding_index_ascii'}{'contents'}[3];
 
$result_trees{'encoding_index_ascii'}{'contents'}[3]{'contents'}[35]{'extra'}{'index_entry'}{'entry_element'}
 = $result_trees{'encoding_index_ascii'}{'contents'}[3]{'contents'}[35];
-$result_trees{'encoding_index_ascii'}{'contents'}[3]{'contents'}[36]{'extra'}{'entry_node'}
 = $result_trees{'encoding_index_ascii'}{'contents'}[3];
+$result_trees{'encoding_index_ascii'}{'contents'}[3]{'contents'}[36]{'extra'}{'element_node'}
 = $result_trees{'encoding_index_ascii'}{'contents'}[3];
 
$result_trees{'encoding_index_ascii'}{'contents'}[3]{'contents'}[36]{'extra'}{'index_entry'}{'entry_element'}
 = $result_trees{'encoding_index_ascii'}{'contents'}[3]{'contents'}[36];
-$result_trees{'encoding_index_ascii'}{'contents'}[3]{'contents'}[37]{'extra'}{'entry_node'}
 = $result_trees{'encoding_index_ascii'}{'contents'}[3];
+$result_trees{'encoding_index_ascii'}{'contents'}[3]{'contents'}[37]{'extra'}{'element_node'}
 = $result_trees{'encoding_index_ascii'}{'contents'}[3];
 
$result_trees{'encoding_index_ascii'}{'contents'}[3]{'contents'}[37]{'extra'}{'index_entry'}{'entry_element'}
 = $result_trees{'encoding_index_ascii'}{'contents'}[3]{'contents'}[37];
-$result_trees{'encoding_index_ascii'}{'contents'}[3]{'contents'}[38]{'extra'}{'entry_node'}
 = $result_trees{'encoding_index_ascii'}{'contents'}[3];
+$result_trees{'encoding_index_ascii'}{'contents'}[3]{'contents'}[38]{'extra'}{'element_node'}
 = $result_trees{'encoding_index_ascii'}{'contents'}[3];
 
$result_trees{'encoding_index_ascii'}{'contents'}[3]{'contents'}[38]{'extra'}{'index_entry'}{'entry_element'}
 = $result_trees{'encoding_index_ascii'}{'contents'}[3]{'contents'}[38];
-$result_trees{'encoding_index_ascii'}{'contents'}[3]{'contents'}[39]{'extra'}{'entry_node'}
 = $result_trees{'encoding_index_ascii'}{'contents'}[3];
+$result_trees{'encoding_index_ascii'}{'contents'}[3]{'contents'}[39]{'extra'}{'element_node'}
 = $result_trees{'encoding_index_ascii'}{'contents'}[3];
 
$result_trees{'encoding_index_ascii'}{'contents'}[3]{'contents'}[39]{'extra'}{'index_entry'}{'entry_element'}
 = $result_trees{'encoding_index_ascii'}{'contents'}[3]{'contents'}[39];
-$result_trees{'encoding_index_ascii'}{'contents'}[3]{'contents'}[40]{'extra'}{'entry_node'}
 = $result_trees{'encoding_index_ascii'}{'contents'}[3];
+$result_trees{'encoding_index_ascii'}{'contents'}[3]{'contents'}[40]{'extra'}{'element_node'}
 = $result_trees{'encoding_index_ascii'}{'contents'}[3];
 
$result_trees{'encoding_index_ascii'}{'contents'}[3]{'contents'}[40]{'extra'}{'index_entry'}{'entry_element'}
 = $result_trees{'encoding_index_ascii'}{'contents'}[3]{'contents'}[40];
-$result_trees{'encoding_index_ascii'}{'contents'}[3]{'contents'}[41]{'extra'}{'entry_node'}
 = $result_trees{'encoding_index_ascii'}{'contents'}[3];
+$result_trees{'encoding_index_ascii'}{'contents'}[3]{'contents'}[41]{'extra'}{'element_node'}
 = $result_trees{'encoding_index_ascii'}{'contents'}[3];
 
$result_trees{'encoding_index_ascii'}{'contents'}[3]{'contents'}[41]{'extra'}{'index_entry'}{'entry_element'}
 = $result_trees{'encoding_index_ascii'}{'contents'}[3]{'contents'}[41];
-$result_trees{'encoding_index_ascii'}{'contents'}[3]{'contents'}[42]{'extra'}{'entry_node'}
 = $result_trees{'encoding_index_ascii'}{'contents'}[3];
+$result_trees{'encoding_index_ascii'}{'contents'}[3]{'contents'}[42]{'extra'}{'element_node'}
 = $result_trees{'encoding_index_ascii'}{'contents'}[3];
 
$result_trees{'encoding_index_ascii'}{'contents'}[3]{'contents'}[42]{'extra'}{'index_entry'}{'entry_element'}
 = $result_trees{'encoding_index_ascii'}{'contents'}[3]{'contents'}[42];
-$result_trees{'encoding_index_ascii'}{'contents'}[3]{'contents'}[43]{'extra'}{'entry_node'}
 = $result_trees{'encoding_index_ascii'}{'contents'}[3];
+$result_trees{'encoding_index_ascii'}{'contents'}[3]{'contents'}[43]{'extra'}{'element_node'}
 = $result_trees{'encoding_index_ascii'}{'contents'}[3];
 
$result_trees{'encoding_index_ascii'}{'contents'}[3]{'contents'}[43]{'extra'}{'index_entry'}{'entry_element'}
 = $result_trees{'encoding_index_ascii'}{'contents'}[3]{'contents'}[43];
-$result_trees{'encoding_index_ascii'}{'contents'}[3]{'contents'}[44]{'extra'}{'entry_node'}
 = $result_trees{'encoding_index_ascii'}{'contents'}[3];
+$result_trees{'encoding_index_ascii'}{'contents'}[3]{'contents'}[44]{'extra'}{'element_node'}
 = $result_trees{'encoding_index_ascii'}{'contents'}[3];
 
$result_trees{'encoding_index_ascii'}{'contents'}[3]{'contents'}[44]{'extra'}{'index_entry'}{'entry_element'}
 = $result_trees{'encoding_index_ascii'}{'contents'}[3]{'contents'}[44];
-$result_trees{'encoding_index_ascii'}{'contents'}[3]{'contents'}[45]{'extra'}{'entry_node'}
 = $result_trees{'encoding_index_ascii'}{'contents'}[3];
+$result_trees{'encoding_index_ascii'}{'contents'}[3]{'contents'}[45]{'extra'}{'element_node'}
 = $result_trees{'encoding_index_ascii'}{'contents'}[3];
 
$result_trees{'encoding_index_ascii'}{'contents'}[3]{'contents'}[45]{'extra'}{'index_entry'}{'entry_element'}
 = $result_trees{'encoding_index_ascii'}{'contents'}[3]{'contents'}[45];
-$result_trees{'encoding_index_ascii'}{'contents'}[3]{'contents'}[46]{'extra'}{'entry_node'}
 = $result_trees{'encoding_index_ascii'}{'contents'}[3];
+$result_trees{'encoding_index_ascii'}{'contents'}[3]{'contents'}[46]{'extra'}{'element_node'}
 = $result_trees{'encoding_index_ascii'}{'contents'}[3];
 
$result_trees{'encoding_index_ascii'}{'contents'}[3]{'contents'}[46]{'extra'}{'index_entry'}{'entry_element'}
 = $result_trees{'encoding_index_ascii'}{'contents'}[3]{'contents'}[46];
-$result_trees{'encoding_index_ascii'}{'contents'}[3]{'contents'}[47]{'extra'}{'entry_node'}
 = $result_trees{'encoding_index_ascii'}{'contents'}[3];
+$result_trees{'encoding_index_ascii'}{'contents'}[3]{'contents'}[47]{'extra'}{'element_node'}
 = $result_trees{'encoding_index_ascii'}{'contents'}[3];
 
$result_trees{'encoding_index_ascii'}{'contents'}[3]{'contents'}[47]{'extra'}{'index_entry'}{'entry_element'}
 = $result_trees{'encoding_index_ascii'}{'contents'}[3]{'contents'}[47];
-$result_trees{'encoding_index_ascii'}{'contents'}[3]{'contents'}[48]{'extra'}{'entry_node'}
 = $result_trees{'encoding_index_ascii'}{'contents'}[3];
+$result_trees{'encoding_index_ascii'}{'contents'}[3]{'contents'}[48]{'extra'}{'element_node'}
 = $result_trees{'encoding_index_ascii'}{'contents'}[3];
 
$result_trees{'encoding_index_ascii'}{'contents'}[3]{'contents'}[48]{'extra'}{'index_entry'}{'entry_element'}
 = $result_trees{'encoding_index_ascii'}{'contents'}[3]{'contents'}[48];
-$result_trees{'encoding_index_ascii'}{'contents'}[3]{'contents'}[49]{'extra'}{'entry_node'}
 = $result_trees{'encoding_index_ascii'}{'contents'}[3];
+$result_trees{'encoding_index_ascii'}{'contents'}[3]{'contents'}[49]{'extra'}{'element_node'}
 = $result_trees{'encoding_index_ascii'}{'contents'}[3];
 
$result_trees{'encoding_index_ascii'}{'contents'}[3]{'contents'}[49]{'extra'}{'index_entry'}{'entry_element'}
 = $result_trees{'encoding_index_ascii'}{'contents'}[3]{'contents'}[49];
-$result_trees{'encoding_index_ascii'}{'contents'}[3]{'contents'}[50]{'extra'}{'entry_node'}
 = $result_trees{'encoding_index_ascii'}{'contents'}[3];
+$result_trees{'encoding_index_ascii'}{'contents'}[3]{'contents'}[50]{'extra'}{'element_node'}
 = $result_trees{'encoding_index_ascii'}{'contents'}[3];
 
$result_trees{'encoding_index_ascii'}{'contents'}[3]{'contents'}[50]{'extra'}{'index_entry'}{'entry_element'}
 = $result_trees{'encoding_index_ascii'}{'contents'}[3]{'contents'}[50];
-$result_trees{'encoding_index_ascii'}{'contents'}[3]{'contents'}[51]{'extra'}{'entry_node'}
 = $result_trees{'encoding_index_ascii'}{'contents'}[3];
+$result_trees{'encoding_index_ascii'}{'contents'}[3]{'contents'}[51]{'extra'}{'element_node'}
 = $result_trees{'encoding_index_ascii'}{'contents'}[3];
 
$result_trees{'encoding_index_ascii'}{'contents'}[3]{'contents'}[51]{'extra'}{'index_entry'}{'entry_element'}
 = $result_trees{'encoding_index_ascii'}{'contents'}[3]{'contents'}[51];
-$result_trees{'encoding_index_ascii'}{'contents'}[3]{'contents'}[52]{'extra'}{'entry_node'}
 = $result_trees{'encoding_index_ascii'}{'contents'}[3];
+$result_trees{'encoding_index_ascii'}{'contents'}[3]{'contents'}[52]{'extra'}{'element_node'}
 = $result_trees{'encoding_index_ascii'}{'contents'}[3];
 
$result_trees{'encoding_index_ascii'}{'contents'}[3]{'contents'}[52]{'extra'}{'index_entry'}{'entry_element'}
 = $result_trees{'encoding_index_ascii'}{'contents'}[3]{'contents'}[52];
-$result_trees{'encoding_index_ascii'}{'contents'}[3]{'contents'}[53]{'extra'}{'entry_node'}
 = $result_trees{'encoding_index_ascii'}{'contents'}[3];
+$result_trees{'encoding_index_ascii'}{'contents'}[3]{'contents'}[53]{'extra'}{'element_node'}
 = $result_trees{'encoding_index_ascii'}{'contents'}[3];
 
$result_trees{'encoding_index_ascii'}{'contents'}[3]{'contents'}[53]{'extra'}{'index_entry'}{'entry_element'}
 = $result_trees{'encoding_index_ascii'}{'contents'}[3]{'contents'}[53];
-$result_trees{'encoding_index_ascii'}{'contents'}[3]{'contents'}[54]{'extra'}{'entry_node'}
 = $result_trees{'encoding_index_ascii'}{'contents'}[3];
+$result_trees{'encoding_index_ascii'}{'contents'}[3]{'contents'}[54]{'extra'}{'element_node'}
 = $result_trees{'encoding_index_ascii'}{'contents'}[3];
 
$result_trees{'encoding_index_ascii'}{'contents'}[3]{'contents'}[54]{'extra'}{'index_entry'}{'entry_element'}
 = $result_trees{'encoding_index_ascii'}{'contents'}[3]{'contents'}[54];
-$result_trees{'encoding_index_ascii'}{'contents'}[3]{'contents'}[55]{'extra'}{'entry_node'}
 = $result_trees{'encoding_index_ascii'}{'contents'}[3];
+$result_trees{'encoding_index_ascii'}{'contents'}[3]{'contents'}[55]{'extra'}{'element_node'}
 = $result_trees{'encoding_index_ascii'}{'contents'}[3];
 
$result_trees{'encoding_index_ascii'}{'contents'}[3]{'contents'}[55]{'extra'}{'index_entry'}{'entry_element'}
 = $result_trees{'encoding_index_ascii'}{'contents'}[3]{'contents'}[55];
 
$result_trees{'encoding_index_ascii'}{'contents'}[3]{'extra'}{'node_content'}[0]
 = 
$result_trees{'encoding_index_ascii'}{'contents'}[3]{'args'}[0]{'contents'}[0];
 
$result_trees{'encoding_index_ascii'}{'contents'}[3]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = 
$result_trees{'encoding_index_ascii'}{'contents'}[3]{'args'}[0]{'contents'}[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 30e6c6ab04..f54b4720a3 100644
--- a/tp/t/results/indices/encoding_index_ascii_enable_encoding.pl
+++ b/tp/t/results/indices/encoding_index_ascii_enable_encoding.pl
@@ -255,7 +255,7 @@ $result_trees{'encoding_index_ascii_enable_encoding'} = {
           ],
           'cmdname' => 'cindex',
           'extra' => {
-            'entry_node' => {},
+            'element_node' => {},
             'index_entry' => {
               'entry_element' => {},
               'entry_number' => 1,
@@ -366,7 +366,7 @@ $result_trees{'encoding_index_ascii_enable_encoding'} = {
           ],
           'cmdname' => 'cindex',
           'extra' => {
-            'entry_node' => {},
+            'element_node' => {},
             'index_entry' => {
               'entry_element' => {},
               'entry_number' => 2,
@@ -495,7 +495,7 @@ $result_trees{'encoding_index_ascii_enable_encoding'} = {
           ],
           'cmdname' => 'cindex',
           'extra' => {
-            'entry_node' => {},
+            'element_node' => {},
             'index_entry' => {
               'entry_element' => {},
               'entry_number' => 3,
@@ -534,7 +534,7 @@ $result_trees{'encoding_index_ascii_enable_encoding'} = {
           ],
           'cmdname' => 'cindex',
           'extra' => {
-            'entry_node' => {},
+            'element_node' => {},
             'index_entry' => {
               'entry_element' => {},
               'entry_number' => 4,
@@ -573,7 +573,7 @@ $result_trees{'encoding_index_ascii_enable_encoding'} = {
           ],
           'cmdname' => 'cindex',
           'extra' => {
-            'entry_node' => {},
+            'element_node' => {},
             'index_entry' => {
               'entry_element' => {},
               'entry_number' => 5,
@@ -612,7 +612,7 @@ $result_trees{'encoding_index_ascii_enable_encoding'} = {
           ],
           'cmdname' => 'cindex',
           'extra' => {
-            'entry_node' => {},
+            'element_node' => {},
             'index_entry' => {
               'entry_element' => {},
               'entry_number' => 6,
@@ -651,7 +651,7 @@ $result_trees{'encoding_index_ascii_enable_encoding'} = {
           ],
           'cmdname' => 'cindex',
           'extra' => {
-            'entry_node' => {},
+            'element_node' => {},
             'index_entry' => {
               'entry_element' => {},
               'entry_number' => 7,
@@ -690,7 +690,7 @@ $result_trees{'encoding_index_ascii_enable_encoding'} = {
           ],
           'cmdname' => 'cindex',
           'extra' => {
-            'entry_node' => {},
+            'element_node' => {},
             'index_entry' => {
               'entry_element' => {},
               'entry_number' => 8,
@@ -729,7 +729,7 @@ $result_trees{'encoding_index_ascii_enable_encoding'} = {
           ],
           'cmdname' => 'cindex',
           'extra' => {
-            'entry_node' => {},
+            'element_node' => {},
             'index_entry' => {
               'entry_element' => {},
               'entry_number' => 9,
@@ -768,7 +768,7 @@ $result_trees{'encoding_index_ascii_enable_encoding'} = {
           ],
           'cmdname' => 'cindex',
           'extra' => {
-            'entry_node' => {},
+            'element_node' => {},
             'index_entry' => {
               'entry_element' => {},
               'entry_number' => 10,
@@ -807,7 +807,7 @@ $result_trees{'encoding_index_ascii_enable_encoding'} = {
           ],
           'cmdname' => 'cindex',
           'extra' => {
-            'entry_node' => {},
+            'element_node' => {},
             'index_entry' => {
               'entry_element' => {},
               'entry_number' => 11,
@@ -846,7 +846,7 @@ $result_trees{'encoding_index_ascii_enable_encoding'} = {
           ],
           'cmdname' => 'cindex',
           'extra' => {
-            'entry_node' => {},
+            'element_node' => {},
             'index_entry' => {
               'entry_element' => {},
               'entry_number' => 12,
@@ -885,7 +885,7 @@ $result_trees{'encoding_index_ascii_enable_encoding'} = {
           ],
           'cmdname' => 'cindex',
           'extra' => {
-            'entry_node' => {},
+            'element_node' => {},
             'index_entry' => {
               'entry_element' => {},
               'entry_number' => 13,
@@ -924,7 +924,7 @@ $result_trees{'encoding_index_ascii_enable_encoding'} = {
           ],
           'cmdname' => 'cindex',
           'extra' => {
-            'entry_node' => {},
+            'element_node' => {},
             'index_entry' => {
               'entry_element' => {},
               'entry_number' => 14,
@@ -963,7 +963,7 @@ $result_trees{'encoding_index_ascii_enable_encoding'} = {
           ],
           'cmdname' => 'cindex',
           'extra' => {
-            'entry_node' => {},
+            'element_node' => {},
             'index_entry' => {
               'entry_element' => {},
               'entry_number' => 15,
@@ -1002,7 +1002,7 @@ $result_trees{'encoding_index_ascii_enable_encoding'} = {
           ],
           'cmdname' => 'cindex',
           'extra' => {
-            'entry_node' => {},
+            'element_node' => {},
             'index_entry' => {
               'entry_element' => {},
               'entry_number' => 16,
@@ -1041,7 +1041,7 @@ $result_trees{'encoding_index_ascii_enable_encoding'} = {
           ],
           'cmdname' => 'cindex',
           'extra' => {
-            'entry_node' => {},
+            'element_node' => {},
             'index_entry' => {
               'entry_element' => {},
               'entry_number' => 17,
@@ -1080,7 +1080,7 @@ $result_trees{'encoding_index_ascii_enable_encoding'} = {
           ],
           'cmdname' => 'cindex',
           'extra' => {
-            'entry_node' => {},
+            'element_node' => {},
             'index_entry' => {
               'entry_element' => {},
               'entry_number' => 18,
@@ -1119,7 +1119,7 @@ $result_trees{'encoding_index_ascii_enable_encoding'} = {
           ],
           'cmdname' => 'cindex',
           'extra' => {
-            'entry_node' => {},
+            'element_node' => {},
             'index_entry' => {
               'entry_element' => {},
               'entry_number' => 19,
@@ -1158,7 +1158,7 @@ $result_trees{'encoding_index_ascii_enable_encoding'} = {
           ],
           'cmdname' => 'cindex',
           'extra' => {
-            'entry_node' => {},
+            'element_node' => {},
             'index_entry' => {
               'entry_element' => {},
               'entry_number' => 20,
@@ -1197,7 +1197,7 @@ $result_trees{'encoding_index_ascii_enable_encoding'} = {
           ],
           'cmdname' => 'cindex',
           'extra' => {
-            'entry_node' => {},
+            'element_node' => {},
             'index_entry' => {
               'entry_element' => {},
               'entry_number' => 21,
@@ -1236,7 +1236,7 @@ $result_trees{'encoding_index_ascii_enable_encoding'} = {
           ],
           'cmdname' => 'cindex',
           'extra' => {
-            'entry_node' => {},
+            'element_node' => {},
             'index_entry' => {
               'entry_element' => {},
               'entry_number' => 22,
@@ -1275,7 +1275,7 @@ $result_trees{'encoding_index_ascii_enable_encoding'} = {
           ],
           'cmdname' => 'cindex',
           'extra' => {
-            'entry_node' => {},
+            'element_node' => {},
             'index_entry' => {
               'entry_element' => {},
               'entry_number' => 23,
@@ -1314,7 +1314,7 @@ $result_trees{'encoding_index_ascii_enable_encoding'} = {
           ],
           'cmdname' => 'cindex',
           'extra' => {
-            'entry_node' => {},
+            'element_node' => {},
             'index_entry' => {
               'entry_element' => {},
               'entry_number' => 24,
@@ -1353,7 +1353,7 @@ $result_trees{'encoding_index_ascii_enable_encoding'} = {
           ],
           'cmdname' => 'cindex',
           'extra' => {
-            'entry_node' => {},
+            'element_node' => {},
             'index_entry' => {
               'entry_element' => {},
               'entry_number' => 25,
@@ -1392,7 +1392,7 @@ $result_trees{'encoding_index_ascii_enable_encoding'} = {
           ],
           'cmdname' => 'cindex',
           'extra' => {
-            'entry_node' => {},
+            'element_node' => {},
             'index_entry' => {
               'entry_element' => {},
               'entry_number' => 26,
@@ -1431,7 +1431,7 @@ $result_trees{'encoding_index_ascii_enable_encoding'} = {
           ],
           'cmdname' => 'cindex',
           'extra' => {
-            'entry_node' => {},
+            'element_node' => {},
             'index_entry' => {
               'entry_element' => {},
               'entry_number' => 27,
@@ -1470,7 +1470,7 @@ $result_trees{'encoding_index_ascii_enable_encoding'} = {
           ],
           'cmdname' => 'cindex',
           'extra' => {
-            'entry_node' => {},
+            'element_node' => {},
             'index_entry' => {
               'entry_element' => {},
               'entry_number' => 28,
@@ -1509,7 +1509,7 @@ $result_trees{'encoding_index_ascii_enable_encoding'} = {
           ],
           'cmdname' => 'cindex',
           'extra' => {
-            'entry_node' => {},
+            'element_node' => {},
             'index_entry' => {
               'entry_element' => {},
               'entry_number' => 29,
@@ -1548,7 +1548,7 @@ $result_trees{'encoding_index_ascii_enable_encoding'} = {
           ],
           'cmdname' => 'cindex',
           'extra' => {
-            'entry_node' => {},
+            'element_node' => {},
             'index_entry' => {
               'entry_element' => {},
               'entry_number' => 30,
@@ -1587,7 +1587,7 @@ $result_trees{'encoding_index_ascii_enable_encoding'} = {
           ],
           'cmdname' => 'cindex',
           'extra' => {
-            'entry_node' => {},
+            'element_node' => {},
             'index_entry' => {
               'entry_element' => {},
               'entry_number' => 31,
@@ -1636,7 +1636,7 @@ $result_trees{'encoding_index_ascii_enable_encoding'} = {
           ],
           'cmdname' => 'cindex',
           'extra' => {
-            'entry_node' => {},
+            'element_node' => {},
             'index_entry' => {
               'entry_element' => {},
               'entry_number' => 32,
@@ -1685,7 +1685,7 @@ $result_trees{'encoding_index_ascii_enable_encoding'} = {
           ],
           'cmdname' => 'cindex',
           'extra' => {
-            'entry_node' => {},
+            'element_node' => {},
             'index_entry' => {
               'entry_element' => {},
               'entry_number' => 33,
@@ -1763,7 +1763,7 @@ $result_trees{'encoding_index_ascii_enable_encoding'} = {
           ],
           'cmdname' => 'cindex',
           'extra' => {
-            'entry_node' => {},
+            'element_node' => {},
             'index_entry' => {
               'entry_element' => {},
               'entry_number' => 34,
@@ -1871,7 +1871,7 @@ $result_trees{'encoding_index_ascii_enable_encoding'} = {
           ],
           'cmdname' => 'cindex',
           'extra' => {
-            'entry_node' => {},
+            'element_node' => {},
             'index_entry' => {
               'entry_element' => {},
               'entry_number' => 35,
@@ -1920,7 +1920,7 @@ $result_trees{'encoding_index_ascii_enable_encoding'} = {
           ],
           'cmdname' => 'cindex',
           'extra' => {
-            'entry_node' => {},
+            'element_node' => {},
             'index_entry' => {
               'entry_element' => {},
               'entry_number' => 36,
@@ -1969,7 +1969,7 @@ $result_trees{'encoding_index_ascii_enable_encoding'} = {
           ],
           'cmdname' => 'cindex',
           'extra' => {
-            'entry_node' => {},
+            'element_node' => {},
             'index_entry' => {
               'entry_element' => {},
               'entry_number' => 37,
@@ -2018,7 +2018,7 @@ $result_trees{'encoding_index_ascii_enable_encoding'} = {
           ],
           'cmdname' => 'cindex',
           'extra' => {
-            'entry_node' => {},
+            'element_node' => {},
             'index_entry' => {
               'entry_element' => {},
               'entry_number' => 38,
@@ -2067,7 +2067,7 @@ $result_trees{'encoding_index_ascii_enable_encoding'} = {
           ],
           'cmdname' => 'cindex',
           'extra' => {
-            'entry_node' => {},
+            'element_node' => {},
             'index_entry' => {
               'entry_element' => {},
               'entry_number' => 39,
@@ -2116,7 +2116,7 @@ $result_trees{'encoding_index_ascii_enable_encoding'} = {
           ],
           'cmdname' => 'cindex',
           'extra' => {
-            'entry_node' => {},
+            'element_node' => {},
             'index_entry' => {
               'entry_element' => {},
               'entry_number' => 40,
@@ -2165,7 +2165,7 @@ $result_trees{'encoding_index_ascii_enable_encoding'} = {
           ],
           'cmdname' => 'cindex',
           'extra' => {
-            'entry_node' => {},
+            'element_node' => {},
             'index_entry' => {
               'entry_element' => {},
               'entry_number' => 41,
@@ -2214,7 +2214,7 @@ $result_trees{'encoding_index_ascii_enable_encoding'} = {
           ],
           'cmdname' => 'cindex',
           'extra' => {
-            'entry_node' => {},
+            'element_node' => {},
             'index_entry' => {
               'entry_element' => {},
               'entry_number' => 42,
@@ -2253,7 +2253,7 @@ $result_trees{'encoding_index_ascii_enable_encoding'} = {
           ],
           'cmdname' => 'cindex',
           'extra' => {
-            'entry_node' => {},
+            'element_node' => {},
             'index_entry' => {
               'entry_element' => {},
               'entry_number' => 43,
@@ -2292,7 +2292,7 @@ $result_trees{'encoding_index_ascii_enable_encoding'} = {
           ],
           'cmdname' => 'cindex',
           'extra' => {
-            'entry_node' => {},
+            'element_node' => {},
             'index_entry' => {
               'entry_element' => {},
               'entry_number' => 44,
@@ -2341,7 +2341,7 @@ $result_trees{'encoding_index_ascii_enable_encoding'} = {
           ],
           'cmdname' => 'cindex',
           'extra' => {
-            'entry_node' => {},
+            'element_node' => {},
             'index_entry' => {
               'entry_element' => {},
               'entry_number' => 45,
@@ -2390,7 +2390,7 @@ $result_trees{'encoding_index_ascii_enable_encoding'} = {
           ],
           'cmdname' => 'cindex',
           'extra' => {
-            'entry_node' => {},
+            'element_node' => {},
             'index_entry' => {
               'entry_element' => {},
               'entry_number' => 46,
@@ -2439,7 +2439,7 @@ $result_trees{'encoding_index_ascii_enable_encoding'} = {
           ],
           'cmdname' => 'cindex',
           'extra' => {
-            'entry_node' => {},
+            'element_node' => {},
             'index_entry' => {
               'entry_element' => {},
               'entry_number' => 47,
@@ -2478,7 +2478,7 @@ $result_trees{'encoding_index_ascii_enable_encoding'} = {
           ],
           'cmdname' => 'cindex',
           'extra' => {
-            'entry_node' => {},
+            'element_node' => {},
             'index_entry' => {
               'entry_element' => {},
               'entry_number' => 48,
@@ -2517,7 +2517,7 @@ $result_trees{'encoding_index_ascii_enable_encoding'} = {
           ],
           'cmdname' => 'cindex',
           'extra' => {
-            'entry_node' => {},
+            'element_node' => {},
             'index_entry' => {
               'entry_element' => {},
               'entry_number' => 49,
@@ -2556,7 +2556,7 @@ $result_trees{'encoding_index_ascii_enable_encoding'} = {
           ],
           'cmdname' => 'cindex',
           'extra' => {
-            'entry_node' => {},
+            'element_node' => {},
             'index_entry' => {
               'entry_element' => {},
               'entry_number' => 50,
@@ -2595,7 +2595,7 @@ $result_trees{'encoding_index_ascii_enable_encoding'} = {
           ],
           'cmdname' => 'cindex',
           'extra' => {
-            'entry_node' => {},
+            'element_node' => {},
             'index_entry' => {
               'entry_element' => {},
               'entry_number' => 51,
@@ -2634,7 +2634,7 @@ $result_trees{'encoding_index_ascii_enable_encoding'} = {
           ],
           'cmdname' => 'cindex',
           'extra' => {
-            'entry_node' => {},
+            'element_node' => {},
             'index_entry' => {
               'entry_element' => {},
               'entry_number' => 52,
@@ -2673,7 +2673,7 @@ $result_trees{'encoding_index_ascii_enable_encoding'} = {
           ],
           'cmdname' => 'cindex',
           'extra' => {
-            'entry_node' => {},
+            'element_node' => {},
             'index_entry' => {
               'entry_element' => {},
               'entry_number' => 53,
@@ -2712,7 +2712,7 @@ $result_trees{'encoding_index_ascii_enable_encoding'} = {
           ],
           'cmdname' => 'cindex',
           'extra' => {
-            'entry_node' => {},
+            'element_node' => {},
             'index_entry' => {
               'entry_element' => {},
               'entry_number' => 54,
@@ -2751,7 +2751,7 @@ $result_trees{'encoding_index_ascii_enable_encoding'} = {
           ],
           'cmdname' => 'cindex',
           'extra' => {
-            'entry_node' => {},
+            'element_node' => {},
             'index_entry' => {
               'entry_element' => {},
               'entry_number' => 55,
@@ -2842,115 +2842,115 @@ $result_trees{'encoding_index_ascii_enable_encoding'} 
= {
 };
 
$result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[1]{'extra'}{'node_content'}[0]
 = 
$result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[1]{'args'}[0]{'contents'}[0];
 
$result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[1]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = 
$result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[1]{'args'}[0]{'contents'}[0];
-$result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[3]{'contents'}[1]{'extra'}{'entry_node'}
 = $result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[3];
+$result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[3]{'contents'}[1]{'extra'}{'element_node'}
 = $result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[3];
 
$result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[3]{'contents'}[1]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[3]{'contents'}[1];
-$result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[3]{'contents'}[2]{'extra'}{'entry_node'}
 = $result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[3];
+$result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[3]{'contents'}[2]{'extra'}{'element_node'}
 = $result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[3];
 
$result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[3]{'contents'}[2]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[3]{'contents'}[2];
-$result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[3]{'contents'}[3]{'extra'}{'entry_node'}
 = $result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[3];
+$result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[3]{'contents'}[3]{'extra'}{'element_node'}
 = $result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[3];
 
$result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[3]{'contents'}[3]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[3]{'contents'}[3];
-$result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[3]{'contents'}[4]{'extra'}{'entry_node'}
 = $result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[3];
+$result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[3]{'contents'}[4]{'extra'}{'element_node'}
 = $result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[3];
 
$result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[3]{'contents'}[4]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[3]{'contents'}[4];
-$result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[3]{'contents'}[5]{'extra'}{'entry_node'}
 = $result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[3];
+$result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[3]{'contents'}[5]{'extra'}{'element_node'}
 = $result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[3];
 
$result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[3]{'contents'}[5]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[3]{'contents'}[5];
-$result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[3]{'contents'}[6]{'extra'}{'entry_node'}
 = $result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[3];
+$result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[3]{'contents'}[6]{'extra'}{'element_node'}
 = $result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[3];
 
$result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[3]{'contents'}[6]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[3]{'contents'}[6];
-$result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[3]{'contents'}[7]{'extra'}{'entry_node'}
 = $result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[3];
+$result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[3]{'contents'}[7]{'extra'}{'element_node'}
 = $result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[3];
 
$result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[3]{'contents'}[7]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[3]{'contents'}[7];
-$result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[3]{'contents'}[8]{'extra'}{'entry_node'}
 = $result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[3];
+$result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[3]{'contents'}[8]{'extra'}{'element_node'}
 = $result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[3];
 
$result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[3]{'contents'}[8]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[3]{'contents'}[8];
-$result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[3]{'contents'}[9]{'extra'}{'entry_node'}
 = $result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[3];
+$result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[3]{'contents'}[9]{'extra'}{'element_node'}
 = $result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[3];
 
$result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[3]{'contents'}[9]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[3]{'contents'}[9];
-$result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[3]{'contents'}[10]{'extra'}{'entry_node'}
 = $result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[3];
+$result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[3]{'contents'}[10]{'extra'}{'element_node'}
 = $result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[3];
 
$result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[3]{'contents'}[10]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[3]{'contents'}[10];
-$result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[3]{'contents'}[11]{'extra'}{'entry_node'}
 = $result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[3];
+$result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[3]{'contents'}[11]{'extra'}{'element_node'}
 = $result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[3];
 
$result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[3]{'contents'}[11]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[3]{'contents'}[11];
-$result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[3]{'contents'}[12]{'extra'}{'entry_node'}
 = $result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[3];
+$result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[3]{'contents'}[12]{'extra'}{'element_node'}
 = $result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[3];
 
$result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[3]{'contents'}[12]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[3]{'contents'}[12];
-$result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[3]{'contents'}[13]{'extra'}{'entry_node'}
 = $result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[3];
+$result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[3]{'contents'}[13]{'extra'}{'element_node'}
 = $result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[3];
 
$result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[3]{'contents'}[13]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[3]{'contents'}[13];
-$result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[3]{'contents'}[14]{'extra'}{'entry_node'}
 = $result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[3];
+$result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[3]{'contents'}[14]{'extra'}{'element_node'}
 = $result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[3];
 
$result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[3]{'contents'}[14]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[3]{'contents'}[14];
-$result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[3]{'contents'}[15]{'extra'}{'entry_node'}
 = $result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[3];
+$result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[3]{'contents'}[15]{'extra'}{'element_node'}
 = $result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[3];
 
$result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[3]{'contents'}[15]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[3]{'contents'}[15];
-$result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[3]{'contents'}[16]{'extra'}{'entry_node'}
 = $result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[3];
+$result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[3]{'contents'}[16]{'extra'}{'element_node'}
 = $result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[3];
 
$result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[3]{'contents'}[16]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[3]{'contents'}[16];
-$result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[3]{'contents'}[17]{'extra'}{'entry_node'}
 = $result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[3];
+$result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[3]{'contents'}[17]{'extra'}{'element_node'}
 = $result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[3];
 
$result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[3]{'contents'}[17]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[3]{'contents'}[17];
-$result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[3]{'contents'}[18]{'extra'}{'entry_node'}
 = $result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[3];
+$result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[3]{'contents'}[18]{'extra'}{'element_node'}
 = $result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[3];
 
$result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[3]{'contents'}[18]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[3]{'contents'}[18];
-$result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[3]{'contents'}[19]{'extra'}{'entry_node'}
 = $result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[3];
+$result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[3]{'contents'}[19]{'extra'}{'element_node'}
 = $result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[3];
 
$result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[3]{'contents'}[19]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[3]{'contents'}[19];
-$result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[3]{'contents'}[20]{'extra'}{'entry_node'}
 = $result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[3];
+$result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[3]{'contents'}[20]{'extra'}{'element_node'}
 = $result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[3];
 
$result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[3]{'contents'}[20]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[3]{'contents'}[20];
-$result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[3]{'contents'}[21]{'extra'}{'entry_node'}
 = $result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[3];
+$result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[3]{'contents'}[21]{'extra'}{'element_node'}
 = $result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[3];
 
$result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[3]{'contents'}[21]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[3]{'contents'}[21];
-$result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[3]{'contents'}[22]{'extra'}{'entry_node'}
 = $result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[3];
+$result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[3]{'contents'}[22]{'extra'}{'element_node'}
 = $result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[3];
 
$result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[3]{'contents'}[22]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[3]{'contents'}[22];
-$result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[3]{'contents'}[23]{'extra'}{'entry_node'}
 = $result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[3];
+$result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[3]{'contents'}[23]{'extra'}{'element_node'}
 = $result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[3];
 
$result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[3]{'contents'}[23]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[3]{'contents'}[23];
-$result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[3]{'contents'}[24]{'extra'}{'entry_node'}
 = $result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[3];
+$result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[3]{'contents'}[24]{'extra'}{'element_node'}
 = $result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[3];
 
$result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[3]{'contents'}[24]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[3]{'contents'}[24];
-$result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[3]{'contents'}[25]{'extra'}{'entry_node'}
 = $result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[3];
+$result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[3]{'contents'}[25]{'extra'}{'element_node'}
 = $result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[3];
 
$result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[3]{'contents'}[25]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[3]{'contents'}[25];
-$result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[3]{'contents'}[26]{'extra'}{'entry_node'}
 = $result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[3];
+$result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[3]{'contents'}[26]{'extra'}{'element_node'}
 = $result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[3];
 
$result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[3]{'contents'}[26]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[3]{'contents'}[26];
-$result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[3]{'contents'}[27]{'extra'}{'entry_node'}
 = $result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[3];
+$result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[3]{'contents'}[27]{'extra'}{'element_node'}
 = $result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[3];
 
$result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[3]{'contents'}[27]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[3]{'contents'}[27];
-$result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[3]{'contents'}[28]{'extra'}{'entry_node'}
 = $result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[3];
+$result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[3]{'contents'}[28]{'extra'}{'element_node'}
 = $result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[3];
 
$result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[3]{'contents'}[28]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[3]{'contents'}[28];
-$result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[3]{'contents'}[29]{'extra'}{'entry_node'}
 = $result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[3];
+$result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[3]{'contents'}[29]{'extra'}{'element_node'}
 = $result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[3];
 
$result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[3]{'contents'}[29]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[3]{'contents'}[29];
-$result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[3]{'contents'}[30]{'extra'}{'entry_node'}
 = $result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[3];
+$result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[3]{'contents'}[30]{'extra'}{'element_node'}
 = $result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[3];
 
$result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[3]{'contents'}[30]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[3]{'contents'}[30];
-$result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[3]{'contents'}[31]{'extra'}{'entry_node'}
 = $result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[3];
+$result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[3]{'contents'}[31]{'extra'}{'element_node'}
 = $result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[3];
 
$result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[3]{'contents'}[31]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[3]{'contents'}[31];
-$result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[3]{'contents'}[32]{'extra'}{'entry_node'}
 = $result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[3];
+$result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[3]{'contents'}[32]{'extra'}{'element_node'}
 = $result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[3];
 
$result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[3]{'contents'}[32]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[3]{'contents'}[32];
-$result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[3]{'contents'}[33]{'extra'}{'entry_node'}
 = $result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[3];
+$result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[3]{'contents'}[33]{'extra'}{'element_node'}
 = $result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[3];
 
$result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[3]{'contents'}[33]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[3]{'contents'}[33];
-$result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[3]{'contents'}[34]{'extra'}{'entry_node'}
 = $result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[3];
+$result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[3]{'contents'}[34]{'extra'}{'element_node'}
 = $result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[3];
 
$result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[3]{'contents'}[34]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[3]{'contents'}[34];
-$result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[3]{'contents'}[35]{'extra'}{'entry_node'}
 = $result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[3];
+$result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[3]{'contents'}[35]{'extra'}{'element_node'}
 = $result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[3];
 
$result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[3]{'contents'}[35]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[3]{'contents'}[35];
-$result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[3]{'contents'}[36]{'extra'}{'entry_node'}
 = $result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[3];
+$result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[3]{'contents'}[36]{'extra'}{'element_node'}
 = $result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[3];
 
$result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[3]{'contents'}[36]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[3]{'contents'}[36];
-$result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[3]{'contents'}[37]{'extra'}{'entry_node'}
 = $result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[3];
+$result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[3]{'contents'}[37]{'extra'}{'element_node'}
 = $result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[3];
 
$result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[3]{'contents'}[37]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[3]{'contents'}[37];
-$result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[3]{'contents'}[38]{'extra'}{'entry_node'}
 = $result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[3];
+$result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[3]{'contents'}[38]{'extra'}{'element_node'}
 = $result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[3];
 
$result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[3]{'contents'}[38]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[3]{'contents'}[38];
-$result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[3]{'contents'}[39]{'extra'}{'entry_node'}
 = $result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[3];
+$result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[3]{'contents'}[39]{'extra'}{'element_node'}
 = $result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[3];
 
$result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[3]{'contents'}[39]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[3]{'contents'}[39];
-$result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[3]{'contents'}[40]{'extra'}{'entry_node'}
 = $result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[3];
+$result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[3]{'contents'}[40]{'extra'}{'element_node'}
 = $result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[3];
 
$result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[3]{'contents'}[40]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[3]{'contents'}[40];
-$result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[3]{'contents'}[41]{'extra'}{'entry_node'}
 = $result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[3];
+$result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[3]{'contents'}[41]{'extra'}{'element_node'}
 = $result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[3];
 
$result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[3]{'contents'}[41]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[3]{'contents'}[41];
-$result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[3]{'contents'}[42]{'extra'}{'entry_node'}
 = $result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[3];
+$result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[3]{'contents'}[42]{'extra'}{'element_node'}
 = $result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[3];
 
$result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[3]{'contents'}[42]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[3]{'contents'}[42];
-$result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[3]{'contents'}[43]{'extra'}{'entry_node'}
 = $result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[3];
+$result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[3]{'contents'}[43]{'extra'}{'element_node'}
 = $result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[3];
 
$result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[3]{'contents'}[43]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[3]{'contents'}[43];
-$result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[3]{'contents'}[44]{'extra'}{'entry_node'}
 = $result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[3];
+$result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[3]{'contents'}[44]{'extra'}{'element_node'}
 = $result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[3];
 
$result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[3]{'contents'}[44]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[3]{'contents'}[44];
-$result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[3]{'contents'}[45]{'extra'}{'entry_node'}
 = $result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[3];
+$result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[3]{'contents'}[45]{'extra'}{'element_node'}
 = $result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[3];
 
$result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[3]{'contents'}[45]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[3]{'contents'}[45];
-$result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[3]{'contents'}[46]{'extra'}{'entry_node'}
 = $result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[3];
+$result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[3]{'contents'}[46]{'extra'}{'element_node'}
 = $result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[3];
 
$result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[3]{'contents'}[46]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[3]{'contents'}[46];
-$result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[3]{'contents'}[47]{'extra'}{'entry_node'}
 = $result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[3];
+$result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[3]{'contents'}[47]{'extra'}{'element_node'}
 = $result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[3];
 
$result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[3]{'contents'}[47]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[3]{'contents'}[47];
-$result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[3]{'contents'}[48]{'extra'}{'entry_node'}
 = $result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[3];
+$result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[3]{'contents'}[48]{'extra'}{'element_node'}
 = $result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[3];
 
$result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[3]{'contents'}[48]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[3]{'contents'}[48];
-$result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[3]{'contents'}[49]{'extra'}{'entry_node'}
 = $result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[3];
+$result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[3]{'contents'}[49]{'extra'}{'element_node'}
 = $result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[3];
 
$result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[3]{'contents'}[49]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[3]{'contents'}[49];
-$result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[3]{'contents'}[50]{'extra'}{'entry_node'}
 = $result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[3];
+$result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[3]{'contents'}[50]{'extra'}{'element_node'}
 = $result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[3];
 
$result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[3]{'contents'}[50]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[3]{'contents'}[50];
-$result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[3]{'contents'}[51]{'extra'}{'entry_node'}
 = $result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[3];
+$result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[3]{'contents'}[51]{'extra'}{'element_node'}
 = $result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[3];
 
$result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[3]{'contents'}[51]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[3]{'contents'}[51];
-$result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[3]{'contents'}[52]{'extra'}{'entry_node'}
 = $result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[3];
+$result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[3]{'contents'}[52]{'extra'}{'element_node'}
 = $result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[3];
 
$result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[3]{'contents'}[52]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[3]{'contents'}[52];
-$result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[3]{'contents'}[53]{'extra'}{'entry_node'}
 = $result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[3];
+$result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[3]{'contents'}[53]{'extra'}{'element_node'}
 = $result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[3];
 
$result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[3]{'contents'}[53]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[3]{'contents'}[53];
-$result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[3]{'contents'}[54]{'extra'}{'entry_node'}
 = $result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[3];
+$result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[3]{'contents'}[54]{'extra'}{'element_node'}
 = $result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[3];
 
$result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[3]{'contents'}[54]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[3]{'contents'}[54];
-$result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[3]{'contents'}[55]{'extra'}{'entry_node'}
 = $result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[3];
+$result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[3]{'contents'}[55]{'extra'}{'element_node'}
 = $result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[3];
 
$result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[3]{'contents'}[55]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[3]{'contents'}[55];
 
$result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[3]{'extra'}{'node_content'}[0]
 = 
$result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[3]{'args'}[0]{'contents'}[0];
 
$result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[3]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = 
$result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[3]{'args'}[0]{'contents'}[0];
diff --git a/tp/t/results/indices/encoding_index_latin1.pl 
b/tp/t/results/indices/encoding_index_latin1.pl
index 00447edb03..40d0f14a02 100644
--- a/tp/t/results/indices/encoding_index_latin1.pl
+++ b/tp/t/results/indices/encoding_index_latin1.pl
@@ -189,7 +189,7 @@ $result_trees{'encoding_index_latin1'} = {
           ],
           'cmdname' => 'cindex',
           'extra' => {
-            'entry_node' => {},
+            'element_node' => {},
             'index_entry' => {
               'entry_element' => {},
               'entry_number' => 1,
@@ -300,7 +300,7 @@ $result_trees{'encoding_index_latin1'} = {
           ],
           'cmdname' => 'cindex',
           'extra' => {
-            'entry_node' => {},
+            'element_node' => {},
             'index_entry' => {
               'entry_element' => {},
               'entry_number' => 2,
@@ -429,7 +429,7 @@ $result_trees{'encoding_index_latin1'} = {
           ],
           'cmdname' => 'cindex',
           'extra' => {
-            'entry_node' => {},
+            'element_node' => {},
             'index_entry' => {
               'entry_element' => {},
               'entry_number' => 3,
@@ -468,7 +468,7 @@ $result_trees{'encoding_index_latin1'} = {
           ],
           'cmdname' => 'cindex',
           'extra' => {
-            'entry_node' => {},
+            'element_node' => {},
             'index_entry' => {
               'entry_element' => {},
               'entry_number' => 4,
@@ -507,7 +507,7 @@ $result_trees{'encoding_index_latin1'} = {
           ],
           'cmdname' => 'cindex',
           'extra' => {
-            'entry_node' => {},
+            'element_node' => {},
             'index_entry' => {
               'entry_element' => {},
               'entry_number' => 5,
@@ -546,7 +546,7 @@ $result_trees{'encoding_index_latin1'} = {
           ],
           'cmdname' => 'cindex',
           'extra' => {
-            'entry_node' => {},
+            'element_node' => {},
             'index_entry' => {
               'entry_element' => {},
               'entry_number' => 6,
@@ -585,7 +585,7 @@ $result_trees{'encoding_index_latin1'} = {
           ],
           'cmdname' => 'cindex',
           'extra' => {
-            'entry_node' => {},
+            'element_node' => {},
             'index_entry' => {
               'entry_element' => {},
               'entry_number' => 7,
@@ -624,7 +624,7 @@ $result_trees{'encoding_index_latin1'} = {
           ],
           'cmdname' => 'cindex',
           'extra' => {
-            'entry_node' => {},
+            'element_node' => {},
             'index_entry' => {
               'entry_element' => {},
               'entry_number' => 8,
@@ -663,7 +663,7 @@ $result_trees{'encoding_index_latin1'} = {
           ],
           'cmdname' => 'cindex',
           'extra' => {
-            'entry_node' => {},
+            'element_node' => {},
             'index_entry' => {
               'entry_element' => {},
               'entry_number' => 9,
@@ -702,7 +702,7 @@ $result_trees{'encoding_index_latin1'} = {
           ],
           'cmdname' => 'cindex',
           'extra' => {
-            'entry_node' => {},
+            'element_node' => {},
             'index_entry' => {
               'entry_element' => {},
               'entry_number' => 10,
@@ -741,7 +741,7 @@ $result_trees{'encoding_index_latin1'} = {
           ],
           'cmdname' => 'cindex',
           'extra' => {
-            'entry_node' => {},
+            'element_node' => {},
             'index_entry' => {
               'entry_element' => {},
               'entry_number' => 11,
@@ -780,7 +780,7 @@ $result_trees{'encoding_index_latin1'} = {
           ],
           'cmdname' => 'cindex',
           'extra' => {
-            'entry_node' => {},
+            'element_node' => {},
             'index_entry' => {
               'entry_element' => {},
               'entry_number' => 12,
@@ -819,7 +819,7 @@ $result_trees{'encoding_index_latin1'} = {
           ],
           'cmdname' => 'cindex',
           'extra' => {
-            'entry_node' => {},
+            'element_node' => {},
             'index_entry' => {
               'entry_element' => {},
               'entry_number' => 13,
@@ -858,7 +858,7 @@ $result_trees{'encoding_index_latin1'} = {
           ],
           'cmdname' => 'cindex',
           'extra' => {
-            'entry_node' => {},
+            'element_node' => {},
             'index_entry' => {
               'entry_element' => {},
               'entry_number' => 14,
@@ -897,7 +897,7 @@ $result_trees{'encoding_index_latin1'} = {
           ],
           'cmdname' => 'cindex',
           'extra' => {
-            'entry_node' => {},
+            'element_node' => {},
             'index_entry' => {
               'entry_element' => {},
               'entry_number' => 15,
@@ -936,7 +936,7 @@ $result_trees{'encoding_index_latin1'} = {
           ],
           'cmdname' => 'cindex',
           'extra' => {
-            'entry_node' => {},
+            'element_node' => {},
             'index_entry' => {
               'entry_element' => {},
               'entry_number' => 16,
@@ -975,7 +975,7 @@ $result_trees{'encoding_index_latin1'} = {
           ],
           'cmdname' => 'cindex',
           'extra' => {
-            'entry_node' => {},
+            'element_node' => {},
             'index_entry' => {
               'entry_element' => {},
               'entry_number' => 17,
@@ -1014,7 +1014,7 @@ $result_trees{'encoding_index_latin1'} = {
           ],
           'cmdname' => 'cindex',
           'extra' => {
-            'entry_node' => {},
+            'element_node' => {},
             'index_entry' => {
               'entry_element' => {},
               'entry_number' => 18,
@@ -1053,7 +1053,7 @@ $result_trees{'encoding_index_latin1'} = {
           ],
           'cmdname' => 'cindex',
           'extra' => {
-            'entry_node' => {},
+            'element_node' => {},
             'index_entry' => {
               'entry_element' => {},
               'entry_number' => 19,
@@ -1092,7 +1092,7 @@ $result_trees{'encoding_index_latin1'} = {
           ],
           'cmdname' => 'cindex',
           'extra' => {
-            'entry_node' => {},
+            'element_node' => {},
             'index_entry' => {
               'entry_element' => {},
               'entry_number' => 20,
@@ -1131,7 +1131,7 @@ $result_trees{'encoding_index_latin1'} = {
           ],
           'cmdname' => 'cindex',
           'extra' => {
-            'entry_node' => {},
+            'element_node' => {},
             'index_entry' => {
               'entry_element' => {},
               'entry_number' => 21,
@@ -1170,7 +1170,7 @@ $result_trees{'encoding_index_latin1'} = {
           ],
           'cmdname' => 'cindex',
           'extra' => {
-            'entry_node' => {},
+            'element_node' => {},
             'index_entry' => {
               'entry_element' => {},
               'entry_number' => 22,
@@ -1209,7 +1209,7 @@ $result_trees{'encoding_index_latin1'} = {
           ],
           'cmdname' => 'cindex',
           'extra' => {
-            'entry_node' => {},
+            'element_node' => {},
             'index_entry' => {
               'entry_element' => {},
               'entry_number' => 23,
@@ -1248,7 +1248,7 @@ $result_trees{'encoding_index_latin1'} = {
           ],
           'cmdname' => 'cindex',
           'extra' => {
-            'entry_node' => {},
+            'element_node' => {},
             'index_entry' => {
               'entry_element' => {},
               'entry_number' => 24,
@@ -1287,7 +1287,7 @@ $result_trees{'encoding_index_latin1'} = {
           ],
           'cmdname' => 'cindex',
           'extra' => {
-            'entry_node' => {},
+            'element_node' => {},
             'index_entry' => {
               'entry_element' => {},
               'entry_number' => 25,
@@ -1326,7 +1326,7 @@ $result_trees{'encoding_index_latin1'} = {
           ],
           'cmdname' => 'cindex',
           'extra' => {
-            'entry_node' => {},
+            'element_node' => {},
             'index_entry' => {
               'entry_element' => {},
               'entry_number' => 26,
@@ -1365,7 +1365,7 @@ $result_trees{'encoding_index_latin1'} = {
           ],
           'cmdname' => 'cindex',
           'extra' => {
-            'entry_node' => {},
+            'element_node' => {},
             'index_entry' => {
               'entry_element' => {},
               'entry_number' => 27,
@@ -1404,7 +1404,7 @@ $result_trees{'encoding_index_latin1'} = {
           ],
           'cmdname' => 'cindex',
           'extra' => {
-            'entry_node' => {},
+            'element_node' => {},
             'index_entry' => {
               'entry_element' => {},
               'entry_number' => 28,
@@ -1443,7 +1443,7 @@ $result_trees{'encoding_index_latin1'} = {
           ],
           'cmdname' => 'cindex',
           'extra' => {
-            'entry_node' => {},
+            'element_node' => {},
             'index_entry' => {
               'entry_element' => {},
               'entry_number' => 29,
@@ -1482,7 +1482,7 @@ $result_trees{'encoding_index_latin1'} = {
           ],
           'cmdname' => 'cindex',
           'extra' => {
-            'entry_node' => {},
+            'element_node' => {},
             'index_entry' => {
               'entry_element' => {},
               'entry_number' => 30,
@@ -1521,7 +1521,7 @@ $result_trees{'encoding_index_latin1'} = {
           ],
           'cmdname' => 'cindex',
           'extra' => {
-            'entry_node' => {},
+            'element_node' => {},
             'index_entry' => {
               'entry_element' => {},
               'entry_number' => 31,
@@ -1570,7 +1570,7 @@ $result_trees{'encoding_index_latin1'} = {
           ],
           'cmdname' => 'cindex',
           'extra' => {
-            'entry_node' => {},
+            'element_node' => {},
             'index_entry' => {
               'entry_element' => {},
               'entry_number' => 32,
@@ -1619,7 +1619,7 @@ $result_trees{'encoding_index_latin1'} = {
           ],
           'cmdname' => 'cindex',
           'extra' => {
-            'entry_node' => {},
+            'element_node' => {},
             'index_entry' => {
               'entry_element' => {},
               'entry_number' => 33,
@@ -1697,7 +1697,7 @@ $result_trees{'encoding_index_latin1'} = {
           ],
           'cmdname' => 'cindex',
           'extra' => {
-            'entry_node' => {},
+            'element_node' => {},
             'index_entry' => {
               'entry_element' => {},
               'entry_number' => 34,
@@ -1805,7 +1805,7 @@ $result_trees{'encoding_index_latin1'} = {
           ],
           'cmdname' => 'cindex',
           'extra' => {
-            'entry_node' => {},
+            'element_node' => {},
             'index_entry' => {
               'entry_element' => {},
               'entry_number' => 35,
@@ -1854,7 +1854,7 @@ $result_trees{'encoding_index_latin1'} = {
           ],
           'cmdname' => 'cindex',
           'extra' => {
-            'entry_node' => {},
+            'element_node' => {},
             'index_entry' => {
               'entry_element' => {},
               'entry_number' => 36,
@@ -1903,7 +1903,7 @@ $result_trees{'encoding_index_latin1'} = {
           ],
           'cmdname' => 'cindex',
           'extra' => {
-            'entry_node' => {},
+            'element_node' => {},
             'index_entry' => {
               'entry_element' => {},
               'entry_number' => 37,
@@ -1952,7 +1952,7 @@ $result_trees{'encoding_index_latin1'} = {
           ],
           'cmdname' => 'cindex',
           'extra' => {
-            'entry_node' => {},
+            'element_node' => {},
             'index_entry' => {
               'entry_element' => {},
               'entry_number' => 38,
@@ -2001,7 +2001,7 @@ $result_trees{'encoding_index_latin1'} = {
           ],
           'cmdname' => 'cindex',
           'extra' => {
-            'entry_node' => {},
+            'element_node' => {},
             'index_entry' => {
               'entry_element' => {},
               'entry_number' => 39,
@@ -2050,7 +2050,7 @@ $result_trees{'encoding_index_latin1'} = {
           ],
           'cmdname' => 'cindex',
           'extra' => {
-            'entry_node' => {},
+            'element_node' => {},
             'index_entry' => {
               'entry_element' => {},
               'entry_number' => 40,
@@ -2099,7 +2099,7 @@ $result_trees{'encoding_index_latin1'} = {
           ],
           'cmdname' => 'cindex',
           'extra' => {
-            'entry_node' => {},
+            'element_node' => {},
             'index_entry' => {
               'entry_element' => {},
               'entry_number' => 41,
@@ -2148,7 +2148,7 @@ $result_trees{'encoding_index_latin1'} = {
           ],
           'cmdname' => 'cindex',
           'extra' => {
-            'entry_node' => {},
+            'element_node' => {},
             'index_entry' => {
               'entry_element' => {},
               'entry_number' => 42,
@@ -2187,7 +2187,7 @@ $result_trees{'encoding_index_latin1'} = {
           ],
           'cmdname' => 'cindex',
           'extra' => {
-            'entry_node' => {},
+            'element_node' => {},
             'index_entry' => {
               'entry_element' => {},
               'entry_number' => 43,
@@ -2226,7 +2226,7 @@ $result_trees{'encoding_index_latin1'} = {
           ],
           'cmdname' => 'cindex',
           'extra' => {
-            'entry_node' => {},
+            'element_node' => {},
             'index_entry' => {
               'entry_element' => {},
               'entry_number' => 44,
@@ -2275,7 +2275,7 @@ $result_trees{'encoding_index_latin1'} = {
           ],
           'cmdname' => 'cindex',
           'extra' => {
-            'entry_node' => {},
+            'element_node' => {},
             'index_entry' => {
               'entry_element' => {},
               'entry_number' => 45,
@@ -2324,7 +2324,7 @@ $result_trees{'encoding_index_latin1'} = {
           ],
           'cmdname' => 'cindex',
           'extra' => {
-            'entry_node' => {},
+            'element_node' => {},
             'index_entry' => {
               'entry_element' => {},
               'entry_number' => 46,
@@ -2373,7 +2373,7 @@ $result_trees{'encoding_index_latin1'} = {
           ],
           'cmdname' => 'cindex',
           'extra' => {
-            'entry_node' => {},
+            'element_node' => {},
             'index_entry' => {
               'entry_element' => {},
               'entry_number' => 47,
@@ -2412,7 +2412,7 @@ $result_trees{'encoding_index_latin1'} = {
           ],
           'cmdname' => 'cindex',
           'extra' => {
-            'entry_node' => {},
+            'element_node' => {},
             'index_entry' => {
               'entry_element' => {},
               'entry_number' => 48,
@@ -2451,7 +2451,7 @@ $result_trees{'encoding_index_latin1'} = {
           ],
           'cmdname' => 'cindex',
           'extra' => {
-            'entry_node' => {},
+            'element_node' => {},
             'index_entry' => {
               'entry_element' => {},
               'entry_number' => 49,
@@ -2490,7 +2490,7 @@ $result_trees{'encoding_index_latin1'} = {
           ],
           'cmdname' => 'cindex',
           'extra' => {
-            'entry_node' => {},
+            'element_node' => {},
             'index_entry' => {
               'entry_element' => {},
               'entry_number' => 50,
@@ -2529,7 +2529,7 @@ $result_trees{'encoding_index_latin1'} = {
           ],
           'cmdname' => 'cindex',
           'extra' => {
-            'entry_node' => {},
+            'element_node' => {},
             'index_entry' => {
               'entry_element' => {},
               'entry_number' => 51,
@@ -2568,7 +2568,7 @@ $result_trees{'encoding_index_latin1'} = {
           ],
           'cmdname' => 'cindex',
           'extra' => {
-            'entry_node' => {},
+            'element_node' => {},
             'index_entry' => {
               'entry_element' => {},
               'entry_number' => 52,
@@ -2607,7 +2607,7 @@ $result_trees{'encoding_index_latin1'} = {
           ],
           'cmdname' => 'cindex',
           'extra' => {
-            'entry_node' => {},
+            'element_node' => {},
             'index_entry' => {
               'entry_element' => {},
               'entry_number' => 53,
@@ -2646,7 +2646,7 @@ $result_trees{'encoding_index_latin1'} = {
           ],
           'cmdname' => 'cindex',
           'extra' => {
-            'entry_node' => {},
+            'element_node' => {},
             'index_entry' => {
               'entry_element' => {},
               'entry_number' => 54,
@@ -2685,7 +2685,7 @@ $result_trees{'encoding_index_latin1'} = {
           ],
           'cmdname' => 'cindex',
           'extra' => {
-            'entry_node' => {},
+            'element_node' => {},
             'index_entry' => {
               'entry_element' => {},
               'entry_number' => 55,
@@ -2786,115 +2786,115 @@ $result_trees{'encoding_index_latin1'} = {
 };
 
$result_trees{'encoding_index_latin1'}{'contents'}[1]{'extra'}{'node_content'}[0]
 = 
$result_trees{'encoding_index_latin1'}{'contents'}[1]{'args'}[0]{'contents'}[0];
 
$result_trees{'encoding_index_latin1'}{'contents'}[1]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = 
$result_trees{'encoding_index_latin1'}{'contents'}[1]{'args'}[0]{'contents'}[0];
-$result_trees{'encoding_index_latin1'}{'contents'}[3]{'contents'}[1]{'extra'}{'entry_node'}
 = $result_trees{'encoding_index_latin1'}{'contents'}[3];
+$result_trees{'encoding_index_latin1'}{'contents'}[3]{'contents'}[1]{'extra'}{'element_node'}
 = $result_trees{'encoding_index_latin1'}{'contents'}[3];
 
$result_trees{'encoding_index_latin1'}{'contents'}[3]{'contents'}[1]{'extra'}{'index_entry'}{'entry_element'}
 = $result_trees{'encoding_index_latin1'}{'contents'}[3]{'contents'}[1];
-$result_trees{'encoding_index_latin1'}{'contents'}[3]{'contents'}[2]{'extra'}{'entry_node'}
 = $result_trees{'encoding_index_latin1'}{'contents'}[3];
+$result_trees{'encoding_index_latin1'}{'contents'}[3]{'contents'}[2]{'extra'}{'element_node'}
 = $result_trees{'encoding_index_latin1'}{'contents'}[3];
 
$result_trees{'encoding_index_latin1'}{'contents'}[3]{'contents'}[2]{'extra'}{'index_entry'}{'entry_element'}
 = $result_trees{'encoding_index_latin1'}{'contents'}[3]{'contents'}[2];
-$result_trees{'encoding_index_latin1'}{'contents'}[3]{'contents'}[3]{'extra'}{'entry_node'}
 = $result_trees{'encoding_index_latin1'}{'contents'}[3];
+$result_trees{'encoding_index_latin1'}{'contents'}[3]{'contents'}[3]{'extra'}{'element_node'}
 = $result_trees{'encoding_index_latin1'}{'contents'}[3];
 
$result_trees{'encoding_index_latin1'}{'contents'}[3]{'contents'}[3]{'extra'}{'index_entry'}{'entry_element'}
 = $result_trees{'encoding_index_latin1'}{'contents'}[3]{'contents'}[3];
-$result_trees{'encoding_index_latin1'}{'contents'}[3]{'contents'}[4]{'extra'}{'entry_node'}
 = $result_trees{'encoding_index_latin1'}{'contents'}[3];
+$result_trees{'encoding_index_latin1'}{'contents'}[3]{'contents'}[4]{'extra'}{'element_node'}
 = $result_trees{'encoding_index_latin1'}{'contents'}[3];
 
$result_trees{'encoding_index_latin1'}{'contents'}[3]{'contents'}[4]{'extra'}{'index_entry'}{'entry_element'}
 = $result_trees{'encoding_index_latin1'}{'contents'}[3]{'contents'}[4];
-$result_trees{'encoding_index_latin1'}{'contents'}[3]{'contents'}[5]{'extra'}{'entry_node'}
 = $result_trees{'encoding_index_latin1'}{'contents'}[3];
+$result_trees{'encoding_index_latin1'}{'contents'}[3]{'contents'}[5]{'extra'}{'element_node'}
 = $result_trees{'encoding_index_latin1'}{'contents'}[3];
 
$result_trees{'encoding_index_latin1'}{'contents'}[3]{'contents'}[5]{'extra'}{'index_entry'}{'entry_element'}
 = $result_trees{'encoding_index_latin1'}{'contents'}[3]{'contents'}[5];
-$result_trees{'encoding_index_latin1'}{'contents'}[3]{'contents'}[6]{'extra'}{'entry_node'}
 = $result_trees{'encoding_index_latin1'}{'contents'}[3];
+$result_trees{'encoding_index_latin1'}{'contents'}[3]{'contents'}[6]{'extra'}{'element_node'}
 = $result_trees{'encoding_index_latin1'}{'contents'}[3];
 
$result_trees{'encoding_index_latin1'}{'contents'}[3]{'contents'}[6]{'extra'}{'index_entry'}{'entry_element'}
 = $result_trees{'encoding_index_latin1'}{'contents'}[3]{'contents'}[6];
-$result_trees{'encoding_index_latin1'}{'contents'}[3]{'contents'}[7]{'extra'}{'entry_node'}
 = $result_trees{'encoding_index_latin1'}{'contents'}[3];
+$result_trees{'encoding_index_latin1'}{'contents'}[3]{'contents'}[7]{'extra'}{'element_node'}
 = $result_trees{'encoding_index_latin1'}{'contents'}[3];
 
$result_trees{'encoding_index_latin1'}{'contents'}[3]{'contents'}[7]{'extra'}{'index_entry'}{'entry_element'}
 = $result_trees{'encoding_index_latin1'}{'contents'}[3]{'contents'}[7];
-$result_trees{'encoding_index_latin1'}{'contents'}[3]{'contents'}[8]{'extra'}{'entry_node'}
 = $result_trees{'encoding_index_latin1'}{'contents'}[3];
+$result_trees{'encoding_index_latin1'}{'contents'}[3]{'contents'}[8]{'extra'}{'element_node'}
 = $result_trees{'encoding_index_latin1'}{'contents'}[3];
 
$result_trees{'encoding_index_latin1'}{'contents'}[3]{'contents'}[8]{'extra'}{'index_entry'}{'entry_element'}
 = $result_trees{'encoding_index_latin1'}{'contents'}[3]{'contents'}[8];
-$result_trees{'encoding_index_latin1'}{'contents'}[3]{'contents'}[9]{'extra'}{'entry_node'}
 = $result_trees{'encoding_index_latin1'}{'contents'}[3];
+$result_trees{'encoding_index_latin1'}{'contents'}[3]{'contents'}[9]{'extra'}{'element_node'}
 = $result_trees{'encoding_index_latin1'}{'contents'}[3];
 
$result_trees{'encoding_index_latin1'}{'contents'}[3]{'contents'}[9]{'extra'}{'index_entry'}{'entry_element'}
 = $result_trees{'encoding_index_latin1'}{'contents'}[3]{'contents'}[9];
-$result_trees{'encoding_index_latin1'}{'contents'}[3]{'contents'}[10]{'extra'}{'entry_node'}
 = $result_trees{'encoding_index_latin1'}{'contents'}[3];
+$result_trees{'encoding_index_latin1'}{'contents'}[3]{'contents'}[10]{'extra'}{'element_node'}
 = $result_trees{'encoding_index_latin1'}{'contents'}[3];
 
$result_trees{'encoding_index_latin1'}{'contents'}[3]{'contents'}[10]{'extra'}{'index_entry'}{'entry_element'}
 = $result_trees{'encoding_index_latin1'}{'contents'}[3]{'contents'}[10];
-$result_trees{'encoding_index_latin1'}{'contents'}[3]{'contents'}[11]{'extra'}{'entry_node'}
 = $result_trees{'encoding_index_latin1'}{'contents'}[3];
+$result_trees{'encoding_index_latin1'}{'contents'}[3]{'contents'}[11]{'extra'}{'element_node'}
 = $result_trees{'encoding_index_latin1'}{'contents'}[3];
 
$result_trees{'encoding_index_latin1'}{'contents'}[3]{'contents'}[11]{'extra'}{'index_entry'}{'entry_element'}
 = $result_trees{'encoding_index_latin1'}{'contents'}[3]{'contents'}[11];
-$result_trees{'encoding_index_latin1'}{'contents'}[3]{'contents'}[12]{'extra'}{'entry_node'}
 = $result_trees{'encoding_index_latin1'}{'contents'}[3];
+$result_trees{'encoding_index_latin1'}{'contents'}[3]{'contents'}[12]{'extra'}{'element_node'}
 = $result_trees{'encoding_index_latin1'}{'contents'}[3];
 
$result_trees{'encoding_index_latin1'}{'contents'}[3]{'contents'}[12]{'extra'}{'index_entry'}{'entry_element'}
 = $result_trees{'encoding_index_latin1'}{'contents'}[3]{'contents'}[12];
-$result_trees{'encoding_index_latin1'}{'contents'}[3]{'contents'}[13]{'extra'}{'entry_node'}
 = $result_trees{'encoding_index_latin1'}{'contents'}[3];
+$result_trees{'encoding_index_latin1'}{'contents'}[3]{'contents'}[13]{'extra'}{'element_node'}
 = $result_trees{'encoding_index_latin1'}{'contents'}[3];
 
$result_trees{'encoding_index_latin1'}{'contents'}[3]{'contents'}[13]{'extra'}{'index_entry'}{'entry_element'}
 = $result_trees{'encoding_index_latin1'}{'contents'}[3]{'contents'}[13];
-$result_trees{'encoding_index_latin1'}{'contents'}[3]{'contents'}[14]{'extra'}{'entry_node'}
 = $result_trees{'encoding_index_latin1'}{'contents'}[3];
+$result_trees{'encoding_index_latin1'}{'contents'}[3]{'contents'}[14]{'extra'}{'element_node'}
 = $result_trees{'encoding_index_latin1'}{'contents'}[3];
 
$result_trees{'encoding_index_latin1'}{'contents'}[3]{'contents'}[14]{'extra'}{'index_entry'}{'entry_element'}
 = $result_trees{'encoding_index_latin1'}{'contents'}[3]{'contents'}[14];
-$result_trees{'encoding_index_latin1'}{'contents'}[3]{'contents'}[15]{'extra'}{'entry_node'}
 = $result_trees{'encoding_index_latin1'}{'contents'}[3];
+$result_trees{'encoding_index_latin1'}{'contents'}[3]{'contents'}[15]{'extra'}{'element_node'}
 = $result_trees{'encoding_index_latin1'}{'contents'}[3];
 
$result_trees{'encoding_index_latin1'}{'contents'}[3]{'contents'}[15]{'extra'}{'index_entry'}{'entry_element'}
 = $result_trees{'encoding_index_latin1'}{'contents'}[3]{'contents'}[15];
-$result_trees{'encoding_index_latin1'}{'contents'}[3]{'contents'}[16]{'extra'}{'entry_node'}
 = $result_trees{'encoding_index_latin1'}{'contents'}[3];
+$result_trees{'encoding_index_latin1'}{'contents'}[3]{'contents'}[16]{'extra'}{'element_node'}
 = $result_trees{'encoding_index_latin1'}{'contents'}[3];
 
$result_trees{'encoding_index_latin1'}{'contents'}[3]{'contents'}[16]{'extra'}{'index_entry'}{'entry_element'}
 = $result_trees{'encoding_index_latin1'}{'contents'}[3]{'contents'}[16];
-$result_trees{'encoding_index_latin1'}{'contents'}[3]{'contents'}[17]{'extra'}{'entry_node'}
 = $result_trees{'encoding_index_latin1'}{'contents'}[3];
+$result_trees{'encoding_index_latin1'}{'contents'}[3]{'contents'}[17]{'extra'}{'element_node'}
 = $result_trees{'encoding_index_latin1'}{'contents'}[3];
 
$result_trees{'encoding_index_latin1'}{'contents'}[3]{'contents'}[17]{'extra'}{'index_entry'}{'entry_element'}
 = $result_trees{'encoding_index_latin1'}{'contents'}[3]{'contents'}[17];
-$result_trees{'encoding_index_latin1'}{'contents'}[3]{'contents'}[18]{'extra'}{'entry_node'}
 = $result_trees{'encoding_index_latin1'}{'contents'}[3];
+$result_trees{'encoding_index_latin1'}{'contents'}[3]{'contents'}[18]{'extra'}{'element_node'}
 = $result_trees{'encoding_index_latin1'}{'contents'}[3];
 
$result_trees{'encoding_index_latin1'}{'contents'}[3]{'contents'}[18]{'extra'}{'index_entry'}{'entry_element'}
 = $result_trees{'encoding_index_latin1'}{'contents'}[3]{'contents'}[18];
-$result_trees{'encoding_index_latin1'}{'contents'}[3]{'contents'}[19]{'extra'}{'entry_node'}
 = $result_trees{'encoding_index_latin1'}{'contents'}[3];
+$result_trees{'encoding_index_latin1'}{'contents'}[3]{'contents'}[19]{'extra'}{'element_node'}
 = $result_trees{'encoding_index_latin1'}{'contents'}[3];
 
$result_trees{'encoding_index_latin1'}{'contents'}[3]{'contents'}[19]{'extra'}{'index_entry'}{'entry_element'}
 = $result_trees{'encoding_index_latin1'}{'contents'}[3]{'contents'}[19];
-$result_trees{'encoding_index_latin1'}{'contents'}[3]{'contents'}[20]{'extra'}{'entry_node'}
 = $result_trees{'encoding_index_latin1'}{'contents'}[3];
+$result_trees{'encoding_index_latin1'}{'contents'}[3]{'contents'}[20]{'extra'}{'element_node'}
 = $result_trees{'encoding_index_latin1'}{'contents'}[3];
 
$result_trees{'encoding_index_latin1'}{'contents'}[3]{'contents'}[20]{'extra'}{'index_entry'}{'entry_element'}
 = $result_trees{'encoding_index_latin1'}{'contents'}[3]{'contents'}[20];
-$result_trees{'encoding_index_latin1'}{'contents'}[3]{'contents'}[21]{'extra'}{'entry_node'}
 = $result_trees{'encoding_index_latin1'}{'contents'}[3];
+$result_trees{'encoding_index_latin1'}{'contents'}[3]{'contents'}[21]{'extra'}{'element_node'}
 = $result_trees{'encoding_index_latin1'}{'contents'}[3];
 
$result_trees{'encoding_index_latin1'}{'contents'}[3]{'contents'}[21]{'extra'}{'index_entry'}{'entry_element'}
 = $result_trees{'encoding_index_latin1'}{'contents'}[3]{'contents'}[21];
-$result_trees{'encoding_index_latin1'}{'contents'}[3]{'contents'}[22]{'extra'}{'entry_node'}
 = $result_trees{'encoding_index_latin1'}{'contents'}[3];
+$result_trees{'encoding_index_latin1'}{'contents'}[3]{'contents'}[22]{'extra'}{'element_node'}
 = $result_trees{'encoding_index_latin1'}{'contents'}[3];
 
$result_trees{'encoding_index_latin1'}{'contents'}[3]{'contents'}[22]{'extra'}{'index_entry'}{'entry_element'}
 = $result_trees{'encoding_index_latin1'}{'contents'}[3]{'contents'}[22];
-$result_trees{'encoding_index_latin1'}{'contents'}[3]{'contents'}[23]{'extra'}{'entry_node'}
 = $result_trees{'encoding_index_latin1'}{'contents'}[3];
+$result_trees{'encoding_index_latin1'}{'contents'}[3]{'contents'}[23]{'extra'}{'element_node'}
 = $result_trees{'encoding_index_latin1'}{'contents'}[3];
 
$result_trees{'encoding_index_latin1'}{'contents'}[3]{'contents'}[23]{'extra'}{'index_entry'}{'entry_element'}
 = $result_trees{'encoding_index_latin1'}{'contents'}[3]{'contents'}[23];
-$result_trees{'encoding_index_latin1'}{'contents'}[3]{'contents'}[24]{'extra'}{'entry_node'}
 = $result_trees{'encoding_index_latin1'}{'contents'}[3];
+$result_trees{'encoding_index_latin1'}{'contents'}[3]{'contents'}[24]{'extra'}{'element_node'}
 = $result_trees{'encoding_index_latin1'}{'contents'}[3];
 
$result_trees{'encoding_index_latin1'}{'contents'}[3]{'contents'}[24]{'extra'}{'index_entry'}{'entry_element'}
 = $result_trees{'encoding_index_latin1'}{'contents'}[3]{'contents'}[24];
-$result_trees{'encoding_index_latin1'}{'contents'}[3]{'contents'}[25]{'extra'}{'entry_node'}
 = $result_trees{'encoding_index_latin1'}{'contents'}[3];
+$result_trees{'encoding_index_latin1'}{'contents'}[3]{'contents'}[25]{'extra'}{'element_node'}
 = $result_trees{'encoding_index_latin1'}{'contents'}[3];
 
$result_trees{'encoding_index_latin1'}{'contents'}[3]{'contents'}[25]{'extra'}{'index_entry'}{'entry_element'}
 = $result_trees{'encoding_index_latin1'}{'contents'}[3]{'contents'}[25];
-$result_trees{'encoding_index_latin1'}{'contents'}[3]{'contents'}[26]{'extra'}{'entry_node'}
 = $result_trees{'encoding_index_latin1'}{'contents'}[3];
+$result_trees{'encoding_index_latin1'}{'contents'}[3]{'contents'}[26]{'extra'}{'element_node'}
 = $result_trees{'encoding_index_latin1'}{'contents'}[3];
 
$result_trees{'encoding_index_latin1'}{'contents'}[3]{'contents'}[26]{'extra'}{'index_entry'}{'entry_element'}
 = $result_trees{'encoding_index_latin1'}{'contents'}[3]{'contents'}[26];
-$result_trees{'encoding_index_latin1'}{'contents'}[3]{'contents'}[27]{'extra'}{'entry_node'}
 = $result_trees{'encoding_index_latin1'}{'contents'}[3];
+$result_trees{'encoding_index_latin1'}{'contents'}[3]{'contents'}[27]{'extra'}{'element_node'}
 = $result_trees{'encoding_index_latin1'}{'contents'}[3];
 
$result_trees{'encoding_index_latin1'}{'contents'}[3]{'contents'}[27]{'extra'}{'index_entry'}{'entry_element'}
 = $result_trees{'encoding_index_latin1'}{'contents'}[3]{'contents'}[27];
-$result_trees{'encoding_index_latin1'}{'contents'}[3]{'contents'}[28]{'extra'}{'entry_node'}
 = $result_trees{'encoding_index_latin1'}{'contents'}[3];
+$result_trees{'encoding_index_latin1'}{'contents'}[3]{'contents'}[28]{'extra'}{'element_node'}
 = $result_trees{'encoding_index_latin1'}{'contents'}[3];
 
$result_trees{'encoding_index_latin1'}{'contents'}[3]{'contents'}[28]{'extra'}{'index_entry'}{'entry_element'}
 = $result_trees{'encoding_index_latin1'}{'contents'}[3]{'contents'}[28];
-$result_trees{'encoding_index_latin1'}{'contents'}[3]{'contents'}[29]{'extra'}{'entry_node'}
 = $result_trees{'encoding_index_latin1'}{'contents'}[3];
+$result_trees{'encoding_index_latin1'}{'contents'}[3]{'contents'}[29]{'extra'}{'element_node'}
 = $result_trees{'encoding_index_latin1'}{'contents'}[3];
 
$result_trees{'encoding_index_latin1'}{'contents'}[3]{'contents'}[29]{'extra'}{'index_entry'}{'entry_element'}
 = $result_trees{'encoding_index_latin1'}{'contents'}[3]{'contents'}[29];
-$result_trees{'encoding_index_latin1'}{'contents'}[3]{'contents'}[30]{'extra'}{'entry_node'}
 = $result_trees{'encoding_index_latin1'}{'contents'}[3];
+$result_trees{'encoding_index_latin1'}{'contents'}[3]{'contents'}[30]{'extra'}{'element_node'}
 = $result_trees{'encoding_index_latin1'}{'contents'}[3];
 
$result_trees{'encoding_index_latin1'}{'contents'}[3]{'contents'}[30]{'extra'}{'index_entry'}{'entry_element'}
 = $result_trees{'encoding_index_latin1'}{'contents'}[3]{'contents'}[30];
-$result_trees{'encoding_index_latin1'}{'contents'}[3]{'contents'}[31]{'extra'}{'entry_node'}
 = $result_trees{'encoding_index_latin1'}{'contents'}[3];
+$result_trees{'encoding_index_latin1'}{'contents'}[3]{'contents'}[31]{'extra'}{'element_node'}
 = $result_trees{'encoding_index_latin1'}{'contents'}[3];
 
$result_trees{'encoding_index_latin1'}{'contents'}[3]{'contents'}[31]{'extra'}{'index_entry'}{'entry_element'}
 = $result_trees{'encoding_index_latin1'}{'contents'}[3]{'contents'}[31];
-$result_trees{'encoding_index_latin1'}{'contents'}[3]{'contents'}[32]{'extra'}{'entry_node'}
 = $result_trees{'encoding_index_latin1'}{'contents'}[3];
+$result_trees{'encoding_index_latin1'}{'contents'}[3]{'contents'}[32]{'extra'}{'element_node'}
 = $result_trees{'encoding_index_latin1'}{'contents'}[3];
 
$result_trees{'encoding_index_latin1'}{'contents'}[3]{'contents'}[32]{'extra'}{'index_entry'}{'entry_element'}
 = $result_trees{'encoding_index_latin1'}{'contents'}[3]{'contents'}[32];
-$result_trees{'encoding_index_latin1'}{'contents'}[3]{'contents'}[33]{'extra'}{'entry_node'}
 = $result_trees{'encoding_index_latin1'}{'contents'}[3];
+$result_trees{'encoding_index_latin1'}{'contents'}[3]{'contents'}[33]{'extra'}{'element_node'}
 = $result_trees{'encoding_index_latin1'}{'contents'}[3];
 
$result_trees{'encoding_index_latin1'}{'contents'}[3]{'contents'}[33]{'extra'}{'index_entry'}{'entry_element'}
 = $result_trees{'encoding_index_latin1'}{'contents'}[3]{'contents'}[33];
-$result_trees{'encoding_index_latin1'}{'contents'}[3]{'contents'}[34]{'extra'}{'entry_node'}
 = $result_trees{'encoding_index_latin1'}{'contents'}[3];
+$result_trees{'encoding_index_latin1'}{'contents'}[3]{'contents'}[34]{'extra'}{'element_node'}
 = $result_trees{'encoding_index_latin1'}{'contents'}[3];
 
$result_trees{'encoding_index_latin1'}{'contents'}[3]{'contents'}[34]{'extra'}{'index_entry'}{'entry_element'}
 = $result_trees{'encoding_index_latin1'}{'contents'}[3]{'contents'}[34];
-$result_trees{'encoding_index_latin1'}{'contents'}[3]{'contents'}[35]{'extra'}{'entry_node'}
 = $result_trees{'encoding_index_latin1'}{'contents'}[3];
+$result_trees{'encoding_index_latin1'}{'contents'}[3]{'contents'}[35]{'extra'}{'element_node'}
 = $result_trees{'encoding_index_latin1'}{'contents'}[3];
 
$result_trees{'encoding_index_latin1'}{'contents'}[3]{'contents'}[35]{'extra'}{'index_entry'}{'entry_element'}
 = $result_trees{'encoding_index_latin1'}{'contents'}[3]{'contents'}[35];
-$result_trees{'encoding_index_latin1'}{'contents'}[3]{'contents'}[36]{'extra'}{'entry_node'}
 = $result_trees{'encoding_index_latin1'}{'contents'}[3];
+$result_trees{'encoding_index_latin1'}{'contents'}[3]{'contents'}[36]{'extra'}{'element_node'}
 = $result_trees{'encoding_index_latin1'}{'contents'}[3];
 
$result_trees{'encoding_index_latin1'}{'contents'}[3]{'contents'}[36]{'extra'}{'index_entry'}{'entry_element'}
 = $result_trees{'encoding_index_latin1'}{'contents'}[3]{'contents'}[36];
-$result_trees{'encoding_index_latin1'}{'contents'}[3]{'contents'}[37]{'extra'}{'entry_node'}
 = $result_trees{'encoding_index_latin1'}{'contents'}[3];
+$result_trees{'encoding_index_latin1'}{'contents'}[3]{'contents'}[37]{'extra'}{'element_node'}
 = $result_trees{'encoding_index_latin1'}{'contents'}[3];
 
$result_trees{'encoding_index_latin1'}{'contents'}[3]{'contents'}[37]{'extra'}{'index_entry'}{'entry_element'}
 = $result_trees{'encoding_index_latin1'}{'contents'}[3]{'contents'}[37];
-$result_trees{'encoding_index_latin1'}{'contents'}[3]{'contents'}[38]{'extra'}{'entry_node'}
 = $result_trees{'encoding_index_latin1'}{'contents'}[3];
+$result_trees{'encoding_index_latin1'}{'contents'}[3]{'contents'}[38]{'extra'}{'element_node'}
 = $result_trees{'encoding_index_latin1'}{'contents'}[3];
 
$result_trees{'encoding_index_latin1'}{'contents'}[3]{'contents'}[38]{'extra'}{'index_entry'}{'entry_element'}
 = $result_trees{'encoding_index_latin1'}{'contents'}[3]{'contents'}[38];
-$result_trees{'encoding_index_latin1'}{'contents'}[3]{'contents'}[39]{'extra'}{'entry_node'}
 = $result_trees{'encoding_index_latin1'}{'contents'}[3];
+$result_trees{'encoding_index_latin1'}{'contents'}[3]{'contents'}[39]{'extra'}{'element_node'}
 = $result_trees{'encoding_index_latin1'}{'contents'}[3];
 
$result_trees{'encoding_index_latin1'}{'contents'}[3]{'contents'}[39]{'extra'}{'index_entry'}{'entry_element'}
 = $result_trees{'encoding_index_latin1'}{'contents'}[3]{'contents'}[39];
-$result_trees{'encoding_index_latin1'}{'contents'}[3]{'contents'}[40]{'extra'}{'entry_node'}
 = $result_trees{'encoding_index_latin1'}{'contents'}[3];
+$result_trees{'encoding_index_latin1'}{'contents'}[3]{'contents'}[40]{'extra'}{'element_node'}
 = $result_trees{'encoding_index_latin1'}{'contents'}[3];
 
$result_trees{'encoding_index_latin1'}{'contents'}[3]{'contents'}[40]{'extra'}{'index_entry'}{'entry_element'}
 = $result_trees{'encoding_index_latin1'}{'contents'}[3]{'contents'}[40];
-$result_trees{'encoding_index_latin1'}{'contents'}[3]{'contents'}[41]{'extra'}{'entry_node'}
 = $result_trees{'encoding_index_latin1'}{'contents'}[3];
+$result_trees{'encoding_index_latin1'}{'contents'}[3]{'contents'}[41]{'extra'}{'element_node'}
 = $result_trees{'encoding_index_latin1'}{'contents'}[3];
 
$result_trees{'encoding_index_latin1'}{'contents'}[3]{'contents'}[41]{'extra'}{'index_entry'}{'entry_element'}
 = $result_trees{'encoding_index_latin1'}{'contents'}[3]{'contents'}[41];
-$result_trees{'encoding_index_latin1'}{'contents'}[3]{'contents'}[42]{'extra'}{'entry_node'}
 = $result_trees{'encoding_index_latin1'}{'contents'}[3];
+$result_trees{'encoding_index_latin1'}{'contents'}[3]{'contents'}[42]{'extra'}{'element_node'}
 = $result_trees{'encoding_index_latin1'}{'contents'}[3];
 
$result_trees{'encoding_index_latin1'}{'contents'}[3]{'contents'}[42]{'extra'}{'index_entry'}{'entry_element'}
 = $result_trees{'encoding_index_latin1'}{'contents'}[3]{'contents'}[42];
-$result_trees{'encoding_index_latin1'}{'contents'}[3]{'contents'}[43]{'extra'}{'entry_node'}
 = $result_trees{'encoding_index_latin1'}{'contents'}[3];
+$result_trees{'encoding_index_latin1'}{'contents'}[3]{'contents'}[43]{'extra'}{'element_node'}
 = $result_trees{'encoding_index_latin1'}{'contents'}[3];
 
$result_trees{'encoding_index_latin1'}{'contents'}[3]{'contents'}[43]{'extra'}{'index_entry'}{'entry_element'}
 = $result_trees{'encoding_index_latin1'}{'contents'}[3]{'contents'}[43];
-$result_trees{'encoding_index_latin1'}{'contents'}[3]{'contents'}[44]{'extra'}{'entry_node'}
 = $result_trees{'encoding_index_latin1'}{'contents'}[3];
+$result_trees{'encoding_index_latin1'}{'contents'}[3]{'contents'}[44]{'extra'}{'element_node'}
 = $result_trees{'encoding_index_latin1'}{'contents'}[3];
 
$result_trees{'encoding_index_latin1'}{'contents'}[3]{'contents'}[44]{'extra'}{'index_entry'}{'entry_element'}
 = $result_trees{'encoding_index_latin1'}{'contents'}[3]{'contents'}[44];
-$result_trees{'encoding_index_latin1'}{'contents'}[3]{'contents'}[45]{'extra'}{'entry_node'}
 = $result_trees{'encoding_index_latin1'}{'contents'}[3];
+$result_trees{'encoding_index_latin1'}{'contents'}[3]{'contents'}[45]{'extra'}{'element_node'}
 = $result_trees{'encoding_index_latin1'}{'contents'}[3];
 
$result_trees{'encoding_index_latin1'}{'contents'}[3]{'contents'}[45]{'extra'}{'index_entry'}{'entry_element'}
 = $result_trees{'encoding_index_latin1'}{'contents'}[3]{'contents'}[45];
-$result_trees{'encoding_index_latin1'}{'contents'}[3]{'contents'}[46]{'extra'}{'entry_node'}
 = $result_trees{'encoding_index_latin1'}{'contents'}[3];
+$result_trees{'encoding_index_latin1'}{'contents'}[3]{'contents'}[46]{'extra'}{'element_node'}
 = $result_trees{'encoding_index_latin1'}{'contents'}[3];
 
$result_trees{'encoding_index_latin1'}{'contents'}[3]{'contents'}[46]{'extra'}{'index_entry'}{'entry_element'}
 = $result_trees{'encoding_index_latin1'}{'contents'}[3]{'contents'}[46];
-$result_trees{'encoding_index_latin1'}{'contents'}[3]{'contents'}[47]{'extra'}{'entry_node'}
 = $result_trees{'encoding_index_latin1'}{'contents'}[3];
+$result_trees{'encoding_index_latin1'}{'contents'}[3]{'contents'}[47]{'extra'}{'element_node'}
 = $result_trees{'encoding_index_latin1'}{'contents'}[3];
 
$result_trees{'encoding_index_latin1'}{'contents'}[3]{'contents'}[47]{'extra'}{'index_entry'}{'entry_element'}
 = $result_trees{'encoding_index_latin1'}{'contents'}[3]{'contents'}[47];
-$result_trees{'encoding_index_latin1'}{'contents'}[3]{'contents'}[48]{'extra'}{'entry_node'}
 = $result_trees{'encoding_index_latin1'}{'contents'}[3];
+$result_trees{'encoding_index_latin1'}{'contents'}[3]{'contents'}[48]{'extra'}{'element_node'}
 = $result_trees{'encoding_index_latin1'}{'contents'}[3];
 
$result_trees{'encoding_index_latin1'}{'contents'}[3]{'contents'}[48]{'extra'}{'index_entry'}{'entry_element'}
 = $result_trees{'encoding_index_latin1'}{'contents'}[3]{'contents'}[48];
-$result_trees{'encoding_index_latin1'}{'contents'}[3]{'contents'}[49]{'extra'}{'entry_node'}
 = $result_trees{'encoding_index_latin1'}{'contents'}[3];
+$result_trees{'encoding_index_latin1'}{'contents'}[3]{'contents'}[49]{'extra'}{'element_node'}
 = $result_trees{'encoding_index_latin1'}{'contents'}[3];
 
$result_trees{'encoding_index_latin1'}{'contents'}[3]{'contents'}[49]{'extra'}{'index_entry'}{'entry_element'}
 = $result_trees{'encoding_index_latin1'}{'contents'}[3]{'contents'}[49];
-$result_trees{'encoding_index_latin1'}{'contents'}[3]{'contents'}[50]{'extra'}{'entry_node'}
 = $result_trees{'encoding_index_latin1'}{'contents'}[3];
+$result_trees{'encoding_index_latin1'}{'contents'}[3]{'contents'}[50]{'extra'}{'element_node'}
 = $result_trees{'encoding_index_latin1'}{'contents'}[3];
 
$result_trees{'encoding_index_latin1'}{'contents'}[3]{'contents'}[50]{'extra'}{'index_entry'}{'entry_element'}
 = $result_trees{'encoding_index_latin1'}{'contents'}[3]{'contents'}[50];
-$result_trees{'encoding_index_latin1'}{'contents'}[3]{'contents'}[51]{'extra'}{'entry_node'}
 = $result_trees{'encoding_index_latin1'}{'contents'}[3];
+$result_trees{'encoding_index_latin1'}{'contents'}[3]{'contents'}[51]{'extra'}{'element_node'}
 = $result_trees{'encoding_index_latin1'}{'contents'}[3];
 
$result_trees{'encoding_index_latin1'}{'contents'}[3]{'contents'}[51]{'extra'}{'index_entry'}{'entry_element'}
 = $result_trees{'encoding_index_latin1'}{'contents'}[3]{'contents'}[51];
-$result_trees{'encoding_index_latin1'}{'contents'}[3]{'contents'}[52]{'extra'}{'entry_node'}
 = $result_trees{'encoding_index_latin1'}{'contents'}[3];
+$result_trees{'encoding_index_latin1'}{'contents'}[3]{'contents'}[52]{'extra'}{'element_node'}
 = $result_trees{'encoding_index_latin1'}{'contents'}[3];
 
$result_trees{'encoding_index_latin1'}{'contents'}[3]{'contents'}[52]{'extra'}{'index_entry'}{'entry_element'}
 = $result_trees{'encoding_index_latin1'}{'contents'}[3]{'contents'}[52];
-$result_trees{'encoding_index_latin1'}{'contents'}[3]{'contents'}[53]{'extra'}{'entry_node'}
 = $result_trees{'encoding_index_latin1'}{'contents'}[3];
+$result_trees{'encoding_index_latin1'}{'contents'}[3]{'contents'}[53]{'extra'}{'element_node'}
 = $result_trees{'encoding_index_latin1'}{'contents'}[3];
 
$result_trees{'encoding_index_latin1'}{'contents'}[3]{'contents'}[53]{'extra'}{'index_entry'}{'entry_element'}
 = $result_trees{'encoding_index_latin1'}{'contents'}[3]{'contents'}[53];
-$result_trees{'encoding_index_latin1'}{'contents'}[3]{'contents'}[54]{'extra'}{'entry_node'}
 = $result_trees{'encoding_index_latin1'}{'contents'}[3];
+$result_trees{'encoding_index_latin1'}{'contents'}[3]{'contents'}[54]{'extra'}{'element_node'}
 = $result_trees{'encoding_index_latin1'}{'contents'}[3];
 
$result_trees{'encoding_index_latin1'}{'contents'}[3]{'contents'}[54]{'extra'}{'index_entry'}{'entry_element'}
 = $result_trees{'encoding_index_latin1'}{'contents'}[3]{'contents'}[54];
-$result_trees{'encoding_index_latin1'}{'contents'}[3]{'contents'}[55]{'extra'}{'entry_node'}
 = $result_trees{'encoding_index_latin1'}{'contents'}[3];
+$result_trees{'encoding_index_latin1'}{'contents'}[3]{'contents'}[55]{'extra'}{'element_node'}
 = $result_trees{'encoding_index_latin1'}{'contents'}[3];
 
$result_trees{'encoding_index_latin1'}{'contents'}[3]{'contents'}[55]{'extra'}{'index_entry'}{'entry_element'}
 = $result_trees{'encoding_index_latin1'}{'contents'}[3]{'contents'}[55];
 
$result_trees{'encoding_index_latin1'}{'contents'}[3]{'extra'}{'node_content'}[0]
 = 
$result_trees{'encoding_index_latin1'}{'contents'}[3]{'args'}[0]{'contents'}[0];
 
$result_trees{'encoding_index_latin1'}{'contents'}[3]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = 
$result_trees{'encoding_index_latin1'}{'contents'}[3]{'args'}[0]{'contents'}[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 eba02ee546..e2b0a84d6a 100644
--- a/tp/t/results/indices/encoding_index_latin1_enable_encoding.pl
+++ b/tp/t/results/indices/encoding_index_latin1_enable_encoding.pl
@@ -189,7 +189,7 @@ $result_trees{'encoding_index_latin1_enable_encoding'} = {
           ],
           'cmdname' => 'cindex',
           'extra' => {
-            'entry_node' => {},
+            'element_node' => {},
             'index_entry' => {
               'entry_element' => {},
               'entry_number' => 1,
@@ -300,7 +300,7 @@ $result_trees{'encoding_index_latin1_enable_encoding'} = {
           ],
           'cmdname' => 'cindex',
           'extra' => {
-            'entry_node' => {},
+            'element_node' => {},
             'index_entry' => {
               'entry_element' => {},
               'entry_number' => 2,
@@ -429,7 +429,7 @@ $result_trees{'encoding_index_latin1_enable_encoding'} = {
           ],
           'cmdname' => 'cindex',
           'extra' => {
-            'entry_node' => {},
+            'element_node' => {},
             'index_entry' => {
               'entry_element' => {},
               'entry_number' => 3,
@@ -468,7 +468,7 @@ $result_trees{'encoding_index_latin1_enable_encoding'} = {
           ],
           'cmdname' => 'cindex',
           'extra' => {
-            'entry_node' => {},
+            'element_node' => {},
             'index_entry' => {
               'entry_element' => {},
               'entry_number' => 4,
@@ -507,7 +507,7 @@ $result_trees{'encoding_index_latin1_enable_encoding'} = {
           ],
           'cmdname' => 'cindex',
           'extra' => {
-            'entry_node' => {},
+            'element_node' => {},
             'index_entry' => {
               'entry_element' => {},
               'entry_number' => 5,
@@ -546,7 +546,7 @@ $result_trees{'encoding_index_latin1_enable_encoding'} = {
           ],
           'cmdname' => 'cindex',
           'extra' => {
-            'entry_node' => {},
+            'element_node' => {},
             'index_entry' => {
               'entry_element' => {},
               'entry_number' => 6,
@@ -585,7 +585,7 @@ $result_trees{'encoding_index_latin1_enable_encoding'} = {
           ],
           'cmdname' => 'cindex',
           'extra' => {
-            'entry_node' => {},
+            'element_node' => {},
             'index_entry' => {
               'entry_element' => {},
               'entry_number' => 7,
@@ -624,7 +624,7 @@ $result_trees{'encoding_index_latin1_enable_encoding'} = {
           ],
           'cmdname' => 'cindex',
           'extra' => {
-            'entry_node' => {},
+            'element_node' => {},
             'index_entry' => {
               'entry_element' => {},
               'entry_number' => 8,
@@ -663,7 +663,7 @@ $result_trees{'encoding_index_latin1_enable_encoding'} = {
           ],
           'cmdname' => 'cindex',
           'extra' => {
-            'entry_node' => {},
+            'element_node' => {},
             'index_entry' => {
               'entry_element' => {},
               'entry_number' => 9,
@@ -702,7 +702,7 @@ $result_trees{'encoding_index_latin1_enable_encoding'} = {
           ],
           'cmdname' => 'cindex',
           'extra' => {
-            'entry_node' => {},
+            'element_node' => {},
             'index_entry' => {
               'entry_element' => {},
               'entry_number' => 10,
@@ -741,7 +741,7 @@ $result_trees{'encoding_index_latin1_enable_encoding'} = {
           ],
           'cmdname' => 'cindex',
           'extra' => {
-            'entry_node' => {},
+            'element_node' => {},
             'index_entry' => {
               'entry_element' => {},
               'entry_number' => 11,
@@ -780,7 +780,7 @@ $result_trees{'encoding_index_latin1_enable_encoding'} = {
           ],
           'cmdname' => 'cindex',
           'extra' => {
-            'entry_node' => {},
+            'element_node' => {},
             'index_entry' => {
               'entry_element' => {},
               'entry_number' => 12,
@@ -819,7 +819,7 @@ $result_trees{'encoding_index_latin1_enable_encoding'} = {
           ],
           'cmdname' => 'cindex',
           'extra' => {
-            'entry_node' => {},
+            'element_node' => {},
             'index_entry' => {
               'entry_element' => {},
               'entry_number' => 13,
@@ -858,7 +858,7 @@ $result_trees{'encoding_index_latin1_enable_encoding'} = {
           ],
           'cmdname' => 'cindex',
           'extra' => {
-            'entry_node' => {},
+            'element_node' => {},
             'index_entry' => {
               'entry_element' => {},
               'entry_number' => 14,
@@ -897,7 +897,7 @@ $result_trees{'encoding_index_latin1_enable_encoding'} = {
           ],
           'cmdname' => 'cindex',
           'extra' => {
-            'entry_node' => {},
+            'element_node' => {},
             'index_entry' => {
               'entry_element' => {},
               'entry_number' => 15,
@@ -936,7 +936,7 @@ $result_trees{'encoding_index_latin1_enable_encoding'} = {
           ],
           'cmdname' => 'cindex',
           'extra' => {
-            'entry_node' => {},
+            'element_node' => {},
             'index_entry' => {
               'entry_element' => {},
               'entry_number' => 16,
@@ -975,7 +975,7 @@ $result_trees{'encoding_index_latin1_enable_encoding'} = {
           ],
           'cmdname' => 'cindex',
           'extra' => {
-            'entry_node' => {},
+            'element_node' => {},
             'index_entry' => {
               'entry_element' => {},
               'entry_number' => 17,
@@ -1014,7 +1014,7 @@ $result_trees{'encoding_index_latin1_enable_encoding'} = {
           ],
           'cmdname' => 'cindex',
           'extra' => {
-            'entry_node' => {},
+            'element_node' => {},
             'index_entry' => {
               'entry_element' => {},
               'entry_number' => 18,
@@ -1053,7 +1053,7 @@ $result_trees{'encoding_index_latin1_enable_encoding'} = {
           ],
           'cmdname' => 'cindex',
           'extra' => {
-            'entry_node' => {},
+            'element_node' => {},
             'index_entry' => {
               'entry_element' => {},
               'entry_number' => 19,
@@ -1092,7 +1092,7 @@ $result_trees{'encoding_index_latin1_enable_encoding'} = {
           ],
           'cmdname' => 'cindex',
           'extra' => {
-            'entry_node' => {},
+            'element_node' => {},
             'index_entry' => {
               'entry_element' => {},
               'entry_number' => 20,
@@ -1131,7 +1131,7 @@ $result_trees{'encoding_index_latin1_enable_encoding'} = {
           ],
           'cmdname' => 'cindex',
           'extra' => {
-            'entry_node' => {},
+            'element_node' => {},
             'index_entry' => {
               'entry_element' => {},
               'entry_number' => 21,
@@ -1170,7 +1170,7 @@ $result_trees{'encoding_index_latin1_enable_encoding'} = {
           ],
           'cmdname' => 'cindex',
           'extra' => {
-            'entry_node' => {},
+            'element_node' => {},
             'index_entry' => {
               'entry_element' => {},
               'entry_number' => 22,
@@ -1209,7 +1209,7 @@ $result_trees{'encoding_index_latin1_enable_encoding'} = {
           ],
           'cmdname' => 'cindex',
           'extra' => {
-            'entry_node' => {},
+            'element_node' => {},
             'index_entry' => {
               'entry_element' => {},
               'entry_number' => 23,
@@ -1248,7 +1248,7 @@ $result_trees{'encoding_index_latin1_enable_encoding'} = {
           ],
           'cmdname' => 'cindex',
           'extra' => {
-            'entry_node' => {},
+            'element_node' => {},
             'index_entry' => {
               'entry_element' => {},
               'entry_number' => 24,
@@ -1287,7 +1287,7 @@ $result_trees{'encoding_index_latin1_enable_encoding'} = {
           ],
           'cmdname' => 'cindex',
           'extra' => {
-            'entry_node' => {},
+            'element_node' => {},
             'index_entry' => {
               'entry_element' => {},
               'entry_number' => 25,
@@ -1326,7 +1326,7 @@ $result_trees{'encoding_index_latin1_enable_encoding'} = {
           ],
           'cmdname' => 'cindex',
           'extra' => {
-            'entry_node' => {},
+            'element_node' => {},
             'index_entry' => {
               'entry_element' => {},
               'entry_number' => 26,
@@ -1365,7 +1365,7 @@ $result_trees{'encoding_index_latin1_enable_encoding'} = {
           ],
           'cmdname' => 'cindex',
           'extra' => {
-            'entry_node' => {},
+            'element_node' => {},
             'index_entry' => {
               'entry_element' => {},
               'entry_number' => 27,
@@ -1404,7 +1404,7 @@ $result_trees{'encoding_index_latin1_enable_encoding'} = {
           ],
           'cmdname' => 'cindex',
           'extra' => {
-            'entry_node' => {},
+            'element_node' => {},
             'index_entry' => {
               'entry_element' => {},
               'entry_number' => 28,
@@ -1443,7 +1443,7 @@ $result_trees{'encoding_index_latin1_enable_encoding'} = {
           ],
           'cmdname' => 'cindex',
           'extra' => {
-            'entry_node' => {},
+            'element_node' => {},
             'index_entry' => {
               'entry_element' => {},
               'entry_number' => 29,
@@ -1482,7 +1482,7 @@ $result_trees{'encoding_index_latin1_enable_encoding'} = {
           ],
           'cmdname' => 'cindex',
           'extra' => {
-            'entry_node' => {},
+            'element_node' => {},
             'index_entry' => {
               'entry_element' => {},
               'entry_number' => 30,
@@ -1521,7 +1521,7 @@ $result_trees{'encoding_index_latin1_enable_encoding'} = {
           ],
           'cmdname' => 'cindex',
           'extra' => {
-            'entry_node' => {},
+            'element_node' => {},
             'index_entry' => {
               'entry_element' => {},
               'entry_number' => 31,
@@ -1570,7 +1570,7 @@ $result_trees{'encoding_index_latin1_enable_encoding'} = {
           ],
           'cmdname' => 'cindex',
           'extra' => {
-            'entry_node' => {},
+            'element_node' => {},
             'index_entry' => {
               'entry_element' => {},
               'entry_number' => 32,
@@ -1619,7 +1619,7 @@ $result_trees{'encoding_index_latin1_enable_encoding'} = {
           ],
           'cmdname' => 'cindex',
           'extra' => {
-            'entry_node' => {},
+            'element_node' => {},
             'index_entry' => {
               'entry_element' => {},
               'entry_number' => 33,
@@ -1697,7 +1697,7 @@ $result_trees{'encoding_index_latin1_enable_encoding'} = {
           ],
           'cmdname' => 'cindex',
           'extra' => {
-            'entry_node' => {},
+            'element_node' => {},
             'index_entry' => {
               'entry_element' => {},
               'entry_number' => 34,
@@ -1805,7 +1805,7 @@ $result_trees{'encoding_index_latin1_enable_encoding'} = {
           ],
           'cmdname' => 'cindex',
           'extra' => {
-            'entry_node' => {},
+            'element_node' => {},
             'index_entry' => {
               'entry_element' => {},
               'entry_number' => 35,
@@ -1854,7 +1854,7 @@ $result_trees{'encoding_index_latin1_enable_encoding'} = {
           ],
           'cmdname' => 'cindex',
           'extra' => {
-            'entry_node' => {},
+            'element_node' => {},
             'index_entry' => {
               'entry_element' => {},
               'entry_number' => 36,
@@ -1903,7 +1903,7 @@ $result_trees{'encoding_index_latin1_enable_encoding'} = {
           ],
           'cmdname' => 'cindex',
           'extra' => {
-            'entry_node' => {},
+            'element_node' => {},
             'index_entry' => {
               'entry_element' => {},
               'entry_number' => 37,
@@ -1952,7 +1952,7 @@ $result_trees{'encoding_index_latin1_enable_encoding'} = {
           ],
           'cmdname' => 'cindex',
           'extra' => {
-            'entry_node' => {},
+            'element_node' => {},
             'index_entry' => {
               'entry_element' => {},
               'entry_number' => 38,
@@ -2001,7 +2001,7 @@ $result_trees{'encoding_index_latin1_enable_encoding'} = {
           ],
           'cmdname' => 'cindex',
           'extra' => {
-            'entry_node' => {},
+            'element_node' => {},
             'index_entry' => {
               'entry_element' => {},
               'entry_number' => 39,
@@ -2050,7 +2050,7 @@ $result_trees{'encoding_index_latin1_enable_encoding'} = {
           ],
           'cmdname' => 'cindex',
           'extra' => {
-            'entry_node' => {},
+            'element_node' => {},
             'index_entry' => {
               'entry_element' => {},
               'entry_number' => 40,
@@ -2099,7 +2099,7 @@ $result_trees{'encoding_index_latin1_enable_encoding'} = {
           ],
           'cmdname' => 'cindex',
           'extra' => {
-            'entry_node' => {},
+            'element_node' => {},
             'index_entry' => {
               'entry_element' => {},
               'entry_number' => 41,
@@ -2148,7 +2148,7 @@ $result_trees{'encoding_index_latin1_enable_encoding'} = {
           ],
           'cmdname' => 'cindex',
           'extra' => {
-            'entry_node' => {},
+            'element_node' => {},
             'index_entry' => {
               'entry_element' => {},
               'entry_number' => 42,
@@ -2187,7 +2187,7 @@ $result_trees{'encoding_index_latin1_enable_encoding'} = {
           ],
           'cmdname' => 'cindex',
           'extra' => {
-            'entry_node' => {},
+            'element_node' => {},
             'index_entry' => {
               'entry_element' => {},
               'entry_number' => 43,
@@ -2226,7 +2226,7 @@ $result_trees{'encoding_index_latin1_enable_encoding'} = {
           ],
           'cmdname' => 'cindex',
           'extra' => {
-            'entry_node' => {},
+            'element_node' => {},
             'index_entry' => {
               'entry_element' => {},
               'entry_number' => 44,
@@ -2275,7 +2275,7 @@ $result_trees{'encoding_index_latin1_enable_encoding'} = {
           ],
           'cmdname' => 'cindex',
           'extra' => {
-            'entry_node' => {},
+            'element_node' => {},
             'index_entry' => {
               'entry_element' => {},
               'entry_number' => 45,
@@ -2324,7 +2324,7 @@ $result_trees{'encoding_index_latin1_enable_encoding'} = {
           ],
           'cmdname' => 'cindex',
           'extra' => {
-            'entry_node' => {},
+            'element_node' => {},
             'index_entry' => {
               'entry_element' => {},
               'entry_number' => 46,
@@ -2373,7 +2373,7 @@ $result_trees{'encoding_index_latin1_enable_encoding'} = {
           ],
           'cmdname' => 'cindex',
           'extra' => {
-            'entry_node' => {},
+            'element_node' => {},
             'index_entry' => {
               'entry_element' => {},
               'entry_number' => 47,
@@ -2412,7 +2412,7 @@ $result_trees{'encoding_index_latin1_enable_encoding'} = {
           ],
           'cmdname' => 'cindex',
           'extra' => {
-            'entry_node' => {},
+            'element_node' => {},
             'index_entry' => {
               'entry_element' => {},
               'entry_number' => 48,
@@ -2451,7 +2451,7 @@ $result_trees{'encoding_index_latin1_enable_encoding'} = {
           ],
           'cmdname' => 'cindex',
           'extra' => {
-            'entry_node' => {},
+            'element_node' => {},
             'index_entry' => {
               'entry_element' => {},
               'entry_number' => 49,
@@ -2490,7 +2490,7 @@ $result_trees{'encoding_index_latin1_enable_encoding'} = {
           ],
           'cmdname' => 'cindex',
           'extra' => {
-            'entry_node' => {},
+            'element_node' => {},
             'index_entry' => {
               'entry_element' => {},
               'entry_number' => 50,
@@ -2529,7 +2529,7 @@ $result_trees{'encoding_index_latin1_enable_encoding'} = {
           ],
           'cmdname' => 'cindex',
           'extra' => {
-            'entry_node' => {},
+            'element_node' => {},
             'index_entry' => {
               'entry_element' => {},
               'entry_number' => 51,
@@ -2568,7 +2568,7 @@ $result_trees{'encoding_index_latin1_enable_encoding'} = {
           ],
           'cmdname' => 'cindex',
           'extra' => {
-            'entry_node' => {},
+            'element_node' => {},
             'index_entry' => {
               'entry_element' => {},
               'entry_number' => 52,
@@ -2607,7 +2607,7 @@ $result_trees{'encoding_index_latin1_enable_encoding'} = {
           ],
           'cmdname' => 'cindex',
           'extra' => {
-            'entry_node' => {},
+            'element_node' => {},
             'index_entry' => {
               'entry_element' => {},
               'entry_number' => 53,
@@ -2646,7 +2646,7 @@ $result_trees{'encoding_index_latin1_enable_encoding'} = {
           ],
           'cmdname' => 'cindex',
           'extra' => {
-            'entry_node' => {},
+            'element_node' => {},
             'index_entry' => {
               'entry_element' => {},
               'entry_number' => 54,
@@ -2685,7 +2685,7 @@ $result_trees{'encoding_index_latin1_enable_encoding'} = {
           ],
           'cmdname' => 'cindex',
           'extra' => {
-            'entry_node' => {},
+            'element_node' => {},
             'index_entry' => {
               'entry_element' => {},
               'entry_number' => 55,
@@ -2786,115 +2786,115 @@ 
$result_trees{'encoding_index_latin1_enable_encoding'} = {
 };
 
$result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[1]{'extra'}{'node_content'}[0]
 = 
$result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[1]{'args'}[0]{'contents'}[0];
 
$result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[1]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = 
$result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[1]{'args'}[0]{'contents'}[0];
-$result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[3]{'contents'}[1]{'extra'}{'entry_node'}
 = $result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[3];
+$result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[3]{'contents'}[1]{'extra'}{'element_node'}
 = $result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[3];
 
$result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[3]{'contents'}[1]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[3]{'contents'}[1];
-$result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[3]{'contents'}[2]{'extra'}{'entry_node'}
 = $result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[3];
+$result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[3]{'contents'}[2]{'extra'}{'element_node'}
 = $result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[3];
 
$result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[3]{'contents'}[2]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[3]{'contents'}[2];
-$result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[3]{'contents'}[3]{'extra'}{'entry_node'}
 = $result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[3];
+$result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[3]{'contents'}[3]{'extra'}{'element_node'}
 = $result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[3];
 
$result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[3]{'contents'}[3]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[3]{'contents'}[3];
-$result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[3]{'contents'}[4]{'extra'}{'entry_node'}
 = $result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[3];
+$result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[3]{'contents'}[4]{'extra'}{'element_node'}
 = $result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[3];
 
$result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[3]{'contents'}[4]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[3]{'contents'}[4];
-$result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[3]{'contents'}[5]{'extra'}{'entry_node'}
 = $result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[3];
+$result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[3]{'contents'}[5]{'extra'}{'element_node'}
 = $result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[3];
 
$result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[3]{'contents'}[5]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[3]{'contents'}[5];
-$result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[3]{'contents'}[6]{'extra'}{'entry_node'}
 = $result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[3];
+$result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[3]{'contents'}[6]{'extra'}{'element_node'}
 = $result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[3];
 
$result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[3]{'contents'}[6]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[3]{'contents'}[6];
-$result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[3]{'contents'}[7]{'extra'}{'entry_node'}
 = $result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[3];
+$result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[3]{'contents'}[7]{'extra'}{'element_node'}
 = $result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[3];
 
$result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[3]{'contents'}[7]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[3]{'contents'}[7];
-$result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[3]{'contents'}[8]{'extra'}{'entry_node'}
 = $result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[3];
+$result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[3]{'contents'}[8]{'extra'}{'element_node'}
 = $result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[3];
 
$result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[3]{'contents'}[8]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[3]{'contents'}[8];
-$result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[3]{'contents'}[9]{'extra'}{'entry_node'}
 = $result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[3];
+$result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[3]{'contents'}[9]{'extra'}{'element_node'}
 = $result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[3];
 
$result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[3]{'contents'}[9]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[3]{'contents'}[9];
-$result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[3]{'contents'}[10]{'extra'}{'entry_node'}
 = $result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[3];
+$result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[3]{'contents'}[10]{'extra'}{'element_node'}
 = $result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[3];
 
$result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[3]{'contents'}[10]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[3]{'contents'}[10];
-$result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[3]{'contents'}[11]{'extra'}{'entry_node'}
 = $result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[3];
+$result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[3]{'contents'}[11]{'extra'}{'element_node'}
 = $result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[3];
 
$result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[3]{'contents'}[11]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[3]{'contents'}[11];
-$result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[3]{'contents'}[12]{'extra'}{'entry_node'}
 = $result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[3];
+$result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[3]{'contents'}[12]{'extra'}{'element_node'}
 = $result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[3];
 
$result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[3]{'contents'}[12]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[3]{'contents'}[12];
-$result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[3]{'contents'}[13]{'extra'}{'entry_node'}
 = $result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[3];
+$result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[3]{'contents'}[13]{'extra'}{'element_node'}
 = $result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[3];
 
$result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[3]{'contents'}[13]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[3]{'contents'}[13];
-$result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[3]{'contents'}[14]{'extra'}{'entry_node'}
 = $result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[3];
+$result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[3]{'contents'}[14]{'extra'}{'element_node'}
 = $result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[3];
 
$result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[3]{'contents'}[14]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[3]{'contents'}[14];
-$result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[3]{'contents'}[15]{'extra'}{'entry_node'}
 = $result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[3];
+$result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[3]{'contents'}[15]{'extra'}{'element_node'}
 = $result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[3];
 
$result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[3]{'contents'}[15]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[3]{'contents'}[15];
-$result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[3]{'contents'}[16]{'extra'}{'entry_node'}
 = $result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[3];
+$result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[3]{'contents'}[16]{'extra'}{'element_node'}
 = $result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[3];
 
$result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[3]{'contents'}[16]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[3]{'contents'}[16];
-$result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[3]{'contents'}[17]{'extra'}{'entry_node'}
 = $result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[3];
+$result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[3]{'contents'}[17]{'extra'}{'element_node'}
 = $result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[3];
 
$result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[3]{'contents'}[17]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[3]{'contents'}[17];
-$result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[3]{'contents'}[18]{'extra'}{'entry_node'}
 = $result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[3];
+$result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[3]{'contents'}[18]{'extra'}{'element_node'}
 = $result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[3];
 
$result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[3]{'contents'}[18]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[3]{'contents'}[18];
-$result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[3]{'contents'}[19]{'extra'}{'entry_node'}
 = $result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[3];
+$result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[3]{'contents'}[19]{'extra'}{'element_node'}
 = $result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[3];
 
$result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[3]{'contents'}[19]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[3]{'contents'}[19];
-$result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[3]{'contents'}[20]{'extra'}{'entry_node'}
 = $result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[3];
+$result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[3]{'contents'}[20]{'extra'}{'element_node'}
 = $result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[3];
 
$result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[3]{'contents'}[20]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[3]{'contents'}[20];
-$result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[3]{'contents'}[21]{'extra'}{'entry_node'}
 = $result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[3];
+$result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[3]{'contents'}[21]{'extra'}{'element_node'}
 = $result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[3];
 
$result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[3]{'contents'}[21]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[3]{'contents'}[21];
-$result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[3]{'contents'}[22]{'extra'}{'entry_node'}
 = $result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[3];
+$result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[3]{'contents'}[22]{'extra'}{'element_node'}
 = $result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[3];
 
$result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[3]{'contents'}[22]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[3]{'contents'}[22];
-$result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[3]{'contents'}[23]{'extra'}{'entry_node'}
 = $result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[3];
+$result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[3]{'contents'}[23]{'extra'}{'element_node'}
 = $result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[3];
 
$result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[3]{'contents'}[23]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[3]{'contents'}[23];
-$result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[3]{'contents'}[24]{'extra'}{'entry_node'}
 = $result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[3];
+$result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[3]{'contents'}[24]{'extra'}{'element_node'}
 = $result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[3];
 
$result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[3]{'contents'}[24]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[3]{'contents'}[24];
-$result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[3]{'contents'}[25]{'extra'}{'entry_node'}
 = $result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[3];
+$result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[3]{'contents'}[25]{'extra'}{'element_node'}
 = $result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[3];
 
$result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[3]{'contents'}[25]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[3]{'contents'}[25];
-$result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[3]{'contents'}[26]{'extra'}{'entry_node'}
 = $result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[3];
+$result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[3]{'contents'}[26]{'extra'}{'element_node'}
 = $result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[3];
 
$result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[3]{'contents'}[26]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[3]{'contents'}[26];
-$result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[3]{'contents'}[27]{'extra'}{'entry_node'}
 = $result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[3];
+$result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[3]{'contents'}[27]{'extra'}{'element_node'}
 = $result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[3];
 
$result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[3]{'contents'}[27]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[3]{'contents'}[27];
-$result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[3]{'contents'}[28]{'extra'}{'entry_node'}
 = $result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[3];
+$result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[3]{'contents'}[28]{'extra'}{'element_node'}
 = $result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[3];
 
$result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[3]{'contents'}[28]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[3]{'contents'}[28];
-$result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[3]{'contents'}[29]{'extra'}{'entry_node'}
 = $result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[3];
+$result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[3]{'contents'}[29]{'extra'}{'element_node'}
 = $result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[3];
 
$result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[3]{'contents'}[29]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[3]{'contents'}[29];
-$result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[3]{'contents'}[30]{'extra'}{'entry_node'}
 = $result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[3];
+$result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[3]{'contents'}[30]{'extra'}{'element_node'}
 = $result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[3];
 
$result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[3]{'contents'}[30]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[3]{'contents'}[30];
-$result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[3]{'contents'}[31]{'extra'}{'entry_node'}
 = $result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[3];
+$result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[3]{'contents'}[31]{'extra'}{'element_node'}
 = $result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[3];
 
$result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[3]{'contents'}[31]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[3]{'contents'}[31];
-$result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[3]{'contents'}[32]{'extra'}{'entry_node'}
 = $result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[3];
+$result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[3]{'contents'}[32]{'extra'}{'element_node'}
 = $result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[3];
 
$result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[3]{'contents'}[32]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[3]{'contents'}[32];
-$result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[3]{'contents'}[33]{'extra'}{'entry_node'}
 = $result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[3];
+$result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[3]{'contents'}[33]{'extra'}{'element_node'}
 = $result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[3];
 
$result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[3]{'contents'}[33]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[3]{'contents'}[33];
-$result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[3]{'contents'}[34]{'extra'}{'entry_node'}
 = $result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[3];
+$result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[3]{'contents'}[34]{'extra'}{'element_node'}
 = $result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[3];
 
$result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[3]{'contents'}[34]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[3]{'contents'}[34];
-$result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[3]{'contents'}[35]{'extra'}{'entry_node'}
 = $result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[3];
+$result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[3]{'contents'}[35]{'extra'}{'element_node'}
 = $result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[3];
 
$result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[3]{'contents'}[35]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[3]{'contents'}[35];
-$result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[3]{'contents'}[36]{'extra'}{'entry_node'}
 = $result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[3];
+$result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[3]{'contents'}[36]{'extra'}{'element_node'}
 = $result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[3];
 
$result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[3]{'contents'}[36]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[3]{'contents'}[36];
-$result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[3]{'contents'}[37]{'extra'}{'entry_node'}
 = $result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[3];
+$result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[3]{'contents'}[37]{'extra'}{'element_node'}
 = $result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[3];
 
$result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[3]{'contents'}[37]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[3]{'contents'}[37];
-$result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[3]{'contents'}[38]{'extra'}{'entry_node'}
 = $result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[3];
+$result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[3]{'contents'}[38]{'extra'}{'element_node'}
 = $result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[3];
 
$result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[3]{'contents'}[38]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[3]{'contents'}[38];
-$result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[3]{'contents'}[39]{'extra'}{'entry_node'}
 = $result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[3];
+$result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[3]{'contents'}[39]{'extra'}{'element_node'}
 = $result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[3];
 
$result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[3]{'contents'}[39]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[3]{'contents'}[39];
-$result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[3]{'contents'}[40]{'extra'}{'entry_node'}
 = $result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[3];
+$result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[3]{'contents'}[40]{'extra'}{'element_node'}
 = $result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[3];
 
$result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[3]{'contents'}[40]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[3]{'contents'}[40];
-$result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[3]{'contents'}[41]{'extra'}{'entry_node'}
 = $result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[3];
+$result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[3]{'contents'}[41]{'extra'}{'element_node'}
 = $result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[3];
 
$result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[3]{'contents'}[41]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[3]{'contents'}[41];
-$result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[3]{'contents'}[42]{'extra'}{'entry_node'}
 = $result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[3];
+$result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[3]{'contents'}[42]{'extra'}{'element_node'}
 = $result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[3];
 
$result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[3]{'contents'}[42]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[3]{'contents'}[42];
-$result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[3]{'contents'}[43]{'extra'}{'entry_node'}
 = $result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[3];
+$result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[3]{'contents'}[43]{'extra'}{'element_node'}
 = $result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[3];
 
$result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[3]{'contents'}[43]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[3]{'contents'}[43];
-$result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[3]{'contents'}[44]{'extra'}{'entry_node'}
 = $result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[3];
+$result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[3]{'contents'}[44]{'extra'}{'element_node'}
 = $result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[3];
 
$result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[3]{'contents'}[44]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[3]{'contents'}[44];
-$result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[3]{'contents'}[45]{'extra'}{'entry_node'}
 = $result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[3];
+$result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[3]{'contents'}[45]{'extra'}{'element_node'}
 = $result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[3];
 
$result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[3]{'contents'}[45]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[3]{'contents'}[45];
-$result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[3]{'contents'}[46]{'extra'}{'entry_node'}
 = $result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[3];
+$result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[3]{'contents'}[46]{'extra'}{'element_node'}
 = $result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[3];
 
$result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[3]{'contents'}[46]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[3]{'contents'}[46];
-$result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[3]{'contents'}[47]{'extra'}{'entry_node'}
 = $result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[3];
+$result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[3]{'contents'}[47]{'extra'}{'element_node'}
 = $result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[3];
 
$result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[3]{'contents'}[47]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[3]{'contents'}[47];
-$result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[3]{'contents'}[48]{'extra'}{'entry_node'}
 = $result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[3];
+$result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[3]{'contents'}[48]{'extra'}{'element_node'}
 = $result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[3];
 
$result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[3]{'contents'}[48]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[3]{'contents'}[48];
-$result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[3]{'contents'}[49]{'extra'}{'entry_node'}
 = $result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[3];
+$result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[3]{'contents'}[49]{'extra'}{'element_node'}
 = $result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[3];
 
$result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[3]{'contents'}[49]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[3]{'contents'}[49];
-$result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[3]{'contents'}[50]{'extra'}{'entry_node'}
 = $result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[3];
+$result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[3]{'contents'}[50]{'extra'}{'element_node'}
 = $result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[3];
 
$result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[3]{'contents'}[50]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[3]{'contents'}[50];
-$result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[3]{'contents'}[51]{'extra'}{'entry_node'}
 = $result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[3];
+$result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[3]{'contents'}[51]{'extra'}{'element_node'}
 = $result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[3];
 
$result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[3]{'contents'}[51]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[3]{'contents'}[51];
-$result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[3]{'contents'}[52]{'extra'}{'entry_node'}
 = $result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[3];
+$result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[3]{'contents'}[52]{'extra'}{'element_node'}
 = $result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[3];
 
$result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[3]{'contents'}[52]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[3]{'contents'}[52];
-$result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[3]{'contents'}[53]{'extra'}{'entry_node'}
 = $result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[3];
+$result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[3]{'contents'}[53]{'extra'}{'element_node'}
 = $result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[3];
 
$result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[3]{'contents'}[53]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[3]{'contents'}[53];
-$result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[3]{'contents'}[54]{'extra'}{'entry_node'}
 = $result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[3];
+$result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[3]{'contents'}[54]{'extra'}{'element_node'}
 = $result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[3];
 
$result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[3]{'contents'}[54]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[3]{'contents'}[54];
-$result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[3]{'contents'}[55]{'extra'}{'entry_node'}
 = $result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[3];
+$result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[3]{'contents'}[55]{'extra'}{'element_node'}
 = $result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[3];
 
$result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[3]{'contents'}[55]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[3]{'contents'}[55];
 
$result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[3]{'extra'}{'node_content'}[0]
 = 
$result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[3]{'args'}[0]{'contents'}[0];
 
$result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[3]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = 
$result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[3]{'args'}[0]{'contents'}[0];
diff --git a/tp/t/results/indices/encoding_index_utf8.pl 
b/tp/t/results/indices/encoding_index_utf8.pl
index f5d49448de..7dfe4b5983 100644
--- a/tp/t/results/indices/encoding_index_utf8.pl
+++ b/tp/t/results/indices/encoding_index_utf8.pl
@@ -189,7 +189,7 @@ $result_trees{'encoding_index_utf8'} = {
           ],
           'cmdname' => 'cindex',
           'extra' => {
-            'entry_node' => {},
+            'element_node' => {},
             'index_entry' => {
               'entry_element' => {},
               'entry_number' => 1,
@@ -300,7 +300,7 @@ $result_trees{'encoding_index_utf8'} = {
           ],
           'cmdname' => 'cindex',
           'extra' => {
-            'entry_node' => {},
+            'element_node' => {},
             'index_entry' => {
               'entry_element' => {},
               'entry_number' => 2,
@@ -429,7 +429,7 @@ $result_trees{'encoding_index_utf8'} = {
           ],
           'cmdname' => 'cindex',
           'extra' => {
-            'entry_node' => {},
+            'element_node' => {},
             'index_entry' => {
               'entry_element' => {},
               'entry_number' => 3,
@@ -468,7 +468,7 @@ $result_trees{'encoding_index_utf8'} = {
           ],
           'cmdname' => 'cindex',
           'extra' => {
-            'entry_node' => {},
+            'element_node' => {},
             'index_entry' => {
               'entry_element' => {},
               'entry_number' => 4,
@@ -507,7 +507,7 @@ $result_trees{'encoding_index_utf8'} = {
           ],
           'cmdname' => 'cindex',
           'extra' => {
-            'entry_node' => {},
+            'element_node' => {},
             'index_entry' => {
               'entry_element' => {},
               'entry_number' => 5,
@@ -546,7 +546,7 @@ $result_trees{'encoding_index_utf8'} = {
           ],
           'cmdname' => 'cindex',
           'extra' => {
-            'entry_node' => {},
+            'element_node' => {},
             'index_entry' => {
               'entry_element' => {},
               'entry_number' => 6,
@@ -585,7 +585,7 @@ $result_trees{'encoding_index_utf8'} = {
           ],
           'cmdname' => 'cindex',
           'extra' => {
-            'entry_node' => {},
+            'element_node' => {},
             'index_entry' => {
               'entry_element' => {},
               'entry_number' => 7,
@@ -624,7 +624,7 @@ $result_trees{'encoding_index_utf8'} = {
           ],
           'cmdname' => 'cindex',
           'extra' => {
-            'entry_node' => {},
+            'element_node' => {},
             'index_entry' => {
               'entry_element' => {},
               'entry_number' => 8,
@@ -663,7 +663,7 @@ $result_trees{'encoding_index_utf8'} = {
           ],
           'cmdname' => 'cindex',
           'extra' => {
-            'entry_node' => {},
+            'element_node' => {},
             'index_entry' => {
               'entry_element' => {},
               'entry_number' => 9,
@@ -702,7 +702,7 @@ $result_trees{'encoding_index_utf8'} = {
           ],
           'cmdname' => 'cindex',
           'extra' => {
-            'entry_node' => {},
+            'element_node' => {},
             'index_entry' => {
               'entry_element' => {},
               'entry_number' => 10,
@@ -741,7 +741,7 @@ $result_trees{'encoding_index_utf8'} = {
           ],
           'cmdname' => 'cindex',
           'extra' => {
-            'entry_node' => {},
+            'element_node' => {},
             'index_entry' => {
               'entry_element' => {},
               'entry_number' => 11,
@@ -780,7 +780,7 @@ $result_trees{'encoding_index_utf8'} = {
           ],
           'cmdname' => 'cindex',
           'extra' => {
-            'entry_node' => {},
+            'element_node' => {},
             'index_entry' => {
               'entry_element' => {},
               'entry_number' => 12,
@@ -819,7 +819,7 @@ $result_trees{'encoding_index_utf8'} = {
           ],
           'cmdname' => 'cindex',
           'extra' => {
-            'entry_node' => {},
+            'element_node' => {},
             'index_entry' => {
               'entry_element' => {},
               'entry_number' => 13,
@@ -858,7 +858,7 @@ $result_trees{'encoding_index_utf8'} = {
           ],
           'cmdname' => 'cindex',
           'extra' => {
-            'entry_node' => {},
+            'element_node' => {},
             'index_entry' => {
               'entry_element' => {},
               'entry_number' => 14,
@@ -897,7 +897,7 @@ $result_trees{'encoding_index_utf8'} = {
           ],
           'cmdname' => 'cindex',
           'extra' => {
-            'entry_node' => {},
+            'element_node' => {},
             'index_entry' => {
               'entry_element' => {},
               'entry_number' => 15,
@@ -936,7 +936,7 @@ $result_trees{'encoding_index_utf8'} = {
           ],
           'cmdname' => 'cindex',
           'extra' => {
-            'entry_node' => {},
+            'element_node' => {},
             'index_entry' => {
               'entry_element' => {},
               'entry_number' => 16,
@@ -975,7 +975,7 @@ $result_trees{'encoding_index_utf8'} = {
           ],
           'cmdname' => 'cindex',
           'extra' => {
-            'entry_node' => {},
+            'element_node' => {},
             'index_entry' => {
               'entry_element' => {},
               'entry_number' => 17,
@@ -1014,7 +1014,7 @@ $result_trees{'encoding_index_utf8'} = {
           ],
           'cmdname' => 'cindex',
           'extra' => {
-            'entry_node' => {},
+            'element_node' => {},
             'index_entry' => {
               'entry_element' => {},
               'entry_number' => 18,
@@ -1053,7 +1053,7 @@ $result_trees{'encoding_index_utf8'} = {
           ],
           'cmdname' => 'cindex',
           'extra' => {
-            'entry_node' => {},
+            'element_node' => {},
             'index_entry' => {
               'entry_element' => {},
               'entry_number' => 19,
@@ -1092,7 +1092,7 @@ $result_trees{'encoding_index_utf8'} = {
           ],
           'cmdname' => 'cindex',
           'extra' => {
-            'entry_node' => {},
+            'element_node' => {},
             'index_entry' => {
               'entry_element' => {},
               'entry_number' => 20,
@@ -1131,7 +1131,7 @@ $result_trees{'encoding_index_utf8'} = {
           ],
           'cmdname' => 'cindex',
           'extra' => {
-            'entry_node' => {},
+            'element_node' => {},
             'index_entry' => {
               'entry_element' => {},
               'entry_number' => 21,
@@ -1170,7 +1170,7 @@ $result_trees{'encoding_index_utf8'} = {
           ],
           'cmdname' => 'cindex',
           'extra' => {
-            'entry_node' => {},
+            'element_node' => {},
             'index_entry' => {
               'entry_element' => {},
               'entry_number' => 22,
@@ -1209,7 +1209,7 @@ $result_trees{'encoding_index_utf8'} = {
           ],
           'cmdname' => 'cindex',
           'extra' => {
-            'entry_node' => {},
+            'element_node' => {},
             'index_entry' => {
               'entry_element' => {},
               'entry_number' => 23,
@@ -1248,7 +1248,7 @@ $result_trees{'encoding_index_utf8'} = {
           ],
           'cmdname' => 'cindex',
           'extra' => {
-            'entry_node' => {},
+            'element_node' => {},
             'index_entry' => {
               'entry_element' => {},
               'entry_number' => 24,
@@ -1287,7 +1287,7 @@ $result_trees{'encoding_index_utf8'} = {
           ],
           'cmdname' => 'cindex',
           'extra' => {
-            'entry_node' => {},
+            'element_node' => {},
             'index_entry' => {
               'entry_element' => {},
               'entry_number' => 25,
@@ -1326,7 +1326,7 @@ $result_trees{'encoding_index_utf8'} = {
           ],
           'cmdname' => 'cindex',
           'extra' => {
-            'entry_node' => {},
+            'element_node' => {},
             'index_entry' => {
               'entry_element' => {},
               'entry_number' => 26,
@@ -1365,7 +1365,7 @@ $result_trees{'encoding_index_utf8'} = {
           ],
           'cmdname' => 'cindex',
           'extra' => {
-            'entry_node' => {},
+            'element_node' => {},
             'index_entry' => {
               'entry_element' => {},
               'entry_number' => 27,
@@ -1404,7 +1404,7 @@ $result_trees{'encoding_index_utf8'} = {
           ],
           'cmdname' => 'cindex',
           'extra' => {
-            'entry_node' => {},
+            'element_node' => {},
             'index_entry' => {
               'entry_element' => {},
               'entry_number' => 28,
@@ -1443,7 +1443,7 @@ $result_trees{'encoding_index_utf8'} = {
           ],
           'cmdname' => 'cindex',
           'extra' => {
-            'entry_node' => {},
+            'element_node' => {},
             'index_entry' => {
               'entry_element' => {},
               'entry_number' => 29,
@@ -1482,7 +1482,7 @@ $result_trees{'encoding_index_utf8'} = {
           ],
           'cmdname' => 'cindex',
           'extra' => {
-            'entry_node' => {},
+            'element_node' => {},
             'index_entry' => {
               'entry_element' => {},
               'entry_number' => 30,
@@ -1521,7 +1521,7 @@ $result_trees{'encoding_index_utf8'} = {
           ],
           'cmdname' => 'cindex',
           'extra' => {
-            'entry_node' => {},
+            'element_node' => {},
             'index_entry' => {
               'entry_element' => {},
               'entry_number' => 31,
@@ -1570,7 +1570,7 @@ $result_trees{'encoding_index_utf8'} = {
           ],
           'cmdname' => 'cindex',
           'extra' => {
-            'entry_node' => {},
+            'element_node' => {},
             'index_entry' => {
               'entry_element' => {},
               'entry_number' => 32,
@@ -1619,7 +1619,7 @@ $result_trees{'encoding_index_utf8'} = {
           ],
           'cmdname' => 'cindex',
           'extra' => {
-            'entry_node' => {},
+            'element_node' => {},
             'index_entry' => {
               'entry_element' => {},
               'entry_number' => 33,
@@ -1697,7 +1697,7 @@ $result_trees{'encoding_index_utf8'} = {
           ],
           'cmdname' => 'cindex',
           'extra' => {
-            'entry_node' => {},
+            'element_node' => {},
             'index_entry' => {
               'entry_element' => {},
               'entry_number' => 34,
@@ -1805,7 +1805,7 @@ $result_trees{'encoding_index_utf8'} = {
           ],
           'cmdname' => 'cindex',
           'extra' => {
-            'entry_node' => {},
+            'element_node' => {},
             'index_entry' => {
               'entry_element' => {},
               'entry_number' => 35,
@@ -1854,7 +1854,7 @@ $result_trees{'encoding_index_utf8'} = {
           ],
           'cmdname' => 'cindex',
           'extra' => {
-            'entry_node' => {},
+            'element_node' => {},
             'index_entry' => {
               'entry_element' => {},
               'entry_number' => 36,
@@ -1903,7 +1903,7 @@ $result_trees{'encoding_index_utf8'} = {
           ],
           'cmdname' => 'cindex',
           'extra' => {
-            'entry_node' => {},
+            'element_node' => {},
             'index_entry' => {
               'entry_element' => {},
               'entry_number' => 37,
@@ -1952,7 +1952,7 @@ $result_trees{'encoding_index_utf8'} = {
           ],
           'cmdname' => 'cindex',
           'extra' => {
-            'entry_node' => {},
+            'element_node' => {},
             'index_entry' => {
               'entry_element' => {},
               'entry_number' => 38,
@@ -2001,7 +2001,7 @@ $result_trees{'encoding_index_utf8'} = {
           ],
           'cmdname' => 'cindex',
           'extra' => {
-            'entry_node' => {},
+            'element_node' => {},
             'index_entry' => {
               'entry_element' => {},
               'entry_number' => 39,
@@ -2050,7 +2050,7 @@ $result_trees{'encoding_index_utf8'} = {
           ],
           'cmdname' => 'cindex',
           'extra' => {
-            'entry_node' => {},
+            'element_node' => {},
             'index_entry' => {
               'entry_element' => {},
               'entry_number' => 40,
@@ -2099,7 +2099,7 @@ $result_trees{'encoding_index_utf8'} = {
           ],
           'cmdname' => 'cindex',
           'extra' => {
-            'entry_node' => {},
+            'element_node' => {},
             'index_entry' => {
               'entry_element' => {},
               'entry_number' => 41,
@@ -2148,7 +2148,7 @@ $result_trees{'encoding_index_utf8'} = {
           ],
           'cmdname' => 'cindex',
           'extra' => {
-            'entry_node' => {},
+            'element_node' => {},
             'index_entry' => {
               'entry_element' => {},
               'entry_number' => 42,
@@ -2187,7 +2187,7 @@ $result_trees{'encoding_index_utf8'} = {
           ],
           'cmdname' => 'cindex',
           'extra' => {
-            'entry_node' => {},
+            'element_node' => {},
             'index_entry' => {
               'entry_element' => {},
               'entry_number' => 43,
@@ -2226,7 +2226,7 @@ $result_trees{'encoding_index_utf8'} = {
           ],
           'cmdname' => 'cindex',
           'extra' => {
-            'entry_node' => {},
+            'element_node' => {},
             'index_entry' => {
               'entry_element' => {},
               'entry_number' => 44,
@@ -2275,7 +2275,7 @@ $result_trees{'encoding_index_utf8'} = {
           ],
           'cmdname' => 'cindex',
           'extra' => {
-            'entry_node' => {},
+            'element_node' => {},
             'index_entry' => {
               'entry_element' => {},
               'entry_number' => 45,
@@ -2324,7 +2324,7 @@ $result_trees{'encoding_index_utf8'} = {
           ],
           'cmdname' => 'cindex',
           'extra' => {
-            'entry_node' => {},
+            'element_node' => {},
             'index_entry' => {
               'entry_element' => {},
               'entry_number' => 46,
@@ -2373,7 +2373,7 @@ $result_trees{'encoding_index_utf8'} = {
           ],
           'cmdname' => 'cindex',
           'extra' => {
-            'entry_node' => {},
+            'element_node' => {},
             'index_entry' => {
               'entry_element' => {},
               'entry_number' => 47,
@@ -2412,7 +2412,7 @@ $result_trees{'encoding_index_utf8'} = {
           ],
           'cmdname' => 'cindex',
           'extra' => {
-            'entry_node' => {},
+            'element_node' => {},
             'index_entry' => {
               'entry_element' => {},
               'entry_number' => 48,
@@ -2451,7 +2451,7 @@ $result_trees{'encoding_index_utf8'} = {
           ],
           'cmdname' => 'cindex',
           'extra' => {
-            'entry_node' => {},
+            'element_node' => {},
             'index_entry' => {
               'entry_element' => {},
               'entry_number' => 49,
@@ -2490,7 +2490,7 @@ $result_trees{'encoding_index_utf8'} = {
           ],
           'cmdname' => 'cindex',
           'extra' => {
-            'entry_node' => {},
+            'element_node' => {},
             'index_entry' => {
               'entry_element' => {},
               'entry_number' => 50,
@@ -2529,7 +2529,7 @@ $result_trees{'encoding_index_utf8'} = {
           ],
           'cmdname' => 'cindex',
           'extra' => {
-            'entry_node' => {},
+            'element_node' => {},
             'index_entry' => {
               'entry_element' => {},
               'entry_number' => 51,
@@ -2568,7 +2568,7 @@ $result_trees{'encoding_index_utf8'} = {
           ],
           'cmdname' => 'cindex',
           'extra' => {
-            'entry_node' => {},
+            'element_node' => {},
             'index_entry' => {
               'entry_element' => {},
               'entry_number' => 52,
@@ -2607,7 +2607,7 @@ $result_trees{'encoding_index_utf8'} = {
           ],
           'cmdname' => 'cindex',
           'extra' => {
-            'entry_node' => {},
+            'element_node' => {},
             'index_entry' => {
               'entry_element' => {},
               'entry_number' => 53,
@@ -2646,7 +2646,7 @@ $result_trees{'encoding_index_utf8'} = {
           ],
           'cmdname' => 'cindex',
           'extra' => {
-            'entry_node' => {},
+            'element_node' => {},
             'index_entry' => {
               'entry_element' => {},
               'entry_number' => 54,
@@ -2685,7 +2685,7 @@ $result_trees{'encoding_index_utf8'} = {
           ],
           'cmdname' => 'cindex',
           'extra' => {
-            'entry_node' => {},
+            'element_node' => {},
             'index_entry' => {
               'entry_element' => {},
               'entry_number' => 55,
@@ -2786,115 +2786,115 @@ $result_trees{'encoding_index_utf8'} = {
 };
 
$result_trees{'encoding_index_utf8'}{'contents'}[1]{'extra'}{'node_content'}[0] 
= $result_trees{'encoding_index_utf8'}{'contents'}[1]{'args'}[0]{'contents'}[0];
 
$result_trees{'encoding_index_utf8'}{'contents'}[1]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = 
$result_trees{'encoding_index_utf8'}{'contents'}[1]{'args'}[0]{'contents'}[0];
-$result_trees{'encoding_index_utf8'}{'contents'}[3]{'contents'}[1]{'extra'}{'entry_node'}
 = $result_trees{'encoding_index_utf8'}{'contents'}[3];
+$result_trees{'encoding_index_utf8'}{'contents'}[3]{'contents'}[1]{'extra'}{'element_node'}
 = $result_trees{'encoding_index_utf8'}{'contents'}[3];
 
$result_trees{'encoding_index_utf8'}{'contents'}[3]{'contents'}[1]{'extra'}{'index_entry'}{'entry_element'}
 = $result_trees{'encoding_index_utf8'}{'contents'}[3]{'contents'}[1];
-$result_trees{'encoding_index_utf8'}{'contents'}[3]{'contents'}[2]{'extra'}{'entry_node'}
 = $result_trees{'encoding_index_utf8'}{'contents'}[3];
+$result_trees{'encoding_index_utf8'}{'contents'}[3]{'contents'}[2]{'extra'}{'element_node'}
 = $result_trees{'encoding_index_utf8'}{'contents'}[3];
 
$result_trees{'encoding_index_utf8'}{'contents'}[3]{'contents'}[2]{'extra'}{'index_entry'}{'entry_element'}
 = $result_trees{'encoding_index_utf8'}{'contents'}[3]{'contents'}[2];
-$result_trees{'encoding_index_utf8'}{'contents'}[3]{'contents'}[3]{'extra'}{'entry_node'}
 = $result_trees{'encoding_index_utf8'}{'contents'}[3];
+$result_trees{'encoding_index_utf8'}{'contents'}[3]{'contents'}[3]{'extra'}{'element_node'}
 = $result_trees{'encoding_index_utf8'}{'contents'}[3];
 
$result_trees{'encoding_index_utf8'}{'contents'}[3]{'contents'}[3]{'extra'}{'index_entry'}{'entry_element'}
 = $result_trees{'encoding_index_utf8'}{'contents'}[3]{'contents'}[3];
-$result_trees{'encoding_index_utf8'}{'contents'}[3]{'contents'}[4]{'extra'}{'entry_node'}
 = $result_trees{'encoding_index_utf8'}{'contents'}[3];
+$result_trees{'encoding_index_utf8'}{'contents'}[3]{'contents'}[4]{'extra'}{'element_node'}
 = $result_trees{'encoding_index_utf8'}{'contents'}[3];
 
$result_trees{'encoding_index_utf8'}{'contents'}[3]{'contents'}[4]{'extra'}{'index_entry'}{'entry_element'}
 = $result_trees{'encoding_index_utf8'}{'contents'}[3]{'contents'}[4];
-$result_trees{'encoding_index_utf8'}{'contents'}[3]{'contents'}[5]{'extra'}{'entry_node'}
 = $result_trees{'encoding_index_utf8'}{'contents'}[3];
+$result_trees{'encoding_index_utf8'}{'contents'}[3]{'contents'}[5]{'extra'}{'element_node'}
 = $result_trees{'encoding_index_utf8'}{'contents'}[3];
 
$result_trees{'encoding_index_utf8'}{'contents'}[3]{'contents'}[5]{'extra'}{'index_entry'}{'entry_element'}
 = $result_trees{'encoding_index_utf8'}{'contents'}[3]{'contents'}[5];
-$result_trees{'encoding_index_utf8'}{'contents'}[3]{'contents'}[6]{'extra'}{'entry_node'}
 = $result_trees{'encoding_index_utf8'}{'contents'}[3];
+$result_trees{'encoding_index_utf8'}{'contents'}[3]{'contents'}[6]{'extra'}{'element_node'}
 = $result_trees{'encoding_index_utf8'}{'contents'}[3];
 
$result_trees{'encoding_index_utf8'}{'contents'}[3]{'contents'}[6]{'extra'}{'index_entry'}{'entry_element'}
 = $result_trees{'encoding_index_utf8'}{'contents'}[3]{'contents'}[6];
-$result_trees{'encoding_index_utf8'}{'contents'}[3]{'contents'}[7]{'extra'}{'entry_node'}
 = $result_trees{'encoding_index_utf8'}{'contents'}[3];
+$result_trees{'encoding_index_utf8'}{'contents'}[3]{'contents'}[7]{'extra'}{'element_node'}
 = $result_trees{'encoding_index_utf8'}{'contents'}[3];
 
$result_trees{'encoding_index_utf8'}{'contents'}[3]{'contents'}[7]{'extra'}{'index_entry'}{'entry_element'}
 = $result_trees{'encoding_index_utf8'}{'contents'}[3]{'contents'}[7];
-$result_trees{'encoding_index_utf8'}{'contents'}[3]{'contents'}[8]{'extra'}{'entry_node'}
 = $result_trees{'encoding_index_utf8'}{'contents'}[3];
+$result_trees{'encoding_index_utf8'}{'contents'}[3]{'contents'}[8]{'extra'}{'element_node'}
 = $result_trees{'encoding_index_utf8'}{'contents'}[3];
 
$result_trees{'encoding_index_utf8'}{'contents'}[3]{'contents'}[8]{'extra'}{'index_entry'}{'entry_element'}
 = $result_trees{'encoding_index_utf8'}{'contents'}[3]{'contents'}[8];
-$result_trees{'encoding_index_utf8'}{'contents'}[3]{'contents'}[9]{'extra'}{'entry_node'}
 = $result_trees{'encoding_index_utf8'}{'contents'}[3];
+$result_trees{'encoding_index_utf8'}{'contents'}[3]{'contents'}[9]{'extra'}{'element_node'}
 = $result_trees{'encoding_index_utf8'}{'contents'}[3];
 
$result_trees{'encoding_index_utf8'}{'contents'}[3]{'contents'}[9]{'extra'}{'index_entry'}{'entry_element'}
 = $result_trees{'encoding_index_utf8'}{'contents'}[3]{'contents'}[9];
-$result_trees{'encoding_index_utf8'}{'contents'}[3]{'contents'}[10]{'extra'}{'entry_node'}
 = $result_trees{'encoding_index_utf8'}{'contents'}[3];
+$result_trees{'encoding_index_utf8'}{'contents'}[3]{'contents'}[10]{'extra'}{'element_node'}
 = $result_trees{'encoding_index_utf8'}{'contents'}[3];
 
$result_trees{'encoding_index_utf8'}{'contents'}[3]{'contents'}[10]{'extra'}{'index_entry'}{'entry_element'}
 = $result_trees{'encoding_index_utf8'}{'contents'}[3]{'contents'}[10];
-$result_trees{'encoding_index_utf8'}{'contents'}[3]{'contents'}[11]{'extra'}{'entry_node'}
 = $result_trees{'encoding_index_utf8'}{'contents'}[3];
+$result_trees{'encoding_index_utf8'}{'contents'}[3]{'contents'}[11]{'extra'}{'element_node'}
 = $result_trees{'encoding_index_utf8'}{'contents'}[3];
 
$result_trees{'encoding_index_utf8'}{'contents'}[3]{'contents'}[11]{'extra'}{'index_entry'}{'entry_element'}
 = $result_trees{'encoding_index_utf8'}{'contents'}[3]{'contents'}[11];
-$result_trees{'encoding_index_utf8'}{'contents'}[3]{'contents'}[12]{'extra'}{'entry_node'}
 = $result_trees{'encoding_index_utf8'}{'contents'}[3];
+$result_trees{'encoding_index_utf8'}{'contents'}[3]{'contents'}[12]{'extra'}{'element_node'}
 = $result_trees{'encoding_index_utf8'}{'contents'}[3];
 
$result_trees{'encoding_index_utf8'}{'contents'}[3]{'contents'}[12]{'extra'}{'index_entry'}{'entry_element'}
 = $result_trees{'encoding_index_utf8'}{'contents'}[3]{'contents'}[12];
-$result_trees{'encoding_index_utf8'}{'contents'}[3]{'contents'}[13]{'extra'}{'entry_node'}
 = $result_trees{'encoding_index_utf8'}{'contents'}[3];
+$result_trees{'encoding_index_utf8'}{'contents'}[3]{'contents'}[13]{'extra'}{'element_node'}
 = $result_trees{'encoding_index_utf8'}{'contents'}[3];
 
$result_trees{'encoding_index_utf8'}{'contents'}[3]{'contents'}[13]{'extra'}{'index_entry'}{'entry_element'}
 = $result_trees{'encoding_index_utf8'}{'contents'}[3]{'contents'}[13];
-$result_trees{'encoding_index_utf8'}{'contents'}[3]{'contents'}[14]{'extra'}{'entry_node'}
 = $result_trees{'encoding_index_utf8'}{'contents'}[3];
+$result_trees{'encoding_index_utf8'}{'contents'}[3]{'contents'}[14]{'extra'}{'element_node'}
 = $result_trees{'encoding_index_utf8'}{'contents'}[3];
 
$result_trees{'encoding_index_utf8'}{'contents'}[3]{'contents'}[14]{'extra'}{'index_entry'}{'entry_element'}
 = $result_trees{'encoding_index_utf8'}{'contents'}[3]{'contents'}[14];
-$result_trees{'encoding_index_utf8'}{'contents'}[3]{'contents'}[15]{'extra'}{'entry_node'}
 = $result_trees{'encoding_index_utf8'}{'contents'}[3];
+$result_trees{'encoding_index_utf8'}{'contents'}[3]{'contents'}[15]{'extra'}{'element_node'}
 = $result_trees{'encoding_index_utf8'}{'contents'}[3];
 
$result_trees{'encoding_index_utf8'}{'contents'}[3]{'contents'}[15]{'extra'}{'index_entry'}{'entry_element'}
 = $result_trees{'encoding_index_utf8'}{'contents'}[3]{'contents'}[15];
-$result_trees{'encoding_index_utf8'}{'contents'}[3]{'contents'}[16]{'extra'}{'entry_node'}
 = $result_trees{'encoding_index_utf8'}{'contents'}[3];
+$result_trees{'encoding_index_utf8'}{'contents'}[3]{'contents'}[16]{'extra'}{'element_node'}
 = $result_trees{'encoding_index_utf8'}{'contents'}[3];
 
$result_trees{'encoding_index_utf8'}{'contents'}[3]{'contents'}[16]{'extra'}{'index_entry'}{'entry_element'}
 = $result_trees{'encoding_index_utf8'}{'contents'}[3]{'contents'}[16];
-$result_trees{'encoding_index_utf8'}{'contents'}[3]{'contents'}[17]{'extra'}{'entry_node'}
 = $result_trees{'encoding_index_utf8'}{'contents'}[3];
+$result_trees{'encoding_index_utf8'}{'contents'}[3]{'contents'}[17]{'extra'}{'element_node'}
 = $result_trees{'encoding_index_utf8'}{'contents'}[3];
 
$result_trees{'encoding_index_utf8'}{'contents'}[3]{'contents'}[17]{'extra'}{'index_entry'}{'entry_element'}
 = $result_trees{'encoding_index_utf8'}{'contents'}[3]{'contents'}[17];
-$result_trees{'encoding_index_utf8'}{'contents'}[3]{'contents'}[18]{'extra'}{'entry_node'}
 = $result_trees{'encoding_index_utf8'}{'contents'}[3];
+$result_trees{'encoding_index_utf8'}{'contents'}[3]{'contents'}[18]{'extra'}{'element_node'}
 = $result_trees{'encoding_index_utf8'}{'contents'}[3];
 
$result_trees{'encoding_index_utf8'}{'contents'}[3]{'contents'}[18]{'extra'}{'index_entry'}{'entry_element'}
 = $result_trees{'encoding_index_utf8'}{'contents'}[3]{'contents'}[18];
-$result_trees{'encoding_index_utf8'}{'contents'}[3]{'contents'}[19]{'extra'}{'entry_node'}
 = $result_trees{'encoding_index_utf8'}{'contents'}[3];
+$result_trees{'encoding_index_utf8'}{'contents'}[3]{'contents'}[19]{'extra'}{'element_node'}
 = $result_trees{'encoding_index_utf8'}{'contents'}[3];
 
$result_trees{'encoding_index_utf8'}{'contents'}[3]{'contents'}[19]{'extra'}{'index_entry'}{'entry_element'}
 = $result_trees{'encoding_index_utf8'}{'contents'}[3]{'contents'}[19];
-$result_trees{'encoding_index_utf8'}{'contents'}[3]{'contents'}[20]{'extra'}{'entry_node'}
 = $result_trees{'encoding_index_utf8'}{'contents'}[3];
+$result_trees{'encoding_index_utf8'}{'contents'}[3]{'contents'}[20]{'extra'}{'element_node'}
 = $result_trees{'encoding_index_utf8'}{'contents'}[3];
 
$result_trees{'encoding_index_utf8'}{'contents'}[3]{'contents'}[20]{'extra'}{'index_entry'}{'entry_element'}
 = $result_trees{'encoding_index_utf8'}{'contents'}[3]{'contents'}[20];
-$result_trees{'encoding_index_utf8'}{'contents'}[3]{'contents'}[21]{'extra'}{'entry_node'}
 = $result_trees{'encoding_index_utf8'}{'contents'}[3];
+$result_trees{'encoding_index_utf8'}{'contents'}[3]{'contents'}[21]{'extra'}{'element_node'}
 = $result_trees{'encoding_index_utf8'}{'contents'}[3];
 
$result_trees{'encoding_index_utf8'}{'contents'}[3]{'contents'}[21]{'extra'}{'index_entry'}{'entry_element'}
 = $result_trees{'encoding_index_utf8'}{'contents'}[3]{'contents'}[21];
-$result_trees{'encoding_index_utf8'}{'contents'}[3]{'contents'}[22]{'extra'}{'entry_node'}
 = $result_trees{'encoding_index_utf8'}{'contents'}[3];
+$result_trees{'encoding_index_utf8'}{'contents'}[3]{'contents'}[22]{'extra'}{'element_node'}
 = $result_trees{'encoding_index_utf8'}{'contents'}[3];
 
$result_trees{'encoding_index_utf8'}{'contents'}[3]{'contents'}[22]{'extra'}{'index_entry'}{'entry_element'}
 = $result_trees{'encoding_index_utf8'}{'contents'}[3]{'contents'}[22];
-$result_trees{'encoding_index_utf8'}{'contents'}[3]{'contents'}[23]{'extra'}{'entry_node'}
 = $result_trees{'encoding_index_utf8'}{'contents'}[3];
+$result_trees{'encoding_index_utf8'}{'contents'}[3]{'contents'}[23]{'extra'}{'element_node'}
 = $result_trees{'encoding_index_utf8'}{'contents'}[3];
 
$result_trees{'encoding_index_utf8'}{'contents'}[3]{'contents'}[23]{'extra'}{'index_entry'}{'entry_element'}
 = $result_trees{'encoding_index_utf8'}{'contents'}[3]{'contents'}[23];
-$result_trees{'encoding_index_utf8'}{'contents'}[3]{'contents'}[24]{'extra'}{'entry_node'}
 = $result_trees{'encoding_index_utf8'}{'contents'}[3];
+$result_trees{'encoding_index_utf8'}{'contents'}[3]{'contents'}[24]{'extra'}{'element_node'}
 = $result_trees{'encoding_index_utf8'}{'contents'}[3];
 
$result_trees{'encoding_index_utf8'}{'contents'}[3]{'contents'}[24]{'extra'}{'index_entry'}{'entry_element'}
 = $result_trees{'encoding_index_utf8'}{'contents'}[3]{'contents'}[24];
-$result_trees{'encoding_index_utf8'}{'contents'}[3]{'contents'}[25]{'extra'}{'entry_node'}
 = $result_trees{'encoding_index_utf8'}{'contents'}[3];
+$result_trees{'encoding_index_utf8'}{'contents'}[3]{'contents'}[25]{'extra'}{'element_node'}
 = $result_trees{'encoding_index_utf8'}{'contents'}[3];
 
$result_trees{'encoding_index_utf8'}{'contents'}[3]{'contents'}[25]{'extra'}{'index_entry'}{'entry_element'}
 = $result_trees{'encoding_index_utf8'}{'contents'}[3]{'contents'}[25];
-$result_trees{'encoding_index_utf8'}{'contents'}[3]{'contents'}[26]{'extra'}{'entry_node'}
 = $result_trees{'encoding_index_utf8'}{'contents'}[3];
+$result_trees{'encoding_index_utf8'}{'contents'}[3]{'contents'}[26]{'extra'}{'element_node'}
 = $result_trees{'encoding_index_utf8'}{'contents'}[3];
 
$result_trees{'encoding_index_utf8'}{'contents'}[3]{'contents'}[26]{'extra'}{'index_entry'}{'entry_element'}
 = $result_trees{'encoding_index_utf8'}{'contents'}[3]{'contents'}[26];
-$result_trees{'encoding_index_utf8'}{'contents'}[3]{'contents'}[27]{'extra'}{'entry_node'}
 = $result_trees{'encoding_index_utf8'}{'contents'}[3];
+$result_trees{'encoding_index_utf8'}{'contents'}[3]{'contents'}[27]{'extra'}{'element_node'}
 = $result_trees{'encoding_index_utf8'}{'contents'}[3];
 
$result_trees{'encoding_index_utf8'}{'contents'}[3]{'contents'}[27]{'extra'}{'index_entry'}{'entry_element'}
 = $result_trees{'encoding_index_utf8'}{'contents'}[3]{'contents'}[27];
-$result_trees{'encoding_index_utf8'}{'contents'}[3]{'contents'}[28]{'extra'}{'entry_node'}
 = $result_trees{'encoding_index_utf8'}{'contents'}[3];
+$result_trees{'encoding_index_utf8'}{'contents'}[3]{'contents'}[28]{'extra'}{'element_node'}
 = $result_trees{'encoding_index_utf8'}{'contents'}[3];
 
$result_trees{'encoding_index_utf8'}{'contents'}[3]{'contents'}[28]{'extra'}{'index_entry'}{'entry_element'}
 = $result_trees{'encoding_index_utf8'}{'contents'}[3]{'contents'}[28];
-$result_trees{'encoding_index_utf8'}{'contents'}[3]{'contents'}[29]{'extra'}{'entry_node'}
 = $result_trees{'encoding_index_utf8'}{'contents'}[3];
+$result_trees{'encoding_index_utf8'}{'contents'}[3]{'contents'}[29]{'extra'}{'element_node'}
 = $result_trees{'encoding_index_utf8'}{'contents'}[3];
 
$result_trees{'encoding_index_utf8'}{'contents'}[3]{'contents'}[29]{'extra'}{'index_entry'}{'entry_element'}
 = $result_trees{'encoding_index_utf8'}{'contents'}[3]{'contents'}[29];
-$result_trees{'encoding_index_utf8'}{'contents'}[3]{'contents'}[30]{'extra'}{'entry_node'}
 = $result_trees{'encoding_index_utf8'}{'contents'}[3];
+$result_trees{'encoding_index_utf8'}{'contents'}[3]{'contents'}[30]{'extra'}{'element_node'}
 = $result_trees{'encoding_index_utf8'}{'contents'}[3];
 
$result_trees{'encoding_index_utf8'}{'contents'}[3]{'contents'}[30]{'extra'}{'index_entry'}{'entry_element'}
 = $result_trees{'encoding_index_utf8'}{'contents'}[3]{'contents'}[30];
-$result_trees{'encoding_index_utf8'}{'contents'}[3]{'contents'}[31]{'extra'}{'entry_node'}
 = $result_trees{'encoding_index_utf8'}{'contents'}[3];
+$result_trees{'encoding_index_utf8'}{'contents'}[3]{'contents'}[31]{'extra'}{'element_node'}
 = $result_trees{'encoding_index_utf8'}{'contents'}[3];
 
$result_trees{'encoding_index_utf8'}{'contents'}[3]{'contents'}[31]{'extra'}{'index_entry'}{'entry_element'}
 = $result_trees{'encoding_index_utf8'}{'contents'}[3]{'contents'}[31];
-$result_trees{'encoding_index_utf8'}{'contents'}[3]{'contents'}[32]{'extra'}{'entry_node'}
 = $result_trees{'encoding_index_utf8'}{'contents'}[3];
+$result_trees{'encoding_index_utf8'}{'contents'}[3]{'contents'}[32]{'extra'}{'element_node'}
 = $result_trees{'encoding_index_utf8'}{'contents'}[3];
 
$result_trees{'encoding_index_utf8'}{'contents'}[3]{'contents'}[32]{'extra'}{'index_entry'}{'entry_element'}
 = $result_trees{'encoding_index_utf8'}{'contents'}[3]{'contents'}[32];
-$result_trees{'encoding_index_utf8'}{'contents'}[3]{'contents'}[33]{'extra'}{'entry_node'}
 = $result_trees{'encoding_index_utf8'}{'contents'}[3];
+$result_trees{'encoding_index_utf8'}{'contents'}[3]{'contents'}[33]{'extra'}{'element_node'}
 = $result_trees{'encoding_index_utf8'}{'contents'}[3];
 
$result_trees{'encoding_index_utf8'}{'contents'}[3]{'contents'}[33]{'extra'}{'index_entry'}{'entry_element'}
 = $result_trees{'encoding_index_utf8'}{'contents'}[3]{'contents'}[33];
-$result_trees{'encoding_index_utf8'}{'contents'}[3]{'contents'}[34]{'extra'}{'entry_node'}
 = $result_trees{'encoding_index_utf8'}{'contents'}[3];
+$result_trees{'encoding_index_utf8'}{'contents'}[3]{'contents'}[34]{'extra'}{'element_node'}
 = $result_trees{'encoding_index_utf8'}{'contents'}[3];
 
$result_trees{'encoding_index_utf8'}{'contents'}[3]{'contents'}[34]{'extra'}{'index_entry'}{'entry_element'}
 = $result_trees{'encoding_index_utf8'}{'contents'}[3]{'contents'}[34];
-$result_trees{'encoding_index_utf8'}{'contents'}[3]{'contents'}[35]{'extra'}{'entry_node'}
 = $result_trees{'encoding_index_utf8'}{'contents'}[3];
+$result_trees{'encoding_index_utf8'}{'contents'}[3]{'contents'}[35]{'extra'}{'element_node'}
 = $result_trees{'encoding_index_utf8'}{'contents'}[3];
 
$result_trees{'encoding_index_utf8'}{'contents'}[3]{'contents'}[35]{'extra'}{'index_entry'}{'entry_element'}
 = $result_trees{'encoding_index_utf8'}{'contents'}[3]{'contents'}[35];
-$result_trees{'encoding_index_utf8'}{'contents'}[3]{'contents'}[36]{'extra'}{'entry_node'}
 = $result_trees{'encoding_index_utf8'}{'contents'}[3];
+$result_trees{'encoding_index_utf8'}{'contents'}[3]{'contents'}[36]{'extra'}{'element_node'}
 = $result_trees{'encoding_index_utf8'}{'contents'}[3];
 
$result_trees{'encoding_index_utf8'}{'contents'}[3]{'contents'}[36]{'extra'}{'index_entry'}{'entry_element'}
 = $result_trees{'encoding_index_utf8'}{'contents'}[3]{'contents'}[36];
-$result_trees{'encoding_index_utf8'}{'contents'}[3]{'contents'}[37]{'extra'}{'entry_node'}
 = $result_trees{'encoding_index_utf8'}{'contents'}[3];
+$result_trees{'encoding_index_utf8'}{'contents'}[3]{'contents'}[37]{'extra'}{'element_node'}
 = $result_trees{'encoding_index_utf8'}{'contents'}[3];
 
$result_trees{'encoding_index_utf8'}{'contents'}[3]{'contents'}[37]{'extra'}{'index_entry'}{'entry_element'}
 = $result_trees{'encoding_index_utf8'}{'contents'}[3]{'contents'}[37];
-$result_trees{'encoding_index_utf8'}{'contents'}[3]{'contents'}[38]{'extra'}{'entry_node'}
 = $result_trees{'encoding_index_utf8'}{'contents'}[3];
+$result_trees{'encoding_index_utf8'}{'contents'}[3]{'contents'}[38]{'extra'}{'element_node'}
 = $result_trees{'encoding_index_utf8'}{'contents'}[3];
 
$result_trees{'encoding_index_utf8'}{'contents'}[3]{'contents'}[38]{'extra'}{'index_entry'}{'entry_element'}
 = $result_trees{'encoding_index_utf8'}{'contents'}[3]{'contents'}[38];
-$result_trees{'encoding_index_utf8'}{'contents'}[3]{'contents'}[39]{'extra'}{'entry_node'}
 = $result_trees{'encoding_index_utf8'}{'contents'}[3];
+$result_trees{'encoding_index_utf8'}{'contents'}[3]{'contents'}[39]{'extra'}{'element_node'}
 = $result_trees{'encoding_index_utf8'}{'contents'}[3];
 
$result_trees{'encoding_index_utf8'}{'contents'}[3]{'contents'}[39]{'extra'}{'index_entry'}{'entry_element'}
 = $result_trees{'encoding_index_utf8'}{'contents'}[3]{'contents'}[39];
-$result_trees{'encoding_index_utf8'}{'contents'}[3]{'contents'}[40]{'extra'}{'entry_node'}
 = $result_trees{'encoding_index_utf8'}{'contents'}[3];
+$result_trees{'encoding_index_utf8'}{'contents'}[3]{'contents'}[40]{'extra'}{'element_node'}
 = $result_trees{'encoding_index_utf8'}{'contents'}[3];
 
$result_trees{'encoding_index_utf8'}{'contents'}[3]{'contents'}[40]{'extra'}{'index_entry'}{'entry_element'}
 = $result_trees{'encoding_index_utf8'}{'contents'}[3]{'contents'}[40];
-$result_trees{'encoding_index_utf8'}{'contents'}[3]{'contents'}[41]{'extra'}{'entry_node'}
 = $result_trees{'encoding_index_utf8'}{'contents'}[3];
+$result_trees{'encoding_index_utf8'}{'contents'}[3]{'contents'}[41]{'extra'}{'element_node'}
 = $result_trees{'encoding_index_utf8'}{'contents'}[3];
 
$result_trees{'encoding_index_utf8'}{'contents'}[3]{'contents'}[41]{'extra'}{'index_entry'}{'entry_element'}
 = $result_trees{'encoding_index_utf8'}{'contents'}[3]{'contents'}[41];
-$result_trees{'encoding_index_utf8'}{'contents'}[3]{'contents'}[42]{'extra'}{'entry_node'}
 = $result_trees{'encoding_index_utf8'}{'contents'}[3];
+$result_trees{'encoding_index_utf8'}{'contents'}[3]{'contents'}[42]{'extra'}{'element_node'}
 = $result_trees{'encoding_index_utf8'}{'contents'}[3];
 
$result_trees{'encoding_index_utf8'}{'contents'}[3]{'contents'}[42]{'extra'}{'index_entry'}{'entry_element'}
 = $result_trees{'encoding_index_utf8'}{'contents'}[3]{'contents'}[42];
-$result_trees{'encoding_index_utf8'}{'contents'}[3]{'contents'}[43]{'extra'}{'entry_node'}
 = $result_trees{'encoding_index_utf8'}{'contents'}[3];
+$result_trees{'encoding_index_utf8'}{'contents'}[3]{'contents'}[43]{'extra'}{'element_node'}
 = $result_trees{'encoding_index_utf8'}{'contents'}[3];
 
$result_trees{'encoding_index_utf8'}{'contents'}[3]{'contents'}[43]{'extra'}{'index_entry'}{'entry_element'}
 = $result_trees{'encoding_index_utf8'}{'contents'}[3]{'contents'}[43];
-$result_trees{'encoding_index_utf8'}{'contents'}[3]{'contents'}[44]{'extra'}{'entry_node'}
 = $result_trees{'encoding_index_utf8'}{'contents'}[3];
+$result_trees{'encoding_index_utf8'}{'contents'}[3]{'contents'}[44]{'extra'}{'element_node'}
 = $result_trees{'encoding_index_utf8'}{'contents'}[3];
 
$result_trees{'encoding_index_utf8'}{'contents'}[3]{'contents'}[44]{'extra'}{'index_entry'}{'entry_element'}
 = $result_trees{'encoding_index_utf8'}{'contents'}[3]{'contents'}[44];
-$result_trees{'encoding_index_utf8'}{'contents'}[3]{'contents'}[45]{'extra'}{'entry_node'}
 = $result_trees{'encoding_index_utf8'}{'contents'}[3];
+$result_trees{'encoding_index_utf8'}{'contents'}[3]{'contents'}[45]{'extra'}{'element_node'}
 = $result_trees{'encoding_index_utf8'}{'contents'}[3];
 
$result_trees{'encoding_index_utf8'}{'contents'}[3]{'contents'}[45]{'extra'}{'index_entry'}{'entry_element'}
 = $result_trees{'encoding_index_utf8'}{'contents'}[3]{'contents'}[45];
-$result_trees{'encoding_index_utf8'}{'contents'}[3]{'contents'}[46]{'extra'}{'entry_node'}
 = $result_trees{'encoding_index_utf8'}{'contents'}[3];
+$result_trees{'encoding_index_utf8'}{'contents'}[3]{'contents'}[46]{'extra'}{'element_node'}
 = $result_trees{'encoding_index_utf8'}{'contents'}[3];
 
$result_trees{'encoding_index_utf8'}{'contents'}[3]{'contents'}[46]{'extra'}{'index_entry'}{'entry_element'}
 = $result_trees{'encoding_index_utf8'}{'contents'}[3]{'contents'}[46];
-$result_trees{'encoding_index_utf8'}{'contents'}[3]{'contents'}[47]{'extra'}{'entry_node'}
 = $result_trees{'encoding_index_utf8'}{'contents'}[3];
+$result_trees{'encoding_index_utf8'}{'contents'}[3]{'contents'}[47]{'extra'}{'element_node'}
 = $result_trees{'encoding_index_utf8'}{'contents'}[3];
 
$result_trees{'encoding_index_utf8'}{'contents'}[3]{'contents'}[47]{'extra'}{'index_entry'}{'entry_element'}
 = $result_trees{'encoding_index_utf8'}{'contents'}[3]{'contents'}[47];
-$result_trees{'encoding_index_utf8'}{'contents'}[3]{'contents'}[48]{'extra'}{'entry_node'}
 = $result_trees{'encoding_index_utf8'}{'contents'}[3];
+$result_trees{'encoding_index_utf8'}{'contents'}[3]{'contents'}[48]{'extra'}{'element_node'}
 = $result_trees{'encoding_index_utf8'}{'contents'}[3];
 
$result_trees{'encoding_index_utf8'}{'contents'}[3]{'contents'}[48]{'extra'}{'index_entry'}{'entry_element'}
 = $result_trees{'encoding_index_utf8'}{'contents'}[3]{'contents'}[48];
-$result_trees{'encoding_index_utf8'}{'contents'}[3]{'contents'}[49]{'extra'}{'entry_node'}
 = $result_trees{'encoding_index_utf8'}{'contents'}[3];
+$result_trees{'encoding_index_utf8'}{'contents'}[3]{'contents'}[49]{'extra'}{'element_node'}
 = $result_trees{'encoding_index_utf8'}{'contents'}[3];
 
$result_trees{'encoding_index_utf8'}{'contents'}[3]{'contents'}[49]{'extra'}{'index_entry'}{'entry_element'}
 = $result_trees{'encoding_index_utf8'}{'contents'}[3]{'contents'}[49];
-$result_trees{'encoding_index_utf8'}{'contents'}[3]{'contents'}[50]{'extra'}{'entry_node'}
 = $result_trees{'encoding_index_utf8'}{'contents'}[3];
+$result_trees{'encoding_index_utf8'}{'contents'}[3]{'contents'}[50]{'extra'}{'element_node'}
 = $result_trees{'encoding_index_utf8'}{'contents'}[3];
 
$result_trees{'encoding_index_utf8'}{'contents'}[3]{'contents'}[50]{'extra'}{'index_entry'}{'entry_element'}
 = $result_trees{'encoding_index_utf8'}{'contents'}[3]{'contents'}[50];
-$result_trees{'encoding_index_utf8'}{'contents'}[3]{'contents'}[51]{'extra'}{'entry_node'}
 = $result_trees{'encoding_index_utf8'}{'contents'}[3];
+$result_trees{'encoding_index_utf8'}{'contents'}[3]{'contents'}[51]{'extra'}{'element_node'}
 = $result_trees{'encoding_index_utf8'}{'contents'}[3];
 
$result_trees{'encoding_index_utf8'}{'contents'}[3]{'contents'}[51]{'extra'}{'index_entry'}{'entry_element'}
 = $result_trees{'encoding_index_utf8'}{'contents'}[3]{'contents'}[51];
-$result_trees{'encoding_index_utf8'}{'contents'}[3]{'contents'}[52]{'extra'}{'entry_node'}
 = $result_trees{'encoding_index_utf8'}{'contents'}[3];
+$result_trees{'encoding_index_utf8'}{'contents'}[3]{'contents'}[52]{'extra'}{'element_node'}
 = $result_trees{'encoding_index_utf8'}{'contents'}[3];
 
$result_trees{'encoding_index_utf8'}{'contents'}[3]{'contents'}[52]{'extra'}{'index_entry'}{'entry_element'}
 = $result_trees{'encoding_index_utf8'}{'contents'}[3]{'contents'}[52];
-$result_trees{'encoding_index_utf8'}{'contents'}[3]{'contents'}[53]{'extra'}{'entry_node'}
 = $result_trees{'encoding_index_utf8'}{'contents'}[3];
+$result_trees{'encoding_index_utf8'}{'contents'}[3]{'contents'}[53]{'extra'}{'element_node'}
 = $result_trees{'encoding_index_utf8'}{'contents'}[3];
 
$result_trees{'encoding_index_utf8'}{'contents'}[3]{'contents'}[53]{'extra'}{'index_entry'}{'entry_element'}
 = $result_trees{'encoding_index_utf8'}{'contents'}[3]{'contents'}[53];
-$result_trees{'encoding_index_utf8'}{'contents'}[3]{'contents'}[54]{'extra'}{'entry_node'}
 = $result_trees{'encoding_index_utf8'}{'contents'}[3];
+$result_trees{'encoding_index_utf8'}{'contents'}[3]{'contents'}[54]{'extra'}{'element_node'}
 = $result_trees{'encoding_index_utf8'}{'contents'}[3];
 
$result_trees{'encoding_index_utf8'}{'contents'}[3]{'contents'}[54]{'extra'}{'index_entry'}{'entry_element'}
 = $result_trees{'encoding_index_utf8'}{'contents'}[3]{'contents'}[54];
-$result_trees{'encoding_index_utf8'}{'contents'}[3]{'contents'}[55]{'extra'}{'entry_node'}
 = $result_trees{'encoding_index_utf8'}{'contents'}[3];
+$result_trees{'encoding_index_utf8'}{'contents'}[3]{'contents'}[55]{'extra'}{'element_node'}
 = $result_trees{'encoding_index_utf8'}{'contents'}[3];
 
$result_trees{'encoding_index_utf8'}{'contents'}[3]{'contents'}[55]{'extra'}{'index_entry'}{'entry_element'}
 = $result_trees{'encoding_index_utf8'}{'contents'}[3]{'contents'}[55];
 
$result_trees{'encoding_index_utf8'}{'contents'}[3]{'extra'}{'node_content'}[0] 
= $result_trees{'encoding_index_utf8'}{'contents'}[3]{'args'}[0]{'contents'}[0];
 
$result_trees{'encoding_index_utf8'}{'contents'}[3]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = 
$result_trees{'encoding_index_utf8'}{'contents'}[3]{'args'}[0]{'contents'}[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 1c3925b58b..74d2531e73 100644
--- a/tp/t/results/indices/encoding_index_utf8_enable_encoding.pl
+++ b/tp/t/results/indices/encoding_index_utf8_enable_encoding.pl
@@ -189,7 +189,7 @@ $result_trees{'encoding_index_utf8_enable_encoding'} = {
           ],
           'cmdname' => 'cindex',
           'extra' => {
-            'entry_node' => {},
+            'element_node' => {},
             'index_entry' => {
               'entry_element' => {},
               'entry_number' => 1,
@@ -300,7 +300,7 @@ $result_trees{'encoding_index_utf8_enable_encoding'} = {
           ],
           'cmdname' => 'cindex',
           'extra' => {
-            'entry_node' => {},
+            'element_node' => {},
             'index_entry' => {
               'entry_element' => {},
               'entry_number' => 2,
@@ -429,7 +429,7 @@ $result_trees{'encoding_index_utf8_enable_encoding'} = {
           ],
           'cmdname' => 'cindex',
           'extra' => {
-            'entry_node' => {},
+            'element_node' => {},
             'index_entry' => {
               'entry_element' => {},
               'entry_number' => 3,
@@ -468,7 +468,7 @@ $result_trees{'encoding_index_utf8_enable_encoding'} = {
           ],
           'cmdname' => 'cindex',
           'extra' => {
-            'entry_node' => {},
+            'element_node' => {},
             'index_entry' => {
               'entry_element' => {},
               'entry_number' => 4,
@@ -507,7 +507,7 @@ $result_trees{'encoding_index_utf8_enable_encoding'} = {
           ],
           'cmdname' => 'cindex',
           'extra' => {
-            'entry_node' => {},
+            'element_node' => {},
             'index_entry' => {
               'entry_element' => {},
               'entry_number' => 5,
@@ -546,7 +546,7 @@ $result_trees{'encoding_index_utf8_enable_encoding'} = {
           ],
           'cmdname' => 'cindex',
           'extra' => {
-            'entry_node' => {},
+            'element_node' => {},
             'index_entry' => {
               'entry_element' => {},
               'entry_number' => 6,
@@ -585,7 +585,7 @@ $result_trees{'encoding_index_utf8_enable_encoding'} = {
           ],
           'cmdname' => 'cindex',
           'extra' => {
-            'entry_node' => {},
+            'element_node' => {},
             'index_entry' => {
               'entry_element' => {},
               'entry_number' => 7,
@@ -624,7 +624,7 @@ $result_trees{'encoding_index_utf8_enable_encoding'} = {
           ],
           'cmdname' => 'cindex',
           'extra' => {
-            'entry_node' => {},
+            'element_node' => {},
             'index_entry' => {
               'entry_element' => {},
               'entry_number' => 8,
@@ -663,7 +663,7 @@ $result_trees{'encoding_index_utf8_enable_encoding'} = {
           ],
           'cmdname' => 'cindex',
           'extra' => {
-            'entry_node' => {},
+            'element_node' => {},
             'index_entry' => {
               'entry_element' => {},
               'entry_number' => 9,
@@ -702,7 +702,7 @@ $result_trees{'encoding_index_utf8_enable_encoding'} = {
           ],
           'cmdname' => 'cindex',
           'extra' => {
-            'entry_node' => {},
+            'element_node' => {},
             'index_entry' => {
               'entry_element' => {},
               'entry_number' => 10,
@@ -741,7 +741,7 @@ $result_trees{'encoding_index_utf8_enable_encoding'} = {
           ],
           'cmdname' => 'cindex',
           'extra' => {
-            'entry_node' => {},
+            'element_node' => {},
             'index_entry' => {
               'entry_element' => {},
               'entry_number' => 11,
@@ -780,7 +780,7 @@ $result_trees{'encoding_index_utf8_enable_encoding'} = {
           ],
           'cmdname' => 'cindex',
           'extra' => {
-            'entry_node' => {},
+            'element_node' => {},
             'index_entry' => {
               'entry_element' => {},
               'entry_number' => 12,
@@ -819,7 +819,7 @@ $result_trees{'encoding_index_utf8_enable_encoding'} = {
           ],
           'cmdname' => 'cindex',
           'extra' => {
-            'entry_node' => {},
+            'element_node' => {},
             'index_entry' => {
               'entry_element' => {},
               'entry_number' => 13,
@@ -858,7 +858,7 @@ $result_trees{'encoding_index_utf8_enable_encoding'} = {
           ],
           'cmdname' => 'cindex',
           'extra' => {
-            'entry_node' => {},
+            'element_node' => {},
             'index_entry' => {
               'entry_element' => {},
               'entry_number' => 14,
@@ -897,7 +897,7 @@ $result_trees{'encoding_index_utf8_enable_encoding'} = {
           ],
           'cmdname' => 'cindex',
           'extra' => {
-            'entry_node' => {},
+            'element_node' => {},
             'index_entry' => {
               'entry_element' => {},
               'entry_number' => 15,
@@ -936,7 +936,7 @@ $result_trees{'encoding_index_utf8_enable_encoding'} = {
           ],
           'cmdname' => 'cindex',
           'extra' => {
-            'entry_node' => {},
+            'element_node' => {},
             'index_entry' => {
               'entry_element' => {},
               'entry_number' => 16,
@@ -975,7 +975,7 @@ $result_trees{'encoding_index_utf8_enable_encoding'} = {
           ],
           'cmdname' => 'cindex',
           'extra' => {
-            'entry_node' => {},
+            'element_node' => {},
             'index_entry' => {
               'entry_element' => {},
               'entry_number' => 17,
@@ -1014,7 +1014,7 @@ $result_trees{'encoding_index_utf8_enable_encoding'} = {
           ],
           'cmdname' => 'cindex',
           'extra' => {
-            'entry_node' => {},
+            'element_node' => {},
             'index_entry' => {
               'entry_element' => {},
               'entry_number' => 18,
@@ -1053,7 +1053,7 @@ $result_trees{'encoding_index_utf8_enable_encoding'} = {
           ],
           'cmdname' => 'cindex',
           'extra' => {
-            'entry_node' => {},
+            'element_node' => {},
             'index_entry' => {
               'entry_element' => {},
               'entry_number' => 19,
@@ -1092,7 +1092,7 @@ $result_trees{'encoding_index_utf8_enable_encoding'} = {
           ],
           'cmdname' => 'cindex',
           'extra' => {
-            'entry_node' => {},
+            'element_node' => {},
             'index_entry' => {
               'entry_element' => {},
               'entry_number' => 20,
@@ -1131,7 +1131,7 @@ $result_trees{'encoding_index_utf8_enable_encoding'} = {
           ],
           'cmdname' => 'cindex',
           'extra' => {
-            'entry_node' => {},
+            'element_node' => {},
             'index_entry' => {
               'entry_element' => {},
               'entry_number' => 21,
@@ -1170,7 +1170,7 @@ $result_trees{'encoding_index_utf8_enable_encoding'} = {
           ],
           'cmdname' => 'cindex',
           'extra' => {
-            'entry_node' => {},
+            'element_node' => {},
             'index_entry' => {
               'entry_element' => {},
               'entry_number' => 22,
@@ -1209,7 +1209,7 @@ $result_trees{'encoding_index_utf8_enable_encoding'} = {
           ],
           'cmdname' => 'cindex',
           'extra' => {
-            'entry_node' => {},
+            'element_node' => {},
             'index_entry' => {
               'entry_element' => {},
               'entry_number' => 23,
@@ -1248,7 +1248,7 @@ $result_trees{'encoding_index_utf8_enable_encoding'} = {
           ],
           'cmdname' => 'cindex',
           'extra' => {
-            'entry_node' => {},
+            'element_node' => {},
             'index_entry' => {
               'entry_element' => {},
               'entry_number' => 24,
@@ -1287,7 +1287,7 @@ $result_trees{'encoding_index_utf8_enable_encoding'} = {
           ],
           'cmdname' => 'cindex',
           'extra' => {
-            'entry_node' => {},
+            'element_node' => {},
             'index_entry' => {
               'entry_element' => {},
               'entry_number' => 25,
@@ -1326,7 +1326,7 @@ $result_trees{'encoding_index_utf8_enable_encoding'} = {
           ],
           'cmdname' => 'cindex',
           'extra' => {
-            'entry_node' => {},
+            'element_node' => {},
             'index_entry' => {
               'entry_element' => {},
               'entry_number' => 26,
@@ -1365,7 +1365,7 @@ $result_trees{'encoding_index_utf8_enable_encoding'} = {
           ],
           'cmdname' => 'cindex',
           'extra' => {
-            'entry_node' => {},
+            'element_node' => {},
             'index_entry' => {
               'entry_element' => {},
               'entry_number' => 27,
@@ -1404,7 +1404,7 @@ $result_trees{'encoding_index_utf8_enable_encoding'} = {
           ],
           'cmdname' => 'cindex',
           'extra' => {
-            'entry_node' => {},
+            'element_node' => {},
             'index_entry' => {
               'entry_element' => {},
               'entry_number' => 28,
@@ -1443,7 +1443,7 @@ $result_trees{'encoding_index_utf8_enable_encoding'} = {
           ],
           'cmdname' => 'cindex',
           'extra' => {
-            'entry_node' => {},
+            'element_node' => {},
             'index_entry' => {
               'entry_element' => {},
               'entry_number' => 29,
@@ -1482,7 +1482,7 @@ $result_trees{'encoding_index_utf8_enable_encoding'} = {
           ],
           'cmdname' => 'cindex',
           'extra' => {
-            'entry_node' => {},
+            'element_node' => {},
             'index_entry' => {
               'entry_element' => {},
               'entry_number' => 30,
@@ -1521,7 +1521,7 @@ $result_trees{'encoding_index_utf8_enable_encoding'} = {
           ],
           'cmdname' => 'cindex',
           'extra' => {
-            'entry_node' => {},
+            'element_node' => {},
             'index_entry' => {
               'entry_element' => {},
               'entry_number' => 31,
@@ -1570,7 +1570,7 @@ $result_trees{'encoding_index_utf8_enable_encoding'} = {
           ],
           'cmdname' => 'cindex',
           'extra' => {
-            'entry_node' => {},
+            'element_node' => {},
             'index_entry' => {
               'entry_element' => {},
               'entry_number' => 32,
@@ -1619,7 +1619,7 @@ $result_trees{'encoding_index_utf8_enable_encoding'} = {
           ],
           'cmdname' => 'cindex',
           'extra' => {
-            'entry_node' => {},
+            'element_node' => {},
             'index_entry' => {
               'entry_element' => {},
               'entry_number' => 33,
@@ -1697,7 +1697,7 @@ $result_trees{'encoding_index_utf8_enable_encoding'} = {
           ],
           'cmdname' => 'cindex',
           'extra' => {
-            'entry_node' => {},
+            'element_node' => {},
             'index_entry' => {
               'entry_element' => {},
               'entry_number' => 34,
@@ -1805,7 +1805,7 @@ $result_trees{'encoding_index_utf8_enable_encoding'} = {
           ],
           'cmdname' => 'cindex',
           'extra' => {
-            'entry_node' => {},
+            'element_node' => {},
             'index_entry' => {
               'entry_element' => {},
               'entry_number' => 35,
@@ -1854,7 +1854,7 @@ $result_trees{'encoding_index_utf8_enable_encoding'} = {
           ],
           'cmdname' => 'cindex',
           'extra' => {
-            'entry_node' => {},
+            'element_node' => {},
             'index_entry' => {
               'entry_element' => {},
               'entry_number' => 36,
@@ -1903,7 +1903,7 @@ $result_trees{'encoding_index_utf8_enable_encoding'} = {
           ],
           'cmdname' => 'cindex',
           'extra' => {
-            'entry_node' => {},
+            'element_node' => {},
             'index_entry' => {
               'entry_element' => {},
               'entry_number' => 37,
@@ -1952,7 +1952,7 @@ $result_trees{'encoding_index_utf8_enable_encoding'} = {
           ],
           'cmdname' => 'cindex',
           'extra' => {
-            'entry_node' => {},
+            'element_node' => {},
             'index_entry' => {
               'entry_element' => {},
               'entry_number' => 38,
@@ -2001,7 +2001,7 @@ $result_trees{'encoding_index_utf8_enable_encoding'} = {
           ],
           'cmdname' => 'cindex',
           'extra' => {
-            'entry_node' => {},
+            'element_node' => {},
             'index_entry' => {
               'entry_element' => {},
               'entry_number' => 39,
@@ -2050,7 +2050,7 @@ $result_trees{'encoding_index_utf8_enable_encoding'} = {
           ],
           'cmdname' => 'cindex',
           'extra' => {
-            'entry_node' => {},
+            'element_node' => {},
             'index_entry' => {
               'entry_element' => {},
               'entry_number' => 40,
@@ -2099,7 +2099,7 @@ $result_trees{'encoding_index_utf8_enable_encoding'} = {
           ],
           'cmdname' => 'cindex',
           'extra' => {
-            'entry_node' => {},
+            'element_node' => {},
             'index_entry' => {
               'entry_element' => {},
               'entry_number' => 41,
@@ -2148,7 +2148,7 @@ $result_trees{'encoding_index_utf8_enable_encoding'} = {
           ],
           'cmdname' => 'cindex',
           'extra' => {
-            'entry_node' => {},
+            'element_node' => {},
             'index_entry' => {
               'entry_element' => {},
               'entry_number' => 42,
@@ -2187,7 +2187,7 @@ $result_trees{'encoding_index_utf8_enable_encoding'} = {
           ],
           'cmdname' => 'cindex',
           'extra' => {
-            'entry_node' => {},
+            'element_node' => {},
             'index_entry' => {
               'entry_element' => {},
               'entry_number' => 43,
@@ -2226,7 +2226,7 @@ $result_trees{'encoding_index_utf8_enable_encoding'} = {
           ],
           'cmdname' => 'cindex',
           'extra' => {
-            'entry_node' => {},
+            'element_node' => {},
             'index_entry' => {
               'entry_element' => {},
               'entry_number' => 44,
@@ -2275,7 +2275,7 @@ $result_trees{'encoding_index_utf8_enable_encoding'} = {
           ],
           'cmdname' => 'cindex',
           'extra' => {
-            'entry_node' => {},
+            'element_node' => {},
             'index_entry' => {
               'entry_element' => {},
               'entry_number' => 45,
@@ -2324,7 +2324,7 @@ $result_trees{'encoding_index_utf8_enable_encoding'} = {
           ],
           'cmdname' => 'cindex',
           'extra' => {
-            'entry_node' => {},
+            'element_node' => {},
             'index_entry' => {
               'entry_element' => {},
               'entry_number' => 46,
@@ -2373,7 +2373,7 @@ $result_trees{'encoding_index_utf8_enable_encoding'} = {
           ],
           'cmdname' => 'cindex',
           'extra' => {
-            'entry_node' => {},
+            'element_node' => {},
             'index_entry' => {
               'entry_element' => {},
               'entry_number' => 47,
@@ -2412,7 +2412,7 @@ $result_trees{'encoding_index_utf8_enable_encoding'} = {
           ],
           'cmdname' => 'cindex',
           'extra' => {
-            'entry_node' => {},
+            'element_node' => {},
             'index_entry' => {
               'entry_element' => {},
               'entry_number' => 48,
@@ -2451,7 +2451,7 @@ $result_trees{'encoding_index_utf8_enable_encoding'} = {
           ],
           'cmdname' => 'cindex',
           'extra' => {
-            'entry_node' => {},
+            'element_node' => {},
             'index_entry' => {
               'entry_element' => {},
               'entry_number' => 49,
@@ -2490,7 +2490,7 @@ $result_trees{'encoding_index_utf8_enable_encoding'} = {
           ],
           'cmdname' => 'cindex',
           'extra' => {
-            'entry_node' => {},
+            'element_node' => {},
             'index_entry' => {
               'entry_element' => {},
               'entry_number' => 50,
@@ -2529,7 +2529,7 @@ $result_trees{'encoding_index_utf8_enable_encoding'} = {
           ],
           'cmdname' => 'cindex',
           'extra' => {
-            'entry_node' => {},
+            'element_node' => {},
             'index_entry' => {
               'entry_element' => {},
               'entry_number' => 51,
@@ -2568,7 +2568,7 @@ $result_trees{'encoding_index_utf8_enable_encoding'} = {
           ],
           'cmdname' => 'cindex',
           'extra' => {
-            'entry_node' => {},
+            'element_node' => {},
             'index_entry' => {
               'entry_element' => {},
               'entry_number' => 52,
@@ -2607,7 +2607,7 @@ $result_trees{'encoding_index_utf8_enable_encoding'} = {
           ],
           'cmdname' => 'cindex',
           'extra' => {
-            'entry_node' => {},
+            'element_node' => {},
             'index_entry' => {
               'entry_element' => {},
               'entry_number' => 53,
@@ -2646,7 +2646,7 @@ $result_trees{'encoding_index_utf8_enable_encoding'} = {
           ],
           'cmdname' => 'cindex',
           'extra' => {
-            'entry_node' => {},
+            'element_node' => {},
             'index_entry' => {
               'entry_element' => {},
               'entry_number' => 54,
@@ -2685,7 +2685,7 @@ $result_trees{'encoding_index_utf8_enable_encoding'} = {
           ],
           'cmdname' => 'cindex',
           'extra' => {
-            'entry_node' => {},
+            'element_node' => {},
             'index_entry' => {
               'entry_element' => {},
               'entry_number' => 55,
@@ -2786,115 +2786,115 @@ $result_trees{'encoding_index_utf8_enable_encoding'} 
= {
 };
 
$result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[1]{'extra'}{'node_content'}[0]
 = 
$result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[1]{'args'}[0]{'contents'}[0];
 
$result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[1]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = 
$result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[1]{'args'}[0]{'contents'}[0];
-$result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[3]{'contents'}[1]{'extra'}{'entry_node'}
 = $result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[3];
+$result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[3]{'contents'}[1]{'extra'}{'element_node'}
 = $result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[3];
 
$result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[3]{'contents'}[1]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[3]{'contents'}[1];
-$result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[3]{'contents'}[2]{'extra'}{'entry_node'}
 = $result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[3];
+$result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[3]{'contents'}[2]{'extra'}{'element_node'}
 = $result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[3];
 
$result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[3]{'contents'}[2]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[3]{'contents'}[2];
-$result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[3]{'contents'}[3]{'extra'}{'entry_node'}
 = $result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[3];
+$result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[3]{'contents'}[3]{'extra'}{'element_node'}
 = $result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[3];
 
$result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[3]{'contents'}[3]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[3]{'contents'}[3];
-$result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[3]{'contents'}[4]{'extra'}{'entry_node'}
 = $result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[3];
+$result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[3]{'contents'}[4]{'extra'}{'element_node'}
 = $result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[3];
 
$result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[3]{'contents'}[4]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[3]{'contents'}[4];
-$result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[3]{'contents'}[5]{'extra'}{'entry_node'}
 = $result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[3];
+$result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[3]{'contents'}[5]{'extra'}{'element_node'}
 = $result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[3];
 
$result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[3]{'contents'}[5]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[3]{'contents'}[5];
-$result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[3]{'contents'}[6]{'extra'}{'entry_node'}
 = $result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[3];
+$result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[3]{'contents'}[6]{'extra'}{'element_node'}
 = $result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[3];
 
$result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[3]{'contents'}[6]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[3]{'contents'}[6];
-$result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[3]{'contents'}[7]{'extra'}{'entry_node'}
 = $result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[3];
+$result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[3]{'contents'}[7]{'extra'}{'element_node'}
 = $result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[3];
 
$result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[3]{'contents'}[7]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[3]{'contents'}[7];
-$result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[3]{'contents'}[8]{'extra'}{'entry_node'}
 = $result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[3];
+$result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[3]{'contents'}[8]{'extra'}{'element_node'}
 = $result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[3];
 
$result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[3]{'contents'}[8]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[3]{'contents'}[8];
-$result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[3]{'contents'}[9]{'extra'}{'entry_node'}
 = $result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[3];
+$result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[3]{'contents'}[9]{'extra'}{'element_node'}
 = $result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[3];
 
$result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[3]{'contents'}[9]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[3]{'contents'}[9];
-$result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[3]{'contents'}[10]{'extra'}{'entry_node'}
 = $result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[3];
+$result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[3]{'contents'}[10]{'extra'}{'element_node'}
 = $result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[3];
 
$result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[3]{'contents'}[10]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[3]{'contents'}[10];
-$result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[3]{'contents'}[11]{'extra'}{'entry_node'}
 = $result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[3];
+$result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[3]{'contents'}[11]{'extra'}{'element_node'}
 = $result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[3];
 
$result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[3]{'contents'}[11]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[3]{'contents'}[11];
-$result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[3]{'contents'}[12]{'extra'}{'entry_node'}
 = $result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[3];
+$result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[3]{'contents'}[12]{'extra'}{'element_node'}
 = $result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[3];
 
$result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[3]{'contents'}[12]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[3]{'contents'}[12];
-$result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[3]{'contents'}[13]{'extra'}{'entry_node'}
 = $result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[3];
+$result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[3]{'contents'}[13]{'extra'}{'element_node'}
 = $result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[3];
 
$result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[3]{'contents'}[13]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[3]{'contents'}[13];
-$result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[3]{'contents'}[14]{'extra'}{'entry_node'}
 = $result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[3];
+$result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[3]{'contents'}[14]{'extra'}{'element_node'}
 = $result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[3];
 
$result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[3]{'contents'}[14]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[3]{'contents'}[14];
-$result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[3]{'contents'}[15]{'extra'}{'entry_node'}
 = $result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[3];
+$result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[3]{'contents'}[15]{'extra'}{'element_node'}
 = $result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[3];
 
$result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[3]{'contents'}[15]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[3]{'contents'}[15];
-$result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[3]{'contents'}[16]{'extra'}{'entry_node'}
 = $result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[3];
+$result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[3]{'contents'}[16]{'extra'}{'element_node'}
 = $result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[3];
 
$result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[3]{'contents'}[16]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[3]{'contents'}[16];
-$result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[3]{'contents'}[17]{'extra'}{'entry_node'}
 = $result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[3];
+$result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[3]{'contents'}[17]{'extra'}{'element_node'}
 = $result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[3];
 
$result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[3]{'contents'}[17]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[3]{'contents'}[17];
-$result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[3]{'contents'}[18]{'extra'}{'entry_node'}
 = $result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[3];
+$result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[3]{'contents'}[18]{'extra'}{'element_node'}
 = $result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[3];
 
$result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[3]{'contents'}[18]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[3]{'contents'}[18];
-$result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[3]{'contents'}[19]{'extra'}{'entry_node'}
 = $result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[3];
+$result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[3]{'contents'}[19]{'extra'}{'element_node'}
 = $result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[3];
 
$result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[3]{'contents'}[19]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[3]{'contents'}[19];
-$result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[3]{'contents'}[20]{'extra'}{'entry_node'}
 = $result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[3];
+$result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[3]{'contents'}[20]{'extra'}{'element_node'}
 = $result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[3];
 
$result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[3]{'contents'}[20]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[3]{'contents'}[20];
-$result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[3]{'contents'}[21]{'extra'}{'entry_node'}
 = $result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[3];
+$result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[3]{'contents'}[21]{'extra'}{'element_node'}
 = $result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[3];
 
$result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[3]{'contents'}[21]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[3]{'contents'}[21];
-$result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[3]{'contents'}[22]{'extra'}{'entry_node'}
 = $result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[3];
+$result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[3]{'contents'}[22]{'extra'}{'element_node'}
 = $result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[3];
 
$result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[3]{'contents'}[22]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[3]{'contents'}[22];
-$result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[3]{'contents'}[23]{'extra'}{'entry_node'}
 = $result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[3];
+$result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[3]{'contents'}[23]{'extra'}{'element_node'}
 = $result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[3];
 
$result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[3]{'contents'}[23]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[3]{'contents'}[23];
-$result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[3]{'contents'}[24]{'extra'}{'entry_node'}
 = $result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[3];
+$result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[3]{'contents'}[24]{'extra'}{'element_node'}
 = $result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[3];
 
$result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[3]{'contents'}[24]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[3]{'contents'}[24];
-$result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[3]{'contents'}[25]{'extra'}{'entry_node'}
 = $result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[3];
+$result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[3]{'contents'}[25]{'extra'}{'element_node'}
 = $result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[3];
 
$result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[3]{'contents'}[25]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[3]{'contents'}[25];
-$result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[3]{'contents'}[26]{'extra'}{'entry_node'}
 = $result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[3];
+$result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[3]{'contents'}[26]{'extra'}{'element_node'}
 = $result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[3];
 
$result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[3]{'contents'}[26]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[3]{'contents'}[26];
-$result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[3]{'contents'}[27]{'extra'}{'entry_node'}
 = $result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[3];
+$result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[3]{'contents'}[27]{'extra'}{'element_node'}
 = $result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[3];
 
$result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[3]{'contents'}[27]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[3]{'contents'}[27];
-$result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[3]{'contents'}[28]{'extra'}{'entry_node'}
 = $result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[3];
+$result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[3]{'contents'}[28]{'extra'}{'element_node'}
 = $result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[3];
 
$result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[3]{'contents'}[28]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[3]{'contents'}[28];
-$result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[3]{'contents'}[29]{'extra'}{'entry_node'}
 = $result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[3];
+$result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[3]{'contents'}[29]{'extra'}{'element_node'}
 = $result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[3];
 
$result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[3]{'contents'}[29]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[3]{'contents'}[29];
-$result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[3]{'contents'}[30]{'extra'}{'entry_node'}
 = $result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[3];
+$result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[3]{'contents'}[30]{'extra'}{'element_node'}
 = $result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[3];
 
$result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[3]{'contents'}[30]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[3]{'contents'}[30];
-$result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[3]{'contents'}[31]{'extra'}{'entry_node'}
 = $result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[3];
+$result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[3]{'contents'}[31]{'extra'}{'element_node'}
 = $result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[3];
 
$result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[3]{'contents'}[31]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[3]{'contents'}[31];
-$result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[3]{'contents'}[32]{'extra'}{'entry_node'}
 = $result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[3];
+$result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[3]{'contents'}[32]{'extra'}{'element_node'}
 = $result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[3];
 
$result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[3]{'contents'}[32]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[3]{'contents'}[32];
-$result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[3]{'contents'}[33]{'extra'}{'entry_node'}
 = $result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[3];
+$result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[3]{'contents'}[33]{'extra'}{'element_node'}
 = $result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[3];
 
$result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[3]{'contents'}[33]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[3]{'contents'}[33];
-$result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[3]{'contents'}[34]{'extra'}{'entry_node'}
 = $result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[3];
+$result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[3]{'contents'}[34]{'extra'}{'element_node'}
 = $result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[3];
 
$result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[3]{'contents'}[34]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[3]{'contents'}[34];
-$result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[3]{'contents'}[35]{'extra'}{'entry_node'}
 = $result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[3];
+$result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[3]{'contents'}[35]{'extra'}{'element_node'}
 = $result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[3];
 
$result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[3]{'contents'}[35]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[3]{'contents'}[35];
-$result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[3]{'contents'}[36]{'extra'}{'entry_node'}
 = $result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[3];
+$result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[3]{'contents'}[36]{'extra'}{'element_node'}
 = $result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[3];
 
$result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[3]{'contents'}[36]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[3]{'contents'}[36];
-$result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[3]{'contents'}[37]{'extra'}{'entry_node'}
 = $result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[3];
+$result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[3]{'contents'}[37]{'extra'}{'element_node'}
 = $result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[3];
 
$result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[3]{'contents'}[37]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[3]{'contents'}[37];
-$result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[3]{'contents'}[38]{'extra'}{'entry_node'}
 = $result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[3];
+$result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[3]{'contents'}[38]{'extra'}{'element_node'}
 = $result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[3];
 
$result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[3]{'contents'}[38]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[3]{'contents'}[38];
-$result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[3]{'contents'}[39]{'extra'}{'entry_node'}
 = $result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[3];
+$result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[3]{'contents'}[39]{'extra'}{'element_node'}
 = $result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[3];
 
$result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[3]{'contents'}[39]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[3]{'contents'}[39];
-$result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[3]{'contents'}[40]{'extra'}{'entry_node'}
 = $result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[3];
+$result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[3]{'contents'}[40]{'extra'}{'element_node'}
 = $result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[3];
 
$result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[3]{'contents'}[40]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[3]{'contents'}[40];
-$result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[3]{'contents'}[41]{'extra'}{'entry_node'}
 = $result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[3];
+$result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[3]{'contents'}[41]{'extra'}{'element_node'}
 = $result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[3];
 
$result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[3]{'contents'}[41]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[3]{'contents'}[41];
-$result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[3]{'contents'}[42]{'extra'}{'entry_node'}
 = $result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[3];
+$result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[3]{'contents'}[42]{'extra'}{'element_node'}
 = $result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[3];
 
$result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[3]{'contents'}[42]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[3]{'contents'}[42];
-$result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[3]{'contents'}[43]{'extra'}{'entry_node'}
 = $result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[3];
+$result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[3]{'contents'}[43]{'extra'}{'element_node'}
 = $result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[3];
 
$result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[3]{'contents'}[43]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[3]{'contents'}[43];
-$result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[3]{'contents'}[44]{'extra'}{'entry_node'}
 = $result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[3];
+$result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[3]{'contents'}[44]{'extra'}{'element_node'}
 = $result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[3];
 
$result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[3]{'contents'}[44]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[3]{'contents'}[44];
-$result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[3]{'contents'}[45]{'extra'}{'entry_node'}
 = $result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[3];
+$result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[3]{'contents'}[45]{'extra'}{'element_node'}
 = $result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[3];
 
$result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[3]{'contents'}[45]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[3]{'contents'}[45];
-$result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[3]{'contents'}[46]{'extra'}{'entry_node'}
 = $result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[3];
+$result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[3]{'contents'}[46]{'extra'}{'element_node'}
 = $result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[3];
 
$result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[3]{'contents'}[46]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[3]{'contents'}[46];
-$result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[3]{'contents'}[47]{'extra'}{'entry_node'}
 = $result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[3];
+$result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[3]{'contents'}[47]{'extra'}{'element_node'}
 = $result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[3];
 
$result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[3]{'contents'}[47]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[3]{'contents'}[47];
-$result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[3]{'contents'}[48]{'extra'}{'entry_node'}
 = $result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[3];
+$result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[3]{'contents'}[48]{'extra'}{'element_node'}
 = $result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[3];
 
$result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[3]{'contents'}[48]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[3]{'contents'}[48];
-$result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[3]{'contents'}[49]{'extra'}{'entry_node'}
 = $result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[3];
+$result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[3]{'contents'}[49]{'extra'}{'element_node'}
 = $result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[3];
 
$result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[3]{'contents'}[49]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[3]{'contents'}[49];
-$result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[3]{'contents'}[50]{'extra'}{'entry_node'}
 = $result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[3];
+$result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[3]{'contents'}[50]{'extra'}{'element_node'}
 = $result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[3];
 
$result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[3]{'contents'}[50]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[3]{'contents'}[50];
-$result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[3]{'contents'}[51]{'extra'}{'entry_node'}
 = $result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[3];
+$result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[3]{'contents'}[51]{'extra'}{'element_node'}
 = $result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[3];
 
$result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[3]{'contents'}[51]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[3]{'contents'}[51];
-$result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[3]{'contents'}[52]{'extra'}{'entry_node'}
 = $result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[3];
+$result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[3]{'contents'}[52]{'extra'}{'element_node'}
 = $result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[3];
 
$result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[3]{'contents'}[52]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[3]{'contents'}[52];
-$result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[3]{'contents'}[53]{'extra'}{'entry_node'}
 = $result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[3];
+$result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[3]{'contents'}[53]{'extra'}{'element_node'}
 = $result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[3];
 
$result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[3]{'contents'}[53]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[3]{'contents'}[53];
-$result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[3]{'contents'}[54]{'extra'}{'entry_node'}
 = $result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[3];
+$result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[3]{'contents'}[54]{'extra'}{'element_node'}
 = $result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[3];
 
$result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[3]{'contents'}[54]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[3]{'contents'}[54];
-$result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[3]{'contents'}[55]{'extra'}{'entry_node'}
 = $result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[3];
+$result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[3]{'contents'}[55]{'extra'}{'element_node'}
 = $result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[3];
 
$result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[3]{'contents'}[55]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[3]{'contents'}[55];
 
$result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[3]{'extra'}{'node_content'}[0]
 = 
$result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[3]{'args'}[0]{'contents'}[0];
 
$result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[3]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = 
$result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[3]{'args'}[0]{'contents'}[0];
diff --git a/tp/t/results/indices/explicit_sort_key.pl 
b/tp/t/results/indices/explicit_sort_key.pl
index 7771f8f561..b6f37f0c1b 100644
--- a/tp/t/results/indices/explicit_sort_key.pl
+++ b/tp/t/results/indices/explicit_sort_key.pl
@@ -190,7 +190,7 @@ $result_trees{'explicit_sort_key'} = {
           ],
           'cmdname' => 'SKindex',
           'extra' => {
-            'entry_node' => {},
+            'element_node' => {},
             'index_entry' => {
               'entry_element' => {},
               'entry_number' => 1,
@@ -252,7 +252,7 @@ $result_trees{'explicit_sort_key'} = {
           ],
           'cmdname' => 'SKindex',
           'extra' => {
-            'entry_node' => {},
+            'element_node' => {},
             'index_entry' => {
               'entry_element' => {},
               'entry_number' => 2,
@@ -314,7 +314,7 @@ $result_trees{'explicit_sort_key'} = {
           ],
           'cmdname' => 'SKindex',
           'extra' => {
-            'entry_node' => {},
+            'element_node' => {},
             'index_entry' => {
               'entry_element' => {},
               'entry_number' => 3,
@@ -387,7 +387,7 @@ $result_trees{'explicit_sort_key'} = {
           ],
           'cmdname' => 'SKindex',
           'extra' => {
-            'entry_node' => {},
+            'element_node' => {},
             'index_entry' => {
               'entry_element' => {},
               'entry_number' => 4,
@@ -642,13 +642,13 @@ $result_trees{'explicit_sort_key'} = {
 };
 $result_trees{'explicit_sort_key'}{'contents'}[1]{'extra'}{'node_content'}[0] 
= $result_trees{'explicit_sort_key'}{'contents'}[1]{'args'}[0]{'contents'}[0];
 
$result_trees{'explicit_sort_key'}{'contents'}[1]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = $result_trees{'explicit_sort_key'}{'contents'}[1]{'args'}[0]{'contents'}[0];
-$result_trees{'explicit_sort_key'}{'contents'}[3]{'contents'}[3]{'extra'}{'entry_node'}
 = $result_trees{'explicit_sort_key'}{'contents'}[3];
+$result_trees{'explicit_sort_key'}{'contents'}[3]{'contents'}[3]{'extra'}{'element_node'}
 = $result_trees{'explicit_sort_key'}{'contents'}[3];
 
$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'}[4]{'extra'}{'entry_node'}
 = $result_trees{'explicit_sort_key'}{'contents'}[3];
+$result_trees{'explicit_sort_key'}{'contents'}[3]{'contents'}[4]{'extra'}{'element_node'}
 = $result_trees{'explicit_sort_key'}{'contents'}[3];
 
$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'}[5]{'extra'}{'entry_node'}
 = $result_trees{'explicit_sort_key'}{'contents'}[3];
+$result_trees{'explicit_sort_key'}{'contents'}[3]{'contents'}[5]{'extra'}{'element_node'}
 = $result_trees{'explicit_sort_key'}{'contents'}[3];
 
$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'}[6]{'extra'}{'entry_node'}
 = $result_trees{'explicit_sort_key'}{'contents'}[3];
+$result_trees{'explicit_sort_key'}{'contents'}[3]{'contents'}[6]{'extra'}{'element_node'}
 = $result_trees{'explicit_sort_key'}{'contents'}[3];
 
$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]{'extra'}{'node_content'}[0] 
= $result_trees{'explicit_sort_key'}{'contents'}[3]{'args'}[0]{'contents'}[0];
 
$result_trees{'explicit_sort_key'}{'contents'}[3]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = $result_trees{'explicit_sort_key'}{'contents'}[3]{'args'}[0]{'contents'}[0];
diff --git a/tp/t/results/indices/ftable_vtable.pl 
b/tp/t/results/indices/ftable_vtable.pl
index 75662ebb73..c03e469204 100644
--- a/tp/t/results/indices/ftable_vtable.pl
+++ b/tp/t/results/indices/ftable_vtable.pl
@@ -141,7 +141,7 @@ $result_trees{'ftable_vtable'} = {
                       ],
                       'cmdname' => 'item',
                       'extra' => {
-                        'entry_node' => {},
+                        'element_node' => {},
                         'index_entry' => {
                           'entry_element' => {},
                           'entry_number' => 1,
@@ -179,7 +179,7 @@ $result_trees{'ftable_vtable'} = {
                       ],
                       'cmdname' => 'itemx',
                       'extra' => {
-                        'entry_node' => {},
+                        'element_node' => {},
                         'index_entry' => {
                           'entry_element' => {},
                           'entry_number' => 2,
@@ -241,7 +241,7 @@ $result_trees{'ftable_vtable'} = {
                       ],
                       'cmdname' => 'item',
                       'extra' => {
-                        'entry_node' => {},
+                        'element_node' => {},
                         'index_entry' => {
                           'entry_element' => {},
                           'entry_number' => 3,
@@ -379,7 +379,7 @@ $result_trees{'ftable_vtable'} = {
                       ],
                       'cmdname' => 'item',
                       'extra' => {
-                        'entry_node' => {},
+                        'element_node' => {},
                         'index_entry' => {
                           'entry_element' => {},
                           'entry_number' => 1,
@@ -417,7 +417,7 @@ $result_trees{'ftable_vtable'} = {
                       ],
                       'cmdname' => 'itemx',
                       'extra' => {
-                        'entry_node' => {},
+                        'element_node' => {},
                         'index_entry' => {
                           'entry_element' => {},
                           'entry_number' => 2,
@@ -479,7 +479,7 @@ $result_trees{'ftable_vtable'} = {
                       ],
                       'cmdname' => 'item',
                       'extra' => {
-                        'entry_node' => {},
+                        'element_node' => {},
                         'index_entry' => {
                           'entry_element' => {},
                           'entry_number' => 3,
@@ -575,7 +575,7 @@ $result_trees{'ftable_vtable'} = {
           ],
           'cmdname' => 'findex',
           'extra' => {
-            'entry_node' => {},
+            'element_node' => {},
             'index_entry' => {
               'entry_element' => {},
               'entry_number' => 4,
@@ -710,21 +710,21 @@ $result_trees{'ftable_vtable'} = {
 };
 $result_trees{'ftable_vtable'}{'contents'}[1]{'extra'}{'node_content'}[0] = 
$result_trees{'ftable_vtable'}{'contents'}[1]{'args'}[0]{'contents'}[0];
 
$result_trees{'ftable_vtable'}{'contents'}[1]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = $result_trees{'ftable_vtable'}{'contents'}[1]{'args'}[0]{'contents'}[0];
-$result_trees{'ftable_vtable'}{'contents'}[2]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'extra'}{'entry_node'}
 = $result_trees{'ftable_vtable'}{'contents'}[2];
+$result_trees{'ftable_vtable'}{'contents'}[2]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'extra'}{'element_node'}
 = $result_trees{'ftable_vtable'}{'contents'}[2];
 
$result_trees{'ftable_vtable'}{'contents'}[2]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'ftable_vtable'}{'contents'}[2]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'contents'}[0];
-$result_trees{'ftable_vtable'}{'contents'}[2]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'contents'}[1]{'extra'}{'entry_node'}
 = $result_trees{'ftable_vtable'}{'contents'}[2];
+$result_trees{'ftable_vtable'}{'contents'}[2]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'contents'}[1]{'extra'}{'element_node'}
 = $result_trees{'ftable_vtable'}{'contents'}[2];
 
$result_trees{'ftable_vtable'}{'contents'}[2]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'contents'}[1]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'ftable_vtable'}{'contents'}[2]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'contents'}[1];
-$result_trees{'ftable_vtable'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'extra'}{'entry_node'}
 = $result_trees{'ftable_vtable'}{'contents'}[2];
+$result_trees{'ftable_vtable'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'extra'}{'element_node'}
 = $result_trees{'ftable_vtable'}{'contents'}[2];
 
$result_trees{'ftable_vtable'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'ftable_vtable'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'contents'}[0]{'contents'}[0];
 
$result_trees{'ftable_vtable'}{'contents'}[2]{'contents'}[1]{'extra'}{'command_as_argument'}
 = 
$result_trees{'ftable_vtable'}{'contents'}[2]{'contents'}[1]{'args'}[0]{'contents'}[0];
-$result_trees{'ftable_vtable'}{'contents'}[2]{'contents'}[3]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'extra'}{'entry_node'}
 = $result_trees{'ftable_vtable'}{'contents'}[2];
+$result_trees{'ftable_vtable'}{'contents'}[2]{'contents'}[3]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'extra'}{'element_node'}
 = $result_trees{'ftable_vtable'}{'contents'}[2];
 
$result_trees{'ftable_vtable'}{'contents'}[2]{'contents'}[3]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'ftable_vtable'}{'contents'}[2]{'contents'}[3]{'contents'}[0]{'contents'}[0]{'contents'}[0];
-$result_trees{'ftable_vtable'}{'contents'}[2]{'contents'}[3]{'contents'}[0]{'contents'}[0]{'contents'}[1]{'extra'}{'entry_node'}
 = $result_trees{'ftable_vtable'}{'contents'}[2];
+$result_trees{'ftable_vtable'}{'contents'}[2]{'contents'}[3]{'contents'}[0]{'contents'}[0]{'contents'}[1]{'extra'}{'element_node'}
 = $result_trees{'ftable_vtable'}{'contents'}[2];
 
$result_trees{'ftable_vtable'}{'contents'}[2]{'contents'}[3]{'contents'}[0]{'contents'}[0]{'contents'}[1]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'ftable_vtable'}{'contents'}[2]{'contents'}[3]{'contents'}[0]{'contents'}[0]{'contents'}[1];
-$result_trees{'ftable_vtable'}{'contents'}[2]{'contents'}[3]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'extra'}{'entry_node'}
 = $result_trees{'ftable_vtable'}{'contents'}[2];
+$result_trees{'ftable_vtable'}{'contents'}[2]{'contents'}[3]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'extra'}{'element_node'}
 = $result_trees{'ftable_vtable'}{'contents'}[2];
 
$result_trees{'ftable_vtable'}{'contents'}[2]{'contents'}[3]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'ftable_vtable'}{'contents'}[2]{'contents'}[3]{'contents'}[1]{'contents'}[0]{'contents'}[0];
 
$result_trees{'ftable_vtable'}{'contents'}[2]{'contents'}[3]{'extra'}{'command_as_argument'}
 = 
$result_trees{'ftable_vtable'}{'contents'}[2]{'contents'}[3]{'args'}[0]{'contents'}[0];
-$result_trees{'ftable_vtable'}{'contents'}[2]{'contents'}[5]{'extra'}{'entry_node'}
 = $result_trees{'ftable_vtable'}{'contents'}[2];
+$result_trees{'ftable_vtable'}{'contents'}[2]{'contents'}[5]{'extra'}{'element_node'}
 = $result_trees{'ftable_vtable'}{'contents'}[2];
 
$result_trees{'ftable_vtable'}{'contents'}[2]{'contents'}[5]{'extra'}{'index_entry'}{'entry_element'}
 = $result_trees{'ftable_vtable'}{'contents'}[2]{'contents'}[5];
 $result_trees{'ftable_vtable'}{'contents'}[2]{'extra'}{'node_content'}[0] = 
$result_trees{'ftable_vtable'}{'contents'}[2]{'args'}[0]{'contents'}[0];
 
$result_trees{'ftable_vtable'}{'contents'}[2]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = $result_trees{'ftable_vtable'}{'contents'}[2]{'args'}[0]{'contents'}[0];
diff --git a/tp/t/results/indices/ignored_sort_char_empty_entries.pl 
b/tp/t/results/indices/ignored_sort_char_empty_entries.pl
index 9016033bb1..8bf562dab1 100644
--- a/tp/t/results/indices/ignored_sort_char_empty_entries.pl
+++ b/tp/t/results/indices/ignored_sort_char_empty_entries.pl
@@ -158,7 +158,7 @@ $result_trees{'ignored_sort_char_empty_entries'} = {
           ],
           'cmdname' => 'findex',
           'extra' => {
-            'entry_node' => {},
+            'element_node' => {},
             'index_entry' => {
               'entry_element' => {},
               'entry_number' => 1,
@@ -198,7 +198,7 @@ $result_trees{'ignored_sort_char_empty_entries'} = {
           ],
           'cmdname' => 'findex',
           'extra' => {
-            'entry_node' => {},
+            'element_node' => {},
             'index_entry' => {
               'entry_element' => {},
               'entry_number' => 2,
@@ -238,7 +238,7 @@ $result_trees{'ignored_sort_char_empty_entries'} = {
           ],
           'cmdname' => 'findex',
           'extra' => {
-            'entry_node' => {},
+            'element_node' => {},
             'index_entry' => {
               'entry_element' => {},
               'entry_number' => 3,
@@ -300,7 +300,7 @@ $result_trees{'ignored_sort_char_empty_entries'} = {
           ],
           'cmdname' => 'findex',
           'extra' => {
-            'entry_node' => {},
+            'element_node' => {},
             'index_entry' => {
               'entry_element' => {},
               'entry_number' => 4,
@@ -393,13 +393,13 @@ $result_trees{'ignored_sort_char_empty_entries'} = {
 };
 
$result_trees{'ignored_sort_char_empty_entries'}{'contents'}[1]{'extra'}{'node_content'}[0]
 = 
$result_trees{'ignored_sort_char_empty_entries'}{'contents'}[1]{'args'}[0]{'contents'}[0];
 
$result_trees{'ignored_sort_char_empty_entries'}{'contents'}[1]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = 
$result_trees{'ignored_sort_char_empty_entries'}{'contents'}[1]{'args'}[0]{'contents'}[0];
-$result_trees{'ignored_sort_char_empty_entries'}{'contents'}[3]{'contents'}[1]{'extra'}{'entry_node'}
 = $result_trees{'ignored_sort_char_empty_entries'}{'contents'}[3];
+$result_trees{'ignored_sort_char_empty_entries'}{'contents'}[3]{'contents'}[1]{'extra'}{'element_node'}
 = $result_trees{'ignored_sort_char_empty_entries'}{'contents'}[3];
 
$result_trees{'ignored_sort_char_empty_entries'}{'contents'}[3]{'contents'}[1]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'ignored_sort_char_empty_entries'}{'contents'}[3]{'contents'}[1];
-$result_trees{'ignored_sort_char_empty_entries'}{'contents'}[3]{'contents'}[2]{'extra'}{'entry_node'}
 = $result_trees{'ignored_sort_char_empty_entries'}{'contents'}[3];
+$result_trees{'ignored_sort_char_empty_entries'}{'contents'}[3]{'contents'}[2]{'extra'}{'element_node'}
 = $result_trees{'ignored_sort_char_empty_entries'}{'contents'}[3];
 
$result_trees{'ignored_sort_char_empty_entries'}{'contents'}[3]{'contents'}[2]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'ignored_sort_char_empty_entries'}{'contents'}[3]{'contents'}[2];
-$result_trees{'ignored_sort_char_empty_entries'}{'contents'}[3]{'contents'}[3]{'extra'}{'entry_node'}
 = $result_trees{'ignored_sort_char_empty_entries'}{'contents'}[3];
+$result_trees{'ignored_sort_char_empty_entries'}{'contents'}[3]{'contents'}[3]{'extra'}{'element_node'}
 = $result_trees{'ignored_sort_char_empty_entries'}{'contents'}[3];
 
$result_trees{'ignored_sort_char_empty_entries'}{'contents'}[3]{'contents'}[3]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'ignored_sort_char_empty_entries'}{'contents'}[3]{'contents'}[3];
-$result_trees{'ignored_sort_char_empty_entries'}{'contents'}[3]{'contents'}[4]{'extra'}{'entry_node'}
 = $result_trees{'ignored_sort_char_empty_entries'}{'contents'}[3];
+$result_trees{'ignored_sort_char_empty_entries'}{'contents'}[3]{'contents'}[4]{'extra'}{'element_node'}
 = $result_trees{'ignored_sort_char_empty_entries'}{'contents'}[3];
 
$result_trees{'ignored_sort_char_empty_entries'}{'contents'}[3]{'contents'}[4]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'ignored_sort_char_empty_entries'}{'contents'}[3]{'contents'}[4];
 
$result_trees{'ignored_sort_char_empty_entries'}{'contents'}[3]{'extra'}{'node_content'}[0]
 = 
$result_trees{'ignored_sort_char_empty_entries'}{'contents'}[3]{'args'}[0]{'contents'}[0];
 
$result_trees{'ignored_sort_char_empty_entries'}{'contents'}[3]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = 
$result_trees{'ignored_sort_char_empty_entries'}{'contents'}[3]{'args'}[0]{'contents'}[0];
diff --git a/tp/t/results/indices/image_lines_count.pl 
b/tp/t/results/indices/image_lines_count.pl
index 7b4f49a802..47628813af 100644
Binary files a/tp/t/results/indices/image_lines_count.pl and 
b/tp/t/results/indices/image_lines_count.pl differ
diff --git a/tp/t/results/indices/image_text_lines_count.pl 
b/tp/t/results/indices/image_text_lines_count.pl
index 56da08ce40..1caa7bab50 100644
Binary files a/tp/t/results/indices/image_text_lines_count.pl and 
b/tp/t/results/indices/image_text_lines_count.pl differ
diff --git a/tp/t/results/indices/index_and_node_same_name.pl 
b/tp/t/results/indices/index_and_node_same_name.pl
index b39b45ebfd..9bd846882b 100644
--- a/tp/t/results/indices/index_and_node_same_name.pl
+++ b/tp/t/results/indices/index_and_node_same_name.pl
@@ -116,7 +116,7 @@ $result_trees{'index_and_node_same_name'} = {
           ],
           'cmdname' => 'cindex',
           'extra' => {
-            'entry_node' => {},
+            'element_node' => {},
             'index_entry' => {
               'entry_element' => {},
               'entry_number' => 1,
@@ -288,7 +288,7 @@ $result_trees{'index_and_node_same_name'} = {
 };
 
$result_trees{'index_and_node_same_name'}{'contents'}[1]{'extra'}{'node_content'}[0]
 = 
$result_trees{'index_and_node_same_name'}{'contents'}[1]{'args'}[0]{'contents'}[0];
 
$result_trees{'index_and_node_same_name'}{'contents'}[1]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = 
$result_trees{'index_and_node_same_name'}{'contents'}[1]{'args'}[0]{'contents'}[0];
-$result_trees{'index_and_node_same_name'}{'contents'}[2]{'contents'}[3]{'extra'}{'entry_node'}
 = $result_trees{'index_and_node_same_name'}{'contents'}[1];
+$result_trees{'index_and_node_same_name'}{'contents'}[2]{'contents'}[3]{'extra'}{'element_node'}
 = $result_trees{'index_and_node_same_name'}{'contents'}[1];
 
$result_trees{'index_and_node_same_name'}{'contents'}[2]{'contents'}[3]{'extra'}{'index_entry'}{'entry_element'}
 = $result_trees{'index_and_node_same_name'}{'contents'}[2]{'contents'}[3];
 
$result_trees{'index_and_node_same_name'}{'contents'}[3]{'extra'}{'node_content'}[0]
 = 
$result_trees{'index_and_node_same_name'}{'contents'}[3]{'args'}[0]{'contents'}[0];
 
$result_trees{'index_and_node_same_name'}{'contents'}[3]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = 
$result_trees{'index_and_node_same_name'}{'contents'}[3]{'args'}[0]{'contents'}[0];
diff --git a/tp/t/results/indices/index_entries_before_nodes.pl 
b/tp/t/results/indices/index_entries_before_nodes.pl
index e1c22f9d1f..a853848065 100644
--- a/tp/t/results/indices/index_entries_before_nodes.pl
+++ b/tp/t/results/indices/index_entries_before_nodes.pl
@@ -102,7 +102,7 @@ $result_trees{'index_entries_before_nodes'} = {
           ],
           'cmdname' => 'cindex',
           'extra' => {
-            'entry_node' => {},
+            'element_node' => {},
             'index_entry' => {
               'entry_element' => {},
               'entry_number' => 2,
@@ -196,7 +196,7 @@ $result_trees{'index_entries_before_nodes'} = {
           ],
           'cmdname' => 'cindex',
           'extra' => {
-            'entry_node' => {},
+            'element_node' => {},
             'index_entry' => {
               'entry_element' => {},
               'entry_number' => 3,
@@ -286,11 +286,11 @@ $result_trees{'index_entries_before_nodes'} = {
   'type' => 'document_root'
 };
 
$result_trees{'index_entries_before_nodes'}{'contents'}[0]{'contents'}[1]{'extra'}{'index_entry'}{'entry_element'}
 = $result_trees{'index_entries_before_nodes'}{'contents'}[0]{'contents'}[1];
-$result_trees{'index_entries_before_nodes'}{'contents'}[1]{'contents'}[1]{'extra'}{'entry_node'}
 = $result_trees{'index_entries_before_nodes'}{'contents'}[1];
+$result_trees{'index_entries_before_nodes'}{'contents'}[1]{'contents'}[1]{'extra'}{'element_node'}
 = $result_trees{'index_entries_before_nodes'}{'contents'}[1];
 
$result_trees{'index_entries_before_nodes'}{'contents'}[1]{'contents'}[1]{'extra'}{'index_entry'}{'entry_element'}
 = $result_trees{'index_entries_before_nodes'}{'contents'}[1]{'contents'}[1];
 
$result_trees{'index_entries_before_nodes'}{'contents'}[1]{'extra'}{'node_content'}[0]
 = 
$result_trees{'index_entries_before_nodes'}{'contents'}[1]{'args'}[0]{'contents'}[0];
 
$result_trees{'index_entries_before_nodes'}{'contents'}[1]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = 
$result_trees{'index_entries_before_nodes'}{'contents'}[1]{'args'}[0]{'contents'}[0];
-$result_trees{'index_entries_before_nodes'}{'contents'}[2]{'contents'}[1]{'extra'}{'entry_node'}
 = $result_trees{'index_entries_before_nodes'}{'contents'}[2];
+$result_trees{'index_entries_before_nodes'}{'contents'}[2]{'contents'}[1]{'extra'}{'element_node'}
 = $result_trees{'index_entries_before_nodes'}{'contents'}[2];
 
$result_trees{'index_entries_before_nodes'}{'contents'}[2]{'contents'}[1]{'extra'}{'index_entry'}{'entry_element'}
 = $result_trees{'index_entries_before_nodes'}{'contents'}[2]{'contents'}[1];
 
$result_trees{'index_entries_before_nodes'}{'contents'}[2]{'extra'}{'node_content'}[0]
 = 
$result_trees{'index_entries_before_nodes'}{'contents'}[2]{'args'}[0]{'contents'}[0];
 
$result_trees{'index_entries_before_nodes'}{'contents'}[2]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = 
$result_trees{'index_entries_before_nodes'}{'contents'}[2]{'args'}[0]{'contents'}[0];
diff --git a/tp/t/results/indices/index_entries_locations.pl 
b/tp/t/results/indices/index_entries_locations.pl
index 6b2bdcddeb..4f45b2a4ef 100644
--- a/tp/t/results/indices/index_entries_locations.pl
+++ b/tp/t/results/indices/index_entries_locations.pl
@@ -132,7 +132,7 @@ $result_trees{'index_entries_locations'} = {
               ],
               'cmdname' => 'cindex',
               'extra' => {
-                'entry_node' => {},
+                'element_node' => {},
                 'index_entry' => {
                   'entry_element' => {},
                   'entry_number' => 1,
@@ -175,7 +175,7 @@ $result_trees{'index_entries_locations'} = {
               ],
               'cmdname' => 'cindex',
               'extra' => {
-                'entry_node' => {},
+                'element_node' => {},
                 'index_entry' => {
                   'entry_element' => {},
                   'entry_number' => 2,
@@ -236,7 +236,7 @@ $result_trees{'index_entries_locations'} = {
           ],
           'cmdname' => 'cindex',
           'extra' => {
-            'entry_node' => {},
+            'element_node' => {},
             'index_entry' => {
               'entry_element' => {},
               'entry_number' => 3,
@@ -289,7 +289,7 @@ $result_trees{'index_entries_locations'} = {
           ],
           'cmdname' => 'cindex',
           'extra' => {
-            'entry_node' => {},
+            'element_node' => {},
             'index_entry' => {
               'entry_element' => {},
               'entry_number' => 4,
@@ -394,13 +394,13 @@ $result_trees{'index_entries_locations'} = {
 };
 
$result_trees{'index_entries_locations'}{'contents'}[1]{'extra'}{'node_content'}[0]
 = 
$result_trees{'index_entries_locations'}{'contents'}[1]{'args'}[0]{'contents'}[0];
 
$result_trees{'index_entries_locations'}{'contents'}[1]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = 
$result_trees{'index_entries_locations'}{'contents'}[1]{'args'}[0]{'contents'}[0];
-$result_trees{'index_entries_locations'}{'contents'}[2]{'contents'}[3]{'contents'}[1]{'extra'}{'entry_node'}
 = $result_trees{'index_entries_locations'}{'contents'}[2];
+$result_trees{'index_entries_locations'}{'contents'}[2]{'contents'}[3]{'contents'}[1]{'extra'}{'element_node'}
 = $result_trees{'index_entries_locations'}{'contents'}[2];
 
$result_trees{'index_entries_locations'}{'contents'}[2]{'contents'}[3]{'contents'}[1]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'index_entries_locations'}{'contents'}[2]{'contents'}[3]{'contents'}[1];
-$result_trees{'index_entries_locations'}{'contents'}[2]{'contents'}[3]{'contents'}[3]{'extra'}{'entry_node'}
 = $result_trees{'index_entries_locations'}{'contents'}[2];
+$result_trees{'index_entries_locations'}{'contents'}[2]{'contents'}[3]{'contents'}[3]{'extra'}{'element_node'}
 = $result_trees{'index_entries_locations'}{'contents'}[2];
 
$result_trees{'index_entries_locations'}{'contents'}[2]{'contents'}[3]{'contents'}[3]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'index_entries_locations'}{'contents'}[2]{'contents'}[3]{'contents'}[3];
-$result_trees{'index_entries_locations'}{'contents'}[2]{'contents'}[7]{'extra'}{'entry_node'}
 = $result_trees{'index_entries_locations'}{'contents'}[2];
+$result_trees{'index_entries_locations'}{'contents'}[2]{'contents'}[7]{'extra'}{'element_node'}
 = $result_trees{'index_entries_locations'}{'contents'}[2];
 
$result_trees{'index_entries_locations'}{'contents'}[2]{'contents'}[7]{'extra'}{'index_entry'}{'entry_element'}
 = $result_trees{'index_entries_locations'}{'contents'}[2]{'contents'}[7];
-$result_trees{'index_entries_locations'}{'contents'}[2]{'contents'}[10]{'extra'}{'entry_node'}
 = $result_trees{'index_entries_locations'}{'contents'}[2];
+$result_trees{'index_entries_locations'}{'contents'}[2]{'contents'}[10]{'extra'}{'element_node'}
 = $result_trees{'index_entries_locations'}{'contents'}[2];
 
$result_trees{'index_entries_locations'}{'contents'}[2]{'contents'}[10]{'extra'}{'index_entry'}{'entry_element'}
 = $result_trees{'index_entries_locations'}{'contents'}[2]{'contents'}[10];
 
$result_trees{'index_entries_locations'}{'contents'}[2]{'extra'}{'node_content'}[0]
 = 
$result_trees{'index_entries_locations'}{'contents'}[2]{'args'}[0]{'contents'}[0];
 
$result_trees{'index_entries_locations'}{'contents'}[2]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = 
$result_trees{'index_entries_locations'}{'contents'}[2]{'args'}[0]{'contents'}[0];
diff --git a/tp/t/results/indices/index_entry_before_node.pl 
b/tp/t/results/indices/index_entry_before_node.pl
index b914891cdd..c272b06b18 100644
--- a/tp/t/results/indices/index_entry_before_node.pl
+++ b/tp/t/results/indices/index_entry_before_node.pl
@@ -296,7 +296,7 @@ $result_trees{'index_entry_before_node'} = {
           ],
           'cmdname' => 'cindex',
           'extra' => {
-            'entry_node' => {},
+            'element_node' => {},
             'index_entry' => {
               'entry_element' => {},
               'entry_number' => 1,
@@ -484,7 +484,7 @@ 
$result_trees{'index_entry_before_node'}{'contents'}[1]{'contents'}[1]{'contents
 
$result_trees{'index_entry_before_node'}{'contents'}[1]{'contents'}[1]{'contents'}[1]{'extra'}{'menu_entry_node_label'}{'node_content'}[0]
 = 
$result_trees{'index_entry_before_node'}{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[0];
 
$result_trees{'index_entry_before_node'}{'contents'}[1]{'extra'}{'node_content'}[0]
 = 
$result_trees{'index_entry_before_node'}{'contents'}[1]{'args'}[0]{'contents'}[0];
 
$result_trees{'index_entry_before_node'}{'contents'}[1]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = 
$result_trees{'index_entry_before_node'}{'contents'}[1]{'args'}[0]{'contents'}[0];
-$result_trees{'index_entry_before_node'}{'contents'}[2]{'contents'}[3]{'extra'}{'entry_node'}
 = $result_trees{'index_entry_before_node'}{'contents'}[2];
+$result_trees{'index_entry_before_node'}{'contents'}[2]{'contents'}[3]{'extra'}{'element_node'}
 = $result_trees{'index_entry_before_node'}{'contents'}[2];
 
$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]{'extra'}{'node_content'}[0]
 = 
$result_trees{'index_entry_before_node'}{'contents'}[2]{'args'}[0]{'contents'}[0];
 
$result_trees{'index_entry_before_node'}{'contents'}[2]{'extra'}{'nodes_manuals'}[0]{'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 d1bb7a0986..161250b346 100644
Binary files a/tp/t/results/indices/index_entry_in_footnote.pl and 
b/tp/t/results/indices/index_entry_in_footnote.pl differ
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 c8a81e30a1..b4a9bb8484 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
@@ -278,7 +278,7 @@ $result_trees{'index_entry_in_footnote_different_node_end'} 
= {
                           ],
                           'cmdname' => 'cindex',
                           'extra' => {
-                            'entry_node' => {},
+                            'element_node' => {},
                             'index_entry' => {
                               'entry_element' => {},
                               'entry_number' => 1,
@@ -353,7 +353,7 @@ $result_trees{'index_entry_in_footnote_different_node_end'} 
= {
                       ],
                       'cmdname' => 'cindex',
                       'extra' => {
-                        'entry_node' => {},
+                        'element_node' => {},
                         'index_entry' => {
                           'entry_element' => {},
                           'entry_number' => 2,
@@ -514,9 +514,9 @@ 
$result_trees{'index_entry_in_footnote_different_node_end'}{'contents'}[1]{'cont
 
$result_trees{'index_entry_in_footnote_different_node_end'}{'contents'}[1]{'contents'}[1]{'contents'}[1]{'extra'}{'menu_entry_node_label'}{'node_content'}[0]
 = 
$result_trees{'index_entry_in_footnote_different_node_end'}{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[0];
 
$result_trees{'index_entry_in_footnote_different_node_end'}{'contents'}[1]{'extra'}{'node_content'}[0]
 = 
$result_trees{'index_entry_in_footnote_different_node_end'}{'contents'}[1]{'args'}[0]{'contents'}[0];
 
$result_trees{'index_entry_in_footnote_different_node_end'}{'contents'}[1]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = 
$result_trees{'index_entry_in_footnote_different_node_end'}{'contents'}[1]{'args'}[0]{'contents'}[0];
-$result_trees{'index_entry_in_footnote_different_node_end'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'args'}[0]{'contents'}[0]{'contents'}[1]{'extra'}{'entry_node'}
 = $result_trees{'index_entry_in_footnote_different_node_end'}{'contents'}[2];
+$result_trees{'index_entry_in_footnote_different_node_end'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'args'}[0]{'contents'}[0]{'contents'}[1]{'extra'}{'element_node'}
 = $result_trees{'index_entry_in_footnote_different_node_end'}{'contents'}[2];
 
$result_trees{'index_entry_in_footnote_different_node_end'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'args'}[0]{'contents'}[0]{'contents'}[1]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'index_entry_in_footnote_different_node_end'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'args'}[0]{'contents'}[0]{'contents'}[1];
-$result_trees{'index_entry_in_footnote_different_node_end'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'args'}[0]{'contents'}[6]{'extra'}{'entry_node'}
 = $result_trees{'index_entry_in_footnote_different_node_end'}{'contents'}[2];
+$result_trees{'index_entry_in_footnote_different_node_end'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'args'}[0]{'contents'}[6]{'extra'}{'element_node'}
 = $result_trees{'index_entry_in_footnote_different_node_end'}{'contents'}[2];
 
$result_trees{'index_entry_in_footnote_different_node_end'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'args'}[0]{'contents'}[6]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'index_entry_in_footnote_different_node_end'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'args'}[0]{'contents'}[6];
 
$result_trees{'index_entry_in_footnote_different_node_end'}{'contents'}[2]{'extra'}{'node_content'}[0]
 = 
$result_trees{'index_entry_in_footnote_different_node_end'}{'contents'}[2]{'args'}[0]{'contents'}[0];
 
$result_trees{'index_entry_in_footnote_different_node_end'}{'contents'}[2]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = 
$result_trees{'index_entry_in_footnote_different_node_end'}{'contents'}[2]{'args'}[0]{'contents'}[0];
diff --git a/tp/t/results/indices/index_entry_in_footnote_sections.pl 
b/tp/t/results/indices/index_entry_in_footnote_sections.pl
index 7cb7e3cbe3..5fc55e1bbd 100644
--- a/tp/t/results/indices/index_entry_in_footnote_sections.pl
+++ b/tp/t/results/indices/index_entry_in_footnote_sections.pl
@@ -131,7 +131,7 @@ $result_trees{'index_entry_in_footnote_sections'} = {
                           ],
                           'cmdname' => 'cindex',
                           'extra' => {
-                            'entry_node' => {},
+                            'element_node' => {},
                             'index_entry' => {
                               'entry_element' => {},
                               'entry_number' => 1,
@@ -310,7 +310,7 @@ $result_trees{'index_entry_in_footnote_sections'} = {
 };
 
$result_trees{'index_entry_in_footnote_sections'}{'contents'}[1]{'extra'}{'node_content'}[0]
 = 
$result_trees{'index_entry_in_footnote_sections'}{'contents'}[1]{'args'}[0]{'contents'}[0];
 
$result_trees{'index_entry_in_footnote_sections'}{'contents'}[1]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = 
$result_trees{'index_entry_in_footnote_sections'}{'contents'}[1]{'args'}[0]{'contents'}[0];
-$result_trees{'index_entry_in_footnote_sections'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'args'}[0]{'contents'}[2]{'contents'}[1]{'extra'}{'entry_node'}
 = $result_trees{'index_entry_in_footnote_sections'}{'contents'}[1];
+$result_trees{'index_entry_in_footnote_sections'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'args'}[0]{'contents'}[2]{'contents'}[1]{'extra'}{'element_node'}
 = $result_trees{'index_entry_in_footnote_sections'}{'contents'}[1];
 
$result_trees{'index_entry_in_footnote_sections'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'args'}[0]{'contents'}[2]{'contents'}[1]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'index_entry_in_footnote_sections'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'args'}[0]{'contents'}[2]{'contents'}[1];
 
$result_trees{'index_entry_in_footnote_sections'}{'contents'}[3]{'extra'}{'node_content'}[0]
 = 
$result_trees{'index_entry_in_footnote_sections'}{'contents'}[3]{'args'}[0]{'contents'}[0];
 
$result_trees{'index_entry_in_footnote_sections'}{'contents'}[3]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = 
$result_trees{'index_entry_in_footnote_sections'}{'contents'}[3]{'args'}[0]{'contents'}[0];
diff --git a/tp/t/results/indices/index_entry_in_footnote_sections_separate.pl 
b/tp/t/results/indices/index_entry_in_footnote_sections_separate.pl
index 44e624e27a..884d32fb2e 100644
--- a/tp/t/results/indices/index_entry_in_footnote_sections_separate.pl
+++ b/tp/t/results/indices/index_entry_in_footnote_sections_separate.pl
@@ -131,7 +131,7 @@ $result_trees{'index_entry_in_footnote_sections_separate'} 
= {
                           ],
                           'cmdname' => 'cindex',
                           'extra' => {
-                            'entry_node' => {},
+                            'element_node' => {},
                             'index_entry' => {
                               'entry_element' => {},
                               'entry_number' => 1,
@@ -310,7 +310,7 @@ $result_trees{'index_entry_in_footnote_sections_separate'} 
= {
 };
 
$result_trees{'index_entry_in_footnote_sections_separate'}{'contents'}[1]{'extra'}{'node_content'}[0]
 = 
$result_trees{'index_entry_in_footnote_sections_separate'}{'contents'}[1]{'args'}[0]{'contents'}[0];
 
$result_trees{'index_entry_in_footnote_sections_separate'}{'contents'}[1]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = 
$result_trees{'index_entry_in_footnote_sections_separate'}{'contents'}[1]{'args'}[0]{'contents'}[0];
-$result_trees{'index_entry_in_footnote_sections_separate'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'args'}[0]{'contents'}[2]{'contents'}[1]{'extra'}{'entry_node'}
 = $result_trees{'index_entry_in_footnote_sections_separate'}{'contents'}[1];
+$result_trees{'index_entry_in_footnote_sections_separate'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'args'}[0]{'contents'}[2]{'contents'}[1]{'extra'}{'element_node'}
 = $result_trees{'index_entry_in_footnote_sections_separate'}{'contents'}[1];
 
$result_trees{'index_entry_in_footnote_sections_separate'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'args'}[0]{'contents'}[2]{'contents'}[1]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'index_entry_in_footnote_sections_separate'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'args'}[0]{'contents'}[2]{'contents'}[1];
 
$result_trees{'index_entry_in_footnote_sections_separate'}{'contents'}[3]{'extra'}{'node_content'}[0]
 = 
$result_trees{'index_entry_in_footnote_sections_separate'}{'contents'}[3]{'args'}[0]{'contents'}[0];
 
$result_trees{'index_entry_in_footnote_sections_separate'}{'contents'}[3]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = 
$result_trees{'index_entry_in_footnote_sections_separate'}{'contents'}[3]{'args'}[0]{'contents'}[0];
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 85daeaf5b2..1ef2b943d8 100644
--- a/tp/t/results/indices/index_entry_in_footnote_separate.pl
+++ b/tp/t/results/indices/index_entry_in_footnote_separate.pl
@@ -313,7 +313,7 @@ $result_trees{'index_entry_in_footnote_separate'} = {
                           ],
                           'cmdname' => 'cindex',
                           'extra' => {
-                            'entry_node' => {},
+                            'element_node' => {},
                             'index_entry' => {
                               'entry_element' => {},
                               'entry_number' => 1,
@@ -388,7 +388,7 @@ $result_trees{'index_entry_in_footnote_separate'} = {
                       ],
                       'cmdname' => 'cindex',
                       'extra' => {
-                        'entry_node' => {},
+                        'element_node' => {},
                         'index_entry' => {
                           'entry_element' => {},
                           'entry_number' => 2,
@@ -549,9 +549,9 @@ 
$result_trees{'index_entry_in_footnote_separate'}{'contents'}[1]{'contents'}[1]{
 
$result_trees{'index_entry_in_footnote_separate'}{'contents'}[1]{'contents'}[1]{'contents'}[1]{'extra'}{'menu_entry_node_label'}{'node_content'}[0]
 = 
$result_trees{'index_entry_in_footnote_separate'}{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[0];
 
$result_trees{'index_entry_in_footnote_separate'}{'contents'}[1]{'extra'}{'node_content'}[0]
 = 
$result_trees{'index_entry_in_footnote_separate'}{'contents'}[1]{'args'}[0]{'contents'}[0];
 
$result_trees{'index_entry_in_footnote_separate'}{'contents'}[1]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = 
$result_trees{'index_entry_in_footnote_separate'}{'contents'}[1]{'args'}[0]{'contents'}[0];
-$result_trees{'index_entry_in_footnote_separate'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'args'}[0]{'contents'}[0]{'contents'}[1]{'extra'}{'entry_node'}
 = $result_trees{'index_entry_in_footnote_separate'}{'contents'}[2];
+$result_trees{'index_entry_in_footnote_separate'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'args'}[0]{'contents'}[0]{'contents'}[1]{'extra'}{'element_node'}
 = $result_trees{'index_entry_in_footnote_separate'}{'contents'}[2];
 
$result_trees{'index_entry_in_footnote_separate'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'args'}[0]{'contents'}[0]{'contents'}[1]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'index_entry_in_footnote_separate'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'args'}[0]{'contents'}[0]{'contents'}[1];
-$result_trees{'index_entry_in_footnote_separate'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'args'}[0]{'contents'}[6]{'extra'}{'entry_node'}
 = $result_trees{'index_entry_in_footnote_separate'}{'contents'}[2];
+$result_trees{'index_entry_in_footnote_separate'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'args'}[0]{'contents'}[6]{'extra'}{'element_node'}
 = $result_trees{'index_entry_in_footnote_separate'}{'contents'}[2];
 
$result_trees{'index_entry_in_footnote_separate'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'args'}[0]{'contents'}[6]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'index_entry_in_footnote_separate'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'args'}[0]{'contents'}[6];
 
$result_trees{'index_entry_in_footnote_separate'}{'contents'}[2]{'extra'}{'node_content'}[0]
 = 
$result_trees{'index_entry_in_footnote_separate'}{'contents'}[2]{'args'}[0]{'contents'}[0];
 
$result_trees{'index_entry_in_footnote_separate'}{'contents'}[2]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = 
$result_trees{'index_entry_in_footnote_separate'}{'contents'}[2]{'args'}[0]{'contents'}[0];
diff --git a/tp/t/results/indices/index_nodes.pl 
b/tp/t/results/indices/index_nodes.pl
index 0ffa6f7c48..b03bf6ecfb 100644
--- a/tp/t/results/indices/index_nodes.pl
+++ b/tp/t/results/indices/index_nodes.pl
@@ -69,7 +69,7 @@ $result_trees{'index_nodes'} = {
           ],
           'cmdname' => 'cindex',
           'extra' => {
-            'entry_node' => {},
+            'element_node' => {},
             'index_entry' => {
               'entry_element' => {},
               'entry_number' => 1,
@@ -424,7 +424,7 @@ $result_trees{'index_nodes'} = {
               ],
               'cmdname' => 'cindex',
               'extra' => {
-                'entry_node' => {},
+                'element_node' => {},
                 'index_entry' => {
                   'entry_element' => {},
                   'entry_number' => 2,
@@ -463,7 +463,7 @@ $result_trees{'index_nodes'} = {
               ],
               'cmdname' => 'cindex',
               'extra' => {
-                'entry_node' => {},
+                'element_node' => {},
                 'index_entry' => {
                   'entry_element' => {},
                   'entry_number' => 3,
@@ -502,7 +502,7 @@ $result_trees{'index_nodes'} = {
               ],
               'cmdname' => 'findex',
               'extra' => {
-                'entry_node' => {},
+                'element_node' => {},
                 'index_entry' => {
                   'entry_element' => {},
                   'entry_number' => 1,
@@ -541,7 +541,7 @@ $result_trees{'index_nodes'} = {
               ],
               'cmdname' => 'cindex',
               'extra' => {
-                'entry_node' => {},
+                'element_node' => {},
                 'index_entry' => {
                   'entry_element' => {},
                   'entry_number' => 4,
@@ -1090,7 +1090,7 @@ $result_trees{'index_nodes'} = {
           ],
           'cmdname' => 'cindex',
           'extra' => {
-            'entry_node' => {},
+            'element_node' => {},
             'index_entry' => {
               'entry_element' => {},
               'entry_number' => 5,
@@ -1129,7 +1129,7 @@ $result_trees{'index_nodes'} = {
           ],
           'cmdname' => 'findex',
           'extra' => {
-            'entry_node' => {},
+            'element_node' => {},
             'index_entry' => {
               'entry_element' => {},
               'entry_number' => 2,
@@ -1168,7 +1168,7 @@ $result_trees{'index_nodes'} = {
           ],
           'cmdname' => 'cindex',
           'extra' => {
-            'entry_node' => {},
+            'element_node' => {},
             'index_entry' => {
               'entry_element' => {},
               'entry_number' => 6,
@@ -1299,7 +1299,7 @@ $result_trees{'index_nodes'} = {
           ],
           'cmdname' => 'cindex',
           'extra' => {
-            'entry_node' => {},
+            'element_node' => {},
             'index_entry' => {
               'entry_element' => {},
               'entry_number' => 7,
@@ -1382,7 +1382,7 @@ $result_trees{'index_nodes'} = {
           ],
           'cmdname' => 'findex',
           'extra' => {
-            'entry_node' => {},
+            'element_node' => {},
             'index_entry' => {
               'entry_element' => {},
               'entry_number' => 3,
@@ -1421,7 +1421,7 @@ $result_trees{'index_nodes'} = {
           ],
           'cmdname' => 'cindex',
           'extra' => {
-            'entry_node' => {},
+            'element_node' => {},
             'index_entry' => {
               'entry_element' => {},
               'entry_number' => 8,
@@ -1538,18 +1538,18 @@ $result_trees{'index_nodes'} = {
   ],
   'type' => 'document_root'
 };
-$result_trees{'index_nodes'}{'contents'}[1]{'contents'}[0]{'extra'}{'entry_node'}
 = $result_trees{'index_nodes'}{'contents'}[1];
+$result_trees{'index_nodes'}{'contents'}[1]{'contents'}[0]{'extra'}{'element_node'}
 = $result_trees{'index_nodes'}{'contents'}[1];
 
$result_trees{'index_nodes'}{'contents'}[1]{'contents'}[0]{'extra'}{'index_entry'}{'entry_element'}
 = $result_trees{'index_nodes'}{'contents'}[1]{'contents'}[0];
 
$result_trees{'index_nodes'}{'contents'}[1]{'contents'}[10]{'contents'}[0]{'extra'}{'menu_entry_node_label'}{'node_content'}[0]
 = 
$result_trees{'index_nodes'}{'contents'}[1]{'contents'}[10]{'contents'}[0]{'contents'}[1]{'contents'}[0];
 $result_trees{'index_nodes'}{'contents'}[1]{'extra'}{'node_content'}[0] = 
$result_trees{'index_nodes'}{'contents'}[1]{'args'}[0]{'contents'}[0];
 
$result_trees{'index_nodes'}{'contents'}[1]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = $result_trees{'index_nodes'}{'contents'}[1]{'args'}[0]{'contents'}[0];
-$result_trees{'index_nodes'}{'contents'}[2]{'contents'}[0]{'contents'}[1]{'extra'}{'entry_node'}
 = $result_trees{'index_nodes'}{'contents'}[2];
+$result_trees{'index_nodes'}{'contents'}[2]{'contents'}[0]{'contents'}[1]{'extra'}{'element_node'}
 = $result_trees{'index_nodes'}{'contents'}[2];
 
$result_trees{'index_nodes'}{'contents'}[2]{'contents'}[0]{'contents'}[1]{'extra'}{'index_entry'}{'entry_element'}
 = $result_trees{'index_nodes'}{'contents'}[2]{'contents'}[0]{'contents'}[1];
-$result_trees{'index_nodes'}{'contents'}[2]{'contents'}[0]{'contents'}[2]{'extra'}{'entry_node'}
 = $result_trees{'index_nodes'}{'contents'}[2];
+$result_trees{'index_nodes'}{'contents'}[2]{'contents'}[0]{'contents'}[2]{'extra'}{'element_node'}
 = $result_trees{'index_nodes'}{'contents'}[2];
 
$result_trees{'index_nodes'}{'contents'}[2]{'contents'}[0]{'contents'}[2]{'extra'}{'index_entry'}{'entry_element'}
 = $result_trees{'index_nodes'}{'contents'}[2]{'contents'}[0]{'contents'}[2];
-$result_trees{'index_nodes'}{'contents'}[2]{'contents'}[0]{'contents'}[3]{'extra'}{'entry_node'}
 = $result_trees{'index_nodes'}{'contents'}[2];
+$result_trees{'index_nodes'}{'contents'}[2]{'contents'}[0]{'contents'}[3]{'extra'}{'element_node'}
 = $result_trees{'index_nodes'}{'contents'}[2];
 
$result_trees{'index_nodes'}{'contents'}[2]{'contents'}[0]{'contents'}[3]{'extra'}{'index_entry'}{'entry_element'}
 = $result_trees{'index_nodes'}{'contents'}[2]{'contents'}[0]{'contents'}[3];
-$result_trees{'index_nodes'}{'contents'}[2]{'contents'}[0]{'contents'}[4]{'extra'}{'entry_node'}
 = $result_trees{'index_nodes'}{'contents'}[2];
+$result_trees{'index_nodes'}{'contents'}[2]{'contents'}[0]{'contents'}[4]{'extra'}{'element_node'}
 = $result_trees{'index_nodes'}{'contents'}[2];
 
$result_trees{'index_nodes'}{'contents'}[2]{'contents'}[0]{'contents'}[4]{'extra'}{'index_entry'}{'entry_element'}
 = $result_trees{'index_nodes'}{'contents'}[2]{'contents'}[0]{'contents'}[4];
 
$result_trees{'index_nodes'}{'contents'}[2]{'contents'}[4]{'contents'}[0]{'extra'}{'menu_entry_node_label'}{'node_content'}[0]
 = 
$result_trees{'index_nodes'}{'contents'}[2]{'contents'}[4]{'contents'}[0]{'contents'}[1]{'contents'}[0];
 $result_trees{'index_nodes'}{'contents'}[2]{'extra'}{'node_content'}[0] = 
$result_trees{'index_nodes'}{'contents'}[2]{'args'}[0]{'contents'}[0];
@@ -1561,21 +1561,21 @@ 
$result_trees{'index_nodes'}{'contents'}[3]{'contents'}[0]{'contents'}[1]{'extra
 $result_trees{'index_nodes'}{'contents'}[3]{'extra'}{'node_content'}[0] = 
$result_trees{'index_nodes'}{'contents'}[3]{'args'}[0]{'contents'}[0];
 
$result_trees{'index_nodes'}{'contents'}[3]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = $result_trees{'index_nodes'}{'contents'}[3]{'args'}[0]{'contents'}[0];
 
$result_trees{'index_nodes'}{'contents'}[3]{'extra'}{'nodes_manuals'}[3]{'node_content'}[0]
 = $result_trees{'index_nodes'}{'contents'}[3]{'args'}[3]{'contents'}[0];
-$result_trees{'index_nodes'}{'contents'}[4]{'contents'}[1]{'extra'}{'entry_node'}
 = $result_trees{'index_nodes'}{'contents'}[4];
+$result_trees{'index_nodes'}{'contents'}[4]{'contents'}[1]{'extra'}{'element_node'}
 = $result_trees{'index_nodes'}{'contents'}[4];
 
$result_trees{'index_nodes'}{'contents'}[4]{'contents'}[1]{'extra'}{'index_entry'}{'entry_element'}
 = $result_trees{'index_nodes'}{'contents'}[4]{'contents'}[1];
-$result_trees{'index_nodes'}{'contents'}[4]{'contents'}[2]{'extra'}{'entry_node'}
 = $result_trees{'index_nodes'}{'contents'}[4];
+$result_trees{'index_nodes'}{'contents'}[4]{'contents'}[2]{'extra'}{'element_node'}
 = $result_trees{'index_nodes'}{'contents'}[4];
 
$result_trees{'index_nodes'}{'contents'}[4]{'contents'}[2]{'extra'}{'index_entry'}{'entry_element'}
 = $result_trees{'index_nodes'}{'contents'}[4]{'contents'}[2];
-$result_trees{'index_nodes'}{'contents'}[4]{'contents'}[3]{'extra'}{'entry_node'}
 = $result_trees{'index_nodes'}{'contents'}[4];
+$result_trees{'index_nodes'}{'contents'}[4]{'contents'}[3]{'extra'}{'element_node'}
 = $result_trees{'index_nodes'}{'contents'}[4];
 
$result_trees{'index_nodes'}{'contents'}[4]{'contents'}[3]{'extra'}{'index_entry'}{'entry_element'}
 = $result_trees{'index_nodes'}{'contents'}[4]{'contents'}[3];
 $result_trees{'index_nodes'}{'contents'}[4]{'extra'}{'node_content'}[0] = 
$result_trees{'index_nodes'}{'contents'}[4]{'args'}[0]{'contents'}[0];
 
$result_trees{'index_nodes'}{'contents'}[4]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = $result_trees{'index_nodes'}{'contents'}[4]{'args'}[0]{'contents'}[0];
 
$result_trees{'index_nodes'}{'contents'}[4]{'extra'}{'nodes_manuals'}[2]{'node_content'}[0]
 = $result_trees{'index_nodes'}{'contents'}[4]{'args'}[2]{'contents'}[0];
 
$result_trees{'index_nodes'}{'contents'}[4]{'extra'}{'nodes_manuals'}[3]{'node_content'}[0]
 = $result_trees{'index_nodes'}{'contents'}[4]{'args'}[3]{'contents'}[0];
-$result_trees{'index_nodes'}{'contents'}[5]{'contents'}[0]{'extra'}{'entry_node'}
 = $result_trees{'index_nodes'}{'contents'}[5];
+$result_trees{'index_nodes'}{'contents'}[5]{'contents'}[0]{'extra'}{'element_node'}
 = $result_trees{'index_nodes'}{'contents'}[5];
 
$result_trees{'index_nodes'}{'contents'}[5]{'contents'}[0]{'extra'}{'index_entry'}{'entry_element'}
 = $result_trees{'index_nodes'}{'contents'}[5]{'contents'}[0];
-$result_trees{'index_nodes'}{'contents'}[5]{'contents'}[4]{'extra'}{'entry_node'}
 = $result_trees{'index_nodes'}{'contents'}[5];
+$result_trees{'index_nodes'}{'contents'}[5]{'contents'}[4]{'extra'}{'element_node'}
 = $result_trees{'index_nodes'}{'contents'}[5];
 
$result_trees{'index_nodes'}{'contents'}[5]{'contents'}[4]{'extra'}{'index_entry'}{'entry_element'}
 = $result_trees{'index_nodes'}{'contents'}[5]{'contents'}[4];
-$result_trees{'index_nodes'}{'contents'}[5]{'contents'}[5]{'extra'}{'entry_node'}
 = $result_trees{'index_nodes'}{'contents'}[5];
+$result_trees{'index_nodes'}{'contents'}[5]{'contents'}[5]{'extra'}{'element_node'}
 = $result_trees{'index_nodes'}{'contents'}[5];
 
$result_trees{'index_nodes'}{'contents'}[5]{'contents'}[5]{'extra'}{'index_entry'}{'entry_element'}
 = $result_trees{'index_nodes'}{'contents'}[5]{'contents'}[5];
 $result_trees{'index_nodes'}{'contents'}[5]{'extra'}{'node_content'}[0] = 
$result_trees{'index_nodes'}{'contents'}[5]{'args'}[0]{'contents'}[0];
 
$result_trees{'index_nodes'}{'contents'}[5]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = $result_trees{'index_nodes'}{'contents'}[5]{'args'}[0]{'contents'}[0];
diff --git a/tp/t/results/indices/index_nodes_no_split_no_use_nodes.pl 
b/tp/t/results/indices/index_nodes_no_split_no_use_nodes.pl
index 4493757dfc..2322fde52e 100644
--- a/tp/t/results/indices/index_nodes_no_split_no_use_nodes.pl
+++ b/tp/t/results/indices/index_nodes_no_split_no_use_nodes.pl
@@ -69,7 +69,7 @@ $result_trees{'index_nodes_no_split_no_use_nodes'} = {
           ],
           'cmdname' => 'cindex',
           'extra' => {
-            'entry_node' => {},
+            'element_node' => {},
             'index_entry' => {
               'entry_element' => {},
               'entry_number' => 1,
@@ -424,7 +424,7 @@ $result_trees{'index_nodes_no_split_no_use_nodes'} = {
               ],
               'cmdname' => 'cindex',
               'extra' => {
-                'entry_node' => {},
+                'element_node' => {},
                 'index_entry' => {
                   'entry_element' => {},
                   'entry_number' => 2,
@@ -463,7 +463,7 @@ $result_trees{'index_nodes_no_split_no_use_nodes'} = {
               ],
               'cmdname' => 'cindex',
               'extra' => {
-                'entry_node' => {},
+                'element_node' => {},
                 'index_entry' => {
                   'entry_element' => {},
                   'entry_number' => 3,
@@ -502,7 +502,7 @@ $result_trees{'index_nodes_no_split_no_use_nodes'} = {
               ],
               'cmdname' => 'findex',
               'extra' => {
-                'entry_node' => {},
+                'element_node' => {},
                 'index_entry' => {
                   'entry_element' => {},
                   'entry_number' => 1,
@@ -541,7 +541,7 @@ $result_trees{'index_nodes_no_split_no_use_nodes'} = {
               ],
               'cmdname' => 'cindex',
               'extra' => {
-                'entry_node' => {},
+                'element_node' => {},
                 'index_entry' => {
                   'entry_element' => {},
                   'entry_number' => 4,
@@ -1090,7 +1090,7 @@ $result_trees{'index_nodes_no_split_no_use_nodes'} = {
           ],
           'cmdname' => 'cindex',
           'extra' => {
-            'entry_node' => {},
+            'element_node' => {},
             'index_entry' => {
               'entry_element' => {},
               'entry_number' => 5,
@@ -1129,7 +1129,7 @@ $result_trees{'index_nodes_no_split_no_use_nodes'} = {
           ],
           'cmdname' => 'findex',
           'extra' => {
-            'entry_node' => {},
+            'element_node' => {},
             'index_entry' => {
               'entry_element' => {},
               'entry_number' => 2,
@@ -1168,7 +1168,7 @@ $result_trees{'index_nodes_no_split_no_use_nodes'} = {
           ],
           'cmdname' => 'cindex',
           'extra' => {
-            'entry_node' => {},
+            'element_node' => {},
             'index_entry' => {
               'entry_element' => {},
               'entry_number' => 6,
@@ -1299,7 +1299,7 @@ $result_trees{'index_nodes_no_split_no_use_nodes'} = {
           ],
           'cmdname' => 'cindex',
           'extra' => {
-            'entry_node' => {},
+            'element_node' => {},
             'index_entry' => {
               'entry_element' => {},
               'entry_number' => 7,
@@ -1382,7 +1382,7 @@ $result_trees{'index_nodes_no_split_no_use_nodes'} = {
           ],
           'cmdname' => 'findex',
           'extra' => {
-            'entry_node' => {},
+            'element_node' => {},
             'index_entry' => {
               'entry_element' => {},
               'entry_number' => 3,
@@ -1421,7 +1421,7 @@ $result_trees{'index_nodes_no_split_no_use_nodes'} = {
           ],
           'cmdname' => 'cindex',
           'extra' => {
-            'entry_node' => {},
+            'element_node' => {},
             'index_entry' => {
               'entry_element' => {},
               'entry_number' => 8,
@@ -1538,18 +1538,18 @@ $result_trees{'index_nodes_no_split_no_use_nodes'} = {
   ],
   'type' => 'document_root'
 };
-$result_trees{'index_nodes_no_split_no_use_nodes'}{'contents'}[1]{'contents'}[0]{'extra'}{'entry_node'}
 = $result_trees{'index_nodes_no_split_no_use_nodes'}{'contents'}[1];
+$result_trees{'index_nodes_no_split_no_use_nodes'}{'contents'}[1]{'contents'}[0]{'extra'}{'element_node'}
 = $result_trees{'index_nodes_no_split_no_use_nodes'}{'contents'}[1];
 
$result_trees{'index_nodes_no_split_no_use_nodes'}{'contents'}[1]{'contents'}[0]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'index_nodes_no_split_no_use_nodes'}{'contents'}[1]{'contents'}[0];
 
$result_trees{'index_nodes_no_split_no_use_nodes'}{'contents'}[1]{'contents'}[10]{'contents'}[0]{'extra'}{'menu_entry_node_label'}{'node_content'}[0]
 = 
$result_trees{'index_nodes_no_split_no_use_nodes'}{'contents'}[1]{'contents'}[10]{'contents'}[0]{'contents'}[1]{'contents'}[0];
 
$result_trees{'index_nodes_no_split_no_use_nodes'}{'contents'}[1]{'extra'}{'node_content'}[0]
 = 
$result_trees{'index_nodes_no_split_no_use_nodes'}{'contents'}[1]{'args'}[0]{'contents'}[0];
 
$result_trees{'index_nodes_no_split_no_use_nodes'}{'contents'}[1]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = 
$result_trees{'index_nodes_no_split_no_use_nodes'}{'contents'}[1]{'args'}[0]{'contents'}[0];
-$result_trees{'index_nodes_no_split_no_use_nodes'}{'contents'}[2]{'contents'}[0]{'contents'}[1]{'extra'}{'entry_node'}
 = $result_trees{'index_nodes_no_split_no_use_nodes'}{'contents'}[2];
+$result_trees{'index_nodes_no_split_no_use_nodes'}{'contents'}[2]{'contents'}[0]{'contents'}[1]{'extra'}{'element_node'}
 = $result_trees{'index_nodes_no_split_no_use_nodes'}{'contents'}[2];
 
$result_trees{'index_nodes_no_split_no_use_nodes'}{'contents'}[2]{'contents'}[0]{'contents'}[1]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'index_nodes_no_split_no_use_nodes'}{'contents'}[2]{'contents'}[0]{'contents'}[1];
-$result_trees{'index_nodes_no_split_no_use_nodes'}{'contents'}[2]{'contents'}[0]{'contents'}[2]{'extra'}{'entry_node'}
 = $result_trees{'index_nodes_no_split_no_use_nodes'}{'contents'}[2];
+$result_trees{'index_nodes_no_split_no_use_nodes'}{'contents'}[2]{'contents'}[0]{'contents'}[2]{'extra'}{'element_node'}
 = $result_trees{'index_nodes_no_split_no_use_nodes'}{'contents'}[2];
 
$result_trees{'index_nodes_no_split_no_use_nodes'}{'contents'}[2]{'contents'}[0]{'contents'}[2]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'index_nodes_no_split_no_use_nodes'}{'contents'}[2]{'contents'}[0]{'contents'}[2];
-$result_trees{'index_nodes_no_split_no_use_nodes'}{'contents'}[2]{'contents'}[0]{'contents'}[3]{'extra'}{'entry_node'}
 = $result_trees{'index_nodes_no_split_no_use_nodes'}{'contents'}[2];
+$result_trees{'index_nodes_no_split_no_use_nodes'}{'contents'}[2]{'contents'}[0]{'contents'}[3]{'extra'}{'element_node'}
 = $result_trees{'index_nodes_no_split_no_use_nodes'}{'contents'}[2];
 
$result_trees{'index_nodes_no_split_no_use_nodes'}{'contents'}[2]{'contents'}[0]{'contents'}[3]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'index_nodes_no_split_no_use_nodes'}{'contents'}[2]{'contents'}[0]{'contents'}[3];
-$result_trees{'index_nodes_no_split_no_use_nodes'}{'contents'}[2]{'contents'}[0]{'contents'}[4]{'extra'}{'entry_node'}
 = $result_trees{'index_nodes_no_split_no_use_nodes'}{'contents'}[2];
+$result_trees{'index_nodes_no_split_no_use_nodes'}{'contents'}[2]{'contents'}[0]{'contents'}[4]{'extra'}{'element_node'}
 = $result_trees{'index_nodes_no_split_no_use_nodes'}{'contents'}[2];
 
$result_trees{'index_nodes_no_split_no_use_nodes'}{'contents'}[2]{'contents'}[0]{'contents'}[4]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'index_nodes_no_split_no_use_nodes'}{'contents'}[2]{'contents'}[0]{'contents'}[4];
 
$result_trees{'index_nodes_no_split_no_use_nodes'}{'contents'}[2]{'contents'}[4]{'contents'}[0]{'extra'}{'menu_entry_node_label'}{'node_content'}[0]
 = 
$result_trees{'index_nodes_no_split_no_use_nodes'}{'contents'}[2]{'contents'}[4]{'contents'}[0]{'contents'}[1]{'contents'}[0];
 
$result_trees{'index_nodes_no_split_no_use_nodes'}{'contents'}[2]{'extra'}{'node_content'}[0]
 = 
$result_trees{'index_nodes_no_split_no_use_nodes'}{'contents'}[2]{'args'}[0]{'contents'}[0];
@@ -1561,21 +1561,21 @@ 
$result_trees{'index_nodes_no_split_no_use_nodes'}{'contents'}[3]{'contents'}[0]
 
$result_trees{'index_nodes_no_split_no_use_nodes'}{'contents'}[3]{'extra'}{'node_content'}[0]
 = 
$result_trees{'index_nodes_no_split_no_use_nodes'}{'contents'}[3]{'args'}[0]{'contents'}[0];
 
$result_trees{'index_nodes_no_split_no_use_nodes'}{'contents'}[3]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = 
$result_trees{'index_nodes_no_split_no_use_nodes'}{'contents'}[3]{'args'}[0]{'contents'}[0];
 
$result_trees{'index_nodes_no_split_no_use_nodes'}{'contents'}[3]{'extra'}{'nodes_manuals'}[3]{'node_content'}[0]
 = 
$result_trees{'index_nodes_no_split_no_use_nodes'}{'contents'}[3]{'args'}[3]{'contents'}[0];
-$result_trees{'index_nodes_no_split_no_use_nodes'}{'contents'}[4]{'contents'}[1]{'extra'}{'entry_node'}
 = $result_trees{'index_nodes_no_split_no_use_nodes'}{'contents'}[4];
+$result_trees{'index_nodes_no_split_no_use_nodes'}{'contents'}[4]{'contents'}[1]{'extra'}{'element_node'}
 = $result_trees{'index_nodes_no_split_no_use_nodes'}{'contents'}[4];
 
$result_trees{'index_nodes_no_split_no_use_nodes'}{'contents'}[4]{'contents'}[1]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'index_nodes_no_split_no_use_nodes'}{'contents'}[4]{'contents'}[1];
-$result_trees{'index_nodes_no_split_no_use_nodes'}{'contents'}[4]{'contents'}[2]{'extra'}{'entry_node'}
 = $result_trees{'index_nodes_no_split_no_use_nodes'}{'contents'}[4];
+$result_trees{'index_nodes_no_split_no_use_nodes'}{'contents'}[4]{'contents'}[2]{'extra'}{'element_node'}
 = $result_trees{'index_nodes_no_split_no_use_nodes'}{'contents'}[4];
 
$result_trees{'index_nodes_no_split_no_use_nodes'}{'contents'}[4]{'contents'}[2]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'index_nodes_no_split_no_use_nodes'}{'contents'}[4]{'contents'}[2];
-$result_trees{'index_nodes_no_split_no_use_nodes'}{'contents'}[4]{'contents'}[3]{'extra'}{'entry_node'}
 = $result_trees{'index_nodes_no_split_no_use_nodes'}{'contents'}[4];
+$result_trees{'index_nodes_no_split_no_use_nodes'}{'contents'}[4]{'contents'}[3]{'extra'}{'element_node'}
 = $result_trees{'index_nodes_no_split_no_use_nodes'}{'contents'}[4];
 
$result_trees{'index_nodes_no_split_no_use_nodes'}{'contents'}[4]{'contents'}[3]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'index_nodes_no_split_no_use_nodes'}{'contents'}[4]{'contents'}[3];
 
$result_trees{'index_nodes_no_split_no_use_nodes'}{'contents'}[4]{'extra'}{'node_content'}[0]
 = 
$result_trees{'index_nodes_no_split_no_use_nodes'}{'contents'}[4]{'args'}[0]{'contents'}[0];
 
$result_trees{'index_nodes_no_split_no_use_nodes'}{'contents'}[4]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = 
$result_trees{'index_nodes_no_split_no_use_nodes'}{'contents'}[4]{'args'}[0]{'contents'}[0];
 
$result_trees{'index_nodes_no_split_no_use_nodes'}{'contents'}[4]{'extra'}{'nodes_manuals'}[2]{'node_content'}[0]
 = 
$result_trees{'index_nodes_no_split_no_use_nodes'}{'contents'}[4]{'args'}[2]{'contents'}[0];
 
$result_trees{'index_nodes_no_split_no_use_nodes'}{'contents'}[4]{'extra'}{'nodes_manuals'}[3]{'node_content'}[0]
 = 
$result_trees{'index_nodes_no_split_no_use_nodes'}{'contents'}[4]{'args'}[3]{'contents'}[0];
-$result_trees{'index_nodes_no_split_no_use_nodes'}{'contents'}[5]{'contents'}[0]{'extra'}{'entry_node'}
 = $result_trees{'index_nodes_no_split_no_use_nodes'}{'contents'}[5];
+$result_trees{'index_nodes_no_split_no_use_nodes'}{'contents'}[5]{'contents'}[0]{'extra'}{'element_node'}
 = $result_trees{'index_nodes_no_split_no_use_nodes'}{'contents'}[5];
 
$result_trees{'index_nodes_no_split_no_use_nodes'}{'contents'}[5]{'contents'}[0]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'index_nodes_no_split_no_use_nodes'}{'contents'}[5]{'contents'}[0];
-$result_trees{'index_nodes_no_split_no_use_nodes'}{'contents'}[5]{'contents'}[4]{'extra'}{'entry_node'}
 = $result_trees{'index_nodes_no_split_no_use_nodes'}{'contents'}[5];
+$result_trees{'index_nodes_no_split_no_use_nodes'}{'contents'}[5]{'contents'}[4]{'extra'}{'element_node'}
 = $result_trees{'index_nodes_no_split_no_use_nodes'}{'contents'}[5];
 
$result_trees{'index_nodes_no_split_no_use_nodes'}{'contents'}[5]{'contents'}[4]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'index_nodes_no_split_no_use_nodes'}{'contents'}[5]{'contents'}[4];
-$result_trees{'index_nodes_no_split_no_use_nodes'}{'contents'}[5]{'contents'}[5]{'extra'}{'entry_node'}
 = $result_trees{'index_nodes_no_split_no_use_nodes'}{'contents'}[5];
+$result_trees{'index_nodes_no_split_no_use_nodes'}{'contents'}[5]{'contents'}[5]{'extra'}{'element_node'}
 = $result_trees{'index_nodes_no_split_no_use_nodes'}{'contents'}[5];
 
$result_trees{'index_nodes_no_split_no_use_nodes'}{'contents'}[5]{'contents'}[5]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'index_nodes_no_split_no_use_nodes'}{'contents'}[5]{'contents'}[5];
 
$result_trees{'index_nodes_no_split_no_use_nodes'}{'contents'}[5]{'extra'}{'node_content'}[0]
 = 
$result_trees{'index_nodes_no_split_no_use_nodes'}{'contents'}[5]{'args'}[0]{'contents'}[0];
 
$result_trees{'index_nodes_no_split_no_use_nodes'}{'contents'}[5]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = 
$result_trees{'index_nodes_no_split_no_use_nodes'}{'contents'}[5]{'args'}[0]{'contents'}[0];
diff --git a/tp/t/results/indices/index_special_region.pl 
b/tp/t/results/indices/index_special_region.pl
index 336f2575bd..cd1c479cb0 100644
--- a/tp/t/results/indices/index_special_region.pl
+++ b/tp/t/results/indices/index_special_region.pl
@@ -64,7 +64,7 @@ $result_trees{'index_special_region'} = {
                   ],
                   'cmdname' => 'cindex',
                   'extra' => {
-                    'entry_region' => 'copying',
+                    'element_region' => 'copying',
                     'index_entry' => {
                       'entry_element' => {},
                       'entry_number' => 1,
@@ -202,7 +202,7 @@ $result_trees{'index_special_region'} = {
                               ],
                               'cmdname' => 'cindex',
                               'extra' => {
-                                'entry_region' => 'copying',
+                                'element_region' => 'copying',
                                 'index_entry' => {
                                   'entry_element' => {},
                                   'entry_number' => 2,
@@ -366,7 +366,7 @@ $result_trees{'index_special_region'} = {
                   ],
                   'cmdname' => 'cindex',
                   'extra' => {
-                    'entry_region' => 'titlepage',
+                    'element_region' => 'titlepage',
                     'index_entry' => {
                       'entry_element' => {},
                       'entry_number' => 3,
@@ -497,7 +497,7 @@ $result_trees{'index_special_region'} = {
                               ],
                               'cmdname' => 'cindex',
                               'extra' => {
-                                'entry_region' => 'titlepage',
+                                'element_region' => 'titlepage',
                                 'index_entry' => {
                                   'entry_element' => {},
                                   'entry_number' => 4,
@@ -786,7 +786,7 @@ $result_trees{'index_special_region'} = {
           ],
           'cmdname' => 'findex',
           'extra' => {
-            'entry_node' => {},
+            'element_node' => {},
             'index_entry' => {
               'entry_element' => {},
               'entry_number' => 1,
@@ -1125,7 +1125,7 @@ $result_trees{'index_special_region'} = {
                       ],
                       'cmdname' => 'item',
                       'extra' => {
-                        'entry_node' => {},
+                        'element_node' => {},
                         'index_entry' => {
                           'entry_element' => {},
                           'entry_number' => 2,
@@ -1416,7 +1416,7 @@ $result_trees{'index_special_region'} = {
           ],
           'cmdname' => 'findex',
           'extra' => {
-            'entry_node' => {},
+            'element_node' => {},
             'index_entry' => {
               'entry_element' => {},
               'entry_number' => 3,
@@ -1460,7 +1460,7 @@ $result_trees{'index_special_region'} = {
           ],
           'cmdname' => 'cindex',
           'extra' => {
-            'entry_node' => {},
+            'element_node' => {},
             'index_entry' => {
               'entry_element' => {},
               'entry_number' => 5,
@@ -1773,22 +1773,22 @@ 
$result_trees{'index_special_region'}{'contents'}[0]{'contents'}[1]{'contents'}[
 
$result_trees{'index_special_region'}{'contents'}[0]{'contents'}[1]{'contents'}[2]{'contents'}[5]{'contents'}[1]{'args'}[0]{'contents'}[4]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'index_special_region'}{'contents'}[0]{'contents'}[1]{'contents'}[2]{'contents'}[5]{'contents'}[1]{'args'}[0]{'contents'}[4];
 
$result_trees{'index_special_region'}{'contents'}[1]{'extra'}{'node_content'}[0]
 = 
$result_trees{'index_special_region'}{'contents'}[1]{'args'}[0]{'contents'}[0];
 
$result_trees{'index_special_region'}{'contents'}[1]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = 
$result_trees{'index_special_region'}{'contents'}[1]{'args'}[0]{'contents'}[0];
-$result_trees{'index_special_region'}{'contents'}[3]{'contents'}[5]{'extra'}{'entry_node'}
 = $result_trees{'index_special_region'}{'contents'}[1];
+$result_trees{'index_special_region'}{'contents'}[3]{'contents'}[5]{'extra'}{'element_node'}
 = $result_trees{'index_special_region'}{'contents'}[1];
 
$result_trees{'index_special_region'}{'contents'}[3]{'contents'}[5]{'extra'}{'index_entry'}{'entry_element'}
 = $result_trees{'index_special_region'}{'contents'}[3]{'contents'}[5];
 
$result_trees{'index_special_region'}{'contents'}[3]{'contents'}[8]{'contents'}[0]{'extra'}{'def_parsed_hash'}{'category'}
 = 
$result_trees{'index_special_region'}{'contents'}[3]{'contents'}[8]{'contents'}[0]{'args'}[0]{'contents'}[0];
 
$result_trees{'index_special_region'}{'contents'}[3]{'contents'}[8]{'contents'}[0]{'extra'}{'def_parsed_hash'}{'name'}
 = 
$result_trees{'index_special_region'}{'contents'}[3]{'contents'}[8]{'contents'}[0]{'args'}[0]{'contents'}[2];
 
$result_trees{'index_special_region'}{'contents'}[3]{'contents'}[8]{'contents'}[1]{'extra'}{'def_parsed_hash'}{'category'}
 = 
$result_trees{'index_special_region'}{'contents'}[3]{'contents'}[8]{'contents'}[1]{'args'}[0]{'contents'}[0];
 
$result_trees{'index_special_region'}{'contents'}[3]{'contents'}[8]{'contents'}[2]{'extra'}{'def_parsed_hash'}{'category'}
 = 
$result_trees{'index_special_region'}{'contents'}[3]{'contents'}[8]{'contents'}[2]{'args'}[0]{'contents'}[0];
 
$result_trees{'index_special_region'}{'contents'}[3]{'contents'}[8]{'contents'}[2]{'extra'}{'def_parsed_hash'}{'name'}
 = 
$result_trees{'index_special_region'}{'contents'}[3]{'contents'}[8]{'contents'}[2]{'args'}[0]{'contents'}[2];
-$result_trees{'index_special_region'}{'contents'}[3]{'contents'}[10]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'extra'}{'entry_node'}
 = $result_trees{'index_special_region'}{'contents'}[1];
+$result_trees{'index_special_region'}{'contents'}[3]{'contents'}[10]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'extra'}{'element_node'}
 = $result_trees{'index_special_region'}{'contents'}[1];
 
$result_trees{'index_special_region'}{'contents'}[3]{'contents'}[10]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'index_special_region'}{'contents'}[3]{'contents'}[10]{'contents'}[1]{'contents'}[0]{'contents'}[0];
 
$result_trees{'index_special_region'}{'contents'}[3]{'contents'}[10]{'extra'}{'command_as_argument'}
 = 
$result_trees{'index_special_region'}{'contents'}[3]{'contents'}[10]{'args'}[0];
 
$result_trees{'index_special_region'}{'contents'}[3]{'contents'}[12]{'contents'}[0]{'extra'}{'menu_entry_node_label'}{'node_content'}[0]
 = 
$result_trees{'index_special_region'}{'contents'}[3]{'contents'}[12]{'contents'}[0]{'contents'}[1]{'contents'}[0];
 
$result_trees{'index_special_region'}{'contents'}[4]{'extra'}{'node_content'}[0]
 = 
$result_trees{'index_special_region'}{'contents'}[4]{'args'}[0]{'contents'}[0];
 
$result_trees{'index_special_region'}{'contents'}[4]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = 
$result_trees{'index_special_region'}{'contents'}[4]{'args'}[0]{'contents'}[0];
-$result_trees{'index_special_region'}{'contents'}[5]{'contents'}[3]{'extra'}{'entry_node'}
 = $result_trees{'index_special_region'}{'contents'}[4];
+$result_trees{'index_special_region'}{'contents'}[5]{'contents'}[3]{'extra'}{'element_node'}
 = $result_trees{'index_special_region'}{'contents'}[4];
 
$result_trees{'index_special_region'}{'contents'}[5]{'contents'}[3]{'extra'}{'index_entry'}{'entry_element'}
 = $result_trees{'index_special_region'}{'contents'}[5]{'contents'}[3];
-$result_trees{'index_special_region'}{'contents'}[5]{'contents'}[5]{'extra'}{'entry_node'}
 = $result_trees{'index_special_region'}{'contents'}[4];
+$result_trees{'index_special_region'}{'contents'}[5]{'contents'}[5]{'extra'}{'element_node'}
 = $result_trees{'index_special_region'}{'contents'}[4];
 
$result_trees{'index_special_region'}{'contents'}[5]{'contents'}[5]{'extra'}{'index_entry'}{'entry_element'}
 = $result_trees{'index_special_region'}{'contents'}[5]{'contents'}[5];
 
$result_trees{'index_special_region'}{'contents'}[5]{'contents'}[7]{'contents'}[0]{'extra'}{'label'}
 = 
$result_trees{'index_special_region'}{'contents'}[0]{'contents'}[1]{'contents'}[0]{'contents'}[2];
 
$result_trees{'index_special_region'}{'contents'}[5]{'contents'}[7]{'contents'}[0]{'extra'}{'node_argument'}{'node_content'}[0]
 = 
$result_trees{'index_special_region'}{'contents'}[5]{'contents'}[7]{'contents'}[0]{'args'}[0]{'contents'}[0];
diff --git a/tp/t/results/indices/index_special_region_no_insertcopying.pl 
b/tp/t/results/indices/index_special_region_no_insertcopying.pl
index b5d84fad95..1ef14424bb 100644
--- a/tp/t/results/indices/index_special_region_no_insertcopying.pl
+++ b/tp/t/results/indices/index_special_region_no_insertcopying.pl
@@ -64,7 +64,7 @@ $result_trees{'index_special_region_no_insertcopying'} = {
                   ],
                   'cmdname' => 'cindex',
                   'extra' => {
-                    'entry_region' => 'copying',
+                    'element_region' => 'copying',
                     'index_entry' => {
                       'entry_element' => {},
                       'entry_number' => 1,
@@ -202,7 +202,7 @@ $result_trees{'index_special_region_no_insertcopying'} = {
                               ],
                               'cmdname' => 'cindex',
                               'extra' => {
-                                'entry_region' => 'copying',
+                                'element_region' => 'copying',
                                 'index_entry' => {
                                   'entry_element' => {},
                                   'entry_number' => 2,
@@ -366,7 +366,7 @@ $result_trees{'index_special_region_no_insertcopying'} = {
                   ],
                   'cmdname' => 'cindex',
                   'extra' => {
-                    'entry_region' => 'titlepage',
+                    'element_region' => 'titlepage',
                     'index_entry' => {
                       'entry_element' => {},
                       'entry_number' => 3,
@@ -497,7 +497,7 @@ $result_trees{'index_special_region_no_insertcopying'} = {
                               ],
                               'cmdname' => 'cindex',
                               'extra' => {
-                                'entry_region' => 'titlepage',
+                                'element_region' => 'titlepage',
                                 'index_entry' => {
                                   'entry_element' => {},
                                   'entry_number' => 4,
@@ -787,7 +787,7 @@ $result_trees{'index_special_region_no_insertcopying'} = {
           ],
           'cmdname' => 'findex',
           'extra' => {
-            'entry_node' => {},
+            'element_node' => {},
             'index_entry' => {
               'entry_element' => {},
               'entry_number' => 1,
@@ -1126,7 +1126,7 @@ $result_trees{'index_special_region_no_insertcopying'} = {
                       ],
                       'cmdname' => 'item',
                       'extra' => {
-                        'entry_node' => {},
+                        'element_node' => {},
                         'index_entry' => {
                           'entry_element' => {},
                           'entry_number' => 2,
@@ -1417,7 +1417,7 @@ $result_trees{'index_special_region_no_insertcopying'} = {
           ],
           'cmdname' => 'findex',
           'extra' => {
-            'entry_node' => {},
+            'element_node' => {},
             'index_entry' => {
               'entry_element' => {},
               'entry_number' => 3,
@@ -1461,7 +1461,7 @@ $result_trees{'index_special_region_no_insertcopying'} = {
           ],
           'cmdname' => 'cindex',
           'extra' => {
-            'entry_node' => {},
+            'element_node' => {},
             'index_entry' => {
               'entry_element' => {},
               'entry_number' => 5,
@@ -1775,22 +1775,22 @@ 
$result_trees{'index_special_region_no_insertcopying'}{'contents'}[0]{'contents'
 
$result_trees{'index_special_region_no_insertcopying'}{'contents'}[0]{'contents'}[1]{'contents'}[2]{'contents'}[5]{'contents'}[1]{'args'}[0]{'contents'}[4]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'index_special_region_no_insertcopying'}{'contents'}[0]{'contents'}[1]{'contents'}[2]{'contents'}[5]{'contents'}[1]{'args'}[0]{'contents'}[4];
 
$result_trees{'index_special_region_no_insertcopying'}{'contents'}[1]{'extra'}{'node_content'}[0]
 = 
$result_trees{'index_special_region_no_insertcopying'}{'contents'}[1]{'args'}[0]{'contents'}[0];
 
$result_trees{'index_special_region_no_insertcopying'}{'contents'}[1]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = 
$result_trees{'index_special_region_no_insertcopying'}{'contents'}[1]{'args'}[0]{'contents'}[0];
-$result_trees{'index_special_region_no_insertcopying'}{'contents'}[3]{'contents'}[5]{'extra'}{'entry_node'}
 = $result_trees{'index_special_region_no_insertcopying'}{'contents'}[1];
+$result_trees{'index_special_region_no_insertcopying'}{'contents'}[3]{'contents'}[5]{'extra'}{'element_node'}
 = $result_trees{'index_special_region_no_insertcopying'}{'contents'}[1];
 
$result_trees{'index_special_region_no_insertcopying'}{'contents'}[3]{'contents'}[5]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'index_special_region_no_insertcopying'}{'contents'}[3]{'contents'}[5];
 
$result_trees{'index_special_region_no_insertcopying'}{'contents'}[3]{'contents'}[8]{'contents'}[0]{'extra'}{'def_parsed_hash'}{'category'}
 = 
$result_trees{'index_special_region_no_insertcopying'}{'contents'}[3]{'contents'}[8]{'contents'}[0]{'args'}[0]{'contents'}[0];
 
$result_trees{'index_special_region_no_insertcopying'}{'contents'}[3]{'contents'}[8]{'contents'}[0]{'extra'}{'def_parsed_hash'}{'name'}
 = 
$result_trees{'index_special_region_no_insertcopying'}{'contents'}[3]{'contents'}[8]{'contents'}[0]{'args'}[0]{'contents'}[2];
 
$result_trees{'index_special_region_no_insertcopying'}{'contents'}[3]{'contents'}[8]{'contents'}[1]{'extra'}{'def_parsed_hash'}{'category'}
 = 
$result_trees{'index_special_region_no_insertcopying'}{'contents'}[3]{'contents'}[8]{'contents'}[1]{'args'}[0]{'contents'}[0];
 
$result_trees{'index_special_region_no_insertcopying'}{'contents'}[3]{'contents'}[8]{'contents'}[2]{'extra'}{'def_parsed_hash'}{'category'}
 = 
$result_trees{'index_special_region_no_insertcopying'}{'contents'}[3]{'contents'}[8]{'contents'}[2]{'args'}[0]{'contents'}[0];
 
$result_trees{'index_special_region_no_insertcopying'}{'contents'}[3]{'contents'}[8]{'contents'}[2]{'extra'}{'def_parsed_hash'}{'name'}
 = 
$result_trees{'index_special_region_no_insertcopying'}{'contents'}[3]{'contents'}[8]{'contents'}[2]{'args'}[0]{'contents'}[2];
-$result_trees{'index_special_region_no_insertcopying'}{'contents'}[3]{'contents'}[10]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'extra'}{'entry_node'}
 = $result_trees{'index_special_region_no_insertcopying'}{'contents'}[1];
+$result_trees{'index_special_region_no_insertcopying'}{'contents'}[3]{'contents'}[10]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'extra'}{'element_node'}
 = $result_trees{'index_special_region_no_insertcopying'}{'contents'}[1];
 
$result_trees{'index_special_region_no_insertcopying'}{'contents'}[3]{'contents'}[10]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'index_special_region_no_insertcopying'}{'contents'}[3]{'contents'}[10]{'contents'}[1]{'contents'}[0]{'contents'}[0];
 
$result_trees{'index_special_region_no_insertcopying'}{'contents'}[3]{'contents'}[10]{'extra'}{'command_as_argument'}
 = 
$result_trees{'index_special_region_no_insertcopying'}{'contents'}[3]{'contents'}[10]{'args'}[0];
 
$result_trees{'index_special_region_no_insertcopying'}{'contents'}[3]{'contents'}[12]{'contents'}[0]{'extra'}{'menu_entry_node_label'}{'node_content'}[0]
 = 
$result_trees{'index_special_region_no_insertcopying'}{'contents'}[3]{'contents'}[12]{'contents'}[0]{'contents'}[1]{'contents'}[0];
 
$result_trees{'index_special_region_no_insertcopying'}{'contents'}[4]{'extra'}{'node_content'}[0]
 = 
$result_trees{'index_special_region_no_insertcopying'}{'contents'}[4]{'args'}[0]{'contents'}[0];
 
$result_trees{'index_special_region_no_insertcopying'}{'contents'}[4]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = 
$result_trees{'index_special_region_no_insertcopying'}{'contents'}[4]{'args'}[0]{'contents'}[0];
-$result_trees{'index_special_region_no_insertcopying'}{'contents'}[5]{'contents'}[3]{'extra'}{'entry_node'}
 = $result_trees{'index_special_region_no_insertcopying'}{'contents'}[4];
+$result_trees{'index_special_region_no_insertcopying'}{'contents'}[5]{'contents'}[3]{'extra'}{'element_node'}
 = $result_trees{'index_special_region_no_insertcopying'}{'contents'}[4];
 
$result_trees{'index_special_region_no_insertcopying'}{'contents'}[5]{'contents'}[3]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'index_special_region_no_insertcopying'}{'contents'}[5]{'contents'}[3];
-$result_trees{'index_special_region_no_insertcopying'}{'contents'}[5]{'contents'}[5]{'extra'}{'entry_node'}
 = $result_trees{'index_special_region_no_insertcopying'}{'contents'}[4];
+$result_trees{'index_special_region_no_insertcopying'}{'contents'}[5]{'contents'}[5]{'extra'}{'element_node'}
 = $result_trees{'index_special_region_no_insertcopying'}{'contents'}[4];
 
$result_trees{'index_special_region_no_insertcopying'}{'contents'}[5]{'contents'}[5]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'index_special_region_no_insertcopying'}{'contents'}[5]{'contents'}[5];
 
$result_trees{'index_special_region_no_insertcopying'}{'contents'}[5]{'contents'}[7]{'contents'}[0]{'extra'}{'label'}
 = 
$result_trees{'index_special_region_no_insertcopying'}{'contents'}[0]{'contents'}[1]{'contents'}[0]{'contents'}[2];
 
$result_trees{'index_special_region_no_insertcopying'}{'contents'}[5]{'contents'}[7]{'contents'}[0]{'extra'}{'node_argument'}{'node_content'}[0]
 = 
$result_trees{'index_special_region_no_insertcopying'}{'contents'}[5]{'contents'}[7]{'contents'}[0]{'args'}[0]{'contents'}[0];
diff --git 
a/tp/t/results/indices/index_special_region_no_insertcopying_no_titlepage_no_nodes.pl
 
b/tp/t/results/indices/index_special_region_no_insertcopying_no_titlepage_no_nodes.pl
index 3c62f4cce6..62f7a232eb 100644
--- 
a/tp/t/results/indices/index_special_region_no_insertcopying_no_titlepage_no_nodes.pl
+++ 
b/tp/t/results/indices/index_special_region_no_insertcopying_no_titlepage_no_nodes.pl
@@ -64,7 +64,7 @@ 
$result_trees{'index_special_region_no_insertcopying_no_titlepage_no_nodes'} = {
                   ],
                   'cmdname' => 'cindex',
                   'extra' => {
-                    'entry_region' => 'copying',
+                    'element_region' => 'copying',
                     'index_entry' => {
                       'entry_element' => {},
                       'entry_number' => 1,
@@ -202,7 +202,7 @@ 
$result_trees{'index_special_region_no_insertcopying_no_titlepage_no_nodes'} = {
                               ],
                               'cmdname' => 'cindex',
                               'extra' => {
-                                'entry_region' => 'copying',
+                                'element_region' => 'copying',
                                 'index_entry' => {
                                   'entry_element' => {},
                                   'entry_number' => 2,
@@ -366,7 +366,7 @@ 
$result_trees{'index_special_region_no_insertcopying_no_titlepage_no_nodes'} = {
                   ],
                   'cmdname' => 'cindex',
                   'extra' => {
-                    'entry_region' => 'titlepage',
+                    'element_region' => 'titlepage',
                     'index_entry' => {
                       'entry_element' => {},
                       'entry_number' => 3,
@@ -497,7 +497,7 @@ 
$result_trees{'index_special_region_no_insertcopying_no_titlepage_no_nodes'} = {
                               ],
                               'cmdname' => 'cindex',
                               'extra' => {
-                                'entry_region' => 'titlepage',
+                                'element_region' => 'titlepage',
                                 'index_entry' => {
                                   'entry_element' => {},
                                   'entry_number' => 4,
@@ -787,7 +787,7 @@ 
$result_trees{'index_special_region_no_insertcopying_no_titlepage_no_nodes'} = {
           ],
           'cmdname' => 'findex',
           'extra' => {
-            'entry_node' => {},
+            'element_node' => {},
             'index_entry' => {
               'entry_element' => {},
               'entry_number' => 1,
@@ -1126,7 +1126,7 @@ 
$result_trees{'index_special_region_no_insertcopying_no_titlepage_no_nodes'} = {
                       ],
                       'cmdname' => 'item',
                       'extra' => {
-                        'entry_node' => {},
+                        'element_node' => {},
                         'index_entry' => {
                           'entry_element' => {},
                           'entry_number' => 2,
@@ -1417,7 +1417,7 @@ 
$result_trees{'index_special_region_no_insertcopying_no_titlepage_no_nodes'} = {
           ],
           'cmdname' => 'findex',
           'extra' => {
-            'entry_node' => {},
+            'element_node' => {},
             'index_entry' => {
               'entry_element' => {},
               'entry_number' => 3,
@@ -1461,7 +1461,7 @@ 
$result_trees{'index_special_region_no_insertcopying_no_titlepage_no_nodes'} = {
           ],
           'cmdname' => 'cindex',
           'extra' => {
-            'entry_node' => {},
+            'element_node' => {},
             'index_entry' => {
               'entry_element' => {},
               'entry_number' => 5,
@@ -1775,22 +1775,22 @@ 
$result_trees{'index_special_region_no_insertcopying_no_titlepage_no_nodes'}{'co
 
$result_trees{'index_special_region_no_insertcopying_no_titlepage_no_nodes'}{'contents'}[0]{'contents'}[1]{'contents'}[2]{'contents'}[5]{'contents'}[1]{'args'}[0]{'contents'}[4]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'index_special_region_no_insertcopying_no_titlepage_no_nodes'}{'contents'}[0]{'contents'}[1]{'contents'}[2]{'contents'}[5]{'contents'}[1]{'args'}[0]{'contents'}[4];
 
$result_trees{'index_special_region_no_insertcopying_no_titlepage_no_nodes'}{'contents'}[1]{'extra'}{'node_content'}[0]
 = 
$result_trees{'index_special_region_no_insertcopying_no_titlepage_no_nodes'}{'contents'}[1]{'args'}[0]{'contents'}[0];
 
$result_trees{'index_special_region_no_insertcopying_no_titlepage_no_nodes'}{'contents'}[1]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = 
$result_trees{'index_special_region_no_insertcopying_no_titlepage_no_nodes'}{'contents'}[1]{'args'}[0]{'contents'}[0];
-$result_trees{'index_special_region_no_insertcopying_no_titlepage_no_nodes'}{'contents'}[3]{'contents'}[5]{'extra'}{'entry_node'}
 = 
$result_trees{'index_special_region_no_insertcopying_no_titlepage_no_nodes'}{'contents'}[1];
+$result_trees{'index_special_region_no_insertcopying_no_titlepage_no_nodes'}{'contents'}[3]{'contents'}[5]{'extra'}{'element_node'}
 = 
$result_trees{'index_special_region_no_insertcopying_no_titlepage_no_nodes'}{'contents'}[1];
 
$result_trees{'index_special_region_no_insertcopying_no_titlepage_no_nodes'}{'contents'}[3]{'contents'}[5]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'index_special_region_no_insertcopying_no_titlepage_no_nodes'}{'contents'}[3]{'contents'}[5];
 
$result_trees{'index_special_region_no_insertcopying_no_titlepage_no_nodes'}{'contents'}[3]{'contents'}[8]{'contents'}[0]{'extra'}{'def_parsed_hash'}{'category'}
 = 
$result_trees{'index_special_region_no_insertcopying_no_titlepage_no_nodes'}{'contents'}[3]{'contents'}[8]{'contents'}[0]{'args'}[0]{'contents'}[0];
 
$result_trees{'index_special_region_no_insertcopying_no_titlepage_no_nodes'}{'contents'}[3]{'contents'}[8]{'contents'}[0]{'extra'}{'def_parsed_hash'}{'name'}
 = 
$result_trees{'index_special_region_no_insertcopying_no_titlepage_no_nodes'}{'contents'}[3]{'contents'}[8]{'contents'}[0]{'args'}[0]{'contents'}[2];
 
$result_trees{'index_special_region_no_insertcopying_no_titlepage_no_nodes'}{'contents'}[3]{'contents'}[8]{'contents'}[1]{'extra'}{'def_parsed_hash'}{'category'}
 = 
$result_trees{'index_special_region_no_insertcopying_no_titlepage_no_nodes'}{'contents'}[3]{'contents'}[8]{'contents'}[1]{'args'}[0]{'contents'}[0];
 
$result_trees{'index_special_region_no_insertcopying_no_titlepage_no_nodes'}{'contents'}[3]{'contents'}[8]{'contents'}[2]{'extra'}{'def_parsed_hash'}{'category'}
 = 
$result_trees{'index_special_region_no_insertcopying_no_titlepage_no_nodes'}{'contents'}[3]{'contents'}[8]{'contents'}[2]{'args'}[0]{'contents'}[0];
 
$result_trees{'index_special_region_no_insertcopying_no_titlepage_no_nodes'}{'contents'}[3]{'contents'}[8]{'contents'}[2]{'extra'}{'def_parsed_hash'}{'name'}
 = 
$result_trees{'index_special_region_no_insertcopying_no_titlepage_no_nodes'}{'contents'}[3]{'contents'}[8]{'contents'}[2]{'args'}[0]{'contents'}[2];
-$result_trees{'index_special_region_no_insertcopying_no_titlepage_no_nodes'}{'contents'}[3]{'contents'}[10]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'extra'}{'entry_node'}
 = 
$result_trees{'index_special_region_no_insertcopying_no_titlepage_no_nodes'}{'contents'}[1];
+$result_trees{'index_special_region_no_insertcopying_no_titlepage_no_nodes'}{'contents'}[3]{'contents'}[10]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'extra'}{'element_node'}
 = 
$result_trees{'index_special_region_no_insertcopying_no_titlepage_no_nodes'}{'contents'}[1];
 
$result_trees{'index_special_region_no_insertcopying_no_titlepage_no_nodes'}{'contents'}[3]{'contents'}[10]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'index_special_region_no_insertcopying_no_titlepage_no_nodes'}{'contents'}[3]{'contents'}[10]{'contents'}[1]{'contents'}[0]{'contents'}[0];
 
$result_trees{'index_special_region_no_insertcopying_no_titlepage_no_nodes'}{'contents'}[3]{'contents'}[10]{'extra'}{'command_as_argument'}
 = 
$result_trees{'index_special_region_no_insertcopying_no_titlepage_no_nodes'}{'contents'}[3]{'contents'}[10]{'args'}[0];
 
$result_trees{'index_special_region_no_insertcopying_no_titlepage_no_nodes'}{'contents'}[3]{'contents'}[12]{'contents'}[0]{'extra'}{'menu_entry_node_label'}{'node_content'}[0]
 = 
$result_trees{'index_special_region_no_insertcopying_no_titlepage_no_nodes'}{'contents'}[3]{'contents'}[12]{'contents'}[0]{'contents'}[1]{'contents'}[0];
 
$result_trees{'index_special_region_no_insertcopying_no_titlepage_no_nodes'}{'contents'}[4]{'extra'}{'node_content'}[0]
 = 
$result_trees{'index_special_region_no_insertcopying_no_titlepage_no_nodes'}{'contents'}[4]{'args'}[0]{'contents'}[0];
 
$result_trees{'index_special_region_no_insertcopying_no_titlepage_no_nodes'}{'contents'}[4]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = 
$result_trees{'index_special_region_no_insertcopying_no_titlepage_no_nodes'}{'contents'}[4]{'args'}[0]{'contents'}[0];
-$result_trees{'index_special_region_no_insertcopying_no_titlepage_no_nodes'}{'contents'}[5]{'contents'}[3]{'extra'}{'entry_node'}
 = 
$result_trees{'index_special_region_no_insertcopying_no_titlepage_no_nodes'}{'contents'}[4];
+$result_trees{'index_special_region_no_insertcopying_no_titlepage_no_nodes'}{'contents'}[5]{'contents'}[3]{'extra'}{'element_node'}
 = 
$result_trees{'index_special_region_no_insertcopying_no_titlepage_no_nodes'}{'contents'}[4];
 
$result_trees{'index_special_region_no_insertcopying_no_titlepage_no_nodes'}{'contents'}[5]{'contents'}[3]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'index_special_region_no_insertcopying_no_titlepage_no_nodes'}{'contents'}[5]{'contents'}[3];
-$result_trees{'index_special_region_no_insertcopying_no_titlepage_no_nodes'}{'contents'}[5]{'contents'}[5]{'extra'}{'entry_node'}
 = 
$result_trees{'index_special_region_no_insertcopying_no_titlepage_no_nodes'}{'contents'}[4];
+$result_trees{'index_special_region_no_insertcopying_no_titlepage_no_nodes'}{'contents'}[5]{'contents'}[5]{'extra'}{'element_node'}
 = 
$result_trees{'index_special_region_no_insertcopying_no_titlepage_no_nodes'}{'contents'}[4];
 
$result_trees{'index_special_region_no_insertcopying_no_titlepage_no_nodes'}{'contents'}[5]{'contents'}[5]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'index_special_region_no_insertcopying_no_titlepage_no_nodes'}{'contents'}[5]{'contents'}[5];
 
$result_trees{'index_special_region_no_insertcopying_no_titlepage_no_nodes'}{'contents'}[5]{'contents'}[7]{'contents'}[0]{'extra'}{'label'}
 = 
$result_trees{'index_special_region_no_insertcopying_no_titlepage_no_nodes'}{'contents'}[0]{'contents'}[1]{'contents'}[0]{'contents'}[2];
 
$result_trees{'index_special_region_no_insertcopying_no_titlepage_no_nodes'}{'contents'}[5]{'contents'}[7]{'contents'}[0]{'extra'}{'node_argument'}{'node_content'}[0]
 = 
$result_trees{'index_special_region_no_insertcopying_no_titlepage_no_nodes'}{'contents'}[5]{'contents'}[7]{'contents'}[0]{'args'}[0]{'contents'}[0];
diff --git 
a/tp/t/results/indices/index_special_region_no_insertcopying_titlepage_no_nodes.pl
 
b/tp/t/results/indices/index_special_region_no_insertcopying_titlepage_no_nodes.pl
index 539e42cd66..7ef4172872 100644
--- 
a/tp/t/results/indices/index_special_region_no_insertcopying_titlepage_no_nodes.pl
+++ 
b/tp/t/results/indices/index_special_region_no_insertcopying_titlepage_no_nodes.pl
@@ -64,7 +64,7 @@ 
$result_trees{'index_special_region_no_insertcopying_titlepage_no_nodes'} = {
                   ],
                   'cmdname' => 'cindex',
                   'extra' => {
-                    'entry_region' => 'copying',
+                    'element_region' => 'copying',
                     'index_entry' => {
                       'entry_element' => {},
                       'entry_number' => 1,
@@ -202,7 +202,7 @@ 
$result_trees{'index_special_region_no_insertcopying_titlepage_no_nodes'} = {
                               ],
                               'cmdname' => 'cindex',
                               'extra' => {
-                                'entry_region' => 'copying',
+                                'element_region' => 'copying',
                                 'index_entry' => {
                                   'entry_element' => {},
                                   'entry_number' => 2,
@@ -366,7 +366,7 @@ 
$result_trees{'index_special_region_no_insertcopying_titlepage_no_nodes'} = {
                   ],
                   'cmdname' => 'cindex',
                   'extra' => {
-                    'entry_region' => 'titlepage',
+                    'element_region' => 'titlepage',
                     'index_entry' => {
                       'entry_element' => {},
                       'entry_number' => 3,
@@ -497,7 +497,7 @@ 
$result_trees{'index_special_region_no_insertcopying_titlepage_no_nodes'} = {
                               ],
                               'cmdname' => 'cindex',
                               'extra' => {
-                                'entry_region' => 'titlepage',
+                                'element_region' => 'titlepage',
                                 'index_entry' => {
                                   'entry_element' => {},
                                   'entry_number' => 4,
@@ -787,7 +787,7 @@ 
$result_trees{'index_special_region_no_insertcopying_titlepage_no_nodes'} = {
           ],
           'cmdname' => 'findex',
           'extra' => {
-            'entry_node' => {},
+            'element_node' => {},
             'index_entry' => {
               'entry_element' => {},
               'entry_number' => 1,
@@ -1126,7 +1126,7 @@ 
$result_trees{'index_special_region_no_insertcopying_titlepage_no_nodes'} = {
                       ],
                       'cmdname' => 'item',
                       'extra' => {
-                        'entry_node' => {},
+                        'element_node' => {},
                         'index_entry' => {
                           'entry_element' => {},
                           'entry_number' => 2,
@@ -1417,7 +1417,7 @@ 
$result_trees{'index_special_region_no_insertcopying_titlepage_no_nodes'} = {
           ],
           'cmdname' => 'findex',
           'extra' => {
-            'entry_node' => {},
+            'element_node' => {},
             'index_entry' => {
               'entry_element' => {},
               'entry_number' => 3,
@@ -1461,7 +1461,7 @@ 
$result_trees{'index_special_region_no_insertcopying_titlepage_no_nodes'} = {
           ],
           'cmdname' => 'cindex',
           'extra' => {
-            'entry_node' => {},
+            'element_node' => {},
             'index_entry' => {
               'entry_element' => {},
               'entry_number' => 5,
@@ -1775,22 +1775,22 @@ 
$result_trees{'index_special_region_no_insertcopying_titlepage_no_nodes'}{'conte
 
$result_trees{'index_special_region_no_insertcopying_titlepage_no_nodes'}{'contents'}[0]{'contents'}[1]{'contents'}[2]{'contents'}[5]{'contents'}[1]{'args'}[0]{'contents'}[4]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'index_special_region_no_insertcopying_titlepage_no_nodes'}{'contents'}[0]{'contents'}[1]{'contents'}[2]{'contents'}[5]{'contents'}[1]{'args'}[0]{'contents'}[4];
 
$result_trees{'index_special_region_no_insertcopying_titlepage_no_nodes'}{'contents'}[1]{'extra'}{'node_content'}[0]
 = 
$result_trees{'index_special_region_no_insertcopying_titlepage_no_nodes'}{'contents'}[1]{'args'}[0]{'contents'}[0];
 
$result_trees{'index_special_region_no_insertcopying_titlepage_no_nodes'}{'contents'}[1]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = 
$result_trees{'index_special_region_no_insertcopying_titlepage_no_nodes'}{'contents'}[1]{'args'}[0]{'contents'}[0];
-$result_trees{'index_special_region_no_insertcopying_titlepage_no_nodes'}{'contents'}[3]{'contents'}[5]{'extra'}{'entry_node'}
 = 
$result_trees{'index_special_region_no_insertcopying_titlepage_no_nodes'}{'contents'}[1];
+$result_trees{'index_special_region_no_insertcopying_titlepage_no_nodes'}{'contents'}[3]{'contents'}[5]{'extra'}{'element_node'}
 = 
$result_trees{'index_special_region_no_insertcopying_titlepage_no_nodes'}{'contents'}[1];
 
$result_trees{'index_special_region_no_insertcopying_titlepage_no_nodes'}{'contents'}[3]{'contents'}[5]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'index_special_region_no_insertcopying_titlepage_no_nodes'}{'contents'}[3]{'contents'}[5];
 
$result_trees{'index_special_region_no_insertcopying_titlepage_no_nodes'}{'contents'}[3]{'contents'}[8]{'contents'}[0]{'extra'}{'def_parsed_hash'}{'category'}
 = 
$result_trees{'index_special_region_no_insertcopying_titlepage_no_nodes'}{'contents'}[3]{'contents'}[8]{'contents'}[0]{'args'}[0]{'contents'}[0];
 
$result_trees{'index_special_region_no_insertcopying_titlepage_no_nodes'}{'contents'}[3]{'contents'}[8]{'contents'}[0]{'extra'}{'def_parsed_hash'}{'name'}
 = 
$result_trees{'index_special_region_no_insertcopying_titlepage_no_nodes'}{'contents'}[3]{'contents'}[8]{'contents'}[0]{'args'}[0]{'contents'}[2];
 
$result_trees{'index_special_region_no_insertcopying_titlepage_no_nodes'}{'contents'}[3]{'contents'}[8]{'contents'}[1]{'extra'}{'def_parsed_hash'}{'category'}
 = 
$result_trees{'index_special_region_no_insertcopying_titlepage_no_nodes'}{'contents'}[3]{'contents'}[8]{'contents'}[1]{'args'}[0]{'contents'}[0];
 
$result_trees{'index_special_region_no_insertcopying_titlepage_no_nodes'}{'contents'}[3]{'contents'}[8]{'contents'}[2]{'extra'}{'def_parsed_hash'}{'category'}
 = 
$result_trees{'index_special_region_no_insertcopying_titlepage_no_nodes'}{'contents'}[3]{'contents'}[8]{'contents'}[2]{'args'}[0]{'contents'}[0];
 
$result_trees{'index_special_region_no_insertcopying_titlepage_no_nodes'}{'contents'}[3]{'contents'}[8]{'contents'}[2]{'extra'}{'def_parsed_hash'}{'name'}
 = 
$result_trees{'index_special_region_no_insertcopying_titlepage_no_nodes'}{'contents'}[3]{'contents'}[8]{'contents'}[2]{'args'}[0]{'contents'}[2];
-$result_trees{'index_special_region_no_insertcopying_titlepage_no_nodes'}{'contents'}[3]{'contents'}[10]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'extra'}{'entry_node'}
 = 
$result_trees{'index_special_region_no_insertcopying_titlepage_no_nodes'}{'contents'}[1];
+$result_trees{'index_special_region_no_insertcopying_titlepage_no_nodes'}{'contents'}[3]{'contents'}[10]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'extra'}{'element_node'}
 = 
$result_trees{'index_special_region_no_insertcopying_titlepage_no_nodes'}{'contents'}[1];
 
$result_trees{'index_special_region_no_insertcopying_titlepage_no_nodes'}{'contents'}[3]{'contents'}[10]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'index_special_region_no_insertcopying_titlepage_no_nodes'}{'contents'}[3]{'contents'}[10]{'contents'}[1]{'contents'}[0]{'contents'}[0];
 
$result_trees{'index_special_region_no_insertcopying_titlepage_no_nodes'}{'contents'}[3]{'contents'}[10]{'extra'}{'command_as_argument'}
 = 
$result_trees{'index_special_region_no_insertcopying_titlepage_no_nodes'}{'contents'}[3]{'contents'}[10]{'args'}[0];
 
$result_trees{'index_special_region_no_insertcopying_titlepage_no_nodes'}{'contents'}[3]{'contents'}[12]{'contents'}[0]{'extra'}{'menu_entry_node_label'}{'node_content'}[0]
 = 
$result_trees{'index_special_region_no_insertcopying_titlepage_no_nodes'}{'contents'}[3]{'contents'}[12]{'contents'}[0]{'contents'}[1]{'contents'}[0];
 
$result_trees{'index_special_region_no_insertcopying_titlepage_no_nodes'}{'contents'}[4]{'extra'}{'node_content'}[0]
 = 
$result_trees{'index_special_region_no_insertcopying_titlepage_no_nodes'}{'contents'}[4]{'args'}[0]{'contents'}[0];
 
$result_trees{'index_special_region_no_insertcopying_titlepage_no_nodes'}{'contents'}[4]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = 
$result_trees{'index_special_region_no_insertcopying_titlepage_no_nodes'}{'contents'}[4]{'args'}[0]{'contents'}[0];
-$result_trees{'index_special_region_no_insertcopying_titlepage_no_nodes'}{'contents'}[5]{'contents'}[3]{'extra'}{'entry_node'}
 = 
$result_trees{'index_special_region_no_insertcopying_titlepage_no_nodes'}{'contents'}[4];
+$result_trees{'index_special_region_no_insertcopying_titlepage_no_nodes'}{'contents'}[5]{'contents'}[3]{'extra'}{'element_node'}
 = 
$result_trees{'index_special_region_no_insertcopying_titlepage_no_nodes'}{'contents'}[4];
 
$result_trees{'index_special_region_no_insertcopying_titlepage_no_nodes'}{'contents'}[5]{'contents'}[3]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'index_special_region_no_insertcopying_titlepage_no_nodes'}{'contents'}[5]{'contents'}[3];
-$result_trees{'index_special_region_no_insertcopying_titlepage_no_nodes'}{'contents'}[5]{'contents'}[5]{'extra'}{'entry_node'}
 = 
$result_trees{'index_special_region_no_insertcopying_titlepage_no_nodes'}{'contents'}[4];
+$result_trees{'index_special_region_no_insertcopying_titlepage_no_nodes'}{'contents'}[5]{'contents'}[5]{'extra'}{'element_node'}
 = 
$result_trees{'index_special_region_no_insertcopying_titlepage_no_nodes'}{'contents'}[4];
 
$result_trees{'index_special_region_no_insertcopying_titlepage_no_nodes'}{'contents'}[5]{'contents'}[5]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'index_special_region_no_insertcopying_titlepage_no_nodes'}{'contents'}[5]{'contents'}[5];
 
$result_trees{'index_special_region_no_insertcopying_titlepage_no_nodes'}{'contents'}[5]{'contents'}[7]{'contents'}[0]{'extra'}{'label'}
 = 
$result_trees{'index_special_region_no_insertcopying_titlepage_no_nodes'}{'contents'}[0]{'contents'}[1]{'contents'}[0]{'contents'}[2];
 
$result_trees{'index_special_region_no_insertcopying_titlepage_no_nodes'}{'contents'}[5]{'contents'}[7]{'contents'}[0]{'extra'}{'node_argument'}{'node_content'}[0]
 = 
$result_trees{'index_special_region_no_insertcopying_titlepage_no_nodes'}{'contents'}[5]{'contents'}[7]{'contents'}[0]{'args'}[0]{'contents'}[0];
diff --git 
a/tp/t/results/indices/index_special_region_no_insertcopying_titlepage_no_nodes_footnotes_default.pl
 
b/tp/t/results/indices/index_special_region_no_insertcopying_titlepage_no_nodes_footnotes_default.pl
index 0a2f02c5fd..ebc0d247a6 100644
--- 
a/tp/t/results/indices/index_special_region_no_insertcopying_titlepage_no_nodes_footnotes_default.pl
+++ 
b/tp/t/results/indices/index_special_region_no_insertcopying_titlepage_no_nodes_footnotes_default.pl
@@ -64,7 +64,7 @@ 
$result_trees{'index_special_region_no_insertcopying_titlepage_no_nodes_footnote
                   ],
                   'cmdname' => 'cindex',
                   'extra' => {
-                    'entry_region' => 'copying',
+                    'element_region' => 'copying',
                     'index_entry' => {
                       'entry_element' => {},
                       'entry_number' => 1,
@@ -202,7 +202,7 @@ 
$result_trees{'index_special_region_no_insertcopying_titlepage_no_nodes_footnote
                               ],
                               'cmdname' => 'cindex',
                               'extra' => {
-                                'entry_region' => 'copying',
+                                'element_region' => 'copying',
                                 'index_entry' => {
                                   'entry_element' => {},
                                   'entry_number' => 2,
@@ -366,7 +366,7 @@ 
$result_trees{'index_special_region_no_insertcopying_titlepage_no_nodes_footnote
                   ],
                   'cmdname' => 'cindex',
                   'extra' => {
-                    'entry_region' => 'titlepage',
+                    'element_region' => 'titlepage',
                     'index_entry' => {
                       'entry_element' => {},
                       'entry_number' => 3,
@@ -497,7 +497,7 @@ 
$result_trees{'index_special_region_no_insertcopying_titlepage_no_nodes_footnote
                               ],
                               'cmdname' => 'cindex',
                               'extra' => {
-                                'entry_region' => 'titlepage',
+                                'element_region' => 'titlepage',
                                 'index_entry' => {
                                   'entry_element' => {},
                                   'entry_number' => 4,
@@ -787,7 +787,7 @@ 
$result_trees{'index_special_region_no_insertcopying_titlepage_no_nodes_footnote
           ],
           'cmdname' => 'findex',
           'extra' => {
-            'entry_node' => {},
+            'element_node' => {},
             'index_entry' => {
               'entry_element' => {},
               'entry_number' => 1,
@@ -1126,7 +1126,7 @@ 
$result_trees{'index_special_region_no_insertcopying_titlepage_no_nodes_footnote
                       ],
                       'cmdname' => 'item',
                       'extra' => {
-                        'entry_node' => {},
+                        'element_node' => {},
                         'index_entry' => {
                           'entry_element' => {},
                           'entry_number' => 2,
@@ -1417,7 +1417,7 @@ 
$result_trees{'index_special_region_no_insertcopying_titlepage_no_nodes_footnote
           ],
           'cmdname' => 'findex',
           'extra' => {
-            'entry_node' => {},
+            'element_node' => {},
             'index_entry' => {
               'entry_element' => {},
               'entry_number' => 3,
@@ -1461,7 +1461,7 @@ 
$result_trees{'index_special_region_no_insertcopying_titlepage_no_nodes_footnote
           ],
           'cmdname' => 'cindex',
           'extra' => {
-            'entry_node' => {},
+            'element_node' => {},
             'index_entry' => {
               'entry_element' => {},
               'entry_number' => 5,
@@ -1775,22 +1775,22 @@ 
$result_trees{'index_special_region_no_insertcopying_titlepage_no_nodes_footnote
 
$result_trees{'index_special_region_no_insertcopying_titlepage_no_nodes_footnotes_default'}{'contents'}[0]{'contents'}[1]{'contents'}[2]{'contents'}[5]{'contents'}[1]{'args'}[0]{'contents'}[4]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'index_special_region_no_insertcopying_titlepage_no_nodes_footnotes_default'}{'contents'}[0]{'contents'}[1]{'contents'}[2]{'contents'}[5]{'contents'}[1]{'args'}[0]{'contents'}[4];
 
$result_trees{'index_special_region_no_insertcopying_titlepage_no_nodes_footnotes_default'}{'contents'}[1]{'extra'}{'node_content'}[0]
 = 
$result_trees{'index_special_region_no_insertcopying_titlepage_no_nodes_footnotes_default'}{'contents'}[1]{'args'}[0]{'contents'}[0];
 
$result_trees{'index_special_region_no_insertcopying_titlepage_no_nodes_footnotes_default'}{'contents'}[1]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = 
$result_trees{'index_special_region_no_insertcopying_titlepage_no_nodes_footnotes_default'}{'contents'}[1]{'args'}[0]{'contents'}[0];
-$result_trees{'index_special_region_no_insertcopying_titlepage_no_nodes_footnotes_default'}{'contents'}[3]{'contents'}[5]{'extra'}{'entry_node'}
 = 
$result_trees{'index_special_region_no_insertcopying_titlepage_no_nodes_footnotes_default'}{'contents'}[1];
+$result_trees{'index_special_region_no_insertcopying_titlepage_no_nodes_footnotes_default'}{'contents'}[3]{'contents'}[5]{'extra'}{'element_node'}
 = 
$result_trees{'index_special_region_no_insertcopying_titlepage_no_nodes_footnotes_default'}{'contents'}[1];
 
$result_trees{'index_special_region_no_insertcopying_titlepage_no_nodes_footnotes_default'}{'contents'}[3]{'contents'}[5]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'index_special_region_no_insertcopying_titlepage_no_nodes_footnotes_default'}{'contents'}[3]{'contents'}[5];
 
$result_trees{'index_special_region_no_insertcopying_titlepage_no_nodes_footnotes_default'}{'contents'}[3]{'contents'}[8]{'contents'}[0]{'extra'}{'def_parsed_hash'}{'category'}
 = 
$result_trees{'index_special_region_no_insertcopying_titlepage_no_nodes_footnotes_default'}{'contents'}[3]{'contents'}[8]{'contents'}[0]{'args'}[0]{'contents'}[0];
 
$result_trees{'index_special_region_no_insertcopying_titlepage_no_nodes_footnotes_default'}{'contents'}[3]{'contents'}[8]{'contents'}[0]{'extra'}{'def_parsed_hash'}{'name'}
 = 
$result_trees{'index_special_region_no_insertcopying_titlepage_no_nodes_footnotes_default'}{'contents'}[3]{'contents'}[8]{'contents'}[0]{'args'}[0]{'contents'}[2];
 
$result_trees{'index_special_region_no_insertcopying_titlepage_no_nodes_footnotes_default'}{'contents'}[3]{'contents'}[8]{'contents'}[1]{'extra'}{'def_parsed_hash'}{'category'}
 = 
$result_trees{'index_special_region_no_insertcopying_titlepage_no_nodes_footnotes_default'}{'contents'}[3]{'contents'}[8]{'contents'}[1]{'args'}[0]{'contents'}[0];
 
$result_trees{'index_special_region_no_insertcopying_titlepage_no_nodes_footnotes_default'}{'contents'}[3]{'contents'}[8]{'contents'}[2]{'extra'}{'def_parsed_hash'}{'category'}
 = 
$result_trees{'index_special_region_no_insertcopying_titlepage_no_nodes_footnotes_default'}{'contents'}[3]{'contents'}[8]{'contents'}[2]{'args'}[0]{'contents'}[0];
 
$result_trees{'index_special_region_no_insertcopying_titlepage_no_nodes_footnotes_default'}{'contents'}[3]{'contents'}[8]{'contents'}[2]{'extra'}{'def_parsed_hash'}{'name'}
 = 
$result_trees{'index_special_region_no_insertcopying_titlepage_no_nodes_footnotes_default'}{'contents'}[3]{'contents'}[8]{'contents'}[2]{'args'}[0]{'contents'}[2];
-$result_trees{'index_special_region_no_insertcopying_titlepage_no_nodes_footnotes_default'}{'contents'}[3]{'contents'}[10]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'extra'}{'entry_node'}
 = 
$result_trees{'index_special_region_no_insertcopying_titlepage_no_nodes_footnotes_default'}{'contents'}[1];
+$result_trees{'index_special_region_no_insertcopying_titlepage_no_nodes_footnotes_default'}{'contents'}[3]{'contents'}[10]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'extra'}{'element_node'}
 = 
$result_trees{'index_special_region_no_insertcopying_titlepage_no_nodes_footnotes_default'}{'contents'}[1];
 
$result_trees{'index_special_region_no_insertcopying_titlepage_no_nodes_footnotes_default'}{'contents'}[3]{'contents'}[10]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'index_special_region_no_insertcopying_titlepage_no_nodes_footnotes_default'}{'contents'}[3]{'contents'}[10]{'contents'}[1]{'contents'}[0]{'contents'}[0];
 
$result_trees{'index_special_region_no_insertcopying_titlepage_no_nodes_footnotes_default'}{'contents'}[3]{'contents'}[10]{'extra'}{'command_as_argument'}
 = 
$result_trees{'index_special_region_no_insertcopying_titlepage_no_nodes_footnotes_default'}{'contents'}[3]{'contents'}[10]{'args'}[0];
 
$result_trees{'index_special_region_no_insertcopying_titlepage_no_nodes_footnotes_default'}{'contents'}[3]{'contents'}[12]{'contents'}[0]{'extra'}{'menu_entry_node_label'}{'node_content'}[0]
 = 
$result_trees{'index_special_region_no_insertcopying_titlepage_no_nodes_footnotes_default'}{'contents'}[3]{'contents'}[12]{'contents'}[0]{'contents'}[1]{'contents'}[0];
 
$result_trees{'index_special_region_no_insertcopying_titlepage_no_nodes_footnotes_default'}{'contents'}[4]{'extra'}{'node_content'}[0]
 = 
$result_trees{'index_special_region_no_insertcopying_titlepage_no_nodes_footnotes_default'}{'contents'}[4]{'args'}[0]{'contents'}[0];
 
$result_trees{'index_special_region_no_insertcopying_titlepage_no_nodes_footnotes_default'}{'contents'}[4]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = 
$result_trees{'index_special_region_no_insertcopying_titlepage_no_nodes_footnotes_default'}{'contents'}[4]{'args'}[0]{'contents'}[0];
-$result_trees{'index_special_region_no_insertcopying_titlepage_no_nodes_footnotes_default'}{'contents'}[5]{'contents'}[3]{'extra'}{'entry_node'}
 = 
$result_trees{'index_special_region_no_insertcopying_titlepage_no_nodes_footnotes_default'}{'contents'}[4];
+$result_trees{'index_special_region_no_insertcopying_titlepage_no_nodes_footnotes_default'}{'contents'}[5]{'contents'}[3]{'extra'}{'element_node'}
 = 
$result_trees{'index_special_region_no_insertcopying_titlepage_no_nodes_footnotes_default'}{'contents'}[4];
 
$result_trees{'index_special_region_no_insertcopying_titlepage_no_nodes_footnotes_default'}{'contents'}[5]{'contents'}[3]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'index_special_region_no_insertcopying_titlepage_no_nodes_footnotes_default'}{'contents'}[5]{'contents'}[3];
-$result_trees{'index_special_region_no_insertcopying_titlepage_no_nodes_footnotes_default'}{'contents'}[5]{'contents'}[5]{'extra'}{'entry_node'}
 = 
$result_trees{'index_special_region_no_insertcopying_titlepage_no_nodes_footnotes_default'}{'contents'}[4];
+$result_trees{'index_special_region_no_insertcopying_titlepage_no_nodes_footnotes_default'}{'contents'}[5]{'contents'}[5]{'extra'}{'element_node'}
 = 
$result_trees{'index_special_region_no_insertcopying_titlepage_no_nodes_footnotes_default'}{'contents'}[4];
 
$result_trees{'index_special_region_no_insertcopying_titlepage_no_nodes_footnotes_default'}{'contents'}[5]{'contents'}[5]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'index_special_region_no_insertcopying_titlepage_no_nodes_footnotes_default'}{'contents'}[5]{'contents'}[5];
 
$result_trees{'index_special_region_no_insertcopying_titlepage_no_nodes_footnotes_default'}{'contents'}[5]{'contents'}[7]{'contents'}[0]{'extra'}{'label'}
 = 
$result_trees{'index_special_region_no_insertcopying_titlepage_no_nodes_footnotes_default'}{'contents'}[0]{'contents'}[1]{'contents'}[0]{'contents'}[2];
 
$result_trees{'index_special_region_no_insertcopying_titlepage_no_nodes_footnotes_default'}{'contents'}[5]{'contents'}[7]{'contents'}[0]{'extra'}{'node_argument'}{'node_content'}[0]
 = 
$result_trees{'index_special_region_no_insertcopying_titlepage_no_nodes_footnotes_default'}{'contents'}[5]{'contents'}[7]{'contents'}[0]{'args'}[0]{'contents'}[0];
diff --git a/tp/t/results/indices/index_special_region_no_titlepage_no_nodes.pl 
b/tp/t/results/indices/index_special_region_no_titlepage_no_nodes.pl
index 7d228a1c3a..05449b10c5 100644
--- a/tp/t/results/indices/index_special_region_no_titlepage_no_nodes.pl
+++ b/tp/t/results/indices/index_special_region_no_titlepage_no_nodes.pl
@@ -64,7 +64,7 @@ $result_trees{'index_special_region_no_titlepage_no_nodes'} = 
{
                   ],
                   'cmdname' => 'cindex',
                   'extra' => {
-                    'entry_region' => 'copying',
+                    'element_region' => 'copying',
                     'index_entry' => {
                       'entry_element' => {},
                       'entry_number' => 1,
@@ -202,7 +202,7 @@ $result_trees{'index_special_region_no_titlepage_no_nodes'} 
= {
                               ],
                               'cmdname' => 'cindex',
                               'extra' => {
-                                'entry_region' => 'copying',
+                                'element_region' => 'copying',
                                 'index_entry' => {
                                   'entry_element' => {},
                                   'entry_number' => 2,
@@ -366,7 +366,7 @@ $result_trees{'index_special_region_no_titlepage_no_nodes'} 
= {
                   ],
                   'cmdname' => 'cindex',
                   'extra' => {
-                    'entry_region' => 'titlepage',
+                    'element_region' => 'titlepage',
                     'index_entry' => {
                       'entry_element' => {},
                       'entry_number' => 3,
@@ -497,7 +497,7 @@ $result_trees{'index_special_region_no_titlepage_no_nodes'} 
= {
                               ],
                               'cmdname' => 'cindex',
                               'extra' => {
-                                'entry_region' => 'titlepage',
+                                'element_region' => 'titlepage',
                                 'index_entry' => {
                                   'entry_element' => {},
                                   'entry_number' => 4,
@@ -786,7 +786,7 @@ $result_trees{'index_special_region_no_titlepage_no_nodes'} 
= {
           ],
           'cmdname' => 'findex',
           'extra' => {
-            'entry_node' => {},
+            'element_node' => {},
             'index_entry' => {
               'entry_element' => {},
               'entry_number' => 1,
@@ -1125,7 +1125,7 @@ 
$result_trees{'index_special_region_no_titlepage_no_nodes'} = {
                       ],
                       'cmdname' => 'item',
                       'extra' => {
-                        'entry_node' => {},
+                        'element_node' => {},
                         'index_entry' => {
                           'entry_element' => {},
                           'entry_number' => 2,
@@ -1416,7 +1416,7 @@ 
$result_trees{'index_special_region_no_titlepage_no_nodes'} = {
           ],
           'cmdname' => 'findex',
           'extra' => {
-            'entry_node' => {},
+            'element_node' => {},
             'index_entry' => {
               'entry_element' => {},
               'entry_number' => 3,
@@ -1460,7 +1460,7 @@ 
$result_trees{'index_special_region_no_titlepage_no_nodes'} = {
           ],
           'cmdname' => 'cindex',
           'extra' => {
-            'entry_node' => {},
+            'element_node' => {},
             'index_entry' => {
               'entry_element' => {},
               'entry_number' => 5,
@@ -1773,22 +1773,22 @@ 
$result_trees{'index_special_region_no_titlepage_no_nodes'}{'contents'}[0]{'cont
 
$result_trees{'index_special_region_no_titlepage_no_nodes'}{'contents'}[0]{'contents'}[1]{'contents'}[2]{'contents'}[5]{'contents'}[1]{'args'}[0]{'contents'}[4]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'index_special_region_no_titlepage_no_nodes'}{'contents'}[0]{'contents'}[1]{'contents'}[2]{'contents'}[5]{'contents'}[1]{'args'}[0]{'contents'}[4];
 
$result_trees{'index_special_region_no_titlepage_no_nodes'}{'contents'}[1]{'extra'}{'node_content'}[0]
 = 
$result_trees{'index_special_region_no_titlepage_no_nodes'}{'contents'}[1]{'args'}[0]{'contents'}[0];
 
$result_trees{'index_special_region_no_titlepage_no_nodes'}{'contents'}[1]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = 
$result_trees{'index_special_region_no_titlepage_no_nodes'}{'contents'}[1]{'args'}[0]{'contents'}[0];
-$result_trees{'index_special_region_no_titlepage_no_nodes'}{'contents'}[3]{'contents'}[5]{'extra'}{'entry_node'}
 = $result_trees{'index_special_region_no_titlepage_no_nodes'}{'contents'}[1];
+$result_trees{'index_special_region_no_titlepage_no_nodes'}{'contents'}[3]{'contents'}[5]{'extra'}{'element_node'}
 = $result_trees{'index_special_region_no_titlepage_no_nodes'}{'contents'}[1];
 
$result_trees{'index_special_region_no_titlepage_no_nodes'}{'contents'}[3]{'contents'}[5]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'index_special_region_no_titlepage_no_nodes'}{'contents'}[3]{'contents'}[5];
 
$result_trees{'index_special_region_no_titlepage_no_nodes'}{'contents'}[3]{'contents'}[8]{'contents'}[0]{'extra'}{'def_parsed_hash'}{'category'}
 = 
$result_trees{'index_special_region_no_titlepage_no_nodes'}{'contents'}[3]{'contents'}[8]{'contents'}[0]{'args'}[0]{'contents'}[0];
 
$result_trees{'index_special_region_no_titlepage_no_nodes'}{'contents'}[3]{'contents'}[8]{'contents'}[0]{'extra'}{'def_parsed_hash'}{'name'}
 = 
$result_trees{'index_special_region_no_titlepage_no_nodes'}{'contents'}[3]{'contents'}[8]{'contents'}[0]{'args'}[0]{'contents'}[2];
 
$result_trees{'index_special_region_no_titlepage_no_nodes'}{'contents'}[3]{'contents'}[8]{'contents'}[1]{'extra'}{'def_parsed_hash'}{'category'}
 = 
$result_trees{'index_special_region_no_titlepage_no_nodes'}{'contents'}[3]{'contents'}[8]{'contents'}[1]{'args'}[0]{'contents'}[0];
 
$result_trees{'index_special_region_no_titlepage_no_nodes'}{'contents'}[3]{'contents'}[8]{'contents'}[2]{'extra'}{'def_parsed_hash'}{'category'}
 = 
$result_trees{'index_special_region_no_titlepage_no_nodes'}{'contents'}[3]{'contents'}[8]{'contents'}[2]{'args'}[0]{'contents'}[0];
 
$result_trees{'index_special_region_no_titlepage_no_nodes'}{'contents'}[3]{'contents'}[8]{'contents'}[2]{'extra'}{'def_parsed_hash'}{'name'}
 = 
$result_trees{'index_special_region_no_titlepage_no_nodes'}{'contents'}[3]{'contents'}[8]{'contents'}[2]{'args'}[0]{'contents'}[2];
-$result_trees{'index_special_region_no_titlepage_no_nodes'}{'contents'}[3]{'contents'}[10]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'extra'}{'entry_node'}
 = $result_trees{'index_special_region_no_titlepage_no_nodes'}{'contents'}[1];
+$result_trees{'index_special_region_no_titlepage_no_nodes'}{'contents'}[3]{'contents'}[10]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'extra'}{'element_node'}
 = $result_trees{'index_special_region_no_titlepage_no_nodes'}{'contents'}[1];
 
$result_trees{'index_special_region_no_titlepage_no_nodes'}{'contents'}[3]{'contents'}[10]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'index_special_region_no_titlepage_no_nodes'}{'contents'}[3]{'contents'}[10]{'contents'}[1]{'contents'}[0]{'contents'}[0];
 
$result_trees{'index_special_region_no_titlepage_no_nodes'}{'contents'}[3]{'contents'}[10]{'extra'}{'command_as_argument'}
 = 
$result_trees{'index_special_region_no_titlepage_no_nodes'}{'contents'}[3]{'contents'}[10]{'args'}[0];
 
$result_trees{'index_special_region_no_titlepage_no_nodes'}{'contents'}[3]{'contents'}[12]{'contents'}[0]{'extra'}{'menu_entry_node_label'}{'node_content'}[0]
 = 
$result_trees{'index_special_region_no_titlepage_no_nodes'}{'contents'}[3]{'contents'}[12]{'contents'}[0]{'contents'}[1]{'contents'}[0];
 
$result_trees{'index_special_region_no_titlepage_no_nodes'}{'contents'}[4]{'extra'}{'node_content'}[0]
 = 
$result_trees{'index_special_region_no_titlepage_no_nodes'}{'contents'}[4]{'args'}[0]{'contents'}[0];
 
$result_trees{'index_special_region_no_titlepage_no_nodes'}{'contents'}[4]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = 
$result_trees{'index_special_region_no_titlepage_no_nodes'}{'contents'}[4]{'args'}[0]{'contents'}[0];
-$result_trees{'index_special_region_no_titlepage_no_nodes'}{'contents'}[5]{'contents'}[3]{'extra'}{'entry_node'}
 = $result_trees{'index_special_region_no_titlepage_no_nodes'}{'contents'}[4];
+$result_trees{'index_special_region_no_titlepage_no_nodes'}{'contents'}[5]{'contents'}[3]{'extra'}{'element_node'}
 = $result_trees{'index_special_region_no_titlepage_no_nodes'}{'contents'}[4];
 
$result_trees{'index_special_region_no_titlepage_no_nodes'}{'contents'}[5]{'contents'}[3]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'index_special_region_no_titlepage_no_nodes'}{'contents'}[5]{'contents'}[3];
-$result_trees{'index_special_region_no_titlepage_no_nodes'}{'contents'}[5]{'contents'}[5]{'extra'}{'entry_node'}
 = $result_trees{'index_special_region_no_titlepage_no_nodes'}{'contents'}[4];
+$result_trees{'index_special_region_no_titlepage_no_nodes'}{'contents'}[5]{'contents'}[5]{'extra'}{'element_node'}
 = $result_trees{'index_special_region_no_titlepage_no_nodes'}{'contents'}[4];
 
$result_trees{'index_special_region_no_titlepage_no_nodes'}{'contents'}[5]{'contents'}[5]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'index_special_region_no_titlepage_no_nodes'}{'contents'}[5]{'contents'}[5];
 
$result_trees{'index_special_region_no_titlepage_no_nodes'}{'contents'}[5]{'contents'}[7]{'contents'}[0]{'extra'}{'label'}
 = 
$result_trees{'index_special_region_no_titlepage_no_nodes'}{'contents'}[0]{'contents'}[1]{'contents'}[0]{'contents'}[2];
 
$result_trees{'index_special_region_no_titlepage_no_nodes'}{'contents'}[5]{'contents'}[7]{'contents'}[0]{'extra'}{'node_argument'}{'node_content'}[0]
 = 
$result_trees{'index_special_region_no_titlepage_no_nodes'}{'contents'}[5]{'contents'}[7]{'contents'}[0]{'args'}[0]{'contents'}[0];
diff --git a/tp/t/results/indices/index_special_region_titlepage_no_nodes.pl 
b/tp/t/results/indices/index_special_region_titlepage_no_nodes.pl
index e81f5a410f..042af72b47 100644
--- a/tp/t/results/indices/index_special_region_titlepage_no_nodes.pl
+++ b/tp/t/results/indices/index_special_region_titlepage_no_nodes.pl
@@ -64,7 +64,7 @@ $result_trees{'index_special_region_titlepage_no_nodes'} = {
                   ],
                   'cmdname' => 'cindex',
                   'extra' => {
-                    'entry_region' => 'copying',
+                    'element_region' => 'copying',
                     'index_entry' => {
                       'entry_element' => {},
                       'entry_number' => 1,
@@ -202,7 +202,7 @@ $result_trees{'index_special_region_titlepage_no_nodes'} = {
                               ],
                               'cmdname' => 'cindex',
                               'extra' => {
-                                'entry_region' => 'copying',
+                                'element_region' => 'copying',
                                 'index_entry' => {
                                   'entry_element' => {},
                                   'entry_number' => 2,
@@ -366,7 +366,7 @@ $result_trees{'index_special_region_titlepage_no_nodes'} = {
                   ],
                   'cmdname' => 'cindex',
                   'extra' => {
-                    'entry_region' => 'titlepage',
+                    'element_region' => 'titlepage',
                     'index_entry' => {
                       'entry_element' => {},
                       'entry_number' => 3,
@@ -497,7 +497,7 @@ $result_trees{'index_special_region_titlepage_no_nodes'} = {
                               ],
                               'cmdname' => 'cindex',
                               'extra' => {
-                                'entry_region' => 'titlepage',
+                                'element_region' => 'titlepage',
                                 'index_entry' => {
                                   'entry_element' => {},
                                   'entry_number' => 4,
@@ -786,7 +786,7 @@ $result_trees{'index_special_region_titlepage_no_nodes'} = {
           ],
           'cmdname' => 'findex',
           'extra' => {
-            'entry_node' => {},
+            'element_node' => {},
             'index_entry' => {
               'entry_element' => {},
               'entry_number' => 1,
@@ -1125,7 +1125,7 @@ $result_trees{'index_special_region_titlepage_no_nodes'} 
= {
                       ],
                       'cmdname' => 'item',
                       'extra' => {
-                        'entry_node' => {},
+                        'element_node' => {},
                         'index_entry' => {
                           'entry_element' => {},
                           'entry_number' => 2,
@@ -1416,7 +1416,7 @@ $result_trees{'index_special_region_titlepage_no_nodes'} 
= {
           ],
           'cmdname' => 'findex',
           'extra' => {
-            'entry_node' => {},
+            'element_node' => {},
             'index_entry' => {
               'entry_element' => {},
               'entry_number' => 3,
@@ -1460,7 +1460,7 @@ $result_trees{'index_special_region_titlepage_no_nodes'} 
= {
           ],
           'cmdname' => 'cindex',
           'extra' => {
-            'entry_node' => {},
+            'element_node' => {},
             'index_entry' => {
               'entry_element' => {},
               'entry_number' => 5,
@@ -1773,22 +1773,22 @@ 
$result_trees{'index_special_region_titlepage_no_nodes'}{'contents'}[0]{'content
 
$result_trees{'index_special_region_titlepage_no_nodes'}{'contents'}[0]{'contents'}[1]{'contents'}[2]{'contents'}[5]{'contents'}[1]{'args'}[0]{'contents'}[4]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'index_special_region_titlepage_no_nodes'}{'contents'}[0]{'contents'}[1]{'contents'}[2]{'contents'}[5]{'contents'}[1]{'args'}[0]{'contents'}[4];
 
$result_trees{'index_special_region_titlepage_no_nodes'}{'contents'}[1]{'extra'}{'node_content'}[0]
 = 
$result_trees{'index_special_region_titlepage_no_nodes'}{'contents'}[1]{'args'}[0]{'contents'}[0];
 
$result_trees{'index_special_region_titlepage_no_nodes'}{'contents'}[1]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = 
$result_trees{'index_special_region_titlepage_no_nodes'}{'contents'}[1]{'args'}[0]{'contents'}[0];
-$result_trees{'index_special_region_titlepage_no_nodes'}{'contents'}[3]{'contents'}[5]{'extra'}{'entry_node'}
 = $result_trees{'index_special_region_titlepage_no_nodes'}{'contents'}[1];
+$result_trees{'index_special_region_titlepage_no_nodes'}{'contents'}[3]{'contents'}[5]{'extra'}{'element_node'}
 = $result_trees{'index_special_region_titlepage_no_nodes'}{'contents'}[1];
 
$result_trees{'index_special_region_titlepage_no_nodes'}{'contents'}[3]{'contents'}[5]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'index_special_region_titlepage_no_nodes'}{'contents'}[3]{'contents'}[5];
 
$result_trees{'index_special_region_titlepage_no_nodes'}{'contents'}[3]{'contents'}[8]{'contents'}[0]{'extra'}{'def_parsed_hash'}{'category'}
 = 
$result_trees{'index_special_region_titlepage_no_nodes'}{'contents'}[3]{'contents'}[8]{'contents'}[0]{'args'}[0]{'contents'}[0];
 
$result_trees{'index_special_region_titlepage_no_nodes'}{'contents'}[3]{'contents'}[8]{'contents'}[0]{'extra'}{'def_parsed_hash'}{'name'}
 = 
$result_trees{'index_special_region_titlepage_no_nodes'}{'contents'}[3]{'contents'}[8]{'contents'}[0]{'args'}[0]{'contents'}[2];
 
$result_trees{'index_special_region_titlepage_no_nodes'}{'contents'}[3]{'contents'}[8]{'contents'}[1]{'extra'}{'def_parsed_hash'}{'category'}
 = 
$result_trees{'index_special_region_titlepage_no_nodes'}{'contents'}[3]{'contents'}[8]{'contents'}[1]{'args'}[0]{'contents'}[0];
 
$result_trees{'index_special_region_titlepage_no_nodes'}{'contents'}[3]{'contents'}[8]{'contents'}[2]{'extra'}{'def_parsed_hash'}{'category'}
 = 
$result_trees{'index_special_region_titlepage_no_nodes'}{'contents'}[3]{'contents'}[8]{'contents'}[2]{'args'}[0]{'contents'}[0];
 
$result_trees{'index_special_region_titlepage_no_nodes'}{'contents'}[3]{'contents'}[8]{'contents'}[2]{'extra'}{'def_parsed_hash'}{'name'}
 = 
$result_trees{'index_special_region_titlepage_no_nodes'}{'contents'}[3]{'contents'}[8]{'contents'}[2]{'args'}[0]{'contents'}[2];
-$result_trees{'index_special_region_titlepage_no_nodes'}{'contents'}[3]{'contents'}[10]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'extra'}{'entry_node'}
 = $result_trees{'index_special_region_titlepage_no_nodes'}{'contents'}[1];
+$result_trees{'index_special_region_titlepage_no_nodes'}{'contents'}[3]{'contents'}[10]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'extra'}{'element_node'}
 = $result_trees{'index_special_region_titlepage_no_nodes'}{'contents'}[1];
 
$result_trees{'index_special_region_titlepage_no_nodes'}{'contents'}[3]{'contents'}[10]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'index_special_region_titlepage_no_nodes'}{'contents'}[3]{'contents'}[10]{'contents'}[1]{'contents'}[0]{'contents'}[0];
 
$result_trees{'index_special_region_titlepage_no_nodes'}{'contents'}[3]{'contents'}[10]{'extra'}{'command_as_argument'}
 = 
$result_trees{'index_special_region_titlepage_no_nodes'}{'contents'}[3]{'contents'}[10]{'args'}[0];
 
$result_trees{'index_special_region_titlepage_no_nodes'}{'contents'}[3]{'contents'}[12]{'contents'}[0]{'extra'}{'menu_entry_node_label'}{'node_content'}[0]
 = 
$result_trees{'index_special_region_titlepage_no_nodes'}{'contents'}[3]{'contents'}[12]{'contents'}[0]{'contents'}[1]{'contents'}[0];
 
$result_trees{'index_special_region_titlepage_no_nodes'}{'contents'}[4]{'extra'}{'node_content'}[0]
 = 
$result_trees{'index_special_region_titlepage_no_nodes'}{'contents'}[4]{'args'}[0]{'contents'}[0];
 
$result_trees{'index_special_region_titlepage_no_nodes'}{'contents'}[4]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = 
$result_trees{'index_special_region_titlepage_no_nodes'}{'contents'}[4]{'args'}[0]{'contents'}[0];
-$result_trees{'index_special_region_titlepage_no_nodes'}{'contents'}[5]{'contents'}[3]{'extra'}{'entry_node'}
 = $result_trees{'index_special_region_titlepage_no_nodes'}{'contents'}[4];
+$result_trees{'index_special_region_titlepage_no_nodes'}{'contents'}[5]{'contents'}[3]{'extra'}{'element_node'}
 = $result_trees{'index_special_region_titlepage_no_nodes'}{'contents'}[4];
 
$result_trees{'index_special_region_titlepage_no_nodes'}{'contents'}[5]{'contents'}[3]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'index_special_region_titlepage_no_nodes'}{'contents'}[5]{'contents'}[3];
-$result_trees{'index_special_region_titlepage_no_nodes'}{'contents'}[5]{'contents'}[5]{'extra'}{'entry_node'}
 = $result_trees{'index_special_region_titlepage_no_nodes'}{'contents'}[4];
+$result_trees{'index_special_region_titlepage_no_nodes'}{'contents'}[5]{'contents'}[5]{'extra'}{'element_node'}
 = $result_trees{'index_special_region_titlepage_no_nodes'}{'contents'}[4];
 
$result_trees{'index_special_region_titlepage_no_nodes'}{'contents'}[5]{'contents'}[5]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'index_special_region_titlepage_no_nodes'}{'contents'}[5]{'contents'}[5];
 
$result_trees{'index_special_region_titlepage_no_nodes'}{'contents'}[5]{'contents'}[7]{'contents'}[0]{'extra'}{'label'}
 = 
$result_trees{'index_special_region_titlepage_no_nodes'}{'contents'}[0]{'contents'}[1]{'contents'}[0]{'contents'}[2];
 
$result_trees{'index_special_region_titlepage_no_nodes'}{'contents'}[5]{'contents'}[7]{'contents'}[0]{'extra'}{'node_argument'}{'node_content'}[0]
 = 
$result_trees{'index_special_region_titlepage_no_nodes'}{'contents'}[5]{'contents'}[7]{'contents'}[0]{'args'}[0]{'contents'}[0];
diff --git 
a/tp/t/results/indices/index_special_region_titlepage_no_nodes_footnotes_default.pl
 
b/tp/t/results/indices/index_special_region_titlepage_no_nodes_footnotes_default.pl
index 9842954525..eabdb416d7 100644
--- 
a/tp/t/results/indices/index_special_region_titlepage_no_nodes_footnotes_default.pl
+++ 
b/tp/t/results/indices/index_special_region_titlepage_no_nodes_footnotes_default.pl
@@ -64,7 +64,7 @@ 
$result_trees{'index_special_region_titlepage_no_nodes_footnotes_default'} = {
                   ],
                   'cmdname' => 'cindex',
                   'extra' => {
-                    'entry_region' => 'copying',
+                    'element_region' => 'copying',
                     'index_entry' => {
                       'entry_element' => {},
                       'entry_number' => 1,
@@ -202,7 +202,7 @@ 
$result_trees{'index_special_region_titlepage_no_nodes_footnotes_default'} = {
                               ],
                               'cmdname' => 'cindex',
                               'extra' => {
-                                'entry_region' => 'copying',
+                                'element_region' => 'copying',
                                 'index_entry' => {
                                   'entry_element' => {},
                                   'entry_number' => 2,
@@ -366,7 +366,7 @@ 
$result_trees{'index_special_region_titlepage_no_nodes_footnotes_default'} = {
                   ],
                   'cmdname' => 'cindex',
                   'extra' => {
-                    'entry_region' => 'titlepage',
+                    'element_region' => 'titlepage',
                     'index_entry' => {
                       'entry_element' => {},
                       'entry_number' => 3,
@@ -497,7 +497,7 @@ 
$result_trees{'index_special_region_titlepage_no_nodes_footnotes_default'} = {
                               ],
                               'cmdname' => 'cindex',
                               'extra' => {
-                                'entry_region' => 'titlepage',
+                                'element_region' => 'titlepage',
                                 'index_entry' => {
                                   'entry_element' => {},
                                   'entry_number' => 4,
@@ -786,7 +786,7 @@ 
$result_trees{'index_special_region_titlepage_no_nodes_footnotes_default'} = {
           ],
           'cmdname' => 'findex',
           'extra' => {
-            'entry_node' => {},
+            'element_node' => {},
             'index_entry' => {
               'entry_element' => {},
               'entry_number' => 1,
@@ -1125,7 +1125,7 @@ 
$result_trees{'index_special_region_titlepage_no_nodes_footnotes_default'} = {
                       ],
                       'cmdname' => 'item',
                       'extra' => {
-                        'entry_node' => {},
+                        'element_node' => {},
                         'index_entry' => {
                           'entry_element' => {},
                           'entry_number' => 2,
@@ -1416,7 +1416,7 @@ 
$result_trees{'index_special_region_titlepage_no_nodes_footnotes_default'} = {
           ],
           'cmdname' => 'findex',
           'extra' => {
-            'entry_node' => {},
+            'element_node' => {},
             'index_entry' => {
               'entry_element' => {},
               'entry_number' => 3,
@@ -1460,7 +1460,7 @@ 
$result_trees{'index_special_region_titlepage_no_nodes_footnotes_default'} = {
           ],
           'cmdname' => 'cindex',
           'extra' => {
-            'entry_node' => {},
+            'element_node' => {},
             'index_entry' => {
               'entry_element' => {},
               'entry_number' => 5,
@@ -1773,22 +1773,22 @@ 
$result_trees{'index_special_region_titlepage_no_nodes_footnotes_default'}{'cont
 
$result_trees{'index_special_region_titlepage_no_nodes_footnotes_default'}{'contents'}[0]{'contents'}[1]{'contents'}[2]{'contents'}[5]{'contents'}[1]{'args'}[0]{'contents'}[4]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'index_special_region_titlepage_no_nodes_footnotes_default'}{'contents'}[0]{'contents'}[1]{'contents'}[2]{'contents'}[5]{'contents'}[1]{'args'}[0]{'contents'}[4];
 
$result_trees{'index_special_region_titlepage_no_nodes_footnotes_default'}{'contents'}[1]{'extra'}{'node_content'}[0]
 = 
$result_trees{'index_special_region_titlepage_no_nodes_footnotes_default'}{'contents'}[1]{'args'}[0]{'contents'}[0];
 
$result_trees{'index_special_region_titlepage_no_nodes_footnotes_default'}{'contents'}[1]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = 
$result_trees{'index_special_region_titlepage_no_nodes_footnotes_default'}{'contents'}[1]{'args'}[0]{'contents'}[0];
-$result_trees{'index_special_region_titlepage_no_nodes_footnotes_default'}{'contents'}[3]{'contents'}[5]{'extra'}{'entry_node'}
 = 
$result_trees{'index_special_region_titlepage_no_nodes_footnotes_default'}{'contents'}[1];
+$result_trees{'index_special_region_titlepage_no_nodes_footnotes_default'}{'contents'}[3]{'contents'}[5]{'extra'}{'element_node'}
 = 
$result_trees{'index_special_region_titlepage_no_nodes_footnotes_default'}{'contents'}[1];
 
$result_trees{'index_special_region_titlepage_no_nodes_footnotes_default'}{'contents'}[3]{'contents'}[5]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'index_special_region_titlepage_no_nodes_footnotes_default'}{'contents'}[3]{'contents'}[5];
 
$result_trees{'index_special_region_titlepage_no_nodes_footnotes_default'}{'contents'}[3]{'contents'}[8]{'contents'}[0]{'extra'}{'def_parsed_hash'}{'category'}
 = 
$result_trees{'index_special_region_titlepage_no_nodes_footnotes_default'}{'contents'}[3]{'contents'}[8]{'contents'}[0]{'args'}[0]{'contents'}[0];
 
$result_trees{'index_special_region_titlepage_no_nodes_footnotes_default'}{'contents'}[3]{'contents'}[8]{'contents'}[0]{'extra'}{'def_parsed_hash'}{'name'}
 = 
$result_trees{'index_special_region_titlepage_no_nodes_footnotes_default'}{'contents'}[3]{'contents'}[8]{'contents'}[0]{'args'}[0]{'contents'}[2];
 
$result_trees{'index_special_region_titlepage_no_nodes_footnotes_default'}{'contents'}[3]{'contents'}[8]{'contents'}[1]{'extra'}{'def_parsed_hash'}{'category'}
 = 
$result_trees{'index_special_region_titlepage_no_nodes_footnotes_default'}{'contents'}[3]{'contents'}[8]{'contents'}[1]{'args'}[0]{'contents'}[0];
 
$result_trees{'index_special_region_titlepage_no_nodes_footnotes_default'}{'contents'}[3]{'contents'}[8]{'contents'}[2]{'extra'}{'def_parsed_hash'}{'category'}
 = 
$result_trees{'index_special_region_titlepage_no_nodes_footnotes_default'}{'contents'}[3]{'contents'}[8]{'contents'}[2]{'args'}[0]{'contents'}[0];
 
$result_trees{'index_special_region_titlepage_no_nodes_footnotes_default'}{'contents'}[3]{'contents'}[8]{'contents'}[2]{'extra'}{'def_parsed_hash'}{'name'}
 = 
$result_trees{'index_special_region_titlepage_no_nodes_footnotes_default'}{'contents'}[3]{'contents'}[8]{'contents'}[2]{'args'}[0]{'contents'}[2];
-$result_trees{'index_special_region_titlepage_no_nodes_footnotes_default'}{'contents'}[3]{'contents'}[10]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'extra'}{'entry_node'}
 = 
$result_trees{'index_special_region_titlepage_no_nodes_footnotes_default'}{'contents'}[1];
+$result_trees{'index_special_region_titlepage_no_nodes_footnotes_default'}{'contents'}[3]{'contents'}[10]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'extra'}{'element_node'}
 = 
$result_trees{'index_special_region_titlepage_no_nodes_footnotes_default'}{'contents'}[1];
 
$result_trees{'index_special_region_titlepage_no_nodes_footnotes_default'}{'contents'}[3]{'contents'}[10]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'index_special_region_titlepage_no_nodes_footnotes_default'}{'contents'}[3]{'contents'}[10]{'contents'}[1]{'contents'}[0]{'contents'}[0];
 
$result_trees{'index_special_region_titlepage_no_nodes_footnotes_default'}{'contents'}[3]{'contents'}[10]{'extra'}{'command_as_argument'}
 = 
$result_trees{'index_special_region_titlepage_no_nodes_footnotes_default'}{'contents'}[3]{'contents'}[10]{'args'}[0];
 
$result_trees{'index_special_region_titlepage_no_nodes_footnotes_default'}{'contents'}[3]{'contents'}[12]{'contents'}[0]{'extra'}{'menu_entry_node_label'}{'node_content'}[0]
 = 
$result_trees{'index_special_region_titlepage_no_nodes_footnotes_default'}{'contents'}[3]{'contents'}[12]{'contents'}[0]{'contents'}[1]{'contents'}[0];
 
$result_trees{'index_special_region_titlepage_no_nodes_footnotes_default'}{'contents'}[4]{'extra'}{'node_content'}[0]
 = 
$result_trees{'index_special_region_titlepage_no_nodes_footnotes_default'}{'contents'}[4]{'args'}[0]{'contents'}[0];
 
$result_trees{'index_special_region_titlepage_no_nodes_footnotes_default'}{'contents'}[4]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = 
$result_trees{'index_special_region_titlepage_no_nodes_footnotes_default'}{'contents'}[4]{'args'}[0]{'contents'}[0];
-$result_trees{'index_special_region_titlepage_no_nodes_footnotes_default'}{'contents'}[5]{'contents'}[3]{'extra'}{'entry_node'}
 = 
$result_trees{'index_special_region_titlepage_no_nodes_footnotes_default'}{'contents'}[4];
+$result_trees{'index_special_region_titlepage_no_nodes_footnotes_default'}{'contents'}[5]{'contents'}[3]{'extra'}{'element_node'}
 = 
$result_trees{'index_special_region_titlepage_no_nodes_footnotes_default'}{'contents'}[4];
 
$result_trees{'index_special_region_titlepage_no_nodes_footnotes_default'}{'contents'}[5]{'contents'}[3]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'index_special_region_titlepage_no_nodes_footnotes_default'}{'contents'}[5]{'contents'}[3];
-$result_trees{'index_special_region_titlepage_no_nodes_footnotes_default'}{'contents'}[5]{'contents'}[5]{'extra'}{'entry_node'}
 = 
$result_trees{'index_special_region_titlepage_no_nodes_footnotes_default'}{'contents'}[4];
+$result_trees{'index_special_region_titlepage_no_nodes_footnotes_default'}{'contents'}[5]{'contents'}[5]{'extra'}{'element_node'}
 = 
$result_trees{'index_special_region_titlepage_no_nodes_footnotes_default'}{'contents'}[4];
 
$result_trees{'index_special_region_titlepage_no_nodes_footnotes_default'}{'contents'}[5]{'contents'}[5]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'index_special_region_titlepage_no_nodes_footnotes_default'}{'contents'}[5]{'contents'}[5];
 
$result_trees{'index_special_region_titlepage_no_nodes_footnotes_default'}{'contents'}[5]{'contents'}[7]{'contents'}[0]{'extra'}{'label'}
 = 
$result_trees{'index_special_region_titlepage_no_nodes_footnotes_default'}{'contents'}[0]{'contents'}[1]{'contents'}[0]{'contents'}[2];
 
$result_trees{'index_special_region_titlepage_no_nodes_footnotes_default'}{'contents'}[5]{'contents'}[7]{'contents'}[0]{'extra'}{'node_argument'}{'node_content'}[0]
 = 
$result_trees{'index_special_region_titlepage_no_nodes_footnotes_default'}{'contents'}[5]{'contents'}[7]{'contents'}[0]{'args'}[0]{'contents'}[0];
diff --git a/tp/t/results/indices/index_split.pl 
b/tp/t/results/indices/index_split.pl
index cbe0852e7f..98549299a9 100644
--- a/tp/t/results/indices/index_split.pl
+++ b/tp/t/results/indices/index_split.pl
@@ -113,7 +113,7 @@ $result_trees{'index_split'} = {
           ],
           'cmdname' => 'cindex',
           'extra' => {
-            'entry_node' => {},
+            'element_node' => {},
             'index_entry' => {
               'entry_element' => {},
               'entry_number' => 1,
@@ -533,7 +533,7 @@ $result_trees{'index_split'} = {
               ],
               'cmdname' => 'cindex',
               'extra' => {
-                'entry_node' => {},
+                'element_node' => {},
                 'index_entry' => {
                   'entry_element' => {},
                   'entry_number' => 2,
@@ -572,7 +572,7 @@ $result_trees{'index_split'} = {
               ],
               'cmdname' => 'cindex',
               'extra' => {
-                'entry_node' => {},
+                'element_node' => {},
                 'index_entry' => {
                   'entry_element' => {},
                   'entry_number' => 3,
@@ -611,7 +611,7 @@ $result_trees{'index_split'} = {
               ],
               'cmdname' => 'findex',
               'extra' => {
-                'entry_node' => {},
+                'element_node' => {},
                 'index_entry' => {
                   'entry_element' => {},
                   'entry_number' => 1,
@@ -650,7 +650,7 @@ $result_trees{'index_split'} = {
               ],
               'cmdname' => 'cindex',
               'extra' => {
-                'entry_node' => {},
+                'element_node' => {},
                 'index_entry' => {
                   'entry_element' => {},
                   'entry_number' => 4,
@@ -775,7 +775,7 @@ $result_trees{'index_split'} = {
           ],
           'cmdname' => 'cindex',
           'extra' => {
-            'entry_node' => {},
+            'element_node' => {},
             'index_entry' => {
               'entry_element' => {},
               'entry_number' => 5,
@@ -865,7 +865,7 @@ $result_trees{'index_split'} = {
           ],
           'cmdname' => 'findex',
           'extra' => {
-            'entry_node' => {},
+            'element_node' => {},
             'index_entry' => {
               'entry_element' => {},
               'entry_number' => 2,
@@ -904,7 +904,7 @@ $result_trees{'index_split'} = {
           ],
           'cmdname' => 'cindex',
           'extra' => {
-            'entry_node' => {},
+            'element_node' => {},
             'index_entry' => {
               'entry_element' => {},
               'entry_number' => 6,
@@ -943,7 +943,7 @@ $result_trees{'index_split'} = {
           ],
           'cmdname' => 'findex',
           'extra' => {
-            'entry_node' => {},
+            'element_node' => {},
             'index_entry' => {
               'entry_element' => {},
               'entry_number' => 3,
@@ -1414,7 +1414,7 @@ $result_trees{'index_split'} = {
           ],
           'cmdname' => 'cindex',
           'extra' => {
-            'entry_node' => {},
+            'element_node' => {},
             'index_entry' => {
               'entry_element' => {},
               'entry_number' => 7,
@@ -1660,7 +1660,7 @@ $result_trees{'index_split'} = {
           ],
           'cmdname' => 'cindex',
           'extra' => {
-            'entry_node' => {},
+            'element_node' => {},
             'index_entry' => {
               'entry_element' => {},
               'entry_number' => 8,
@@ -1893,7 +1893,7 @@ $result_trees{'index_split'} = {
           ],
           'cmdname' => 'cindex',
           'extra' => {
-            'entry_node' => {},
+            'element_node' => {},
             'index_entry' => {
               'entry_element' => {},
               'entry_number' => 9,
@@ -1976,7 +1976,7 @@ $result_trees{'index_split'} = {
           ],
           'cmdname' => 'cindex',
           'extra' => {
-            'entry_node' => {},
+            'element_node' => {},
             'index_entry' => {
               'entry_element' => {},
               'entry_number' => 10,
@@ -2195,7 +2195,7 @@ $result_trees{'index_split'} = {
           ],
           'cmdname' => 'cindex',
           'extra' => {
-            'entry_node' => {},
+            'element_node' => {},
             'index_entry' => {
               'entry_element' => {},
               'entry_number' => 11,
@@ -2334,7 +2334,7 @@ $result_trees{'index_split'} = {
           ],
           'cmdname' => 'cindex',
           'extra' => {
-            'entry_node' => {},
+            'element_node' => {},
             'index_entry' => {
               'entry_element' => {},
               'entry_number' => 12,
@@ -2464,7 +2464,7 @@ $result_trees{'index_split'} = {
           ],
           'cmdname' => 'cindex',
           'extra' => {
-            'entry_node' => {},
+            'element_node' => {},
             'index_entry' => {
               'entry_element' => {},
               'entry_number' => 13,
@@ -2556,7 +2556,7 @@ $result_trees{'index_split'} = {
           ],
           'cmdname' => 'cindex',
           'extra' => {
-            'entry_node' => {},
+            'element_node' => {},
             'index_entry' => {
               'entry_element' => {},
               'entry_number' => 14,
@@ -2639,7 +2639,7 @@ $result_trees{'index_split'} = {
           ],
           'cmdname' => 'cindex',
           'extra' => {
-            'entry_node' => {},
+            'element_node' => {},
             'index_entry' => {
               'entry_element' => {},
               'entry_number' => 15,
@@ -2756,7 +2756,7 @@ $result_trees{'index_split'} = {
           ],
           'cmdname' => 'cindex',
           'extra' => {
-            'entry_node' => {},
+            'element_node' => {},
             'index_entry' => {
               'entry_element' => {},
               'entry_number' => 16,
@@ -2924,28 +2924,28 @@ $result_trees{'index_split'} = {
 };
 $result_trees{'index_split'}{'contents'}[1]{'extra'}{'node_content'}[0] = 
$result_trees{'index_split'}{'contents'}[1]{'args'}[0]{'contents'}[0];
 
$result_trees{'index_split'}{'contents'}[1]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = $result_trees{'index_split'}{'contents'}[1]{'args'}[0]{'contents'}[0];
-$result_trees{'index_split'}{'contents'}[2]{'contents'}[0]{'extra'}{'entry_node'}
 = $result_trees{'index_split'}{'contents'}[1];
+$result_trees{'index_split'}{'contents'}[2]{'contents'}[0]{'extra'}{'element_node'}
 = $result_trees{'index_split'}{'contents'}[1];
 
$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'}[10]{'contents'}[0]{'extra'}{'menu_entry_node_label'}{'node_content'}[0]
 = 
$result_trees{'index_split'}{'contents'}[2]{'contents'}[10]{'contents'}[0]{'contents'}[1]{'contents'}[0];
 
$result_trees{'index_split'}{'contents'}[2]{'contents'}[10]{'contents'}[1]{'extra'}{'menu_entry_node_label'}{'node_content'}[0]
 = 
$result_trees{'index_split'}{'contents'}[2]{'contents'}[10]{'contents'}[1]{'contents'}[1]{'contents'}[0];
 
$result_trees{'index_split'}{'contents'}[2]{'contents'}[10]{'contents'}[2]{'extra'}{'menu_entry_node_label'}{'node_content'}[0]
 = 
$result_trees{'index_split'}{'contents'}[2]{'contents'}[10]{'contents'}[2]{'contents'}[1]{'contents'}[0];
-$result_trees{'index_split'}{'contents'}[3]{'contents'}[1]{'contents'}[1]{'extra'}{'entry_node'}
 = $result_trees{'index_split'}{'contents'}[3];
+$result_trees{'index_split'}{'contents'}[3]{'contents'}[1]{'contents'}[1]{'extra'}{'element_node'}
 = $result_trees{'index_split'}{'contents'}[3];
 
$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'}[2]{'extra'}{'entry_node'}
 = $result_trees{'index_split'}{'contents'}[3];
+$result_trees{'index_split'}{'contents'}[3]{'contents'}[1]{'contents'}[2]{'extra'}{'element_node'}
 = $result_trees{'index_split'}{'contents'}[3];
 
$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'}[3]{'extra'}{'entry_node'}
 = $result_trees{'index_split'}{'contents'}[3];
+$result_trees{'index_split'}{'contents'}[3]{'contents'}[1]{'contents'}[3]{'extra'}{'element_node'}
 = $result_trees{'index_split'}{'contents'}[3];
 
$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'}[4]{'extra'}{'entry_node'}
 = $result_trees{'index_split'}{'contents'}[3];
+$result_trees{'index_split'}{'contents'}[3]{'contents'}[1]{'contents'}[4]{'extra'}{'element_node'}
 = $result_trees{'index_split'}{'contents'}[3];
 
$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'}[7]{'extra'}{'entry_node'}
 = $result_trees{'index_split'}{'contents'}[3];
+$result_trees{'index_split'}{'contents'}[3]{'contents'}[7]{'extra'}{'element_node'}
 = $result_trees{'index_split'}{'contents'}[3];
 
$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]{'extra'}{'node_content'}[0] = 
$result_trees{'index_split'}{'contents'}[3]{'args'}[0]{'contents'}[0];
 
$result_trees{'index_split'}{'contents'}[3]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = $result_trees{'index_split'}{'contents'}[3]{'args'}[0]{'contents'}[0];
-$result_trees{'index_split'}{'contents'}[4]{'contents'}[0]{'extra'}{'entry_node'}
 = $result_trees{'index_split'}{'contents'}[3];
+$result_trees{'index_split'}{'contents'}[4]{'contents'}[0]{'extra'}{'element_node'}
 = $result_trees{'index_split'}{'contents'}[3];
 
$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'}[1]{'extra'}{'entry_node'}
 = $result_trees{'index_split'}{'contents'}[3];
+$result_trees{'index_split'}{'contents'}[4]{'contents'}[1]{'extra'}{'element_node'}
 = $result_trees{'index_split'}{'contents'}[3];
 
$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'}[2]{'extra'}{'entry_node'}
 = $result_trees{'index_split'}{'contents'}[3];
+$result_trees{'index_split'}{'contents'}[4]{'contents'}[2]{'extra'}{'element_node'}
 = $result_trees{'index_split'}{'contents'}[3];
 
$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'}[4]{'contents'}[0]{'extra'}{'menu_entry_node_label'}{'node_content'}[0]
 = 
$result_trees{'index_split'}{'contents'}[4]{'contents'}[4]{'contents'}[0]{'contents'}[1]{'contents'}[0];
 
$result_trees{'index_split'}{'contents'}[4]{'contents'}[4]{'contents'}[1]{'extra'}{'menu_entry_node_label'}{'node_content'}[0]
 = 
$result_trees{'index_split'}{'contents'}[4]{'contents'}[4]{'contents'}[1]{'contents'}[1]{'contents'}[0];
@@ -2955,42 +2955,42 @@ 
$result_trees{'index_split'}{'contents'}[4]{'contents'}[4]{'contents'}[4]{'extra
 
$result_trees{'index_split'}{'contents'}[4]{'contents'}[4]{'contents'}[5]{'extra'}{'menu_entry_node_label'}{'node_content'}[0]
 = 
$result_trees{'index_split'}{'contents'}[4]{'contents'}[4]{'contents'}[5]{'contents'}[1]{'contents'}[0];
 $result_trees{'index_split'}{'contents'}[5]{'extra'}{'node_content'}[0] = 
$result_trees{'index_split'}{'contents'}[5]{'args'}[0]{'contents'}[0];
 
$result_trees{'index_split'}{'contents'}[5]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = $result_trees{'index_split'}{'contents'}[5]{'args'}[0]{'contents'}[0];
-$result_trees{'index_split'}{'contents'}[6]{'contents'}[1]{'extra'}{'entry_node'}
 = $result_trees{'index_split'}{'contents'}[5];
+$result_trees{'index_split'}{'contents'}[6]{'contents'}[1]{'extra'}{'element_node'}
 = $result_trees{'index_split'}{'contents'}[5];
 
$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'}[3]{'contents'}[0]{'extra'}{'menu_entry_node_label'}{'node_content'}[0]
 = 
$result_trees{'index_split'}{'contents'}[6]{'contents'}[3]{'contents'}[0]{'contents'}[1]{'contents'}[0];
 
$result_trees{'index_split'}{'contents'}[6]{'contents'}[3]{'contents'}[1]{'extra'}{'menu_entry_node_label'}{'node_content'}[0]
 = 
$result_trees{'index_split'}{'contents'}[6]{'contents'}[3]{'contents'}[1]{'contents'}[1]{'contents'}[0];
-$result_trees{'index_split'}{'contents'}[6]{'contents'}[8]{'extra'}{'entry_node'}
 = $result_trees{'index_split'}{'contents'}[5];
+$result_trees{'index_split'}{'contents'}[6]{'contents'}[8]{'extra'}{'element_node'}
 = $result_trees{'index_split'}{'contents'}[5];
 
$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'}[7]{'extra'}{'node_content'}[0] = 
$result_trees{'index_split'}{'contents'}[7]{'args'}[0]{'contents'}[0];
 
$result_trees{'index_split'}{'contents'}[7]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = $result_trees{'index_split'}{'contents'}[7]{'args'}[0]{'contents'}[0];
 $result_trees{'index_split'}{'contents'}[9]{'extra'}{'node_content'}[0] = 
$result_trees{'index_split'}{'contents'}[9]{'args'}[0]{'contents'}[0];
 
$result_trees{'index_split'}{'contents'}[9]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = $result_trees{'index_split'}{'contents'}[9]{'args'}[0]{'contents'}[0];
-$result_trees{'index_split'}{'contents'}[10]{'contents'}[3]{'extra'}{'entry_node'}
 = $result_trees{'index_split'}{'contents'}[9];
+$result_trees{'index_split'}{'contents'}[10]{'contents'}[3]{'extra'}{'element_node'}
 = $result_trees{'index_split'}{'contents'}[9];
 
$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'}[7]{'extra'}{'entry_node'}
 = $result_trees{'index_split'}{'contents'}[9];
+$result_trees{'index_split'}{'contents'}[10]{'contents'}[7]{'extra'}{'element_node'}
 = $result_trees{'index_split'}{'contents'}[9];
 
$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'}[11]{'extra'}{'node_content'}[0] = 
$result_trees{'index_split'}{'contents'}[11]{'args'}[0]{'contents'}[0];
 
$result_trees{'index_split'}{'contents'}[11]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = $result_trees{'index_split'}{'contents'}[11]{'args'}[0]{'contents'}[0];
 $result_trees{'index_split'}{'contents'}[13]{'extra'}{'node_content'}[0] = 
$result_trees{'index_split'}{'contents'}[13]{'args'}[0]{'contents'}[0];
 
$result_trees{'index_split'}{'contents'}[13]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = $result_trees{'index_split'}{'contents'}[13]{'args'}[0]{'contents'}[0];
-$result_trees{'index_split'}{'contents'}[14]{'contents'}[1]{'extra'}{'entry_node'}
 = $result_trees{'index_split'}{'contents'}[13];
+$result_trees{'index_split'}{'contents'}[14]{'contents'}[1]{'extra'}{'element_node'}
 = $result_trees{'index_split'}{'contents'}[13];
 
$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'}[15]{'contents'}[1]{'extra'}{'entry_node'}
 = $result_trees{'index_split'}{'contents'}[15];
+$result_trees{'index_split'}{'contents'}[15]{'contents'}[1]{'extra'}{'element_node'}
 = $result_trees{'index_split'}{'contents'}[15];
 
$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]{'extra'}{'node_content'}[0] = 
$result_trees{'index_split'}{'contents'}[15]{'args'}[0]{'contents'}[0];
 
$result_trees{'index_split'}{'contents'}[15]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = $result_trees{'index_split'}{'contents'}[15]{'args'}[0]{'contents'}[0];
 
$result_trees{'index_split'}{'contents'}[15]{'extra'}{'nodes_manuals'}[2]{'node_content'}[0]
 = $result_trees{'index_split'}{'contents'}[15]{'args'}[2]{'contents'}[0];
 
$result_trees{'index_split'}{'contents'}[15]{'extra'}{'nodes_manuals'}[3]{'node_content'}[0]
 = $result_trees{'index_split'}{'contents'}[15]{'args'}[3]{'contents'}[0];
-$result_trees{'index_split'}{'contents'}[16]{'contents'}[1]{'extra'}{'entry_node'}
 = $result_trees{'index_split'}{'contents'}[16];
+$result_trees{'index_split'}{'contents'}[16]{'contents'}[1]{'extra'}{'element_node'}
 = $result_trees{'index_split'}{'contents'}[16];
 
$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'}[6]{'extra'}{'entry_node'}
 = $result_trees{'index_split'}{'contents'}[16];
+$result_trees{'index_split'}{'contents'}[16]{'contents'}[6]{'extra'}{'element_node'}
 = $result_trees{'index_split'}{'contents'}[16];
 
$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'}[10]{'extra'}{'entry_node'}
 = $result_trees{'index_split'}{'contents'}[16];
+$result_trees{'index_split'}{'contents'}[16]{'contents'}[10]{'extra'}{'element_node'}
 = $result_trees{'index_split'}{'contents'}[16];
 
$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]{'extra'}{'node_content'}[0] = 
$result_trees{'index_split'}{'contents'}[16]{'args'}[0]{'contents'}[0];
 
$result_trees{'index_split'}{'contents'}[16]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = $result_trees{'index_split'}{'contents'}[16]{'args'}[0]{'contents'}[0];
 
$result_trees{'index_split'}{'contents'}[16]{'extra'}{'nodes_manuals'}[3]{'node_content'}[0]
 = $result_trees{'index_split'}{'contents'}[16]{'args'}[3]{'contents'}[0];
-$result_trees{'index_split'}{'contents'}[17]{'contents'}[1]{'extra'}{'entry_node'}
 = $result_trees{'index_split'}{'contents'}[17];
+$result_trees{'index_split'}{'contents'}[17]{'contents'}[1]{'extra'}{'element_node'}
 = $result_trees{'index_split'}{'contents'}[17];
 
$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]{'extra'}{'node_content'}[0] = 
$result_trees{'index_split'}{'contents'}[17]{'args'}[0]{'contents'}[0];
 
$result_trees{'index_split'}{'contents'}[17]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = $result_trees{'index_split'}{'contents'}[17]{'args'}[0]{'contents'}[0];
diff --git a/tp/t/results/indices/index_split_split_chapter_no_nodes.pl 
b/tp/t/results/indices/index_split_split_chapter_no_nodes.pl
index 8d944c035c..8f7b47f3f8 100644
--- a/tp/t/results/indices/index_split_split_chapter_no_nodes.pl
+++ b/tp/t/results/indices/index_split_split_chapter_no_nodes.pl
@@ -113,7 +113,7 @@ $result_trees{'index_split_split_chapter_no_nodes'} = {
           ],
           'cmdname' => 'cindex',
           'extra' => {
-            'entry_node' => {},
+            'element_node' => {},
             'index_entry' => {
               'entry_element' => {},
               'entry_number' => 1,
@@ -533,7 +533,7 @@ $result_trees{'index_split_split_chapter_no_nodes'} = {
               ],
               'cmdname' => 'cindex',
               'extra' => {
-                'entry_node' => {},
+                'element_node' => {},
                 'index_entry' => {
                   'entry_element' => {},
                   'entry_number' => 2,
@@ -572,7 +572,7 @@ $result_trees{'index_split_split_chapter_no_nodes'} = {
               ],
               'cmdname' => 'cindex',
               'extra' => {
-                'entry_node' => {},
+                'element_node' => {},
                 'index_entry' => {
                   'entry_element' => {},
                   'entry_number' => 3,
@@ -611,7 +611,7 @@ $result_trees{'index_split_split_chapter_no_nodes'} = {
               ],
               'cmdname' => 'findex',
               'extra' => {
-                'entry_node' => {},
+                'element_node' => {},
                 'index_entry' => {
                   'entry_element' => {},
                   'entry_number' => 1,
@@ -650,7 +650,7 @@ $result_trees{'index_split_split_chapter_no_nodes'} = {
               ],
               'cmdname' => 'cindex',
               'extra' => {
-                'entry_node' => {},
+                'element_node' => {},
                 'index_entry' => {
                   'entry_element' => {},
                   'entry_number' => 4,
@@ -775,7 +775,7 @@ $result_trees{'index_split_split_chapter_no_nodes'} = {
           ],
           'cmdname' => 'cindex',
           'extra' => {
-            'entry_node' => {},
+            'element_node' => {},
             'index_entry' => {
               'entry_element' => {},
               'entry_number' => 5,
@@ -865,7 +865,7 @@ $result_trees{'index_split_split_chapter_no_nodes'} = {
           ],
           'cmdname' => 'findex',
           'extra' => {
-            'entry_node' => {},
+            'element_node' => {},
             'index_entry' => {
               'entry_element' => {},
               'entry_number' => 2,
@@ -904,7 +904,7 @@ $result_trees{'index_split_split_chapter_no_nodes'} = {
           ],
           'cmdname' => 'cindex',
           'extra' => {
-            'entry_node' => {},
+            'element_node' => {},
             'index_entry' => {
               'entry_element' => {},
               'entry_number' => 6,
@@ -943,7 +943,7 @@ $result_trees{'index_split_split_chapter_no_nodes'} = {
           ],
           'cmdname' => 'findex',
           'extra' => {
-            'entry_node' => {},
+            'element_node' => {},
             'index_entry' => {
               'entry_element' => {},
               'entry_number' => 3,
@@ -1414,7 +1414,7 @@ $result_trees{'index_split_split_chapter_no_nodes'} = {
           ],
           'cmdname' => 'cindex',
           'extra' => {
-            'entry_node' => {},
+            'element_node' => {},
             'index_entry' => {
               'entry_element' => {},
               'entry_number' => 7,
@@ -1660,7 +1660,7 @@ $result_trees{'index_split_split_chapter_no_nodes'} = {
           ],
           'cmdname' => 'cindex',
           'extra' => {
-            'entry_node' => {},
+            'element_node' => {},
             'index_entry' => {
               'entry_element' => {},
               'entry_number' => 8,
@@ -1893,7 +1893,7 @@ $result_trees{'index_split_split_chapter_no_nodes'} = {
           ],
           'cmdname' => 'cindex',
           'extra' => {
-            'entry_node' => {},
+            'element_node' => {},
             'index_entry' => {
               'entry_element' => {},
               'entry_number' => 9,
@@ -1976,7 +1976,7 @@ $result_trees{'index_split_split_chapter_no_nodes'} = {
           ],
           'cmdname' => 'cindex',
           'extra' => {
-            'entry_node' => {},
+            'element_node' => {},
             'index_entry' => {
               'entry_element' => {},
               'entry_number' => 10,
@@ -2195,7 +2195,7 @@ $result_trees{'index_split_split_chapter_no_nodes'} = {
           ],
           'cmdname' => 'cindex',
           'extra' => {
-            'entry_node' => {},
+            'element_node' => {},
             'index_entry' => {
               'entry_element' => {},
               'entry_number' => 11,
@@ -2334,7 +2334,7 @@ $result_trees{'index_split_split_chapter_no_nodes'} = {
           ],
           'cmdname' => 'cindex',
           'extra' => {
-            'entry_node' => {},
+            'element_node' => {},
             'index_entry' => {
               'entry_element' => {},
               'entry_number' => 12,
@@ -2464,7 +2464,7 @@ $result_trees{'index_split_split_chapter_no_nodes'} = {
           ],
           'cmdname' => 'cindex',
           'extra' => {
-            'entry_node' => {},
+            'element_node' => {},
             'index_entry' => {
               'entry_element' => {},
               'entry_number' => 13,
@@ -2556,7 +2556,7 @@ $result_trees{'index_split_split_chapter_no_nodes'} = {
           ],
           'cmdname' => 'cindex',
           'extra' => {
-            'entry_node' => {},
+            'element_node' => {},
             'index_entry' => {
               'entry_element' => {},
               'entry_number' => 14,
@@ -2639,7 +2639,7 @@ $result_trees{'index_split_split_chapter_no_nodes'} = {
           ],
           'cmdname' => 'cindex',
           'extra' => {
-            'entry_node' => {},
+            'element_node' => {},
             'index_entry' => {
               'entry_element' => {},
               'entry_number' => 15,
@@ -2756,7 +2756,7 @@ $result_trees{'index_split_split_chapter_no_nodes'} = {
           ],
           'cmdname' => 'cindex',
           'extra' => {
-            'entry_node' => {},
+            'element_node' => {},
             'index_entry' => {
               'entry_element' => {},
               'entry_number' => 16,
@@ -2924,28 +2924,28 @@ $result_trees{'index_split_split_chapter_no_nodes'} = {
 };
 
$result_trees{'index_split_split_chapter_no_nodes'}{'contents'}[1]{'extra'}{'node_content'}[0]
 = 
$result_trees{'index_split_split_chapter_no_nodes'}{'contents'}[1]{'args'}[0]{'contents'}[0];
 
$result_trees{'index_split_split_chapter_no_nodes'}{'contents'}[1]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = 
$result_trees{'index_split_split_chapter_no_nodes'}{'contents'}[1]{'args'}[0]{'contents'}[0];
-$result_trees{'index_split_split_chapter_no_nodes'}{'contents'}[2]{'contents'}[0]{'extra'}{'entry_node'}
 = $result_trees{'index_split_split_chapter_no_nodes'}{'contents'}[1];
+$result_trees{'index_split_split_chapter_no_nodes'}{'contents'}[2]{'contents'}[0]{'extra'}{'element_node'}
 = $result_trees{'index_split_split_chapter_no_nodes'}{'contents'}[1];
 
$result_trees{'index_split_split_chapter_no_nodes'}{'contents'}[2]{'contents'}[0]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'index_split_split_chapter_no_nodes'}{'contents'}[2]{'contents'}[0];
 
$result_trees{'index_split_split_chapter_no_nodes'}{'contents'}[2]{'contents'}[10]{'contents'}[0]{'extra'}{'menu_entry_node_label'}{'node_content'}[0]
 = 
$result_trees{'index_split_split_chapter_no_nodes'}{'contents'}[2]{'contents'}[10]{'contents'}[0]{'contents'}[1]{'contents'}[0];
 
$result_trees{'index_split_split_chapter_no_nodes'}{'contents'}[2]{'contents'}[10]{'contents'}[1]{'extra'}{'menu_entry_node_label'}{'node_content'}[0]
 = 
$result_trees{'index_split_split_chapter_no_nodes'}{'contents'}[2]{'contents'}[10]{'contents'}[1]{'contents'}[1]{'contents'}[0];
 
$result_trees{'index_split_split_chapter_no_nodes'}{'contents'}[2]{'contents'}[10]{'contents'}[2]{'extra'}{'menu_entry_node_label'}{'node_content'}[0]
 = 
$result_trees{'index_split_split_chapter_no_nodes'}{'contents'}[2]{'contents'}[10]{'contents'}[2]{'contents'}[1]{'contents'}[0];
-$result_trees{'index_split_split_chapter_no_nodes'}{'contents'}[3]{'contents'}[1]{'contents'}[1]{'extra'}{'entry_node'}
 = $result_trees{'index_split_split_chapter_no_nodes'}{'contents'}[3];
+$result_trees{'index_split_split_chapter_no_nodes'}{'contents'}[3]{'contents'}[1]{'contents'}[1]{'extra'}{'element_node'}
 = $result_trees{'index_split_split_chapter_no_nodes'}{'contents'}[3];
 
$result_trees{'index_split_split_chapter_no_nodes'}{'contents'}[3]{'contents'}[1]{'contents'}[1]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'index_split_split_chapter_no_nodes'}{'contents'}[3]{'contents'}[1]{'contents'}[1];
-$result_trees{'index_split_split_chapter_no_nodes'}{'contents'}[3]{'contents'}[1]{'contents'}[2]{'extra'}{'entry_node'}
 = $result_trees{'index_split_split_chapter_no_nodes'}{'contents'}[3];
+$result_trees{'index_split_split_chapter_no_nodes'}{'contents'}[3]{'contents'}[1]{'contents'}[2]{'extra'}{'element_node'}
 = $result_trees{'index_split_split_chapter_no_nodes'}{'contents'}[3];
 
$result_trees{'index_split_split_chapter_no_nodes'}{'contents'}[3]{'contents'}[1]{'contents'}[2]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'index_split_split_chapter_no_nodes'}{'contents'}[3]{'contents'}[1]{'contents'}[2];
-$result_trees{'index_split_split_chapter_no_nodes'}{'contents'}[3]{'contents'}[1]{'contents'}[3]{'extra'}{'entry_node'}
 = $result_trees{'index_split_split_chapter_no_nodes'}{'contents'}[3];
+$result_trees{'index_split_split_chapter_no_nodes'}{'contents'}[3]{'contents'}[1]{'contents'}[3]{'extra'}{'element_node'}
 = $result_trees{'index_split_split_chapter_no_nodes'}{'contents'}[3];
 
$result_trees{'index_split_split_chapter_no_nodes'}{'contents'}[3]{'contents'}[1]{'contents'}[3]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'index_split_split_chapter_no_nodes'}{'contents'}[3]{'contents'}[1]{'contents'}[3];
-$result_trees{'index_split_split_chapter_no_nodes'}{'contents'}[3]{'contents'}[1]{'contents'}[4]{'extra'}{'entry_node'}
 = $result_trees{'index_split_split_chapter_no_nodes'}{'contents'}[3];
+$result_trees{'index_split_split_chapter_no_nodes'}{'contents'}[3]{'contents'}[1]{'contents'}[4]{'extra'}{'element_node'}
 = $result_trees{'index_split_split_chapter_no_nodes'}{'contents'}[3];
 
$result_trees{'index_split_split_chapter_no_nodes'}{'contents'}[3]{'contents'}[1]{'contents'}[4]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'index_split_split_chapter_no_nodes'}{'contents'}[3]{'contents'}[1]{'contents'}[4];
-$result_trees{'index_split_split_chapter_no_nodes'}{'contents'}[3]{'contents'}[7]{'extra'}{'entry_node'}
 = $result_trees{'index_split_split_chapter_no_nodes'}{'contents'}[3];
+$result_trees{'index_split_split_chapter_no_nodes'}{'contents'}[3]{'contents'}[7]{'extra'}{'element_node'}
 = $result_trees{'index_split_split_chapter_no_nodes'}{'contents'}[3];
 
$result_trees{'index_split_split_chapter_no_nodes'}{'contents'}[3]{'contents'}[7]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'index_split_split_chapter_no_nodes'}{'contents'}[3]{'contents'}[7];
 
$result_trees{'index_split_split_chapter_no_nodes'}{'contents'}[3]{'extra'}{'node_content'}[0]
 = 
$result_trees{'index_split_split_chapter_no_nodes'}{'contents'}[3]{'args'}[0]{'contents'}[0];
 
$result_trees{'index_split_split_chapter_no_nodes'}{'contents'}[3]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = 
$result_trees{'index_split_split_chapter_no_nodes'}{'contents'}[3]{'args'}[0]{'contents'}[0];
-$result_trees{'index_split_split_chapter_no_nodes'}{'contents'}[4]{'contents'}[0]{'extra'}{'entry_node'}
 = $result_trees{'index_split_split_chapter_no_nodes'}{'contents'}[3];
+$result_trees{'index_split_split_chapter_no_nodes'}{'contents'}[4]{'contents'}[0]{'extra'}{'element_node'}
 = $result_trees{'index_split_split_chapter_no_nodes'}{'contents'}[3];
 
$result_trees{'index_split_split_chapter_no_nodes'}{'contents'}[4]{'contents'}[0]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'index_split_split_chapter_no_nodes'}{'contents'}[4]{'contents'}[0];
-$result_trees{'index_split_split_chapter_no_nodes'}{'contents'}[4]{'contents'}[1]{'extra'}{'entry_node'}
 = $result_trees{'index_split_split_chapter_no_nodes'}{'contents'}[3];
+$result_trees{'index_split_split_chapter_no_nodes'}{'contents'}[4]{'contents'}[1]{'extra'}{'element_node'}
 = $result_trees{'index_split_split_chapter_no_nodes'}{'contents'}[3];
 
$result_trees{'index_split_split_chapter_no_nodes'}{'contents'}[4]{'contents'}[1]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'index_split_split_chapter_no_nodes'}{'contents'}[4]{'contents'}[1];
-$result_trees{'index_split_split_chapter_no_nodes'}{'contents'}[4]{'contents'}[2]{'extra'}{'entry_node'}
 = $result_trees{'index_split_split_chapter_no_nodes'}{'contents'}[3];
+$result_trees{'index_split_split_chapter_no_nodes'}{'contents'}[4]{'contents'}[2]{'extra'}{'element_node'}
 = $result_trees{'index_split_split_chapter_no_nodes'}{'contents'}[3];
 
$result_trees{'index_split_split_chapter_no_nodes'}{'contents'}[4]{'contents'}[2]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'index_split_split_chapter_no_nodes'}{'contents'}[4]{'contents'}[2];
 
$result_trees{'index_split_split_chapter_no_nodes'}{'contents'}[4]{'contents'}[4]{'contents'}[0]{'extra'}{'menu_entry_node_label'}{'node_content'}[0]
 = 
$result_trees{'index_split_split_chapter_no_nodes'}{'contents'}[4]{'contents'}[4]{'contents'}[0]{'contents'}[1]{'contents'}[0];
 
$result_trees{'index_split_split_chapter_no_nodes'}{'contents'}[4]{'contents'}[4]{'contents'}[1]{'extra'}{'menu_entry_node_label'}{'node_content'}[0]
 = 
$result_trees{'index_split_split_chapter_no_nodes'}{'contents'}[4]{'contents'}[4]{'contents'}[1]{'contents'}[1]{'contents'}[0];
@@ -2955,42 +2955,42 @@ 
$result_trees{'index_split_split_chapter_no_nodes'}{'contents'}[4]{'contents'}[4
 
$result_trees{'index_split_split_chapter_no_nodes'}{'contents'}[4]{'contents'}[4]{'contents'}[5]{'extra'}{'menu_entry_node_label'}{'node_content'}[0]
 = 
$result_trees{'index_split_split_chapter_no_nodes'}{'contents'}[4]{'contents'}[4]{'contents'}[5]{'contents'}[1]{'contents'}[0];
 
$result_trees{'index_split_split_chapter_no_nodes'}{'contents'}[5]{'extra'}{'node_content'}[0]
 = 
$result_trees{'index_split_split_chapter_no_nodes'}{'contents'}[5]{'args'}[0]{'contents'}[0];
 
$result_trees{'index_split_split_chapter_no_nodes'}{'contents'}[5]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = 
$result_trees{'index_split_split_chapter_no_nodes'}{'contents'}[5]{'args'}[0]{'contents'}[0];
-$result_trees{'index_split_split_chapter_no_nodes'}{'contents'}[6]{'contents'}[1]{'extra'}{'entry_node'}
 = $result_trees{'index_split_split_chapter_no_nodes'}{'contents'}[5];
+$result_trees{'index_split_split_chapter_no_nodes'}{'contents'}[6]{'contents'}[1]{'extra'}{'element_node'}
 = $result_trees{'index_split_split_chapter_no_nodes'}{'contents'}[5];
 
$result_trees{'index_split_split_chapter_no_nodes'}{'contents'}[6]{'contents'}[1]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'index_split_split_chapter_no_nodes'}{'contents'}[6]{'contents'}[1];
 
$result_trees{'index_split_split_chapter_no_nodes'}{'contents'}[6]{'contents'}[3]{'contents'}[0]{'extra'}{'menu_entry_node_label'}{'node_content'}[0]
 = 
$result_trees{'index_split_split_chapter_no_nodes'}{'contents'}[6]{'contents'}[3]{'contents'}[0]{'contents'}[1]{'contents'}[0];
 
$result_trees{'index_split_split_chapter_no_nodes'}{'contents'}[6]{'contents'}[3]{'contents'}[1]{'extra'}{'menu_entry_node_label'}{'node_content'}[0]
 = 
$result_trees{'index_split_split_chapter_no_nodes'}{'contents'}[6]{'contents'}[3]{'contents'}[1]{'contents'}[1]{'contents'}[0];
-$result_trees{'index_split_split_chapter_no_nodes'}{'contents'}[6]{'contents'}[8]{'extra'}{'entry_node'}
 = $result_trees{'index_split_split_chapter_no_nodes'}{'contents'}[5];
+$result_trees{'index_split_split_chapter_no_nodes'}{'contents'}[6]{'contents'}[8]{'extra'}{'element_node'}
 = $result_trees{'index_split_split_chapter_no_nodes'}{'contents'}[5];
 
$result_trees{'index_split_split_chapter_no_nodes'}{'contents'}[6]{'contents'}[8]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'index_split_split_chapter_no_nodes'}{'contents'}[6]{'contents'}[8];
 
$result_trees{'index_split_split_chapter_no_nodes'}{'contents'}[7]{'extra'}{'node_content'}[0]
 = 
$result_trees{'index_split_split_chapter_no_nodes'}{'contents'}[7]{'args'}[0]{'contents'}[0];
 
$result_trees{'index_split_split_chapter_no_nodes'}{'contents'}[7]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = 
$result_trees{'index_split_split_chapter_no_nodes'}{'contents'}[7]{'args'}[0]{'contents'}[0];
 
$result_trees{'index_split_split_chapter_no_nodes'}{'contents'}[9]{'extra'}{'node_content'}[0]
 = 
$result_trees{'index_split_split_chapter_no_nodes'}{'contents'}[9]{'args'}[0]{'contents'}[0];
 
$result_trees{'index_split_split_chapter_no_nodes'}{'contents'}[9]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = 
$result_trees{'index_split_split_chapter_no_nodes'}{'contents'}[9]{'args'}[0]{'contents'}[0];
-$result_trees{'index_split_split_chapter_no_nodes'}{'contents'}[10]{'contents'}[3]{'extra'}{'entry_node'}
 = $result_trees{'index_split_split_chapter_no_nodes'}{'contents'}[9];
+$result_trees{'index_split_split_chapter_no_nodes'}{'contents'}[10]{'contents'}[3]{'extra'}{'element_node'}
 = $result_trees{'index_split_split_chapter_no_nodes'}{'contents'}[9];
 
$result_trees{'index_split_split_chapter_no_nodes'}{'contents'}[10]{'contents'}[3]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'index_split_split_chapter_no_nodes'}{'contents'}[10]{'contents'}[3];
-$result_trees{'index_split_split_chapter_no_nodes'}{'contents'}[10]{'contents'}[7]{'extra'}{'entry_node'}
 = $result_trees{'index_split_split_chapter_no_nodes'}{'contents'}[9];
+$result_trees{'index_split_split_chapter_no_nodes'}{'contents'}[10]{'contents'}[7]{'extra'}{'element_node'}
 = $result_trees{'index_split_split_chapter_no_nodes'}{'contents'}[9];
 
$result_trees{'index_split_split_chapter_no_nodes'}{'contents'}[10]{'contents'}[7]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'index_split_split_chapter_no_nodes'}{'contents'}[10]{'contents'}[7];
 
$result_trees{'index_split_split_chapter_no_nodes'}{'contents'}[11]{'extra'}{'node_content'}[0]
 = 
$result_trees{'index_split_split_chapter_no_nodes'}{'contents'}[11]{'args'}[0]{'contents'}[0];
 
$result_trees{'index_split_split_chapter_no_nodes'}{'contents'}[11]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = 
$result_trees{'index_split_split_chapter_no_nodes'}{'contents'}[11]{'args'}[0]{'contents'}[0];
 
$result_trees{'index_split_split_chapter_no_nodes'}{'contents'}[13]{'extra'}{'node_content'}[0]
 = 
$result_trees{'index_split_split_chapter_no_nodes'}{'contents'}[13]{'args'}[0]{'contents'}[0];
 
$result_trees{'index_split_split_chapter_no_nodes'}{'contents'}[13]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = 
$result_trees{'index_split_split_chapter_no_nodes'}{'contents'}[13]{'args'}[0]{'contents'}[0];
-$result_trees{'index_split_split_chapter_no_nodes'}{'contents'}[14]{'contents'}[1]{'extra'}{'entry_node'}
 = $result_trees{'index_split_split_chapter_no_nodes'}{'contents'}[13];
+$result_trees{'index_split_split_chapter_no_nodes'}{'contents'}[14]{'contents'}[1]{'extra'}{'element_node'}
 = $result_trees{'index_split_split_chapter_no_nodes'}{'contents'}[13];
 
$result_trees{'index_split_split_chapter_no_nodes'}{'contents'}[14]{'contents'}[1]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'index_split_split_chapter_no_nodes'}{'contents'}[14]{'contents'}[1];
-$result_trees{'index_split_split_chapter_no_nodes'}{'contents'}[15]{'contents'}[1]{'extra'}{'entry_node'}
 = $result_trees{'index_split_split_chapter_no_nodes'}{'contents'}[15];
+$result_trees{'index_split_split_chapter_no_nodes'}{'contents'}[15]{'contents'}[1]{'extra'}{'element_node'}
 = $result_trees{'index_split_split_chapter_no_nodes'}{'contents'}[15];
 
$result_trees{'index_split_split_chapter_no_nodes'}{'contents'}[15]{'contents'}[1]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'index_split_split_chapter_no_nodes'}{'contents'}[15]{'contents'}[1];
 
$result_trees{'index_split_split_chapter_no_nodes'}{'contents'}[15]{'extra'}{'node_content'}[0]
 = 
$result_trees{'index_split_split_chapter_no_nodes'}{'contents'}[15]{'args'}[0]{'contents'}[0];
 
$result_trees{'index_split_split_chapter_no_nodes'}{'contents'}[15]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = 
$result_trees{'index_split_split_chapter_no_nodes'}{'contents'}[15]{'args'}[0]{'contents'}[0];
 
$result_trees{'index_split_split_chapter_no_nodes'}{'contents'}[15]{'extra'}{'nodes_manuals'}[2]{'node_content'}[0]
 = 
$result_trees{'index_split_split_chapter_no_nodes'}{'contents'}[15]{'args'}[2]{'contents'}[0];
 
$result_trees{'index_split_split_chapter_no_nodes'}{'contents'}[15]{'extra'}{'nodes_manuals'}[3]{'node_content'}[0]
 = 
$result_trees{'index_split_split_chapter_no_nodes'}{'contents'}[15]{'args'}[3]{'contents'}[0];
-$result_trees{'index_split_split_chapter_no_nodes'}{'contents'}[16]{'contents'}[1]{'extra'}{'entry_node'}
 = $result_trees{'index_split_split_chapter_no_nodes'}{'contents'}[16];
+$result_trees{'index_split_split_chapter_no_nodes'}{'contents'}[16]{'contents'}[1]{'extra'}{'element_node'}
 = $result_trees{'index_split_split_chapter_no_nodes'}{'contents'}[16];
 
$result_trees{'index_split_split_chapter_no_nodes'}{'contents'}[16]{'contents'}[1]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'index_split_split_chapter_no_nodes'}{'contents'}[16]{'contents'}[1];
-$result_trees{'index_split_split_chapter_no_nodes'}{'contents'}[16]{'contents'}[6]{'extra'}{'entry_node'}
 = $result_trees{'index_split_split_chapter_no_nodes'}{'contents'}[16];
+$result_trees{'index_split_split_chapter_no_nodes'}{'contents'}[16]{'contents'}[6]{'extra'}{'element_node'}
 = $result_trees{'index_split_split_chapter_no_nodes'}{'contents'}[16];
 
$result_trees{'index_split_split_chapter_no_nodes'}{'contents'}[16]{'contents'}[6]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'index_split_split_chapter_no_nodes'}{'contents'}[16]{'contents'}[6];
-$result_trees{'index_split_split_chapter_no_nodes'}{'contents'}[16]{'contents'}[10]{'extra'}{'entry_node'}
 = $result_trees{'index_split_split_chapter_no_nodes'}{'contents'}[16];
+$result_trees{'index_split_split_chapter_no_nodes'}{'contents'}[16]{'contents'}[10]{'extra'}{'element_node'}
 = $result_trees{'index_split_split_chapter_no_nodes'}{'contents'}[16];
 
$result_trees{'index_split_split_chapter_no_nodes'}{'contents'}[16]{'contents'}[10]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'index_split_split_chapter_no_nodes'}{'contents'}[16]{'contents'}[10];
 
$result_trees{'index_split_split_chapter_no_nodes'}{'contents'}[16]{'extra'}{'node_content'}[0]
 = 
$result_trees{'index_split_split_chapter_no_nodes'}{'contents'}[16]{'args'}[0]{'contents'}[0];
 
$result_trees{'index_split_split_chapter_no_nodes'}{'contents'}[16]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = 
$result_trees{'index_split_split_chapter_no_nodes'}{'contents'}[16]{'args'}[0]{'contents'}[0];
 
$result_trees{'index_split_split_chapter_no_nodes'}{'contents'}[16]{'extra'}{'nodes_manuals'}[3]{'node_content'}[0]
 = 
$result_trees{'index_split_split_chapter_no_nodes'}{'contents'}[16]{'args'}[3]{'contents'}[0];
-$result_trees{'index_split_split_chapter_no_nodes'}{'contents'}[17]{'contents'}[1]{'extra'}{'entry_node'}
 = $result_trees{'index_split_split_chapter_no_nodes'}{'contents'}[17];
+$result_trees{'index_split_split_chapter_no_nodes'}{'contents'}[17]{'contents'}[1]{'extra'}{'element_node'}
 = $result_trees{'index_split_split_chapter_no_nodes'}{'contents'}[17];
 
$result_trees{'index_split_split_chapter_no_nodes'}{'contents'}[17]{'contents'}[1]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'index_split_split_chapter_no_nodes'}{'contents'}[17]{'contents'}[1];
 
$result_trees{'index_split_split_chapter_no_nodes'}{'contents'}[17]{'extra'}{'node_content'}[0]
 = 
$result_trees{'index_split_split_chapter_no_nodes'}{'contents'}[17]{'args'}[0]{'contents'}[0];
 
$result_trees{'index_split_split_chapter_no_nodes'}{'contents'}[17]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = 
$result_trees{'index_split_split_chapter_no_nodes'}{'contents'}[17]{'args'}[0]{'contents'}[0];
diff --git a/tp/t/results/indices/index_table.pl 
b/tp/t/results/indices/index_table.pl
index 87be849b9b..693fdfade2 100644
--- a/tp/t/results/indices/index_table.pl
+++ b/tp/t/results/indices/index_table.pl
@@ -394,7 +394,7 @@ $result_trees{'index_table'} = {
           ],
           'cmdname' => 'cindex',
           'extra' => {
-            'entry_node' => {},
+            'element_node' => {},
             'index_entry' => {
               'entry_element' => {},
               'entry_number' => 1,
@@ -444,7 +444,7 @@ $result_trees{'index_table'} = {
               ],
               'cmdname' => 'cindex',
               'extra' => {
-                'entry_node' => {},
+                'element_node' => {},
                 'index_entry' => {
                   'entry_element' => {},
                   'entry_number' => 2,
@@ -534,7 +534,7 @@ $result_trees{'index_table'} = {
                       ],
                       'cmdname' => 'item',
                       'extra' => {
-                        'entry_node' => {},
+                        'element_node' => {},
                         'index_entry' => {
                           'entry_element' => {},
                           'entry_number' => 1,
@@ -572,7 +572,7 @@ $result_trees{'index_table'} = {
                       ],
                       'cmdname' => 'itemx',
                       'extra' => {
-                        'entry_node' => {},
+                        'element_node' => {},
                         'index_entry' => {
                           'entry_element' => {},
                           'entry_number' => 2,
@@ -724,7 +724,7 @@ $result_trees{'index_table'} = {
                       ],
                       'cmdname' => 'item',
                       'extra' => {
-                        'entry_node' => {},
+                        'element_node' => {},
                         'index_entry' => {
                           'entry_element' => {},
                           'entry_number' => 1,
@@ -762,7 +762,7 @@ $result_trees{'index_table'} = {
                       ],
                       'cmdname' => 'itemx',
                       'extra' => {
-                        'entry_node' => {},
+                        'element_node' => {},
                         'index_entry' => {
                           'entry_element' => {},
                           'entry_number' => 2,
@@ -824,7 +824,7 @@ $result_trees{'index_table'} = {
                       ],
                       'cmdname' => 'item',
                       'extra' => {
-                        'entry_node' => {},
+                        'element_node' => {},
                         'index_entry' => {
                           'entry_element' => {},
                           'entry_number' => 3,
@@ -1299,7 +1299,7 @@ $result_trees{'index_table'} = {
           ],
           'cmdname' => 'cindex',
           'extra' => {
-            'entry_node' => {},
+            'element_node' => {},
             'index_entry' => {
               'entry_element' => {},
               'entry_number' => 3,
@@ -1338,7 +1338,7 @@ $result_trees{'index_table'} = {
           ],
           'cmdname' => 'cindex',
           'extra' => {
-            'entry_node' => {},
+            'element_node' => {},
             'index_entry' => {
               'entry_element' => {},
               'entry_number' => 4,
@@ -1377,7 +1377,7 @@ $result_trees{'index_table'} = {
           ],
           'cmdname' => 'cindex',
           'extra' => {
-            'entry_node' => {},
+            'element_node' => {},
             'index_entry' => {
               'entry_element' => {},
               'entry_number' => 5,
@@ -1416,7 +1416,7 @@ $result_trees{'index_table'} = {
           ],
           'cmdname' => 'cindex',
           'extra' => {
-            'entry_node' => {},
+            'element_node' => {},
             'index_entry' => {
               'entry_element' => {},
               'entry_number' => 6,
@@ -1455,7 +1455,7 @@ $result_trees{'index_table'} = {
           ],
           'cmdname' => 'cindex',
           'extra' => {
-            'entry_node' => {},
+            'element_node' => {},
             'index_entry' => {
               'entry_element' => {},
               'entry_number' => 7,
@@ -1494,7 +1494,7 @@ $result_trees{'index_table'} = {
           ],
           'cmdname' => 'cindex',
           'extra' => {
-            'entry_node' => {},
+            'element_node' => {},
             'index_entry' => {
               'entry_element' => {},
               'entry_number' => 8,
@@ -1533,7 +1533,7 @@ $result_trees{'index_table'} = {
           ],
           'cmdname' => 'cindex',
           'extra' => {
-            'entry_node' => {},
+            'element_node' => {},
             'index_entry' => {
               'entry_element' => {},
               'entry_number' => 9,
@@ -1572,7 +1572,7 @@ $result_trees{'index_table'} = {
           ],
           'cmdname' => 'cindex',
           'extra' => {
-            'entry_node' => {},
+            'element_node' => {},
             'index_entry' => {
               'entry_element' => {},
               'entry_number' => 10,
@@ -1611,7 +1611,7 @@ $result_trees{'index_table'} = {
           ],
           'cmdname' => 'cindex',
           'extra' => {
-            'entry_node' => {},
+            'element_node' => {},
             'index_entry' => {
               'entry_element' => {},
               'entry_number' => 11,
@@ -1650,7 +1650,7 @@ $result_trees{'index_table'} = {
           ],
           'cmdname' => 'cindex',
           'extra' => {
-            'entry_node' => {},
+            'element_node' => {},
             'index_entry' => {
               'entry_element' => {},
               'entry_number' => 12,
@@ -1689,7 +1689,7 @@ $result_trees{'index_table'} = {
           ],
           'cmdname' => 'cindex',
           'extra' => {
-            'entry_node' => {},
+            'element_node' => {},
             'index_entry' => {
               'entry_element' => {},
               'entry_number' => 13,
@@ -1728,7 +1728,7 @@ $result_trees{'index_table'} = {
           ],
           'cmdname' => 'cindex',
           'extra' => {
-            'entry_node' => {},
+            'element_node' => {},
             'index_entry' => {
               'entry_element' => {},
               'entry_number' => 14,
@@ -1767,7 +1767,7 @@ $result_trees{'index_table'} = {
           ],
           'cmdname' => 'cindex',
           'extra' => {
-            'entry_node' => {},
+            'element_node' => {},
             'index_entry' => {
               'entry_element' => {},
               'entry_number' => 15,
@@ -1806,7 +1806,7 @@ $result_trees{'index_table'} = {
           ],
           'cmdname' => 'cindex',
           'extra' => {
-            'entry_node' => {},
+            'element_node' => {},
             'index_entry' => {
               'entry_element' => {},
               'entry_number' => 16,
@@ -1845,7 +1845,7 @@ $result_trees{'index_table'} = {
           ],
           'cmdname' => 'cindex',
           'extra' => {
-            'entry_node' => {},
+            'element_node' => {},
             'index_entry' => {
               'entry_element' => {},
               'entry_number' => 17,
@@ -1884,7 +1884,7 @@ $result_trees{'index_table'} = {
           ],
           'cmdname' => 'cindex',
           'extra' => {
-            'entry_node' => {},
+            'element_node' => {},
             'index_entry' => {
               'entry_element' => {},
               'entry_number' => 18,
@@ -1923,7 +1923,7 @@ $result_trees{'index_table'} = {
           ],
           'cmdname' => 'cindex',
           'extra' => {
-            'entry_node' => {},
+            'element_node' => {},
             'index_entry' => {
               'entry_element' => {},
               'entry_number' => 19,
@@ -1962,7 +1962,7 @@ $result_trees{'index_table'} = {
           ],
           'cmdname' => 'cindex',
           'extra' => {
-            'entry_node' => {},
+            'element_node' => {},
             'index_entry' => {
               'entry_element' => {},
               'entry_number' => 20,
@@ -2001,7 +2001,7 @@ $result_trees{'index_table'} = {
           ],
           'cmdname' => 'cindex',
           'extra' => {
-            'entry_node' => {},
+            'element_node' => {},
             'index_entry' => {
               'entry_element' => {},
               'entry_number' => 21,
@@ -2040,7 +2040,7 @@ $result_trees{'index_table'} = {
           ],
           'cmdname' => 'cindex',
           'extra' => {
-            'entry_node' => {},
+            'element_node' => {},
             'index_entry' => {
               'entry_element' => {},
               'entry_number' => 22,
@@ -2079,7 +2079,7 @@ $result_trees{'index_table'} = {
           ],
           'cmdname' => 'cindex',
           'extra' => {
-            'entry_node' => {},
+            'element_node' => {},
             'index_entry' => {
               'entry_element' => {},
               'entry_number' => 23,
@@ -2118,7 +2118,7 @@ $result_trees{'index_table'} = {
           ],
           'cmdname' => 'cindex',
           'extra' => {
-            'entry_node' => {},
+            'element_node' => {},
             'index_entry' => {
               'entry_element' => {},
               'entry_number' => 24,
@@ -2157,7 +2157,7 @@ $result_trees{'index_table'} = {
           ],
           'cmdname' => 'cindex',
           'extra' => {
-            'entry_node' => {},
+            'element_node' => {},
             'index_entry' => {
               'entry_element' => {},
               'entry_number' => 25,
@@ -2196,7 +2196,7 @@ $result_trees{'index_table'} = {
           ],
           'cmdname' => 'cindex',
           'extra' => {
-            'entry_node' => {},
+            'element_node' => {},
             'index_entry' => {
               'entry_element' => {},
               'entry_number' => 26,
@@ -2235,7 +2235,7 @@ $result_trees{'index_table'} = {
           ],
           'cmdname' => 'cindex',
           'extra' => {
-            'entry_node' => {},
+            'element_node' => {},
             'index_entry' => {
               'entry_element' => {},
               'entry_number' => 27,
@@ -2274,7 +2274,7 @@ $result_trees{'index_table'} = {
           ],
           'cmdname' => 'cindex',
           'extra' => {
-            'entry_node' => {},
+            'element_node' => {},
             'index_entry' => {
               'entry_element' => {},
               'entry_number' => 28,
@@ -2313,7 +2313,7 @@ $result_trees{'index_table'} = {
           ],
           'cmdname' => 'cindex',
           'extra' => {
-            'entry_node' => {},
+            'element_node' => {},
             'index_entry' => {
               'entry_element' => {},
               'entry_number' => 29,
@@ -2352,7 +2352,7 @@ $result_trees{'index_table'} = {
           ],
           'cmdname' => 'cindex',
           'extra' => {
-            'entry_node' => {},
+            'element_node' => {},
             'index_entry' => {
               'entry_element' => {},
               'entry_number' => 30,
@@ -2391,7 +2391,7 @@ $result_trees{'index_table'} = {
           ],
           'cmdname' => 'cindex',
           'extra' => {
-            'entry_node' => {},
+            'element_node' => {},
             'index_entry' => {
               'entry_element' => {},
               'entry_number' => 31,
@@ -2430,7 +2430,7 @@ $result_trees{'index_table'} = {
           ],
           'cmdname' => 'cindex',
           'extra' => {
-            'entry_node' => {},
+            'element_node' => {},
             'index_entry' => {
               'entry_element' => {},
               'entry_number' => 32,
@@ -2469,7 +2469,7 @@ $result_trees{'index_table'} = {
           ],
           'cmdname' => 'cindex',
           'extra' => {
-            'entry_node' => {},
+            'element_node' => {},
             'index_entry' => {
               'entry_element' => {},
               'entry_number' => 33,
@@ -2508,7 +2508,7 @@ $result_trees{'index_table'} = {
           ],
           'cmdname' => 'cindex',
           'extra' => {
-            'entry_node' => {},
+            'element_node' => {},
             'index_entry' => {
               'entry_element' => {},
               'entry_number' => 34,
@@ -2547,7 +2547,7 @@ $result_trees{'index_table'} = {
           ],
           'cmdname' => 'cindex',
           'extra' => {
-            'entry_node' => {},
+            'element_node' => {},
             'index_entry' => {
               'entry_element' => {},
               'entry_number' => 35,
@@ -2586,7 +2586,7 @@ $result_trees{'index_table'} = {
           ],
           'cmdname' => 'cindex',
           'extra' => {
-            'entry_node' => {},
+            'element_node' => {},
             'index_entry' => {
               'entry_element' => {},
               'entry_number' => 36,
@@ -2625,7 +2625,7 @@ $result_trees{'index_table'} = {
           ],
           'cmdname' => 'cindex',
           'extra' => {
-            'entry_node' => {},
+            'element_node' => {},
             'index_entry' => {
               'entry_element' => {},
               'entry_number' => 37,
@@ -2664,7 +2664,7 @@ $result_trees{'index_table'} = {
           ],
           'cmdname' => 'cindex',
           'extra' => {
-            'entry_node' => {},
+            'element_node' => {},
             'index_entry' => {
               'entry_element' => {},
               'entry_number' => 38,
@@ -2703,7 +2703,7 @@ $result_trees{'index_table'} = {
           ],
           'cmdname' => 'cindex',
           'extra' => {
-            'entry_node' => {},
+            'element_node' => {},
             'index_entry' => {
               'entry_element' => {},
               'entry_number' => 39,
@@ -2742,7 +2742,7 @@ $result_trees{'index_table'} = {
           ],
           'cmdname' => 'cindex',
           'extra' => {
-            'entry_node' => {},
+            'element_node' => {},
             'index_entry' => {
               'entry_element' => {},
               'entry_number' => 40,
@@ -2781,7 +2781,7 @@ $result_trees{'index_table'} = {
           ],
           'cmdname' => 'cindex',
           'extra' => {
-            'entry_node' => {},
+            'element_node' => {},
             'index_entry' => {
               'entry_element' => {},
               'entry_number' => 41,
@@ -2820,7 +2820,7 @@ $result_trees{'index_table'} = {
           ],
           'cmdname' => 'cindex',
           'extra' => {
-            'entry_node' => {},
+            'element_node' => {},
             'index_entry' => {
               'entry_element' => {},
               'entry_number' => 42,
@@ -2859,7 +2859,7 @@ $result_trees{'index_table'} = {
           ],
           'cmdname' => 'cindex',
           'extra' => {
-            'entry_node' => {},
+            'element_node' => {},
             'index_entry' => {
               'entry_element' => {},
               'entry_number' => 43,
@@ -2898,7 +2898,7 @@ $result_trees{'index_table'} = {
           ],
           'cmdname' => 'cindex',
           'extra' => {
-            'entry_node' => {},
+            'element_node' => {},
             'index_entry' => {
               'entry_element' => {},
               'entry_number' => 44,
@@ -2937,7 +2937,7 @@ $result_trees{'index_table'} = {
           ],
           'cmdname' => 'cindex',
           'extra' => {
-            'entry_node' => {},
+            'element_node' => {},
             'index_entry' => {
               'entry_element' => {},
               'entry_number' => 45,
@@ -2976,7 +2976,7 @@ $result_trees{'index_table'} = {
           ],
           'cmdname' => 'cindex',
           'extra' => {
-            'entry_node' => {},
+            'element_node' => {},
             'index_entry' => {
               'entry_element' => {},
               'entry_number' => 46,
@@ -3015,7 +3015,7 @@ $result_trees{'index_table'} = {
           ],
           'cmdname' => 'cindex',
           'extra' => {
-            'entry_node' => {},
+            'element_node' => {},
             'index_entry' => {
               'entry_element' => {},
               'entry_number' => 47,
@@ -3054,7 +3054,7 @@ $result_trees{'index_table'} = {
           ],
           'cmdname' => 'cindex',
           'extra' => {
-            'entry_node' => {},
+            'element_node' => {},
             'index_entry' => {
               'entry_element' => {},
               'entry_number' => 48,
@@ -3093,7 +3093,7 @@ $result_trees{'index_table'} = {
           ],
           'cmdname' => 'cindex',
           'extra' => {
-            'entry_node' => {},
+            'element_node' => {},
             'index_entry' => {
               'entry_element' => {},
               'entry_number' => 49,
@@ -3132,7 +3132,7 @@ $result_trees{'index_table'} = {
           ],
           'cmdname' => 'cindex',
           'extra' => {
-            'entry_node' => {},
+            'element_node' => {},
             'index_entry' => {
               'entry_element' => {},
               'entry_number' => 50,
@@ -3171,7 +3171,7 @@ $result_trees{'index_table'} = {
           ],
           'cmdname' => 'cindex',
           'extra' => {
-            'entry_node' => {},
+            'element_node' => {},
             'index_entry' => {
               'entry_element' => {},
               'entry_number' => 51,
@@ -3210,7 +3210,7 @@ $result_trees{'index_table'} = {
           ],
           'cmdname' => 'cindex',
           'extra' => {
-            'entry_node' => {},
+            'element_node' => {},
             'index_entry' => {
               'entry_element' => {},
               'entry_number' => 52,
@@ -3249,7 +3249,7 @@ $result_trees{'index_table'} = {
           ],
           'cmdname' => 'cindex',
           'extra' => {
-            'entry_node' => {},
+            'element_node' => {},
             'index_entry' => {
               'entry_element' => {},
               'entry_number' => 53,
@@ -3288,7 +3288,7 @@ $result_trees{'index_table'} = {
           ],
           'cmdname' => 'cindex',
           'extra' => {
-            'entry_node' => {},
+            'element_node' => {},
             'index_entry' => {
               'entry_element' => {},
               'entry_number' => 54,
@@ -3327,7 +3327,7 @@ $result_trees{'index_table'} = {
           ],
           'cmdname' => 'cindex',
           'extra' => {
-            'entry_node' => {},
+            'element_node' => {},
             'index_entry' => {
               'entry_element' => {},
               'entry_number' => 55,
@@ -3366,7 +3366,7 @@ $result_trees{'index_table'} = {
           ],
           'cmdname' => 'cindex',
           'extra' => {
-            'entry_node' => {},
+            'element_node' => {},
             'index_entry' => {
               'entry_element' => {},
               'entry_number' => 56,
@@ -3405,7 +3405,7 @@ $result_trees{'index_table'} = {
           ],
           'cmdname' => 'cindex',
           'extra' => {
-            'entry_node' => {},
+            'element_node' => {},
             'index_entry' => {
               'entry_element' => {},
               'entry_number' => 57,
@@ -3444,7 +3444,7 @@ $result_trees{'index_table'} = {
           ],
           'cmdname' => 'cindex',
           'extra' => {
-            'entry_node' => {},
+            'element_node' => {},
             'index_entry' => {
               'entry_element' => {},
               'entry_number' => 58,
@@ -3483,7 +3483,7 @@ $result_trees{'index_table'} = {
           ],
           'cmdname' => 'cindex',
           'extra' => {
-            'entry_node' => {},
+            'element_node' => {},
             'index_entry' => {
               'entry_element' => {},
               'entry_number' => 59,
@@ -3522,7 +3522,7 @@ $result_trees{'index_table'} = {
           ],
           'cmdname' => 'cindex',
           'extra' => {
-            'entry_node' => {},
+            'element_node' => {},
             'index_entry' => {
               'entry_element' => {},
               'entry_number' => 60,
@@ -3561,7 +3561,7 @@ $result_trees{'index_table'} = {
           ],
           'cmdname' => 'cindex',
           'extra' => {
-            'entry_node' => {},
+            'element_node' => {},
             'index_entry' => {
               'entry_element' => {},
               'entry_number' => 61,
@@ -3600,7 +3600,7 @@ $result_trees{'index_table'} = {
           ],
           'cmdname' => 'cindex',
           'extra' => {
-            'entry_node' => {},
+            'element_node' => {},
             'index_entry' => {
               'entry_element' => {},
               'entry_number' => 62,
@@ -3639,7 +3639,7 @@ $result_trees{'index_table'} = {
           ],
           'cmdname' => 'cindex',
           'extra' => {
-            'entry_node' => {},
+            'element_node' => {},
             'index_entry' => {
               'entry_element' => {},
               'entry_number' => 63,
@@ -3678,7 +3678,7 @@ $result_trees{'index_table'} = {
           ],
           'cmdname' => 'cindex',
           'extra' => {
-            'entry_node' => {},
+            'element_node' => {},
             'index_entry' => {
               'entry_element' => {},
               'entry_number' => 64,
@@ -3717,7 +3717,7 @@ $result_trees{'index_table'} = {
           ],
           'cmdname' => 'cindex',
           'extra' => {
-            'entry_node' => {},
+            'element_node' => {},
             'index_entry' => {
               'entry_element' => {},
               'entry_number' => 65,
@@ -3756,7 +3756,7 @@ $result_trees{'index_table'} = {
           ],
           'cmdname' => 'cindex',
           'extra' => {
-            'entry_node' => {},
+            'element_node' => {},
             'index_entry' => {
               'entry_element' => {},
               'entry_number' => 66,
@@ -3795,7 +3795,7 @@ $result_trees{'index_table'} = {
           ],
           'cmdname' => 'cindex',
           'extra' => {
-            'entry_node' => {},
+            'element_node' => {},
             'index_entry' => {
               'entry_element' => {},
               'entry_number' => 67,
@@ -3834,7 +3834,7 @@ $result_trees{'index_table'} = {
           ],
           'cmdname' => 'cindex',
           'extra' => {
-            'entry_node' => {},
+            'element_node' => {},
             'index_entry' => {
               'entry_element' => {},
               'entry_number' => 68,
@@ -3873,7 +3873,7 @@ $result_trees{'index_table'} = {
           ],
           'cmdname' => 'cindex',
           'extra' => {
-            'entry_node' => {},
+            'element_node' => {},
             'index_entry' => {
               'entry_element' => {},
               'entry_number' => 69,
@@ -3912,7 +3912,7 @@ $result_trees{'index_table'} = {
           ],
           'cmdname' => 'cindex',
           'extra' => {
-            'entry_node' => {},
+            'element_node' => {},
             'index_entry' => {
               'entry_element' => {},
               'entry_number' => 70,
@@ -3951,7 +3951,7 @@ $result_trees{'index_table'} = {
           ],
           'cmdname' => 'cindex',
           'extra' => {
-            'entry_node' => {},
+            'element_node' => {},
             'index_entry' => {
               'entry_element' => {},
               'entry_number' => 71,
@@ -3990,7 +3990,7 @@ $result_trees{'index_table'} = {
           ],
           'cmdname' => 'cindex',
           'extra' => {
-            'entry_node' => {},
+            'element_node' => {},
             'index_entry' => {
               'entry_element' => {},
               'entry_number' => 72,
@@ -4029,7 +4029,7 @@ $result_trees{'index_table'} = {
           ],
           'cmdname' => 'cindex',
           'extra' => {
-            'entry_node' => {},
+            'element_node' => {},
             'index_entry' => {
               'entry_element' => {},
               'entry_number' => 73,
@@ -4068,7 +4068,7 @@ $result_trees{'index_table'} = {
           ],
           'cmdname' => 'cindex',
           'extra' => {
-            'entry_node' => {},
+            'element_node' => {},
             'index_entry' => {
               'entry_element' => {},
               'entry_number' => 74,
@@ -4107,7 +4107,7 @@ $result_trees{'index_table'} = {
           ],
           'cmdname' => 'cindex',
           'extra' => {
-            'entry_node' => {},
+            'element_node' => {},
             'index_entry' => {
               'entry_element' => {},
               'entry_number' => 75,
@@ -4146,7 +4146,7 @@ $result_trees{'index_table'} = {
           ],
           'cmdname' => 'cindex',
           'extra' => {
-            'entry_node' => {},
+            'element_node' => {},
             'index_entry' => {
               'entry_element' => {},
               'entry_number' => 76,
@@ -4185,7 +4185,7 @@ $result_trees{'index_table'} = {
           ],
           'cmdname' => 'cindex',
           'extra' => {
-            'entry_node' => {},
+            'element_node' => {},
             'index_entry' => {
               'entry_element' => {},
               'entry_number' => 77,
@@ -4224,7 +4224,7 @@ $result_trees{'index_table'} = {
           ],
           'cmdname' => 'cindex',
           'extra' => {
-            'entry_node' => {},
+            'element_node' => {},
             'index_entry' => {
               'entry_element' => {},
               'entry_number' => 78,
@@ -4263,7 +4263,7 @@ $result_trees{'index_table'} = {
           ],
           'cmdname' => 'cindex',
           'extra' => {
-            'entry_node' => {},
+            'element_node' => {},
             'index_entry' => {
               'entry_element' => {},
               'entry_number' => 79,
@@ -4302,7 +4302,7 @@ $result_trees{'index_table'} = {
           ],
           'cmdname' => 'cindex',
           'extra' => {
-            'entry_node' => {},
+            'element_node' => {},
             'index_entry' => {
               'entry_element' => {},
               'entry_number' => 80,
@@ -4341,7 +4341,7 @@ $result_trees{'index_table'} = {
           ],
           'cmdname' => 'cindex',
           'extra' => {
-            'entry_node' => {},
+            'element_node' => {},
             'index_entry' => {
               'entry_element' => {},
               'entry_number' => 81,
@@ -4380,7 +4380,7 @@ $result_trees{'index_table'} = {
           ],
           'cmdname' => 'cindex',
           'extra' => {
-            'entry_node' => {},
+            'element_node' => {},
             'index_entry' => {
               'entry_element' => {},
               'entry_number' => 82,
@@ -4419,7 +4419,7 @@ $result_trees{'index_table'} = {
           ],
           'cmdname' => 'cindex',
           'extra' => {
-            'entry_node' => {},
+            'element_node' => {},
             'index_entry' => {
               'entry_element' => {},
               'entry_number' => 83,
@@ -4458,7 +4458,7 @@ $result_trees{'index_table'} = {
           ],
           'cmdname' => 'cindex',
           'extra' => {
-            'entry_node' => {},
+            'element_node' => {},
             'index_entry' => {
               'entry_element' => {},
               'entry_number' => 84,
@@ -4497,7 +4497,7 @@ $result_trees{'index_table'} = {
           ],
           'cmdname' => 'cindex',
           'extra' => {
-            'entry_node' => {},
+            'element_node' => {},
             'index_entry' => {
               'entry_element' => {},
               'entry_number' => 85,
@@ -4536,7 +4536,7 @@ $result_trees{'index_table'} = {
           ],
           'cmdname' => 'cindex',
           'extra' => {
-            'entry_node' => {},
+            'element_node' => {},
             'index_entry' => {
               'entry_element' => {},
               'entry_number' => 86,
@@ -4575,7 +4575,7 @@ $result_trees{'index_table'} = {
           ],
           'cmdname' => 'cindex',
           'extra' => {
-            'entry_node' => {},
+            'element_node' => {},
             'index_entry' => {
               'entry_element' => {},
               'entry_number' => 87,
@@ -4614,7 +4614,7 @@ $result_trees{'index_table'} = {
           ],
           'cmdname' => 'cindex',
           'extra' => {
-            'entry_node' => {},
+            'element_node' => {},
             'index_entry' => {
               'entry_element' => {},
               'entry_number' => 88,
@@ -4653,7 +4653,7 @@ $result_trees{'index_table'} = {
           ],
           'cmdname' => 'cindex',
           'extra' => {
-            'entry_node' => {},
+            'element_node' => {},
             'index_entry' => {
               'entry_element' => {},
               'entry_number' => 89,
@@ -4692,7 +4692,7 @@ $result_trees{'index_table'} = {
           ],
           'cmdname' => 'cindex',
           'extra' => {
-            'entry_node' => {},
+            'element_node' => {},
             'index_entry' => {
               'entry_element' => {},
               'entry_number' => 90,
@@ -4731,7 +4731,7 @@ $result_trees{'index_table'} = {
           ],
           'cmdname' => 'cindex',
           'extra' => {
-            'entry_node' => {},
+            'element_node' => {},
             'index_entry' => {
               'entry_element' => {},
               'entry_number' => 91,
@@ -4770,7 +4770,7 @@ $result_trees{'index_table'} = {
           ],
           'cmdname' => 'cindex',
           'extra' => {
-            'entry_node' => {},
+            'element_node' => {},
             'index_entry' => {
               'entry_element' => {},
               'entry_number' => 92,
@@ -4809,7 +4809,7 @@ $result_trees{'index_table'} = {
           ],
           'cmdname' => 'cindex',
           'extra' => {
-            'entry_node' => {},
+            'element_node' => {},
             'index_entry' => {
               'entry_element' => {},
               'entry_number' => 93,
@@ -4848,7 +4848,7 @@ $result_trees{'index_table'} = {
           ],
           'cmdname' => 'cindex',
           'extra' => {
-            'entry_node' => {},
+            'element_node' => {},
             'index_entry' => {
               'entry_element' => {},
               'entry_number' => 94,
@@ -4887,7 +4887,7 @@ $result_trees{'index_table'} = {
           ],
           'cmdname' => 'cindex',
           'extra' => {
-            'entry_node' => {},
+            'element_node' => {},
             'index_entry' => {
               'entry_element' => {},
               'entry_number' => 95,
@@ -4926,7 +4926,7 @@ $result_trees{'index_table'} = {
           ],
           'cmdname' => 'cindex',
           'extra' => {
-            'entry_node' => {},
+            'element_node' => {},
             'index_entry' => {
               'entry_element' => {},
               'entry_number' => 96,
@@ -4965,7 +4965,7 @@ $result_trees{'index_table'} = {
           ],
           'cmdname' => 'cindex',
           'extra' => {
-            'entry_node' => {},
+            'element_node' => {},
             'index_entry' => {
               'entry_element' => {},
               'entry_number' => 97,
@@ -5004,7 +5004,7 @@ $result_trees{'index_table'} = {
           ],
           'cmdname' => 'cindex',
           'extra' => {
-            'entry_node' => {},
+            'element_node' => {},
             'index_entry' => {
               'entry_element' => {},
               'entry_number' => 98,
@@ -5043,7 +5043,7 @@ $result_trees{'index_table'} = {
           ],
           'cmdname' => 'cindex',
           'extra' => {
-            'entry_node' => {},
+            'element_node' => {},
             'index_entry' => {
               'entry_element' => {},
               'entry_number' => 99,
@@ -5082,7 +5082,7 @@ $result_trees{'index_table'} = {
           ],
           'cmdname' => 'cindex',
           'extra' => {
-            'entry_node' => {},
+            'element_node' => {},
             'index_entry' => {
               'entry_element' => {},
               'entry_number' => 100,
@@ -5121,7 +5121,7 @@ $result_trees{'index_table'} = {
           ],
           'cmdname' => 'cindex',
           'extra' => {
-            'entry_node' => {},
+            'element_node' => {},
             'index_entry' => {
               'entry_element' => {},
               'entry_number' => 101,
@@ -5160,7 +5160,7 @@ $result_trees{'index_table'} = {
           ],
           'cmdname' => 'cindex',
           'extra' => {
-            'entry_node' => {},
+            'element_node' => {},
             'index_entry' => {
               'entry_element' => {},
               'entry_number' => 102,
@@ -5199,7 +5199,7 @@ $result_trees{'index_table'} = {
           ],
           'cmdname' => 'cindex',
           'extra' => {
-            'entry_node' => {},
+            'element_node' => {},
             'index_entry' => {
               'entry_element' => {},
               'entry_number' => 103,
@@ -5238,7 +5238,7 @@ $result_trees{'index_table'} = {
           ],
           'cmdname' => 'cindex',
           'extra' => {
-            'entry_node' => {},
+            'element_node' => {},
             'index_entry' => {
               'entry_element' => {},
               'entry_number' => 104,
@@ -5277,7 +5277,7 @@ $result_trees{'index_table'} = {
           ],
           'cmdname' => 'cindex',
           'extra' => {
-            'entry_node' => {},
+            'element_node' => {},
             'index_entry' => {
               'entry_element' => {},
               'entry_number' => 105,
@@ -5316,7 +5316,7 @@ $result_trees{'index_table'} = {
           ],
           'cmdname' => 'cindex',
           'extra' => {
-            'entry_node' => {},
+            'element_node' => {},
             'index_entry' => {
               'entry_element' => {},
               'entry_number' => 106,
@@ -5355,7 +5355,7 @@ $result_trees{'index_table'} = {
           ],
           'cmdname' => 'cindex',
           'extra' => {
-            'entry_node' => {},
+            'element_node' => {},
             'index_entry' => {
               'entry_element' => {},
               'entry_number' => 107,
@@ -5394,7 +5394,7 @@ $result_trees{'index_table'} = {
           ],
           'cmdname' => 'cindex',
           'extra' => {
-            'entry_node' => {},
+            'element_node' => {},
             'index_entry' => {
               'entry_element' => {},
               'entry_number' => 108,
@@ -5433,7 +5433,7 @@ $result_trees{'index_table'} = {
           ],
           'cmdname' => 'cindex',
           'extra' => {
-            'entry_node' => {},
+            'element_node' => {},
             'index_entry' => {
               'entry_element' => {},
               'entry_number' => 109,
@@ -5472,7 +5472,7 @@ $result_trees{'index_table'} = {
           ],
           'cmdname' => 'cindex',
           'extra' => {
-            'entry_node' => {},
+            'element_node' => {},
             'index_entry' => {
               'entry_element' => {},
               'entry_number' => 110,
@@ -5511,7 +5511,7 @@ $result_trees{'index_table'} = {
           ],
           'cmdname' => 'cindex',
           'extra' => {
-            'entry_node' => {},
+            'element_node' => {},
             'index_entry' => {
               'entry_element' => {},
               'entry_number' => 111,
@@ -5550,7 +5550,7 @@ $result_trees{'index_table'} = {
           ],
           'cmdname' => 'cindex',
           'extra' => {
-            'entry_node' => {},
+            'element_node' => {},
             'index_entry' => {
               'entry_element' => {},
               'entry_number' => 112,
@@ -5589,7 +5589,7 @@ $result_trees{'index_table'} = {
           ],
           'cmdname' => 'cindex',
           'extra' => {
-            'entry_node' => {},
+            'element_node' => {},
             'index_entry' => {
               'entry_element' => {},
               'entry_number' => 113,
@@ -5628,7 +5628,7 @@ $result_trees{'index_table'} = {
           ],
           'cmdname' => 'cindex',
           'extra' => {
-            'entry_node' => {},
+            'element_node' => {},
             'index_entry' => {
               'entry_element' => {},
               'entry_number' => 114,
@@ -5667,7 +5667,7 @@ $result_trees{'index_table'} = {
           ],
           'cmdname' => 'cindex',
           'extra' => {
-            'entry_node' => {},
+            'element_node' => {},
             'index_entry' => {
               'entry_element' => {},
               'entry_number' => 115,
@@ -5706,7 +5706,7 @@ $result_trees{'index_table'} = {
           ],
           'cmdname' => 'cindex',
           'extra' => {
-            'entry_node' => {},
+            'element_node' => {},
             'index_entry' => {
               'entry_element' => {},
               'entry_number' => 116,
@@ -5745,7 +5745,7 @@ $result_trees{'index_table'} = {
           ],
           'cmdname' => 'cindex',
           'extra' => {
-            'entry_node' => {},
+            'element_node' => {},
             'index_entry' => {
               'entry_element' => {},
               'entry_number' => 117,
@@ -5784,7 +5784,7 @@ $result_trees{'index_table'} = {
           ],
           'cmdname' => 'cindex',
           'extra' => {
-            'entry_node' => {},
+            'element_node' => {},
             'index_entry' => {
               'entry_element' => {},
               'entry_number' => 118,
@@ -5823,7 +5823,7 @@ $result_trees{'index_table'} = {
           ],
           'cmdname' => 'cindex',
           'extra' => {
-            'entry_node' => {},
+            'element_node' => {},
             'index_entry' => {
               'entry_element' => {},
               'entry_number' => 119,
@@ -5862,7 +5862,7 @@ $result_trees{'index_table'} = {
           ],
           'cmdname' => 'cindex',
           'extra' => {
-            'entry_node' => {},
+            'element_node' => {},
             'index_entry' => {
               'entry_element' => {},
               'entry_number' => 120,
@@ -5901,7 +5901,7 @@ $result_trees{'index_table'} = {
           ],
           'cmdname' => 'cindex',
           'extra' => {
-            'entry_node' => {},
+            'element_node' => {},
             'index_entry' => {
               'entry_element' => {},
               'entry_number' => 121,
@@ -5940,7 +5940,7 @@ $result_trees{'index_table'} = {
           ],
           'cmdname' => 'cindex',
           'extra' => {
-            'entry_node' => {},
+            'element_node' => {},
             'index_entry' => {
               'entry_element' => {},
               'entry_number' => 122,
@@ -5979,7 +5979,7 @@ $result_trees{'index_table'} = {
           ],
           'cmdname' => 'cindex',
           'extra' => {
-            'entry_node' => {},
+            'element_node' => {},
             'index_entry' => {
               'entry_element' => {},
               'entry_number' => 123,
@@ -6018,7 +6018,7 @@ $result_trees{'index_table'} = {
           ],
           'cmdname' => 'cindex',
           'extra' => {
-            'entry_node' => {},
+            'element_node' => {},
             'index_entry' => {
               'entry_element' => {},
               'entry_number' => 124,
@@ -6057,7 +6057,7 @@ $result_trees{'index_table'} = {
           ],
           'cmdname' => 'cindex',
           'extra' => {
-            'entry_node' => {},
+            'element_node' => {},
             'index_entry' => {
               'entry_element' => {},
               'entry_number' => 125,
@@ -6096,7 +6096,7 @@ $result_trees{'index_table'} = {
           ],
           'cmdname' => 'cindex',
           'extra' => {
-            'entry_node' => {},
+            'element_node' => {},
             'index_entry' => {
               'entry_element' => {},
               'entry_number' => 126,
@@ -6135,7 +6135,7 @@ $result_trees{'index_table'} = {
           ],
           'cmdname' => 'cindex',
           'extra' => {
-            'entry_node' => {},
+            'element_node' => {},
             'index_entry' => {
               'entry_element' => {},
               'entry_number' => 127,
@@ -6174,7 +6174,7 @@ $result_trees{'index_table'} = {
           ],
           'cmdname' => 'cindex',
           'extra' => {
-            'entry_node' => {},
+            'element_node' => {},
             'index_entry' => {
               'entry_element' => {},
               'entry_number' => 128,
@@ -6213,7 +6213,7 @@ $result_trees{'index_table'} = {
           ],
           'cmdname' => 'cindex',
           'extra' => {
-            'entry_node' => {},
+            'element_node' => {},
             'index_entry' => {
               'entry_element' => {},
               'entry_number' => 129,
@@ -6252,7 +6252,7 @@ $result_trees{'index_table'} = {
           ],
           'cmdname' => 'cindex',
           'extra' => {
-            'entry_node' => {},
+            'element_node' => {},
             'index_entry' => {
               'entry_element' => {},
               'entry_number' => 130,
@@ -6502,20 +6502,20 @@ 
$result_trees{'index_table'}{'contents'}[2]{'contents'}[0]{'contents'}[1]{'extra
 
$result_trees{'index_table'}{'contents'}[2]{'contents'}[0]{'contents'}[2]{'extra'}{'menu_entry_node_label'}{'node_content'}[0]
 = 
$result_trees{'index_table'}{'contents'}[2]{'contents'}[0]{'contents'}[2]{'contents'}[1]{'contents'}[0];
 $result_trees{'index_table'}{'contents'}[3]{'extra'}{'node_content'}[0] = 
$result_trees{'index_table'}{'contents'}[3]{'args'}[0]{'contents'}[0];
 
$result_trees{'index_table'}{'contents'}[3]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = $result_trees{'index_table'}{'contents'}[3]{'args'}[0]{'contents'}[0];
-$result_trees{'index_table'}{'contents'}[4]{'contents'}[1]{'extra'}{'entry_node'}
 = $result_trees{'index_table'}{'contents'}[3];
+$result_trees{'index_table'}{'contents'}[4]{'contents'}[1]{'extra'}{'element_node'}
 = $result_trees{'index_table'}{'contents'}[3];
 
$result_trees{'index_table'}{'contents'}[4]{'contents'}[1]{'extra'}{'index_entry'}{'entry_element'}
 = $result_trees{'index_table'}{'contents'}[4]{'contents'}[1];
-$result_trees{'index_table'}{'contents'}[4]{'contents'}[3]{'contents'}[1]{'extra'}{'entry_node'}
 = $result_trees{'index_table'}{'contents'}[3];
+$result_trees{'index_table'}{'contents'}[4]{'contents'}[3]{'contents'}[1]{'extra'}{'element_node'}
 = $result_trees{'index_table'}{'contents'}[3];
 
$result_trees{'index_table'}{'contents'}[4]{'contents'}[3]{'contents'}[1]{'extra'}{'index_entry'}{'entry_element'}
 = $result_trees{'index_table'}{'contents'}[4]{'contents'}[3]{'contents'}[1];
-$result_trees{'index_table'}{'contents'}[4]{'contents'}[7]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'extra'}{'entry_node'}
 = $result_trees{'index_table'}{'contents'}[3];
+$result_trees{'index_table'}{'contents'}[4]{'contents'}[7]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'extra'}{'element_node'}
 = $result_trees{'index_table'}{'contents'}[3];
 
$result_trees{'index_table'}{'contents'}[4]{'contents'}[7]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'index_table'}{'contents'}[4]{'contents'}[7]{'contents'}[0]{'contents'}[0]{'contents'}[0];
-$result_trees{'index_table'}{'contents'}[4]{'contents'}[7]{'contents'}[0]{'contents'}[0]{'contents'}[1]{'extra'}{'entry_node'}
 = $result_trees{'index_table'}{'contents'}[3];
+$result_trees{'index_table'}{'contents'}[4]{'contents'}[7]{'contents'}[0]{'contents'}[0]{'contents'}[1]{'extra'}{'element_node'}
 = $result_trees{'index_table'}{'contents'}[3];
 
$result_trees{'index_table'}{'contents'}[4]{'contents'}[7]{'contents'}[0]{'contents'}[0]{'contents'}[1]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'index_table'}{'contents'}[4]{'contents'}[7]{'contents'}[0]{'contents'}[0]{'contents'}[1];
 
$result_trees{'index_table'}{'contents'}[4]{'contents'}[7]{'extra'}{'command_as_argument'}
 = $result_trees{'index_table'}{'contents'}[4]{'contents'}[7]{'args'}[0];
-$result_trees{'index_table'}{'contents'}[4]{'contents'}[10]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'extra'}{'entry_node'}
 = $result_trees{'index_table'}{'contents'}[3];
+$result_trees{'index_table'}{'contents'}[4]{'contents'}[10]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'extra'}{'element_node'}
 = $result_trees{'index_table'}{'contents'}[3];
 
$result_trees{'index_table'}{'contents'}[4]{'contents'}[10]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'index_table'}{'contents'}[4]{'contents'}[10]{'contents'}[0]{'contents'}[0]{'contents'}[0];
-$result_trees{'index_table'}{'contents'}[4]{'contents'}[10]{'contents'}[0]{'contents'}[0]{'contents'}[1]{'extra'}{'entry_node'}
 = $result_trees{'index_table'}{'contents'}[3];
+$result_trees{'index_table'}{'contents'}[4]{'contents'}[10]{'contents'}[0]{'contents'}[0]{'contents'}[1]{'extra'}{'element_node'}
 = $result_trees{'index_table'}{'contents'}[3];
 
$result_trees{'index_table'}{'contents'}[4]{'contents'}[10]{'contents'}[0]{'contents'}[0]{'contents'}[1]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'index_table'}{'contents'}[4]{'contents'}[10]{'contents'}[0]{'contents'}[0]{'contents'}[1];
-$result_trees{'index_table'}{'contents'}[4]{'contents'}[10]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'extra'}{'entry_node'}
 = $result_trees{'index_table'}{'contents'}[3];
+$result_trees{'index_table'}{'contents'}[4]{'contents'}[10]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'extra'}{'element_node'}
 = $result_trees{'index_table'}{'contents'}[3];
 
$result_trees{'index_table'}{'contents'}[4]{'contents'}[10]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'index_table'}{'contents'}[4]{'contents'}[10]{'contents'}[1]{'contents'}[0]{'contents'}[0];
 
$result_trees{'index_table'}{'contents'}[4]{'contents'}[10]{'extra'}{'command_as_argument'}
 = $result_trees{'index_table'}{'contents'}[4]{'contents'}[10]{'args'}[0];
 $result_trees{'index_table'}{'contents'}[5]{'extra'}{'node_content'}[0] = 
$result_trees{'index_table'}{'contents'}[5]{'args'}[0]{'contents'}[0];
@@ -6523,261 +6523,261 @@ 
$result_trees{'index_table'}{'contents'}[5]{'extra'}{'nodes_manuals'}[0]{'node_c
 $result_trees{'index_table'}{'contents'}[7]{'extra'}{'node_content'}[0] = 
$result_trees{'index_table'}{'contents'}[7]{'args'}[0]{'contents'}[0];
 
$result_trees{'index_table'}{'contents'}[7]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = $result_trees{'index_table'}{'contents'}[7]{'args'}[0]{'contents'}[0];
 
$result_trees{'index_table'}{'contents'}[8]{'contents'}[0]{'contents'}[0]{'extra'}{'menu_entry_node_label'}{'node_content'}[0]
 = 
$result_trees{'index_table'}{'contents'}[8]{'contents'}[0]{'contents'}[0]{'contents'}[1]{'contents'}[0];
-$result_trees{'index_table'}{'contents'}[8]{'contents'}[1]{'extra'}{'entry_node'}
 = $result_trees{'index_table'}{'contents'}[7];
+$result_trees{'index_table'}{'contents'}[8]{'contents'}[1]{'extra'}{'element_node'}
 = $result_trees{'index_table'}{'contents'}[7];
 
$result_trees{'index_table'}{'contents'}[8]{'contents'}[1]{'extra'}{'index_entry'}{'entry_element'}
 = $result_trees{'index_table'}{'contents'}[8]{'contents'}[1];
-$result_trees{'index_table'}{'contents'}[8]{'contents'}[2]{'extra'}{'entry_node'}
 = $result_trees{'index_table'}{'contents'}[7];
+$result_trees{'index_table'}{'contents'}[8]{'contents'}[2]{'extra'}{'element_node'}
 = $result_trees{'index_table'}{'contents'}[7];
 
$result_trees{'index_table'}{'contents'}[8]{'contents'}[2]{'extra'}{'index_entry'}{'entry_element'}
 = $result_trees{'index_table'}{'contents'}[8]{'contents'}[2];
-$result_trees{'index_table'}{'contents'}[8]{'contents'}[3]{'extra'}{'entry_node'}
 = $result_trees{'index_table'}{'contents'}[7];
+$result_trees{'index_table'}{'contents'}[8]{'contents'}[3]{'extra'}{'element_node'}
 = $result_trees{'index_table'}{'contents'}[7];
 
$result_trees{'index_table'}{'contents'}[8]{'contents'}[3]{'extra'}{'index_entry'}{'entry_element'}
 = $result_trees{'index_table'}{'contents'}[8]{'contents'}[3];
-$result_trees{'index_table'}{'contents'}[8]{'contents'}[4]{'extra'}{'entry_node'}
 = $result_trees{'index_table'}{'contents'}[7];
+$result_trees{'index_table'}{'contents'}[8]{'contents'}[4]{'extra'}{'element_node'}
 = $result_trees{'index_table'}{'contents'}[7];
 
$result_trees{'index_table'}{'contents'}[8]{'contents'}[4]{'extra'}{'index_entry'}{'entry_element'}
 = $result_trees{'index_table'}{'contents'}[8]{'contents'}[4];
-$result_trees{'index_table'}{'contents'}[8]{'contents'}[5]{'extra'}{'entry_node'}
 = $result_trees{'index_table'}{'contents'}[7];
+$result_trees{'index_table'}{'contents'}[8]{'contents'}[5]{'extra'}{'element_node'}
 = $result_trees{'index_table'}{'contents'}[7];
 
$result_trees{'index_table'}{'contents'}[8]{'contents'}[5]{'extra'}{'index_entry'}{'entry_element'}
 = $result_trees{'index_table'}{'contents'}[8]{'contents'}[5];
-$result_trees{'index_table'}{'contents'}[8]{'contents'}[6]{'extra'}{'entry_node'}
 = $result_trees{'index_table'}{'contents'}[7];
+$result_trees{'index_table'}{'contents'}[8]{'contents'}[6]{'extra'}{'element_node'}
 = $result_trees{'index_table'}{'contents'}[7];
 
$result_trees{'index_table'}{'contents'}[8]{'contents'}[6]{'extra'}{'index_entry'}{'entry_element'}
 = $result_trees{'index_table'}{'contents'}[8]{'contents'}[6];
-$result_trees{'index_table'}{'contents'}[8]{'contents'}[7]{'extra'}{'entry_node'}
 = $result_trees{'index_table'}{'contents'}[7];
+$result_trees{'index_table'}{'contents'}[8]{'contents'}[7]{'extra'}{'element_node'}
 = $result_trees{'index_table'}{'contents'}[7];
 
$result_trees{'index_table'}{'contents'}[8]{'contents'}[7]{'extra'}{'index_entry'}{'entry_element'}
 = $result_trees{'index_table'}{'contents'}[8]{'contents'}[7];
-$result_trees{'index_table'}{'contents'}[8]{'contents'}[8]{'extra'}{'entry_node'}
 = $result_trees{'index_table'}{'contents'}[7];
+$result_trees{'index_table'}{'contents'}[8]{'contents'}[8]{'extra'}{'element_node'}
 = $result_trees{'index_table'}{'contents'}[7];
 
$result_trees{'index_table'}{'contents'}[8]{'contents'}[8]{'extra'}{'index_entry'}{'entry_element'}
 = $result_trees{'index_table'}{'contents'}[8]{'contents'}[8];
-$result_trees{'index_table'}{'contents'}[8]{'contents'}[9]{'extra'}{'entry_node'}
 = $result_trees{'index_table'}{'contents'}[7];
+$result_trees{'index_table'}{'contents'}[8]{'contents'}[9]{'extra'}{'element_node'}
 = $result_trees{'index_table'}{'contents'}[7];
 
$result_trees{'index_table'}{'contents'}[8]{'contents'}[9]{'extra'}{'index_entry'}{'entry_element'}
 = $result_trees{'index_table'}{'contents'}[8]{'contents'}[9];
-$result_trees{'index_table'}{'contents'}[8]{'contents'}[10]{'extra'}{'entry_node'}
 = $result_trees{'index_table'}{'contents'}[7];
+$result_trees{'index_table'}{'contents'}[8]{'contents'}[10]{'extra'}{'element_node'}
 = $result_trees{'index_table'}{'contents'}[7];
 
$result_trees{'index_table'}{'contents'}[8]{'contents'}[10]{'extra'}{'index_entry'}{'entry_element'}
 = $result_trees{'index_table'}{'contents'}[8]{'contents'}[10];
-$result_trees{'index_table'}{'contents'}[8]{'contents'}[11]{'extra'}{'entry_node'}
 = $result_trees{'index_table'}{'contents'}[7];
+$result_trees{'index_table'}{'contents'}[8]{'contents'}[11]{'extra'}{'element_node'}
 = $result_trees{'index_table'}{'contents'}[7];
 
$result_trees{'index_table'}{'contents'}[8]{'contents'}[11]{'extra'}{'index_entry'}{'entry_element'}
 = $result_trees{'index_table'}{'contents'}[8]{'contents'}[11];
-$result_trees{'index_table'}{'contents'}[8]{'contents'}[12]{'extra'}{'entry_node'}
 = $result_trees{'index_table'}{'contents'}[7];
+$result_trees{'index_table'}{'contents'}[8]{'contents'}[12]{'extra'}{'element_node'}
 = $result_trees{'index_table'}{'contents'}[7];
 
$result_trees{'index_table'}{'contents'}[8]{'contents'}[12]{'extra'}{'index_entry'}{'entry_element'}
 = $result_trees{'index_table'}{'contents'}[8]{'contents'}[12];
-$result_trees{'index_table'}{'contents'}[8]{'contents'}[13]{'extra'}{'entry_node'}
 = $result_trees{'index_table'}{'contents'}[7];
+$result_trees{'index_table'}{'contents'}[8]{'contents'}[13]{'extra'}{'element_node'}
 = $result_trees{'index_table'}{'contents'}[7];
 
$result_trees{'index_table'}{'contents'}[8]{'contents'}[13]{'extra'}{'index_entry'}{'entry_element'}
 = $result_trees{'index_table'}{'contents'}[8]{'contents'}[13];
-$result_trees{'index_table'}{'contents'}[8]{'contents'}[14]{'extra'}{'entry_node'}
 = $result_trees{'index_table'}{'contents'}[7];
+$result_trees{'index_table'}{'contents'}[8]{'contents'}[14]{'extra'}{'element_node'}
 = $result_trees{'index_table'}{'contents'}[7];
 
$result_trees{'index_table'}{'contents'}[8]{'contents'}[14]{'extra'}{'index_entry'}{'entry_element'}
 = $result_trees{'index_table'}{'contents'}[8]{'contents'}[14];
-$result_trees{'index_table'}{'contents'}[8]{'contents'}[15]{'extra'}{'entry_node'}
 = $result_trees{'index_table'}{'contents'}[7];
+$result_trees{'index_table'}{'contents'}[8]{'contents'}[15]{'extra'}{'element_node'}
 = $result_trees{'index_table'}{'contents'}[7];
 
$result_trees{'index_table'}{'contents'}[8]{'contents'}[15]{'extra'}{'index_entry'}{'entry_element'}
 = $result_trees{'index_table'}{'contents'}[8]{'contents'}[15];
-$result_trees{'index_table'}{'contents'}[8]{'contents'}[16]{'extra'}{'entry_node'}
 = $result_trees{'index_table'}{'contents'}[7];
+$result_trees{'index_table'}{'contents'}[8]{'contents'}[16]{'extra'}{'element_node'}
 = $result_trees{'index_table'}{'contents'}[7];
 
$result_trees{'index_table'}{'contents'}[8]{'contents'}[16]{'extra'}{'index_entry'}{'entry_element'}
 = $result_trees{'index_table'}{'contents'}[8]{'contents'}[16];
-$result_trees{'index_table'}{'contents'}[8]{'contents'}[17]{'extra'}{'entry_node'}
 = $result_trees{'index_table'}{'contents'}[7];
+$result_trees{'index_table'}{'contents'}[8]{'contents'}[17]{'extra'}{'element_node'}
 = $result_trees{'index_table'}{'contents'}[7];
 
$result_trees{'index_table'}{'contents'}[8]{'contents'}[17]{'extra'}{'index_entry'}{'entry_element'}
 = $result_trees{'index_table'}{'contents'}[8]{'contents'}[17];
-$result_trees{'index_table'}{'contents'}[8]{'contents'}[18]{'extra'}{'entry_node'}
 = $result_trees{'index_table'}{'contents'}[7];
+$result_trees{'index_table'}{'contents'}[8]{'contents'}[18]{'extra'}{'element_node'}
 = $result_trees{'index_table'}{'contents'}[7];
 
$result_trees{'index_table'}{'contents'}[8]{'contents'}[18]{'extra'}{'index_entry'}{'entry_element'}
 = $result_trees{'index_table'}{'contents'}[8]{'contents'}[18];
-$result_trees{'index_table'}{'contents'}[8]{'contents'}[19]{'extra'}{'entry_node'}
 = $result_trees{'index_table'}{'contents'}[7];
+$result_trees{'index_table'}{'contents'}[8]{'contents'}[19]{'extra'}{'element_node'}
 = $result_trees{'index_table'}{'contents'}[7];
 
$result_trees{'index_table'}{'contents'}[8]{'contents'}[19]{'extra'}{'index_entry'}{'entry_element'}
 = $result_trees{'index_table'}{'contents'}[8]{'contents'}[19];
-$result_trees{'index_table'}{'contents'}[8]{'contents'}[20]{'extra'}{'entry_node'}
 = $result_trees{'index_table'}{'contents'}[7];
+$result_trees{'index_table'}{'contents'}[8]{'contents'}[20]{'extra'}{'element_node'}
 = $result_trees{'index_table'}{'contents'}[7];
 
$result_trees{'index_table'}{'contents'}[8]{'contents'}[20]{'extra'}{'index_entry'}{'entry_element'}
 = $result_trees{'index_table'}{'contents'}[8]{'contents'}[20];
-$result_trees{'index_table'}{'contents'}[8]{'contents'}[21]{'extra'}{'entry_node'}
 = $result_trees{'index_table'}{'contents'}[7];
+$result_trees{'index_table'}{'contents'}[8]{'contents'}[21]{'extra'}{'element_node'}
 = $result_trees{'index_table'}{'contents'}[7];
 
$result_trees{'index_table'}{'contents'}[8]{'contents'}[21]{'extra'}{'index_entry'}{'entry_element'}
 = $result_trees{'index_table'}{'contents'}[8]{'contents'}[21];
-$result_trees{'index_table'}{'contents'}[8]{'contents'}[22]{'extra'}{'entry_node'}
 = $result_trees{'index_table'}{'contents'}[7];
+$result_trees{'index_table'}{'contents'}[8]{'contents'}[22]{'extra'}{'element_node'}
 = $result_trees{'index_table'}{'contents'}[7];
 
$result_trees{'index_table'}{'contents'}[8]{'contents'}[22]{'extra'}{'index_entry'}{'entry_element'}
 = $result_trees{'index_table'}{'contents'}[8]{'contents'}[22];
-$result_trees{'index_table'}{'contents'}[8]{'contents'}[23]{'extra'}{'entry_node'}
 = $result_trees{'index_table'}{'contents'}[7];
+$result_trees{'index_table'}{'contents'}[8]{'contents'}[23]{'extra'}{'element_node'}
 = $result_trees{'index_table'}{'contents'}[7];
 
$result_trees{'index_table'}{'contents'}[8]{'contents'}[23]{'extra'}{'index_entry'}{'entry_element'}
 = $result_trees{'index_table'}{'contents'}[8]{'contents'}[23];
-$result_trees{'index_table'}{'contents'}[8]{'contents'}[24]{'extra'}{'entry_node'}
 = $result_trees{'index_table'}{'contents'}[7];
+$result_trees{'index_table'}{'contents'}[8]{'contents'}[24]{'extra'}{'element_node'}
 = $result_trees{'index_table'}{'contents'}[7];
 
$result_trees{'index_table'}{'contents'}[8]{'contents'}[24]{'extra'}{'index_entry'}{'entry_element'}
 = $result_trees{'index_table'}{'contents'}[8]{'contents'}[24];
-$result_trees{'index_table'}{'contents'}[8]{'contents'}[25]{'extra'}{'entry_node'}
 = $result_trees{'index_table'}{'contents'}[7];
+$result_trees{'index_table'}{'contents'}[8]{'contents'}[25]{'extra'}{'element_node'}
 = $result_trees{'index_table'}{'contents'}[7];
 
$result_trees{'index_table'}{'contents'}[8]{'contents'}[25]{'extra'}{'index_entry'}{'entry_element'}
 = $result_trees{'index_table'}{'contents'}[8]{'contents'}[25];
-$result_trees{'index_table'}{'contents'}[8]{'contents'}[26]{'extra'}{'entry_node'}
 = $result_trees{'index_table'}{'contents'}[7];
+$result_trees{'index_table'}{'contents'}[8]{'contents'}[26]{'extra'}{'element_node'}
 = $result_trees{'index_table'}{'contents'}[7];
 
$result_trees{'index_table'}{'contents'}[8]{'contents'}[26]{'extra'}{'index_entry'}{'entry_element'}
 = $result_trees{'index_table'}{'contents'}[8]{'contents'}[26];
-$result_trees{'index_table'}{'contents'}[8]{'contents'}[27]{'extra'}{'entry_node'}
 = $result_trees{'index_table'}{'contents'}[7];
+$result_trees{'index_table'}{'contents'}[8]{'contents'}[27]{'extra'}{'element_node'}
 = $result_trees{'index_table'}{'contents'}[7];
 
$result_trees{'index_table'}{'contents'}[8]{'contents'}[27]{'extra'}{'index_entry'}{'entry_element'}
 = $result_trees{'index_table'}{'contents'}[8]{'contents'}[27];
-$result_trees{'index_table'}{'contents'}[8]{'contents'}[28]{'extra'}{'entry_node'}
 = $result_trees{'index_table'}{'contents'}[7];
+$result_trees{'index_table'}{'contents'}[8]{'contents'}[28]{'extra'}{'element_node'}
 = $result_trees{'index_table'}{'contents'}[7];
 
$result_trees{'index_table'}{'contents'}[8]{'contents'}[28]{'extra'}{'index_entry'}{'entry_element'}
 = $result_trees{'index_table'}{'contents'}[8]{'contents'}[28];
-$result_trees{'index_table'}{'contents'}[8]{'contents'}[29]{'extra'}{'entry_node'}
 = $result_trees{'index_table'}{'contents'}[7];
+$result_trees{'index_table'}{'contents'}[8]{'contents'}[29]{'extra'}{'element_node'}
 = $result_trees{'index_table'}{'contents'}[7];
 
$result_trees{'index_table'}{'contents'}[8]{'contents'}[29]{'extra'}{'index_entry'}{'entry_element'}
 = $result_trees{'index_table'}{'contents'}[8]{'contents'}[29];
-$result_trees{'index_table'}{'contents'}[8]{'contents'}[30]{'extra'}{'entry_node'}
 = $result_trees{'index_table'}{'contents'}[7];
+$result_trees{'index_table'}{'contents'}[8]{'contents'}[30]{'extra'}{'element_node'}
 = $result_trees{'index_table'}{'contents'}[7];
 
$result_trees{'index_table'}{'contents'}[8]{'contents'}[30]{'extra'}{'index_entry'}{'entry_element'}
 = $result_trees{'index_table'}{'contents'}[8]{'contents'}[30];
-$result_trees{'index_table'}{'contents'}[8]{'contents'}[31]{'extra'}{'entry_node'}
 = $result_trees{'index_table'}{'contents'}[7];
+$result_trees{'index_table'}{'contents'}[8]{'contents'}[31]{'extra'}{'element_node'}
 = $result_trees{'index_table'}{'contents'}[7];
 
$result_trees{'index_table'}{'contents'}[8]{'contents'}[31]{'extra'}{'index_entry'}{'entry_element'}
 = $result_trees{'index_table'}{'contents'}[8]{'contents'}[31];
-$result_trees{'index_table'}{'contents'}[8]{'contents'}[32]{'extra'}{'entry_node'}
 = $result_trees{'index_table'}{'contents'}[7];
+$result_trees{'index_table'}{'contents'}[8]{'contents'}[32]{'extra'}{'element_node'}
 = $result_trees{'index_table'}{'contents'}[7];
 
$result_trees{'index_table'}{'contents'}[8]{'contents'}[32]{'extra'}{'index_entry'}{'entry_element'}
 = $result_trees{'index_table'}{'contents'}[8]{'contents'}[32];
-$result_trees{'index_table'}{'contents'}[8]{'contents'}[33]{'extra'}{'entry_node'}
 = $result_trees{'index_table'}{'contents'}[7];
+$result_trees{'index_table'}{'contents'}[8]{'contents'}[33]{'extra'}{'element_node'}
 = $result_trees{'index_table'}{'contents'}[7];
 
$result_trees{'index_table'}{'contents'}[8]{'contents'}[33]{'extra'}{'index_entry'}{'entry_element'}
 = $result_trees{'index_table'}{'contents'}[8]{'contents'}[33];
-$result_trees{'index_table'}{'contents'}[8]{'contents'}[34]{'extra'}{'entry_node'}
 = $result_trees{'index_table'}{'contents'}[7];
+$result_trees{'index_table'}{'contents'}[8]{'contents'}[34]{'extra'}{'element_node'}
 = $result_trees{'index_table'}{'contents'}[7];
 
$result_trees{'index_table'}{'contents'}[8]{'contents'}[34]{'extra'}{'index_entry'}{'entry_element'}
 = $result_trees{'index_table'}{'contents'}[8]{'contents'}[34];
-$result_trees{'index_table'}{'contents'}[8]{'contents'}[35]{'extra'}{'entry_node'}
 = $result_trees{'index_table'}{'contents'}[7];
+$result_trees{'index_table'}{'contents'}[8]{'contents'}[35]{'extra'}{'element_node'}
 = $result_trees{'index_table'}{'contents'}[7];
 
$result_trees{'index_table'}{'contents'}[8]{'contents'}[35]{'extra'}{'index_entry'}{'entry_element'}
 = $result_trees{'index_table'}{'contents'}[8]{'contents'}[35];
-$result_trees{'index_table'}{'contents'}[8]{'contents'}[36]{'extra'}{'entry_node'}
 = $result_trees{'index_table'}{'contents'}[7];
+$result_trees{'index_table'}{'contents'}[8]{'contents'}[36]{'extra'}{'element_node'}
 = $result_trees{'index_table'}{'contents'}[7];
 
$result_trees{'index_table'}{'contents'}[8]{'contents'}[36]{'extra'}{'index_entry'}{'entry_element'}
 = $result_trees{'index_table'}{'contents'}[8]{'contents'}[36];
-$result_trees{'index_table'}{'contents'}[8]{'contents'}[37]{'extra'}{'entry_node'}
 = $result_trees{'index_table'}{'contents'}[7];
+$result_trees{'index_table'}{'contents'}[8]{'contents'}[37]{'extra'}{'element_node'}
 = $result_trees{'index_table'}{'contents'}[7];
 
$result_trees{'index_table'}{'contents'}[8]{'contents'}[37]{'extra'}{'index_entry'}{'entry_element'}
 = $result_trees{'index_table'}{'contents'}[8]{'contents'}[37];
-$result_trees{'index_table'}{'contents'}[8]{'contents'}[38]{'extra'}{'entry_node'}
 = $result_trees{'index_table'}{'contents'}[7];
+$result_trees{'index_table'}{'contents'}[8]{'contents'}[38]{'extra'}{'element_node'}
 = $result_trees{'index_table'}{'contents'}[7];
 
$result_trees{'index_table'}{'contents'}[8]{'contents'}[38]{'extra'}{'index_entry'}{'entry_element'}
 = $result_trees{'index_table'}{'contents'}[8]{'contents'}[38];
-$result_trees{'index_table'}{'contents'}[8]{'contents'}[39]{'extra'}{'entry_node'}
 = $result_trees{'index_table'}{'contents'}[7];
+$result_trees{'index_table'}{'contents'}[8]{'contents'}[39]{'extra'}{'element_node'}
 = $result_trees{'index_table'}{'contents'}[7];
 
$result_trees{'index_table'}{'contents'}[8]{'contents'}[39]{'extra'}{'index_entry'}{'entry_element'}
 = $result_trees{'index_table'}{'contents'}[8]{'contents'}[39];
-$result_trees{'index_table'}{'contents'}[8]{'contents'}[40]{'extra'}{'entry_node'}
 = $result_trees{'index_table'}{'contents'}[7];
+$result_trees{'index_table'}{'contents'}[8]{'contents'}[40]{'extra'}{'element_node'}
 = $result_trees{'index_table'}{'contents'}[7];
 
$result_trees{'index_table'}{'contents'}[8]{'contents'}[40]{'extra'}{'index_entry'}{'entry_element'}
 = $result_trees{'index_table'}{'contents'}[8]{'contents'}[40];
-$result_trees{'index_table'}{'contents'}[8]{'contents'}[41]{'extra'}{'entry_node'}
 = $result_trees{'index_table'}{'contents'}[7];
+$result_trees{'index_table'}{'contents'}[8]{'contents'}[41]{'extra'}{'element_node'}
 = $result_trees{'index_table'}{'contents'}[7];
 
$result_trees{'index_table'}{'contents'}[8]{'contents'}[41]{'extra'}{'index_entry'}{'entry_element'}
 = $result_trees{'index_table'}{'contents'}[8]{'contents'}[41];
-$result_trees{'index_table'}{'contents'}[8]{'contents'}[42]{'extra'}{'entry_node'}
 = $result_trees{'index_table'}{'contents'}[7];
+$result_trees{'index_table'}{'contents'}[8]{'contents'}[42]{'extra'}{'element_node'}
 = $result_trees{'index_table'}{'contents'}[7];
 
$result_trees{'index_table'}{'contents'}[8]{'contents'}[42]{'extra'}{'index_entry'}{'entry_element'}
 = $result_trees{'index_table'}{'contents'}[8]{'contents'}[42];
-$result_trees{'index_table'}{'contents'}[8]{'contents'}[43]{'extra'}{'entry_node'}
 = $result_trees{'index_table'}{'contents'}[7];
+$result_trees{'index_table'}{'contents'}[8]{'contents'}[43]{'extra'}{'element_node'}
 = $result_trees{'index_table'}{'contents'}[7];
 
$result_trees{'index_table'}{'contents'}[8]{'contents'}[43]{'extra'}{'index_entry'}{'entry_element'}
 = $result_trees{'index_table'}{'contents'}[8]{'contents'}[43];
-$result_trees{'index_table'}{'contents'}[8]{'contents'}[44]{'extra'}{'entry_node'}
 = $result_trees{'index_table'}{'contents'}[7];
+$result_trees{'index_table'}{'contents'}[8]{'contents'}[44]{'extra'}{'element_node'}
 = $result_trees{'index_table'}{'contents'}[7];
 
$result_trees{'index_table'}{'contents'}[8]{'contents'}[44]{'extra'}{'index_entry'}{'entry_element'}
 = $result_trees{'index_table'}{'contents'}[8]{'contents'}[44];
-$result_trees{'index_table'}{'contents'}[8]{'contents'}[45]{'extra'}{'entry_node'}
 = $result_trees{'index_table'}{'contents'}[7];
+$result_trees{'index_table'}{'contents'}[8]{'contents'}[45]{'extra'}{'element_node'}
 = $result_trees{'index_table'}{'contents'}[7];
 
$result_trees{'index_table'}{'contents'}[8]{'contents'}[45]{'extra'}{'index_entry'}{'entry_element'}
 = $result_trees{'index_table'}{'contents'}[8]{'contents'}[45];
-$result_trees{'index_table'}{'contents'}[8]{'contents'}[46]{'extra'}{'entry_node'}
 = $result_trees{'index_table'}{'contents'}[7];
+$result_trees{'index_table'}{'contents'}[8]{'contents'}[46]{'extra'}{'element_node'}
 = $result_trees{'index_table'}{'contents'}[7];
 
$result_trees{'index_table'}{'contents'}[8]{'contents'}[46]{'extra'}{'index_entry'}{'entry_element'}
 = $result_trees{'index_table'}{'contents'}[8]{'contents'}[46];
-$result_trees{'index_table'}{'contents'}[8]{'contents'}[47]{'extra'}{'entry_node'}
 = $result_trees{'index_table'}{'contents'}[7];
+$result_trees{'index_table'}{'contents'}[8]{'contents'}[47]{'extra'}{'element_node'}
 = $result_trees{'index_table'}{'contents'}[7];
 
$result_trees{'index_table'}{'contents'}[8]{'contents'}[47]{'extra'}{'index_entry'}{'entry_element'}
 = $result_trees{'index_table'}{'contents'}[8]{'contents'}[47];
-$result_trees{'index_table'}{'contents'}[8]{'contents'}[48]{'extra'}{'entry_node'}
 = $result_trees{'index_table'}{'contents'}[7];
+$result_trees{'index_table'}{'contents'}[8]{'contents'}[48]{'extra'}{'element_node'}
 = $result_trees{'index_table'}{'contents'}[7];
 
$result_trees{'index_table'}{'contents'}[8]{'contents'}[48]{'extra'}{'index_entry'}{'entry_element'}
 = $result_trees{'index_table'}{'contents'}[8]{'contents'}[48];
-$result_trees{'index_table'}{'contents'}[8]{'contents'}[49]{'extra'}{'entry_node'}
 = $result_trees{'index_table'}{'contents'}[7];
+$result_trees{'index_table'}{'contents'}[8]{'contents'}[49]{'extra'}{'element_node'}
 = $result_trees{'index_table'}{'contents'}[7];
 
$result_trees{'index_table'}{'contents'}[8]{'contents'}[49]{'extra'}{'index_entry'}{'entry_element'}
 = $result_trees{'index_table'}{'contents'}[8]{'contents'}[49];
-$result_trees{'index_table'}{'contents'}[8]{'contents'}[50]{'extra'}{'entry_node'}
 = $result_trees{'index_table'}{'contents'}[7];
+$result_trees{'index_table'}{'contents'}[8]{'contents'}[50]{'extra'}{'element_node'}
 = $result_trees{'index_table'}{'contents'}[7];
 
$result_trees{'index_table'}{'contents'}[8]{'contents'}[50]{'extra'}{'index_entry'}{'entry_element'}
 = $result_trees{'index_table'}{'contents'}[8]{'contents'}[50];
-$result_trees{'index_table'}{'contents'}[8]{'contents'}[51]{'extra'}{'entry_node'}
 = $result_trees{'index_table'}{'contents'}[7];
+$result_trees{'index_table'}{'contents'}[8]{'contents'}[51]{'extra'}{'element_node'}
 = $result_trees{'index_table'}{'contents'}[7];
 
$result_trees{'index_table'}{'contents'}[8]{'contents'}[51]{'extra'}{'index_entry'}{'entry_element'}
 = $result_trees{'index_table'}{'contents'}[8]{'contents'}[51];
-$result_trees{'index_table'}{'contents'}[8]{'contents'}[52]{'extra'}{'entry_node'}
 = $result_trees{'index_table'}{'contents'}[7];
+$result_trees{'index_table'}{'contents'}[8]{'contents'}[52]{'extra'}{'element_node'}
 = $result_trees{'index_table'}{'contents'}[7];
 
$result_trees{'index_table'}{'contents'}[8]{'contents'}[52]{'extra'}{'index_entry'}{'entry_element'}
 = $result_trees{'index_table'}{'contents'}[8]{'contents'}[52];
-$result_trees{'index_table'}{'contents'}[8]{'contents'}[53]{'extra'}{'entry_node'}
 = $result_trees{'index_table'}{'contents'}[7];
+$result_trees{'index_table'}{'contents'}[8]{'contents'}[53]{'extra'}{'element_node'}
 = $result_trees{'index_table'}{'contents'}[7];
 
$result_trees{'index_table'}{'contents'}[8]{'contents'}[53]{'extra'}{'index_entry'}{'entry_element'}
 = $result_trees{'index_table'}{'contents'}[8]{'contents'}[53];
-$result_trees{'index_table'}{'contents'}[8]{'contents'}[54]{'extra'}{'entry_node'}
 = $result_trees{'index_table'}{'contents'}[7];
+$result_trees{'index_table'}{'contents'}[8]{'contents'}[54]{'extra'}{'element_node'}
 = $result_trees{'index_table'}{'contents'}[7];
 
$result_trees{'index_table'}{'contents'}[8]{'contents'}[54]{'extra'}{'index_entry'}{'entry_element'}
 = $result_trees{'index_table'}{'contents'}[8]{'contents'}[54];
-$result_trees{'index_table'}{'contents'}[8]{'contents'}[55]{'extra'}{'entry_node'}
 = $result_trees{'index_table'}{'contents'}[7];
+$result_trees{'index_table'}{'contents'}[8]{'contents'}[55]{'extra'}{'element_node'}
 = $result_trees{'index_table'}{'contents'}[7];
 
$result_trees{'index_table'}{'contents'}[8]{'contents'}[55]{'extra'}{'index_entry'}{'entry_element'}
 = $result_trees{'index_table'}{'contents'}[8]{'contents'}[55];
-$result_trees{'index_table'}{'contents'}[8]{'contents'}[56]{'extra'}{'entry_node'}
 = $result_trees{'index_table'}{'contents'}[7];
+$result_trees{'index_table'}{'contents'}[8]{'contents'}[56]{'extra'}{'element_node'}
 = $result_trees{'index_table'}{'contents'}[7];
 
$result_trees{'index_table'}{'contents'}[8]{'contents'}[56]{'extra'}{'index_entry'}{'entry_element'}
 = $result_trees{'index_table'}{'contents'}[8]{'contents'}[56];
-$result_trees{'index_table'}{'contents'}[8]{'contents'}[57]{'extra'}{'entry_node'}
 = $result_trees{'index_table'}{'contents'}[7];
+$result_trees{'index_table'}{'contents'}[8]{'contents'}[57]{'extra'}{'element_node'}
 = $result_trees{'index_table'}{'contents'}[7];
 
$result_trees{'index_table'}{'contents'}[8]{'contents'}[57]{'extra'}{'index_entry'}{'entry_element'}
 = $result_trees{'index_table'}{'contents'}[8]{'contents'}[57];
-$result_trees{'index_table'}{'contents'}[8]{'contents'}[58]{'extra'}{'entry_node'}
 = $result_trees{'index_table'}{'contents'}[7];
+$result_trees{'index_table'}{'contents'}[8]{'contents'}[58]{'extra'}{'element_node'}
 = $result_trees{'index_table'}{'contents'}[7];
 
$result_trees{'index_table'}{'contents'}[8]{'contents'}[58]{'extra'}{'index_entry'}{'entry_element'}
 = $result_trees{'index_table'}{'contents'}[8]{'contents'}[58];
-$result_trees{'index_table'}{'contents'}[8]{'contents'}[59]{'extra'}{'entry_node'}
 = $result_trees{'index_table'}{'contents'}[7];
+$result_trees{'index_table'}{'contents'}[8]{'contents'}[59]{'extra'}{'element_node'}
 = $result_trees{'index_table'}{'contents'}[7];
 
$result_trees{'index_table'}{'contents'}[8]{'contents'}[59]{'extra'}{'index_entry'}{'entry_element'}
 = $result_trees{'index_table'}{'contents'}[8]{'contents'}[59];
-$result_trees{'index_table'}{'contents'}[8]{'contents'}[60]{'extra'}{'entry_node'}
 = $result_trees{'index_table'}{'contents'}[7];
+$result_trees{'index_table'}{'contents'}[8]{'contents'}[60]{'extra'}{'element_node'}
 = $result_trees{'index_table'}{'contents'}[7];
 
$result_trees{'index_table'}{'contents'}[8]{'contents'}[60]{'extra'}{'index_entry'}{'entry_element'}
 = $result_trees{'index_table'}{'contents'}[8]{'contents'}[60];
-$result_trees{'index_table'}{'contents'}[8]{'contents'}[61]{'extra'}{'entry_node'}
 = $result_trees{'index_table'}{'contents'}[7];
+$result_trees{'index_table'}{'contents'}[8]{'contents'}[61]{'extra'}{'element_node'}
 = $result_trees{'index_table'}{'contents'}[7];
 
$result_trees{'index_table'}{'contents'}[8]{'contents'}[61]{'extra'}{'index_entry'}{'entry_element'}
 = $result_trees{'index_table'}{'contents'}[8]{'contents'}[61];
-$result_trees{'index_table'}{'contents'}[8]{'contents'}[62]{'extra'}{'entry_node'}
 = $result_trees{'index_table'}{'contents'}[7];
+$result_trees{'index_table'}{'contents'}[8]{'contents'}[62]{'extra'}{'element_node'}
 = $result_trees{'index_table'}{'contents'}[7];
 
$result_trees{'index_table'}{'contents'}[8]{'contents'}[62]{'extra'}{'index_entry'}{'entry_element'}
 = $result_trees{'index_table'}{'contents'}[8]{'contents'}[62];
-$result_trees{'index_table'}{'contents'}[8]{'contents'}[63]{'extra'}{'entry_node'}
 = $result_trees{'index_table'}{'contents'}[7];
+$result_trees{'index_table'}{'contents'}[8]{'contents'}[63]{'extra'}{'element_node'}
 = $result_trees{'index_table'}{'contents'}[7];
 
$result_trees{'index_table'}{'contents'}[8]{'contents'}[63]{'extra'}{'index_entry'}{'entry_element'}
 = $result_trees{'index_table'}{'contents'}[8]{'contents'}[63];
-$result_trees{'index_table'}{'contents'}[8]{'contents'}[64]{'extra'}{'entry_node'}
 = $result_trees{'index_table'}{'contents'}[7];
+$result_trees{'index_table'}{'contents'}[8]{'contents'}[64]{'extra'}{'element_node'}
 = $result_trees{'index_table'}{'contents'}[7];
 
$result_trees{'index_table'}{'contents'}[8]{'contents'}[64]{'extra'}{'index_entry'}{'entry_element'}
 = $result_trees{'index_table'}{'contents'}[8]{'contents'}[64];
-$result_trees{'index_table'}{'contents'}[8]{'contents'}[65]{'extra'}{'entry_node'}
 = $result_trees{'index_table'}{'contents'}[7];
+$result_trees{'index_table'}{'contents'}[8]{'contents'}[65]{'extra'}{'element_node'}
 = $result_trees{'index_table'}{'contents'}[7];
 
$result_trees{'index_table'}{'contents'}[8]{'contents'}[65]{'extra'}{'index_entry'}{'entry_element'}
 = $result_trees{'index_table'}{'contents'}[8]{'contents'}[65];
-$result_trees{'index_table'}{'contents'}[8]{'contents'}[66]{'extra'}{'entry_node'}
 = $result_trees{'index_table'}{'contents'}[7];
+$result_trees{'index_table'}{'contents'}[8]{'contents'}[66]{'extra'}{'element_node'}
 = $result_trees{'index_table'}{'contents'}[7];
 
$result_trees{'index_table'}{'contents'}[8]{'contents'}[66]{'extra'}{'index_entry'}{'entry_element'}
 = $result_trees{'index_table'}{'contents'}[8]{'contents'}[66];
-$result_trees{'index_table'}{'contents'}[8]{'contents'}[67]{'extra'}{'entry_node'}
 = $result_trees{'index_table'}{'contents'}[7];
+$result_trees{'index_table'}{'contents'}[8]{'contents'}[67]{'extra'}{'element_node'}
 = $result_trees{'index_table'}{'contents'}[7];
 
$result_trees{'index_table'}{'contents'}[8]{'contents'}[67]{'extra'}{'index_entry'}{'entry_element'}
 = $result_trees{'index_table'}{'contents'}[8]{'contents'}[67];
-$result_trees{'index_table'}{'contents'}[8]{'contents'}[68]{'extra'}{'entry_node'}
 = $result_trees{'index_table'}{'contents'}[7];
+$result_trees{'index_table'}{'contents'}[8]{'contents'}[68]{'extra'}{'element_node'}
 = $result_trees{'index_table'}{'contents'}[7];
 
$result_trees{'index_table'}{'contents'}[8]{'contents'}[68]{'extra'}{'index_entry'}{'entry_element'}
 = $result_trees{'index_table'}{'contents'}[8]{'contents'}[68];
-$result_trees{'index_table'}{'contents'}[8]{'contents'}[69]{'extra'}{'entry_node'}
 = $result_trees{'index_table'}{'contents'}[7];
+$result_trees{'index_table'}{'contents'}[8]{'contents'}[69]{'extra'}{'element_node'}
 = $result_trees{'index_table'}{'contents'}[7];
 
$result_trees{'index_table'}{'contents'}[8]{'contents'}[69]{'extra'}{'index_entry'}{'entry_element'}
 = $result_trees{'index_table'}{'contents'}[8]{'contents'}[69];
-$result_trees{'index_table'}{'contents'}[8]{'contents'}[70]{'extra'}{'entry_node'}
 = $result_trees{'index_table'}{'contents'}[7];
+$result_trees{'index_table'}{'contents'}[8]{'contents'}[70]{'extra'}{'element_node'}
 = $result_trees{'index_table'}{'contents'}[7];
 
$result_trees{'index_table'}{'contents'}[8]{'contents'}[70]{'extra'}{'index_entry'}{'entry_element'}
 = $result_trees{'index_table'}{'contents'}[8]{'contents'}[70];
-$result_trees{'index_table'}{'contents'}[8]{'contents'}[71]{'extra'}{'entry_node'}
 = $result_trees{'index_table'}{'contents'}[7];
+$result_trees{'index_table'}{'contents'}[8]{'contents'}[71]{'extra'}{'element_node'}
 = $result_trees{'index_table'}{'contents'}[7];
 
$result_trees{'index_table'}{'contents'}[8]{'contents'}[71]{'extra'}{'index_entry'}{'entry_element'}
 = $result_trees{'index_table'}{'contents'}[8]{'contents'}[71];
-$result_trees{'index_table'}{'contents'}[8]{'contents'}[72]{'extra'}{'entry_node'}
 = $result_trees{'index_table'}{'contents'}[7];
+$result_trees{'index_table'}{'contents'}[8]{'contents'}[72]{'extra'}{'element_node'}
 = $result_trees{'index_table'}{'contents'}[7];
 
$result_trees{'index_table'}{'contents'}[8]{'contents'}[72]{'extra'}{'index_entry'}{'entry_element'}
 = $result_trees{'index_table'}{'contents'}[8]{'contents'}[72];
-$result_trees{'index_table'}{'contents'}[8]{'contents'}[73]{'extra'}{'entry_node'}
 = $result_trees{'index_table'}{'contents'}[7];
+$result_trees{'index_table'}{'contents'}[8]{'contents'}[73]{'extra'}{'element_node'}
 = $result_trees{'index_table'}{'contents'}[7];
 
$result_trees{'index_table'}{'contents'}[8]{'contents'}[73]{'extra'}{'index_entry'}{'entry_element'}
 = $result_trees{'index_table'}{'contents'}[8]{'contents'}[73];
-$result_trees{'index_table'}{'contents'}[8]{'contents'}[74]{'extra'}{'entry_node'}
 = $result_trees{'index_table'}{'contents'}[7];
+$result_trees{'index_table'}{'contents'}[8]{'contents'}[74]{'extra'}{'element_node'}
 = $result_trees{'index_table'}{'contents'}[7];
 
$result_trees{'index_table'}{'contents'}[8]{'contents'}[74]{'extra'}{'index_entry'}{'entry_element'}
 = $result_trees{'index_table'}{'contents'}[8]{'contents'}[74];
-$result_trees{'index_table'}{'contents'}[8]{'contents'}[75]{'extra'}{'entry_node'}
 = $result_trees{'index_table'}{'contents'}[7];
+$result_trees{'index_table'}{'contents'}[8]{'contents'}[75]{'extra'}{'element_node'}
 = $result_trees{'index_table'}{'contents'}[7];
 
$result_trees{'index_table'}{'contents'}[8]{'contents'}[75]{'extra'}{'index_entry'}{'entry_element'}
 = $result_trees{'index_table'}{'contents'}[8]{'contents'}[75];
-$result_trees{'index_table'}{'contents'}[8]{'contents'}[76]{'extra'}{'entry_node'}
 = $result_trees{'index_table'}{'contents'}[7];
+$result_trees{'index_table'}{'contents'}[8]{'contents'}[76]{'extra'}{'element_node'}
 = $result_trees{'index_table'}{'contents'}[7];
 
$result_trees{'index_table'}{'contents'}[8]{'contents'}[76]{'extra'}{'index_entry'}{'entry_element'}
 = $result_trees{'index_table'}{'contents'}[8]{'contents'}[76];
-$result_trees{'index_table'}{'contents'}[8]{'contents'}[77]{'extra'}{'entry_node'}
 = $result_trees{'index_table'}{'contents'}[7];
+$result_trees{'index_table'}{'contents'}[8]{'contents'}[77]{'extra'}{'element_node'}
 = $result_trees{'index_table'}{'contents'}[7];
 
$result_trees{'index_table'}{'contents'}[8]{'contents'}[77]{'extra'}{'index_entry'}{'entry_element'}
 = $result_trees{'index_table'}{'contents'}[8]{'contents'}[77];
-$result_trees{'index_table'}{'contents'}[8]{'contents'}[78]{'extra'}{'entry_node'}
 = $result_trees{'index_table'}{'contents'}[7];
+$result_trees{'index_table'}{'contents'}[8]{'contents'}[78]{'extra'}{'element_node'}
 = $result_trees{'index_table'}{'contents'}[7];
 
$result_trees{'index_table'}{'contents'}[8]{'contents'}[78]{'extra'}{'index_entry'}{'entry_element'}
 = $result_trees{'index_table'}{'contents'}[8]{'contents'}[78];
-$result_trees{'index_table'}{'contents'}[8]{'contents'}[79]{'extra'}{'entry_node'}
 = $result_trees{'index_table'}{'contents'}[7];
+$result_trees{'index_table'}{'contents'}[8]{'contents'}[79]{'extra'}{'element_node'}
 = $result_trees{'index_table'}{'contents'}[7];
 
$result_trees{'index_table'}{'contents'}[8]{'contents'}[79]{'extra'}{'index_entry'}{'entry_element'}
 = $result_trees{'index_table'}{'contents'}[8]{'contents'}[79];
-$result_trees{'index_table'}{'contents'}[8]{'contents'}[80]{'extra'}{'entry_node'}
 = $result_trees{'index_table'}{'contents'}[7];
+$result_trees{'index_table'}{'contents'}[8]{'contents'}[80]{'extra'}{'element_node'}
 = $result_trees{'index_table'}{'contents'}[7];
 
$result_trees{'index_table'}{'contents'}[8]{'contents'}[80]{'extra'}{'index_entry'}{'entry_element'}
 = $result_trees{'index_table'}{'contents'}[8]{'contents'}[80];
-$result_trees{'index_table'}{'contents'}[8]{'contents'}[81]{'extra'}{'entry_node'}
 = $result_trees{'index_table'}{'contents'}[7];
+$result_trees{'index_table'}{'contents'}[8]{'contents'}[81]{'extra'}{'element_node'}
 = $result_trees{'index_table'}{'contents'}[7];
 
$result_trees{'index_table'}{'contents'}[8]{'contents'}[81]{'extra'}{'index_entry'}{'entry_element'}
 = $result_trees{'index_table'}{'contents'}[8]{'contents'}[81];
-$result_trees{'index_table'}{'contents'}[8]{'contents'}[82]{'extra'}{'entry_node'}
 = $result_trees{'index_table'}{'contents'}[7];
+$result_trees{'index_table'}{'contents'}[8]{'contents'}[82]{'extra'}{'element_node'}
 = $result_trees{'index_table'}{'contents'}[7];
 
$result_trees{'index_table'}{'contents'}[8]{'contents'}[82]{'extra'}{'index_entry'}{'entry_element'}
 = $result_trees{'index_table'}{'contents'}[8]{'contents'}[82];
-$result_trees{'index_table'}{'contents'}[8]{'contents'}[83]{'extra'}{'entry_node'}
 = $result_trees{'index_table'}{'contents'}[7];
+$result_trees{'index_table'}{'contents'}[8]{'contents'}[83]{'extra'}{'element_node'}
 = $result_trees{'index_table'}{'contents'}[7];
 
$result_trees{'index_table'}{'contents'}[8]{'contents'}[83]{'extra'}{'index_entry'}{'entry_element'}
 = $result_trees{'index_table'}{'contents'}[8]{'contents'}[83];
-$result_trees{'index_table'}{'contents'}[8]{'contents'}[84]{'extra'}{'entry_node'}
 = $result_trees{'index_table'}{'contents'}[7];
+$result_trees{'index_table'}{'contents'}[8]{'contents'}[84]{'extra'}{'element_node'}
 = $result_trees{'index_table'}{'contents'}[7];
 
$result_trees{'index_table'}{'contents'}[8]{'contents'}[84]{'extra'}{'index_entry'}{'entry_element'}
 = $result_trees{'index_table'}{'contents'}[8]{'contents'}[84];
-$result_trees{'index_table'}{'contents'}[8]{'contents'}[85]{'extra'}{'entry_node'}
 = $result_trees{'index_table'}{'contents'}[7];
+$result_trees{'index_table'}{'contents'}[8]{'contents'}[85]{'extra'}{'element_node'}
 = $result_trees{'index_table'}{'contents'}[7];
 
$result_trees{'index_table'}{'contents'}[8]{'contents'}[85]{'extra'}{'index_entry'}{'entry_element'}
 = $result_trees{'index_table'}{'contents'}[8]{'contents'}[85];
-$result_trees{'index_table'}{'contents'}[8]{'contents'}[86]{'extra'}{'entry_node'}
 = $result_trees{'index_table'}{'contents'}[7];
+$result_trees{'index_table'}{'contents'}[8]{'contents'}[86]{'extra'}{'element_node'}
 = $result_trees{'index_table'}{'contents'}[7];
 
$result_trees{'index_table'}{'contents'}[8]{'contents'}[86]{'extra'}{'index_entry'}{'entry_element'}
 = $result_trees{'index_table'}{'contents'}[8]{'contents'}[86];
-$result_trees{'index_table'}{'contents'}[8]{'contents'}[87]{'extra'}{'entry_node'}
 = $result_trees{'index_table'}{'contents'}[7];
+$result_trees{'index_table'}{'contents'}[8]{'contents'}[87]{'extra'}{'element_node'}
 = $result_trees{'index_table'}{'contents'}[7];
 
$result_trees{'index_table'}{'contents'}[8]{'contents'}[87]{'extra'}{'index_entry'}{'entry_element'}
 = $result_trees{'index_table'}{'contents'}[8]{'contents'}[87];
-$result_trees{'index_table'}{'contents'}[8]{'contents'}[88]{'extra'}{'entry_node'}
 = $result_trees{'index_table'}{'contents'}[7];
+$result_trees{'index_table'}{'contents'}[8]{'contents'}[88]{'extra'}{'element_node'}
 = $result_trees{'index_table'}{'contents'}[7];
 
$result_trees{'index_table'}{'contents'}[8]{'contents'}[88]{'extra'}{'index_entry'}{'entry_element'}
 = $result_trees{'index_table'}{'contents'}[8]{'contents'}[88];
-$result_trees{'index_table'}{'contents'}[8]{'contents'}[89]{'extra'}{'entry_node'}
 = $result_trees{'index_table'}{'contents'}[7];
+$result_trees{'index_table'}{'contents'}[8]{'contents'}[89]{'extra'}{'element_node'}
 = $result_trees{'index_table'}{'contents'}[7];
 
$result_trees{'index_table'}{'contents'}[8]{'contents'}[89]{'extra'}{'index_entry'}{'entry_element'}
 = $result_trees{'index_table'}{'contents'}[8]{'contents'}[89];
-$result_trees{'index_table'}{'contents'}[8]{'contents'}[90]{'extra'}{'entry_node'}
 = $result_trees{'index_table'}{'contents'}[7];
+$result_trees{'index_table'}{'contents'}[8]{'contents'}[90]{'extra'}{'element_node'}
 = $result_trees{'index_table'}{'contents'}[7];
 
$result_trees{'index_table'}{'contents'}[8]{'contents'}[90]{'extra'}{'index_entry'}{'entry_element'}
 = $result_trees{'index_table'}{'contents'}[8]{'contents'}[90];
-$result_trees{'index_table'}{'contents'}[8]{'contents'}[91]{'extra'}{'entry_node'}
 = $result_trees{'index_table'}{'contents'}[7];
+$result_trees{'index_table'}{'contents'}[8]{'contents'}[91]{'extra'}{'element_node'}
 = $result_trees{'index_table'}{'contents'}[7];
 
$result_trees{'index_table'}{'contents'}[8]{'contents'}[91]{'extra'}{'index_entry'}{'entry_element'}
 = $result_trees{'index_table'}{'contents'}[8]{'contents'}[91];
-$result_trees{'index_table'}{'contents'}[8]{'contents'}[92]{'extra'}{'entry_node'}
 = $result_trees{'index_table'}{'contents'}[7];
+$result_trees{'index_table'}{'contents'}[8]{'contents'}[92]{'extra'}{'element_node'}
 = $result_trees{'index_table'}{'contents'}[7];
 
$result_trees{'index_table'}{'contents'}[8]{'contents'}[92]{'extra'}{'index_entry'}{'entry_element'}
 = $result_trees{'index_table'}{'contents'}[8]{'contents'}[92];
-$result_trees{'index_table'}{'contents'}[8]{'contents'}[93]{'extra'}{'entry_node'}
 = $result_trees{'index_table'}{'contents'}[7];
+$result_trees{'index_table'}{'contents'}[8]{'contents'}[93]{'extra'}{'element_node'}
 = $result_trees{'index_table'}{'contents'}[7];
 
$result_trees{'index_table'}{'contents'}[8]{'contents'}[93]{'extra'}{'index_entry'}{'entry_element'}
 = $result_trees{'index_table'}{'contents'}[8]{'contents'}[93];
-$result_trees{'index_table'}{'contents'}[8]{'contents'}[94]{'extra'}{'entry_node'}
 = $result_trees{'index_table'}{'contents'}[7];
+$result_trees{'index_table'}{'contents'}[8]{'contents'}[94]{'extra'}{'element_node'}
 = $result_trees{'index_table'}{'contents'}[7];
 
$result_trees{'index_table'}{'contents'}[8]{'contents'}[94]{'extra'}{'index_entry'}{'entry_element'}
 = $result_trees{'index_table'}{'contents'}[8]{'contents'}[94];
-$result_trees{'index_table'}{'contents'}[8]{'contents'}[95]{'extra'}{'entry_node'}
 = $result_trees{'index_table'}{'contents'}[7];
+$result_trees{'index_table'}{'contents'}[8]{'contents'}[95]{'extra'}{'element_node'}
 = $result_trees{'index_table'}{'contents'}[7];
 
$result_trees{'index_table'}{'contents'}[8]{'contents'}[95]{'extra'}{'index_entry'}{'entry_element'}
 = $result_trees{'index_table'}{'contents'}[8]{'contents'}[95];
-$result_trees{'index_table'}{'contents'}[8]{'contents'}[96]{'extra'}{'entry_node'}
 = $result_trees{'index_table'}{'contents'}[7];
+$result_trees{'index_table'}{'contents'}[8]{'contents'}[96]{'extra'}{'element_node'}
 = $result_trees{'index_table'}{'contents'}[7];
 
$result_trees{'index_table'}{'contents'}[8]{'contents'}[96]{'extra'}{'index_entry'}{'entry_element'}
 = $result_trees{'index_table'}{'contents'}[8]{'contents'}[96];
-$result_trees{'index_table'}{'contents'}[8]{'contents'}[97]{'extra'}{'entry_node'}
 = $result_trees{'index_table'}{'contents'}[7];
+$result_trees{'index_table'}{'contents'}[8]{'contents'}[97]{'extra'}{'element_node'}
 = $result_trees{'index_table'}{'contents'}[7];
 
$result_trees{'index_table'}{'contents'}[8]{'contents'}[97]{'extra'}{'index_entry'}{'entry_element'}
 = $result_trees{'index_table'}{'contents'}[8]{'contents'}[97];
-$result_trees{'index_table'}{'contents'}[8]{'contents'}[98]{'extra'}{'entry_node'}
 = $result_trees{'index_table'}{'contents'}[7];
+$result_trees{'index_table'}{'contents'}[8]{'contents'}[98]{'extra'}{'element_node'}
 = $result_trees{'index_table'}{'contents'}[7];
 
$result_trees{'index_table'}{'contents'}[8]{'contents'}[98]{'extra'}{'index_entry'}{'entry_element'}
 = $result_trees{'index_table'}{'contents'}[8]{'contents'}[98];
-$result_trees{'index_table'}{'contents'}[8]{'contents'}[99]{'extra'}{'entry_node'}
 = $result_trees{'index_table'}{'contents'}[7];
+$result_trees{'index_table'}{'contents'}[8]{'contents'}[99]{'extra'}{'element_node'}
 = $result_trees{'index_table'}{'contents'}[7];
 
$result_trees{'index_table'}{'contents'}[8]{'contents'}[99]{'extra'}{'index_entry'}{'entry_element'}
 = $result_trees{'index_table'}{'contents'}[8]{'contents'}[99];
-$result_trees{'index_table'}{'contents'}[8]{'contents'}[100]{'extra'}{'entry_node'}
 = $result_trees{'index_table'}{'contents'}[7];
+$result_trees{'index_table'}{'contents'}[8]{'contents'}[100]{'extra'}{'element_node'}
 = $result_trees{'index_table'}{'contents'}[7];
 
$result_trees{'index_table'}{'contents'}[8]{'contents'}[100]{'extra'}{'index_entry'}{'entry_element'}
 = $result_trees{'index_table'}{'contents'}[8]{'contents'}[100];
-$result_trees{'index_table'}{'contents'}[8]{'contents'}[101]{'extra'}{'entry_node'}
 = $result_trees{'index_table'}{'contents'}[7];
+$result_trees{'index_table'}{'contents'}[8]{'contents'}[101]{'extra'}{'element_node'}
 = $result_trees{'index_table'}{'contents'}[7];
 
$result_trees{'index_table'}{'contents'}[8]{'contents'}[101]{'extra'}{'index_entry'}{'entry_element'}
 = $result_trees{'index_table'}{'contents'}[8]{'contents'}[101];
-$result_trees{'index_table'}{'contents'}[8]{'contents'}[102]{'extra'}{'entry_node'}
 = $result_trees{'index_table'}{'contents'}[7];
+$result_trees{'index_table'}{'contents'}[8]{'contents'}[102]{'extra'}{'element_node'}
 = $result_trees{'index_table'}{'contents'}[7];
 
$result_trees{'index_table'}{'contents'}[8]{'contents'}[102]{'extra'}{'index_entry'}{'entry_element'}
 = $result_trees{'index_table'}{'contents'}[8]{'contents'}[102];
-$result_trees{'index_table'}{'contents'}[8]{'contents'}[103]{'extra'}{'entry_node'}
 = $result_trees{'index_table'}{'contents'}[7];
+$result_trees{'index_table'}{'contents'}[8]{'contents'}[103]{'extra'}{'element_node'}
 = $result_trees{'index_table'}{'contents'}[7];
 
$result_trees{'index_table'}{'contents'}[8]{'contents'}[103]{'extra'}{'index_entry'}{'entry_element'}
 = $result_trees{'index_table'}{'contents'}[8]{'contents'}[103];
-$result_trees{'index_table'}{'contents'}[8]{'contents'}[104]{'extra'}{'entry_node'}
 = $result_trees{'index_table'}{'contents'}[7];
+$result_trees{'index_table'}{'contents'}[8]{'contents'}[104]{'extra'}{'element_node'}
 = $result_trees{'index_table'}{'contents'}[7];
 
$result_trees{'index_table'}{'contents'}[8]{'contents'}[104]{'extra'}{'index_entry'}{'entry_element'}
 = $result_trees{'index_table'}{'contents'}[8]{'contents'}[104];
-$result_trees{'index_table'}{'contents'}[8]{'contents'}[105]{'extra'}{'entry_node'}
 = $result_trees{'index_table'}{'contents'}[7];
+$result_trees{'index_table'}{'contents'}[8]{'contents'}[105]{'extra'}{'element_node'}
 = $result_trees{'index_table'}{'contents'}[7];
 
$result_trees{'index_table'}{'contents'}[8]{'contents'}[105]{'extra'}{'index_entry'}{'entry_element'}
 = $result_trees{'index_table'}{'contents'}[8]{'contents'}[105];
-$result_trees{'index_table'}{'contents'}[8]{'contents'}[106]{'extra'}{'entry_node'}
 = $result_trees{'index_table'}{'contents'}[7];
+$result_trees{'index_table'}{'contents'}[8]{'contents'}[106]{'extra'}{'element_node'}
 = $result_trees{'index_table'}{'contents'}[7];
 
$result_trees{'index_table'}{'contents'}[8]{'contents'}[106]{'extra'}{'index_entry'}{'entry_element'}
 = $result_trees{'index_table'}{'contents'}[8]{'contents'}[106];
-$result_trees{'index_table'}{'contents'}[8]{'contents'}[107]{'extra'}{'entry_node'}
 = $result_trees{'index_table'}{'contents'}[7];
+$result_trees{'index_table'}{'contents'}[8]{'contents'}[107]{'extra'}{'element_node'}
 = $result_trees{'index_table'}{'contents'}[7];
 
$result_trees{'index_table'}{'contents'}[8]{'contents'}[107]{'extra'}{'index_entry'}{'entry_element'}
 = $result_trees{'index_table'}{'contents'}[8]{'contents'}[107];
-$result_trees{'index_table'}{'contents'}[8]{'contents'}[108]{'extra'}{'entry_node'}
 = $result_trees{'index_table'}{'contents'}[7];
+$result_trees{'index_table'}{'contents'}[8]{'contents'}[108]{'extra'}{'element_node'}
 = $result_trees{'index_table'}{'contents'}[7];
 
$result_trees{'index_table'}{'contents'}[8]{'contents'}[108]{'extra'}{'index_entry'}{'entry_element'}
 = $result_trees{'index_table'}{'contents'}[8]{'contents'}[108];
-$result_trees{'index_table'}{'contents'}[8]{'contents'}[109]{'extra'}{'entry_node'}
 = $result_trees{'index_table'}{'contents'}[7];
+$result_trees{'index_table'}{'contents'}[8]{'contents'}[109]{'extra'}{'element_node'}
 = $result_trees{'index_table'}{'contents'}[7];
 
$result_trees{'index_table'}{'contents'}[8]{'contents'}[109]{'extra'}{'index_entry'}{'entry_element'}
 = $result_trees{'index_table'}{'contents'}[8]{'contents'}[109];
-$result_trees{'index_table'}{'contents'}[8]{'contents'}[110]{'extra'}{'entry_node'}
 = $result_trees{'index_table'}{'contents'}[7];
+$result_trees{'index_table'}{'contents'}[8]{'contents'}[110]{'extra'}{'element_node'}
 = $result_trees{'index_table'}{'contents'}[7];
 
$result_trees{'index_table'}{'contents'}[8]{'contents'}[110]{'extra'}{'index_entry'}{'entry_element'}
 = $result_trees{'index_table'}{'contents'}[8]{'contents'}[110];
-$result_trees{'index_table'}{'contents'}[8]{'contents'}[111]{'extra'}{'entry_node'}
 = $result_trees{'index_table'}{'contents'}[7];
+$result_trees{'index_table'}{'contents'}[8]{'contents'}[111]{'extra'}{'element_node'}
 = $result_trees{'index_table'}{'contents'}[7];
 
$result_trees{'index_table'}{'contents'}[8]{'contents'}[111]{'extra'}{'index_entry'}{'entry_element'}
 = $result_trees{'index_table'}{'contents'}[8]{'contents'}[111];
-$result_trees{'index_table'}{'contents'}[8]{'contents'}[112]{'extra'}{'entry_node'}
 = $result_trees{'index_table'}{'contents'}[7];
+$result_trees{'index_table'}{'contents'}[8]{'contents'}[112]{'extra'}{'element_node'}
 = $result_trees{'index_table'}{'contents'}[7];
 
$result_trees{'index_table'}{'contents'}[8]{'contents'}[112]{'extra'}{'index_entry'}{'entry_element'}
 = $result_trees{'index_table'}{'contents'}[8]{'contents'}[112];
-$result_trees{'index_table'}{'contents'}[8]{'contents'}[113]{'extra'}{'entry_node'}
 = $result_trees{'index_table'}{'contents'}[7];
+$result_trees{'index_table'}{'contents'}[8]{'contents'}[113]{'extra'}{'element_node'}
 = $result_trees{'index_table'}{'contents'}[7];
 
$result_trees{'index_table'}{'contents'}[8]{'contents'}[113]{'extra'}{'index_entry'}{'entry_element'}
 = $result_trees{'index_table'}{'contents'}[8]{'contents'}[113];
-$result_trees{'index_table'}{'contents'}[8]{'contents'}[114]{'extra'}{'entry_node'}
 = $result_trees{'index_table'}{'contents'}[7];
+$result_trees{'index_table'}{'contents'}[8]{'contents'}[114]{'extra'}{'element_node'}
 = $result_trees{'index_table'}{'contents'}[7];
 
$result_trees{'index_table'}{'contents'}[8]{'contents'}[114]{'extra'}{'index_entry'}{'entry_element'}
 = $result_trees{'index_table'}{'contents'}[8]{'contents'}[114];
-$result_trees{'index_table'}{'contents'}[8]{'contents'}[115]{'extra'}{'entry_node'}
 = $result_trees{'index_table'}{'contents'}[7];
+$result_trees{'index_table'}{'contents'}[8]{'contents'}[115]{'extra'}{'element_node'}
 = $result_trees{'index_table'}{'contents'}[7];
 
$result_trees{'index_table'}{'contents'}[8]{'contents'}[115]{'extra'}{'index_entry'}{'entry_element'}
 = $result_trees{'index_table'}{'contents'}[8]{'contents'}[115];
-$result_trees{'index_table'}{'contents'}[8]{'contents'}[116]{'extra'}{'entry_node'}
 = $result_trees{'index_table'}{'contents'}[7];
+$result_trees{'index_table'}{'contents'}[8]{'contents'}[116]{'extra'}{'element_node'}
 = $result_trees{'index_table'}{'contents'}[7];
 
$result_trees{'index_table'}{'contents'}[8]{'contents'}[116]{'extra'}{'index_entry'}{'entry_element'}
 = $result_trees{'index_table'}{'contents'}[8]{'contents'}[116];
-$result_trees{'index_table'}{'contents'}[8]{'contents'}[117]{'extra'}{'entry_node'}
 = $result_trees{'index_table'}{'contents'}[7];
+$result_trees{'index_table'}{'contents'}[8]{'contents'}[117]{'extra'}{'element_node'}
 = $result_trees{'index_table'}{'contents'}[7];
 
$result_trees{'index_table'}{'contents'}[8]{'contents'}[117]{'extra'}{'index_entry'}{'entry_element'}
 = $result_trees{'index_table'}{'contents'}[8]{'contents'}[117];
-$result_trees{'index_table'}{'contents'}[8]{'contents'}[118]{'extra'}{'entry_node'}
 = $result_trees{'index_table'}{'contents'}[7];
+$result_trees{'index_table'}{'contents'}[8]{'contents'}[118]{'extra'}{'element_node'}
 = $result_trees{'index_table'}{'contents'}[7];
 
$result_trees{'index_table'}{'contents'}[8]{'contents'}[118]{'extra'}{'index_entry'}{'entry_element'}
 = $result_trees{'index_table'}{'contents'}[8]{'contents'}[118];
-$result_trees{'index_table'}{'contents'}[8]{'contents'}[119]{'extra'}{'entry_node'}
 = $result_trees{'index_table'}{'contents'}[7];
+$result_trees{'index_table'}{'contents'}[8]{'contents'}[119]{'extra'}{'element_node'}
 = $result_trees{'index_table'}{'contents'}[7];
 
$result_trees{'index_table'}{'contents'}[8]{'contents'}[119]{'extra'}{'index_entry'}{'entry_element'}
 = $result_trees{'index_table'}{'contents'}[8]{'contents'}[119];
-$result_trees{'index_table'}{'contents'}[8]{'contents'}[120]{'extra'}{'entry_node'}
 = $result_trees{'index_table'}{'contents'}[7];
+$result_trees{'index_table'}{'contents'}[8]{'contents'}[120]{'extra'}{'element_node'}
 = $result_trees{'index_table'}{'contents'}[7];
 
$result_trees{'index_table'}{'contents'}[8]{'contents'}[120]{'extra'}{'index_entry'}{'entry_element'}
 = $result_trees{'index_table'}{'contents'}[8]{'contents'}[120];
-$result_trees{'index_table'}{'contents'}[8]{'contents'}[121]{'extra'}{'entry_node'}
 = $result_trees{'index_table'}{'contents'}[7];
+$result_trees{'index_table'}{'contents'}[8]{'contents'}[121]{'extra'}{'element_node'}
 = $result_trees{'index_table'}{'contents'}[7];
 
$result_trees{'index_table'}{'contents'}[8]{'contents'}[121]{'extra'}{'index_entry'}{'entry_element'}
 = $result_trees{'index_table'}{'contents'}[8]{'contents'}[121];
-$result_trees{'index_table'}{'contents'}[8]{'contents'}[122]{'extra'}{'entry_node'}
 = $result_trees{'index_table'}{'contents'}[7];
+$result_trees{'index_table'}{'contents'}[8]{'contents'}[122]{'extra'}{'element_node'}
 = $result_trees{'index_table'}{'contents'}[7];
 
$result_trees{'index_table'}{'contents'}[8]{'contents'}[122]{'extra'}{'index_entry'}{'entry_element'}
 = $result_trees{'index_table'}{'contents'}[8]{'contents'}[122];
-$result_trees{'index_table'}{'contents'}[8]{'contents'}[123]{'extra'}{'entry_node'}
 = $result_trees{'index_table'}{'contents'}[7];
+$result_trees{'index_table'}{'contents'}[8]{'contents'}[123]{'extra'}{'element_node'}
 = $result_trees{'index_table'}{'contents'}[7];
 
$result_trees{'index_table'}{'contents'}[8]{'contents'}[123]{'extra'}{'index_entry'}{'entry_element'}
 = $result_trees{'index_table'}{'contents'}[8]{'contents'}[123];
-$result_trees{'index_table'}{'contents'}[8]{'contents'}[124]{'extra'}{'entry_node'}
 = $result_trees{'index_table'}{'contents'}[7];
+$result_trees{'index_table'}{'contents'}[8]{'contents'}[124]{'extra'}{'element_node'}
 = $result_trees{'index_table'}{'contents'}[7];
 
$result_trees{'index_table'}{'contents'}[8]{'contents'}[124]{'extra'}{'index_entry'}{'entry_element'}
 = $result_trees{'index_table'}{'contents'}[8]{'contents'}[124];
-$result_trees{'index_table'}{'contents'}[8]{'contents'}[125]{'extra'}{'entry_node'}
 = $result_trees{'index_table'}{'contents'}[7];
+$result_trees{'index_table'}{'contents'}[8]{'contents'}[125]{'extra'}{'element_node'}
 = $result_trees{'index_table'}{'contents'}[7];
 
$result_trees{'index_table'}{'contents'}[8]{'contents'}[125]{'extra'}{'index_entry'}{'entry_element'}
 = $result_trees{'index_table'}{'contents'}[8]{'contents'}[125];
-$result_trees{'index_table'}{'contents'}[8]{'contents'}[126]{'extra'}{'entry_node'}
 = $result_trees{'index_table'}{'contents'}[7];
+$result_trees{'index_table'}{'contents'}[8]{'contents'}[126]{'extra'}{'element_node'}
 = $result_trees{'index_table'}{'contents'}[7];
 
$result_trees{'index_table'}{'contents'}[8]{'contents'}[126]{'extra'}{'index_entry'}{'entry_element'}
 = $result_trees{'index_table'}{'contents'}[8]{'contents'}[126];
-$result_trees{'index_table'}{'contents'}[8]{'contents'}[127]{'extra'}{'entry_node'}
 = $result_trees{'index_table'}{'contents'}[7];
+$result_trees{'index_table'}{'contents'}[8]{'contents'}[127]{'extra'}{'element_node'}
 = $result_trees{'index_table'}{'contents'}[7];
 
$result_trees{'index_table'}{'contents'}[8]{'contents'}[127]{'extra'}{'index_entry'}{'entry_element'}
 = $result_trees{'index_table'}{'contents'}[8]{'contents'}[127];
-$result_trees{'index_table'}{'contents'}[8]{'contents'}[128]{'extra'}{'entry_node'}
 = $result_trees{'index_table'}{'contents'}[7];
+$result_trees{'index_table'}{'contents'}[8]{'contents'}[128]{'extra'}{'element_node'}
 = $result_trees{'index_table'}{'contents'}[7];
 
$result_trees{'index_table'}{'contents'}[8]{'contents'}[128]{'extra'}{'index_entry'}{'entry_element'}
 = $result_trees{'index_table'}{'contents'}[8]{'contents'}[128];
 $result_trees{'index_table'}{'contents'}[9]{'extra'}{'node_content'}[0] = 
$result_trees{'index_table'}{'contents'}[9]{'args'}[0]{'contents'}[0];
 
$result_trees{'index_table'}{'contents'}[9]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = $result_trees{'index_table'}{'contents'}[9]{'args'}[0]{'contents'}[0];
diff --git a/tp/t/results/indices/index_table_chapter_no_node.pl 
b/tp/t/results/indices/index_table_chapter_no_node.pl
index 906f5cc597..d0bdd096ab 100644
--- a/tp/t/results/indices/index_table_chapter_no_node.pl
+++ b/tp/t/results/indices/index_table_chapter_no_node.pl
@@ -394,7 +394,7 @@ $result_trees{'index_table_chapter_no_node'} = {
           ],
           'cmdname' => 'cindex',
           'extra' => {
-            'entry_node' => {},
+            'element_node' => {},
             'index_entry' => {
               'entry_element' => {},
               'entry_number' => 1,
@@ -444,7 +444,7 @@ $result_trees{'index_table_chapter_no_node'} = {
               ],
               'cmdname' => 'cindex',
               'extra' => {
-                'entry_node' => {},
+                'element_node' => {},
                 'index_entry' => {
                   'entry_element' => {},
                   'entry_number' => 2,
@@ -534,7 +534,7 @@ $result_trees{'index_table_chapter_no_node'} = {
                       ],
                       'cmdname' => 'item',
                       'extra' => {
-                        'entry_node' => {},
+                        'element_node' => {},
                         'index_entry' => {
                           'entry_element' => {},
                           'entry_number' => 1,
@@ -572,7 +572,7 @@ $result_trees{'index_table_chapter_no_node'} = {
                       ],
                       'cmdname' => 'itemx',
                       'extra' => {
-                        'entry_node' => {},
+                        'element_node' => {},
                         'index_entry' => {
                           'entry_element' => {},
                           'entry_number' => 2,
@@ -724,7 +724,7 @@ $result_trees{'index_table_chapter_no_node'} = {
                       ],
                       'cmdname' => 'item',
                       'extra' => {
-                        'entry_node' => {},
+                        'element_node' => {},
                         'index_entry' => {
                           'entry_element' => {},
                           'entry_number' => 1,
@@ -762,7 +762,7 @@ $result_trees{'index_table_chapter_no_node'} = {
                       ],
                       'cmdname' => 'itemx',
                       'extra' => {
-                        'entry_node' => {},
+                        'element_node' => {},
                         'index_entry' => {
                           'entry_element' => {},
                           'entry_number' => 2,
@@ -824,7 +824,7 @@ $result_trees{'index_table_chapter_no_node'} = {
                       ],
                       'cmdname' => 'item',
                       'extra' => {
-                        'entry_node' => {},
+                        'element_node' => {},
                         'index_entry' => {
                           'entry_element' => {},
                           'entry_number' => 3,
@@ -1299,7 +1299,7 @@ $result_trees{'index_table_chapter_no_node'} = {
           ],
           'cmdname' => 'cindex',
           'extra' => {
-            'entry_node' => {},
+            'element_node' => {},
             'index_entry' => {
               'entry_element' => {},
               'entry_number' => 3,
@@ -1338,7 +1338,7 @@ $result_trees{'index_table_chapter_no_node'} = {
           ],
           'cmdname' => 'cindex',
           'extra' => {
-            'entry_node' => {},
+            'element_node' => {},
             'index_entry' => {
               'entry_element' => {},
               'entry_number' => 4,
@@ -1377,7 +1377,7 @@ $result_trees{'index_table_chapter_no_node'} = {
           ],
           'cmdname' => 'cindex',
           'extra' => {
-            'entry_node' => {},
+            'element_node' => {},
             'index_entry' => {
               'entry_element' => {},
               'entry_number' => 5,
@@ -1416,7 +1416,7 @@ $result_trees{'index_table_chapter_no_node'} = {
           ],
           'cmdname' => 'cindex',
           'extra' => {
-            'entry_node' => {},
+            'element_node' => {},
             'index_entry' => {
               'entry_element' => {},
               'entry_number' => 6,
@@ -1455,7 +1455,7 @@ $result_trees{'index_table_chapter_no_node'} = {
           ],
           'cmdname' => 'cindex',
           'extra' => {
-            'entry_node' => {},
+            'element_node' => {},
             'index_entry' => {
               'entry_element' => {},
               'entry_number' => 7,
@@ -1494,7 +1494,7 @@ $result_trees{'index_table_chapter_no_node'} = {
           ],
           'cmdname' => 'cindex',
           'extra' => {
-            'entry_node' => {},
+            'element_node' => {},
             'index_entry' => {
               'entry_element' => {},
               'entry_number' => 8,
@@ -1533,7 +1533,7 @@ $result_trees{'index_table_chapter_no_node'} = {
           ],
           'cmdname' => 'cindex',
           'extra' => {
-            'entry_node' => {},
+            'element_node' => {},
             'index_entry' => {
               'entry_element' => {},
               'entry_number' => 9,
@@ -1572,7 +1572,7 @@ $result_trees{'index_table_chapter_no_node'} = {
           ],
           'cmdname' => 'cindex',
           'extra' => {
-            'entry_node' => {},
+            'element_node' => {},
             'index_entry' => {
               'entry_element' => {},
               'entry_number' => 10,
@@ -1611,7 +1611,7 @@ $result_trees{'index_table_chapter_no_node'} = {
           ],
           'cmdname' => 'cindex',
           'extra' => {
-            'entry_node' => {},
+            'element_node' => {},
             'index_entry' => {
               'entry_element' => {},
               'entry_number' => 11,
@@ -1650,7 +1650,7 @@ $result_trees{'index_table_chapter_no_node'} = {
           ],
           'cmdname' => 'cindex',
           'extra' => {
-            'entry_node' => {},
+            'element_node' => {},
             'index_entry' => {
               'entry_element' => {},
               'entry_number' => 12,
@@ -1689,7 +1689,7 @@ $result_trees{'index_table_chapter_no_node'} = {
           ],
           'cmdname' => 'cindex',
           'extra' => {
-            'entry_node' => {},
+            'element_node' => {},
             'index_entry' => {
               'entry_element' => {},
               'entry_number' => 13,
@@ -1728,7 +1728,7 @@ $result_trees{'index_table_chapter_no_node'} = {
           ],
           'cmdname' => 'cindex',
           'extra' => {
-            'entry_node' => {},
+            'element_node' => {},
             'index_entry' => {
               'entry_element' => {},
               'entry_number' => 14,
@@ -1767,7 +1767,7 @@ $result_trees{'index_table_chapter_no_node'} = {
           ],
           'cmdname' => 'cindex',
           'extra' => {
-            'entry_node' => {},
+            'element_node' => {},
             'index_entry' => {
               'entry_element' => {},
               'entry_number' => 15,
@@ -1806,7 +1806,7 @@ $result_trees{'index_table_chapter_no_node'} = {
           ],
           'cmdname' => 'cindex',
           'extra' => {
-            'entry_node' => {},
+            'element_node' => {},
             'index_entry' => {
               'entry_element' => {},
               'entry_number' => 16,
@@ -1845,7 +1845,7 @@ $result_trees{'index_table_chapter_no_node'} = {
           ],
           'cmdname' => 'cindex',
           'extra' => {
-            'entry_node' => {},
+            'element_node' => {},
             'index_entry' => {
               'entry_element' => {},
               'entry_number' => 17,
@@ -1884,7 +1884,7 @@ $result_trees{'index_table_chapter_no_node'} = {
           ],
           'cmdname' => 'cindex',
           'extra' => {
-            'entry_node' => {},
+            'element_node' => {},
             'index_entry' => {
               'entry_element' => {},
               'entry_number' => 18,
@@ -1923,7 +1923,7 @@ $result_trees{'index_table_chapter_no_node'} = {
           ],
           'cmdname' => 'cindex',
           'extra' => {
-            'entry_node' => {},
+            'element_node' => {},
             'index_entry' => {
               'entry_element' => {},
               'entry_number' => 19,
@@ -1962,7 +1962,7 @@ $result_trees{'index_table_chapter_no_node'} = {
           ],
           'cmdname' => 'cindex',
           'extra' => {
-            'entry_node' => {},
+            'element_node' => {},
             'index_entry' => {
               'entry_element' => {},
               'entry_number' => 20,
@@ -2001,7 +2001,7 @@ $result_trees{'index_table_chapter_no_node'} = {
           ],
           'cmdname' => 'cindex',
           'extra' => {
-            'entry_node' => {},
+            'element_node' => {},
             'index_entry' => {
               'entry_element' => {},
               'entry_number' => 21,
@@ -2040,7 +2040,7 @@ $result_trees{'index_table_chapter_no_node'} = {
           ],
           'cmdname' => 'cindex',
           'extra' => {
-            'entry_node' => {},
+            'element_node' => {},
             'index_entry' => {
               'entry_element' => {},
               'entry_number' => 22,
@@ -2079,7 +2079,7 @@ $result_trees{'index_table_chapter_no_node'} = {
           ],
           'cmdname' => 'cindex',
           'extra' => {
-            'entry_node' => {},
+            'element_node' => {},
             'index_entry' => {
               'entry_element' => {},
               'entry_number' => 23,
@@ -2118,7 +2118,7 @@ $result_trees{'index_table_chapter_no_node'} = {
           ],
           'cmdname' => 'cindex',
           'extra' => {
-            'entry_node' => {},
+            'element_node' => {},
             'index_entry' => {
               'entry_element' => {},
               'entry_number' => 24,
@@ -2157,7 +2157,7 @@ $result_trees{'index_table_chapter_no_node'} = {
           ],
           'cmdname' => 'cindex',
           'extra' => {
-            'entry_node' => {},
+            'element_node' => {},
             'index_entry' => {
               'entry_element' => {},
               'entry_number' => 25,
@@ -2196,7 +2196,7 @@ $result_trees{'index_table_chapter_no_node'} = {
           ],
           'cmdname' => 'cindex',
           'extra' => {
-            'entry_node' => {},
+            'element_node' => {},
             'index_entry' => {
               'entry_element' => {},
               'entry_number' => 26,
@@ -2235,7 +2235,7 @@ $result_trees{'index_table_chapter_no_node'} = {
           ],
           'cmdname' => 'cindex',
           'extra' => {
-            'entry_node' => {},
+            'element_node' => {},
             'index_entry' => {
               'entry_element' => {},
               'entry_number' => 27,
@@ -2274,7 +2274,7 @@ $result_trees{'index_table_chapter_no_node'} = {
           ],
           'cmdname' => 'cindex',
           'extra' => {
-            'entry_node' => {},
+            'element_node' => {},
             'index_entry' => {
               'entry_element' => {},
               'entry_number' => 28,
@@ -2313,7 +2313,7 @@ $result_trees{'index_table_chapter_no_node'} = {
           ],
           'cmdname' => 'cindex',
           'extra' => {
-            'entry_node' => {},
+            'element_node' => {},
             'index_entry' => {
               'entry_element' => {},
               'entry_number' => 29,
@@ -2352,7 +2352,7 @@ $result_trees{'index_table_chapter_no_node'} = {
           ],
           'cmdname' => 'cindex',
           'extra' => {
-            'entry_node' => {},
+            'element_node' => {},
             'index_entry' => {
               'entry_element' => {},
               'entry_number' => 30,
@@ -2391,7 +2391,7 @@ $result_trees{'index_table_chapter_no_node'} = {
           ],
           'cmdname' => 'cindex',
           'extra' => {
-            'entry_node' => {},
+            'element_node' => {},
             'index_entry' => {
               'entry_element' => {},
               'entry_number' => 31,
@@ -2430,7 +2430,7 @@ $result_trees{'index_table_chapter_no_node'} = {
           ],
           'cmdname' => 'cindex',
           'extra' => {
-            'entry_node' => {},
+            'element_node' => {},
             'index_entry' => {
               'entry_element' => {},
               'entry_number' => 32,
@@ -2469,7 +2469,7 @@ $result_trees{'index_table_chapter_no_node'} = {
           ],
           'cmdname' => 'cindex',
           'extra' => {
-            'entry_node' => {},
+            'element_node' => {},
             'index_entry' => {
               'entry_element' => {},
               'entry_number' => 33,
@@ -2508,7 +2508,7 @@ $result_trees{'index_table_chapter_no_node'} = {
           ],
           'cmdname' => 'cindex',
           'extra' => {
-            'entry_node' => {},
+            'element_node' => {},
             'index_entry' => {
               'entry_element' => {},
               'entry_number' => 34,
@@ -2547,7 +2547,7 @@ $result_trees{'index_table_chapter_no_node'} = {
           ],
           'cmdname' => 'cindex',
           'extra' => {
-            'entry_node' => {},
+            'element_node' => {},
             'index_entry' => {
               'entry_element' => {},
               'entry_number' => 35,
@@ -2586,7 +2586,7 @@ $result_trees{'index_table_chapter_no_node'} = {
           ],
           'cmdname' => 'cindex',
           'extra' => {
-            'entry_node' => {},
+            'element_node' => {},
             'index_entry' => {
               'entry_element' => {},
               'entry_number' => 36,
@@ -2625,7 +2625,7 @@ $result_trees{'index_table_chapter_no_node'} = {
           ],
           'cmdname' => 'cindex',
           'extra' => {
-            'entry_node' => {},
+            'element_node' => {},
             'index_entry' => {
               'entry_element' => {},
               'entry_number' => 37,
@@ -2664,7 +2664,7 @@ $result_trees{'index_table_chapter_no_node'} = {
           ],
           'cmdname' => 'cindex',
           'extra' => {
-            'entry_node' => {},
+            'element_node' => {},
             'index_entry' => {
               'entry_element' => {},
               'entry_number' => 38,
@@ -2703,7 +2703,7 @@ $result_trees{'index_table_chapter_no_node'} = {
           ],
           'cmdname' => 'cindex',
           'extra' => {
-            'entry_node' => {},
+            'element_node' => {},
             'index_entry' => {
               'entry_element' => {},
               'entry_number' => 39,
@@ -2742,7 +2742,7 @@ $result_trees{'index_table_chapter_no_node'} = {
           ],
           'cmdname' => 'cindex',
           'extra' => {
-            'entry_node' => {},
+            'element_node' => {},
             'index_entry' => {
               'entry_element' => {},
               'entry_number' => 40,
@@ -2781,7 +2781,7 @@ $result_trees{'index_table_chapter_no_node'} = {
           ],
           'cmdname' => 'cindex',
           'extra' => {
-            'entry_node' => {},
+            'element_node' => {},
             'index_entry' => {
               'entry_element' => {},
               'entry_number' => 41,
@@ -2820,7 +2820,7 @@ $result_trees{'index_table_chapter_no_node'} = {
           ],
           'cmdname' => 'cindex',
           'extra' => {
-            'entry_node' => {},
+            'element_node' => {},
             'index_entry' => {
               'entry_element' => {},
               'entry_number' => 42,
@@ -2859,7 +2859,7 @@ $result_trees{'index_table_chapter_no_node'} = {
           ],
           'cmdname' => 'cindex',
           'extra' => {
-            'entry_node' => {},
+            'element_node' => {},
             'index_entry' => {
               'entry_element' => {},
               'entry_number' => 43,
@@ -2898,7 +2898,7 @@ $result_trees{'index_table_chapter_no_node'} = {
           ],
           'cmdname' => 'cindex',
           'extra' => {
-            'entry_node' => {},
+            'element_node' => {},
             'index_entry' => {
               'entry_element' => {},
               'entry_number' => 44,
@@ -2937,7 +2937,7 @@ $result_trees{'index_table_chapter_no_node'} = {
           ],
           'cmdname' => 'cindex',
           'extra' => {
-            'entry_node' => {},
+            'element_node' => {},
             'index_entry' => {
               'entry_element' => {},
               'entry_number' => 45,
@@ -2976,7 +2976,7 @@ $result_trees{'index_table_chapter_no_node'} = {
           ],
           'cmdname' => 'cindex',
           'extra' => {
-            'entry_node' => {},
+            'element_node' => {},
             'index_entry' => {
               'entry_element' => {},
               'entry_number' => 46,
@@ -3015,7 +3015,7 @@ $result_trees{'index_table_chapter_no_node'} = {
           ],
           'cmdname' => 'cindex',
           'extra' => {
-            'entry_node' => {},
+            'element_node' => {},
             'index_entry' => {
               'entry_element' => {},
               'entry_number' => 47,
@@ -3054,7 +3054,7 @@ $result_trees{'index_table_chapter_no_node'} = {
           ],
           'cmdname' => 'cindex',
           'extra' => {
-            'entry_node' => {},
+            'element_node' => {},
             'index_entry' => {
               'entry_element' => {},
               'entry_number' => 48,
@@ -3093,7 +3093,7 @@ $result_trees{'index_table_chapter_no_node'} = {
           ],
           'cmdname' => 'cindex',
           'extra' => {
-            'entry_node' => {},
+            'element_node' => {},
             'index_entry' => {
               'entry_element' => {},
               'entry_number' => 49,
@@ -3132,7 +3132,7 @@ $result_trees{'index_table_chapter_no_node'} = {
           ],
           'cmdname' => 'cindex',
           'extra' => {
-            'entry_node' => {},
+            'element_node' => {},
             'index_entry' => {
               'entry_element' => {},
               'entry_number' => 50,
@@ -3171,7 +3171,7 @@ $result_trees{'index_table_chapter_no_node'} = {
           ],
           'cmdname' => 'cindex',
           'extra' => {
-            'entry_node' => {},
+            'element_node' => {},
             'index_entry' => {
               'entry_element' => {},
               'entry_number' => 51,
@@ -3210,7 +3210,7 @@ $result_trees{'index_table_chapter_no_node'} = {
           ],
           'cmdname' => 'cindex',
           'extra' => {
-            'entry_node' => {},
+            'element_node' => {},
             'index_entry' => {
               'entry_element' => {},
               'entry_number' => 52,
@@ -3249,7 +3249,7 @@ $result_trees{'index_table_chapter_no_node'} = {
           ],
           'cmdname' => 'cindex',
           'extra' => {
-            'entry_node' => {},
+            'element_node' => {},
             'index_entry' => {
               'entry_element' => {},
               'entry_number' => 53,
@@ -3288,7 +3288,7 @@ $result_trees{'index_table_chapter_no_node'} = {
           ],
           'cmdname' => 'cindex',
           'extra' => {
-            'entry_node' => {},
+            'element_node' => {},
             'index_entry' => {
               'entry_element' => {},
               'entry_number' => 54,
@@ -3327,7 +3327,7 @@ $result_trees{'index_table_chapter_no_node'} = {
           ],
           'cmdname' => 'cindex',
           'extra' => {
-            'entry_node' => {},
+            'element_node' => {},
             'index_entry' => {
               'entry_element' => {},
               'entry_number' => 55,
@@ -3366,7 +3366,7 @@ $result_trees{'index_table_chapter_no_node'} = {
           ],
           'cmdname' => 'cindex',
           'extra' => {
-            'entry_node' => {},
+            'element_node' => {},
             'index_entry' => {
               'entry_element' => {},
               'entry_number' => 56,
@@ -3405,7 +3405,7 @@ $result_trees{'index_table_chapter_no_node'} = {
           ],
           'cmdname' => 'cindex',
           'extra' => {
-            'entry_node' => {},
+            'element_node' => {},
             'index_entry' => {
               'entry_element' => {},
               'entry_number' => 57,
@@ -3444,7 +3444,7 @@ $result_trees{'index_table_chapter_no_node'} = {
           ],
           'cmdname' => 'cindex',
           'extra' => {
-            'entry_node' => {},
+            'element_node' => {},
             'index_entry' => {
               'entry_element' => {},
               'entry_number' => 58,
@@ -3483,7 +3483,7 @@ $result_trees{'index_table_chapter_no_node'} = {
           ],
           'cmdname' => 'cindex',
           'extra' => {
-            'entry_node' => {},
+            'element_node' => {},
             'index_entry' => {
               'entry_element' => {},
               'entry_number' => 59,
@@ -3522,7 +3522,7 @@ $result_trees{'index_table_chapter_no_node'} = {
           ],
           'cmdname' => 'cindex',
           'extra' => {
-            'entry_node' => {},
+            'element_node' => {},
             'index_entry' => {
               'entry_element' => {},
               'entry_number' => 60,
@@ -3561,7 +3561,7 @@ $result_trees{'index_table_chapter_no_node'} = {
           ],
           'cmdname' => 'cindex',
           'extra' => {
-            'entry_node' => {},
+            'element_node' => {},
             'index_entry' => {
               'entry_element' => {},
               'entry_number' => 61,
@@ -3600,7 +3600,7 @@ $result_trees{'index_table_chapter_no_node'} = {
           ],
           'cmdname' => 'cindex',
           'extra' => {
-            'entry_node' => {},
+            'element_node' => {},
             'index_entry' => {
               'entry_element' => {},
               'entry_number' => 62,
@@ -3639,7 +3639,7 @@ $result_trees{'index_table_chapter_no_node'} = {
           ],
           'cmdname' => 'cindex',
           'extra' => {
-            'entry_node' => {},
+            'element_node' => {},
             'index_entry' => {
               'entry_element' => {},
               'entry_number' => 63,
@@ -3678,7 +3678,7 @@ $result_trees{'index_table_chapter_no_node'} = {
           ],
           'cmdname' => 'cindex',
           'extra' => {
-            'entry_node' => {},
+            'element_node' => {},
             'index_entry' => {
               'entry_element' => {},
               'entry_number' => 64,
@@ -3717,7 +3717,7 @@ $result_trees{'index_table_chapter_no_node'} = {
           ],
           'cmdname' => 'cindex',
           'extra' => {
-            'entry_node' => {},
+            'element_node' => {},
             'index_entry' => {
               'entry_element' => {},
               'entry_number' => 65,
@@ -3756,7 +3756,7 @@ $result_trees{'index_table_chapter_no_node'} = {
           ],
           'cmdname' => 'cindex',
           'extra' => {
-            'entry_node' => {},
+            'element_node' => {},
             'index_entry' => {
               'entry_element' => {},
               'entry_number' => 66,
@@ -3795,7 +3795,7 @@ $result_trees{'index_table_chapter_no_node'} = {
           ],
           'cmdname' => 'cindex',
           'extra' => {
-            'entry_node' => {},
+            'element_node' => {},
             'index_entry' => {
               'entry_element' => {},
               'entry_number' => 67,
@@ -3834,7 +3834,7 @@ $result_trees{'index_table_chapter_no_node'} = {
           ],
           'cmdname' => 'cindex',
           'extra' => {
-            'entry_node' => {},
+            'element_node' => {},
             'index_entry' => {
               'entry_element' => {},
               'entry_number' => 68,
@@ -3873,7 +3873,7 @@ $result_trees{'index_table_chapter_no_node'} = {
           ],
           'cmdname' => 'cindex',
           'extra' => {
-            'entry_node' => {},
+            'element_node' => {},
             'index_entry' => {
               'entry_element' => {},
               'entry_number' => 69,
@@ -3912,7 +3912,7 @@ $result_trees{'index_table_chapter_no_node'} = {
           ],
           'cmdname' => 'cindex',
           'extra' => {
-            'entry_node' => {},
+            'element_node' => {},
             'index_entry' => {
               'entry_element' => {},
               'entry_number' => 70,
@@ -3951,7 +3951,7 @@ $result_trees{'index_table_chapter_no_node'} = {
           ],
           'cmdname' => 'cindex',
           'extra' => {
-            'entry_node' => {},
+            'element_node' => {},
             'index_entry' => {
               'entry_element' => {},
               'entry_number' => 71,
@@ -3990,7 +3990,7 @@ $result_trees{'index_table_chapter_no_node'} = {
           ],
           'cmdname' => 'cindex',
           'extra' => {
-            'entry_node' => {},
+            'element_node' => {},
             'index_entry' => {
               'entry_element' => {},
               'entry_number' => 72,
@@ -4029,7 +4029,7 @@ $result_trees{'index_table_chapter_no_node'} = {
           ],
           'cmdname' => 'cindex',
           'extra' => {
-            'entry_node' => {},
+            'element_node' => {},
             'index_entry' => {
               'entry_element' => {},
               'entry_number' => 73,
@@ -4068,7 +4068,7 @@ $result_trees{'index_table_chapter_no_node'} = {
           ],
           'cmdname' => 'cindex',
           'extra' => {
-            'entry_node' => {},
+            'element_node' => {},
             'index_entry' => {
               'entry_element' => {},
               'entry_number' => 74,
@@ -4107,7 +4107,7 @@ $result_trees{'index_table_chapter_no_node'} = {
           ],
           'cmdname' => 'cindex',
           'extra' => {
-            'entry_node' => {},
+            'element_node' => {},
             'index_entry' => {
               'entry_element' => {},
               'entry_number' => 75,
@@ -4146,7 +4146,7 @@ $result_trees{'index_table_chapter_no_node'} = {
           ],
           'cmdname' => 'cindex',
           'extra' => {
-            'entry_node' => {},
+            'element_node' => {},
             'index_entry' => {
               'entry_element' => {},
               'entry_number' => 76,
@@ -4185,7 +4185,7 @@ $result_trees{'index_table_chapter_no_node'} = {
           ],
           'cmdname' => 'cindex',
           'extra' => {
-            'entry_node' => {},
+            'element_node' => {},
             'index_entry' => {
               'entry_element' => {},
               'entry_number' => 77,
@@ -4224,7 +4224,7 @@ $result_trees{'index_table_chapter_no_node'} = {
           ],
           'cmdname' => 'cindex',
           'extra' => {
-            'entry_node' => {},
+            'element_node' => {},
             'index_entry' => {
               'entry_element' => {},
               'entry_number' => 78,
@@ -4263,7 +4263,7 @@ $result_trees{'index_table_chapter_no_node'} = {
           ],
           'cmdname' => 'cindex',
           'extra' => {
-            'entry_node' => {},
+            'element_node' => {},
             'index_entry' => {
               'entry_element' => {},
               'entry_number' => 79,
@@ -4302,7 +4302,7 @@ $result_trees{'index_table_chapter_no_node'} = {
           ],
           'cmdname' => 'cindex',
           'extra' => {
-            'entry_node' => {},
+            'element_node' => {},
             'index_entry' => {
               'entry_element' => {},
               'entry_number' => 80,
@@ -4341,7 +4341,7 @@ $result_trees{'index_table_chapter_no_node'} = {
           ],
           'cmdname' => 'cindex',
           'extra' => {
-            'entry_node' => {},
+            'element_node' => {},
             'index_entry' => {
               'entry_element' => {},
               'entry_number' => 81,
@@ -4380,7 +4380,7 @@ $result_trees{'index_table_chapter_no_node'} = {
           ],
           'cmdname' => 'cindex',
           'extra' => {
-            'entry_node' => {},
+            'element_node' => {},
             'index_entry' => {
               'entry_element' => {},
               'entry_number' => 82,
@@ -4419,7 +4419,7 @@ $result_trees{'index_table_chapter_no_node'} = {
           ],
           'cmdname' => 'cindex',
           'extra' => {
-            'entry_node' => {},
+            'element_node' => {},
             'index_entry' => {
               'entry_element' => {},
               'entry_number' => 83,
@@ -4458,7 +4458,7 @@ $result_trees{'index_table_chapter_no_node'} = {
           ],
           'cmdname' => 'cindex',
           'extra' => {
-            'entry_node' => {},
+            'element_node' => {},
             'index_entry' => {
               'entry_element' => {},
               'entry_number' => 84,
@@ -4497,7 +4497,7 @@ $result_trees{'index_table_chapter_no_node'} = {
           ],
           'cmdname' => 'cindex',
           'extra' => {
-            'entry_node' => {},
+            'element_node' => {},
             'index_entry' => {
               'entry_element' => {},
               'entry_number' => 85,
@@ -4536,7 +4536,7 @@ $result_trees{'index_table_chapter_no_node'} = {
           ],
           'cmdname' => 'cindex',
           'extra' => {
-            'entry_node' => {},
+            'element_node' => {},
             'index_entry' => {
               'entry_element' => {},
               'entry_number' => 86,
@@ -4575,7 +4575,7 @@ $result_trees{'index_table_chapter_no_node'} = {
           ],
           'cmdname' => 'cindex',
           'extra' => {
-            'entry_node' => {},
+            'element_node' => {},
             'index_entry' => {
               'entry_element' => {},
               'entry_number' => 87,
@@ -4614,7 +4614,7 @@ $result_trees{'index_table_chapter_no_node'} = {
           ],
           'cmdname' => 'cindex',
           'extra' => {
-            'entry_node' => {},
+            'element_node' => {},
             'index_entry' => {
               'entry_element' => {},
               'entry_number' => 88,
@@ -4653,7 +4653,7 @@ $result_trees{'index_table_chapter_no_node'} = {
           ],
           'cmdname' => 'cindex',
           'extra' => {
-            'entry_node' => {},
+            'element_node' => {},
             'index_entry' => {
               'entry_element' => {},
               'entry_number' => 89,
@@ -4692,7 +4692,7 @@ $result_trees{'index_table_chapter_no_node'} = {
           ],
           'cmdname' => 'cindex',
           'extra' => {
-            'entry_node' => {},
+            'element_node' => {},
             'index_entry' => {
               'entry_element' => {},
               'entry_number' => 90,
@@ -4731,7 +4731,7 @@ $result_trees{'index_table_chapter_no_node'} = {
           ],
           'cmdname' => 'cindex',
           'extra' => {
-            'entry_node' => {},
+            'element_node' => {},
             'index_entry' => {
               'entry_element' => {},
               'entry_number' => 91,
@@ -4770,7 +4770,7 @@ $result_trees{'index_table_chapter_no_node'} = {
           ],
           'cmdname' => 'cindex',
           'extra' => {
-            'entry_node' => {},
+            'element_node' => {},
             'index_entry' => {
               'entry_element' => {},
               'entry_number' => 92,
@@ -4809,7 +4809,7 @@ $result_trees{'index_table_chapter_no_node'} = {
           ],
           'cmdname' => 'cindex',
           'extra' => {
-            'entry_node' => {},
+            'element_node' => {},
             'index_entry' => {
               'entry_element' => {},
               'entry_number' => 93,
@@ -4848,7 +4848,7 @@ $result_trees{'index_table_chapter_no_node'} = {
           ],
           'cmdname' => 'cindex',
           'extra' => {
-            'entry_node' => {},
+            'element_node' => {},
             'index_entry' => {
               'entry_element' => {},
               'entry_number' => 94,
@@ -4887,7 +4887,7 @@ $result_trees{'index_table_chapter_no_node'} = {
           ],
           'cmdname' => 'cindex',
           'extra' => {
-            'entry_node' => {},
+            'element_node' => {},
             'index_entry' => {
               'entry_element' => {},
               'entry_number' => 95,
@@ -4926,7 +4926,7 @@ $result_trees{'index_table_chapter_no_node'} = {
           ],
           'cmdname' => 'cindex',
           'extra' => {
-            'entry_node' => {},
+            'element_node' => {},
             'index_entry' => {
               'entry_element' => {},
               'entry_number' => 96,
@@ -4965,7 +4965,7 @@ $result_trees{'index_table_chapter_no_node'} = {
           ],
           'cmdname' => 'cindex',
           'extra' => {
-            'entry_node' => {},
+            'element_node' => {},
             'index_entry' => {
               'entry_element' => {},
               'entry_number' => 97,
@@ -5004,7 +5004,7 @@ $result_trees{'index_table_chapter_no_node'} = {
           ],
           'cmdname' => 'cindex',
           'extra' => {
-            'entry_node' => {},
+            'element_node' => {},
             'index_entry' => {
               'entry_element' => {},
               'entry_number' => 98,
@@ -5043,7 +5043,7 @@ $result_trees{'index_table_chapter_no_node'} = {
           ],
           'cmdname' => 'cindex',
           'extra' => {
-            'entry_node' => {},
+            'element_node' => {},
             'index_entry' => {
               'entry_element' => {},
               'entry_number' => 99,
@@ -5082,7 +5082,7 @@ $result_trees{'index_table_chapter_no_node'} = {
           ],
           'cmdname' => 'cindex',
           'extra' => {
-            'entry_node' => {},
+            'element_node' => {},
             'index_entry' => {
               'entry_element' => {},
               'entry_number' => 100,
@@ -5121,7 +5121,7 @@ $result_trees{'index_table_chapter_no_node'} = {
           ],
           'cmdname' => 'cindex',
           'extra' => {
-            'entry_node' => {},
+            'element_node' => {},
             'index_entry' => {
               'entry_element' => {},
               'entry_number' => 101,
@@ -5160,7 +5160,7 @@ $result_trees{'index_table_chapter_no_node'} = {
           ],
           'cmdname' => 'cindex',
           'extra' => {
-            'entry_node' => {},
+            'element_node' => {},
             'index_entry' => {
               'entry_element' => {},
               'entry_number' => 102,
@@ -5199,7 +5199,7 @@ $result_trees{'index_table_chapter_no_node'} = {
           ],
           'cmdname' => 'cindex',
           'extra' => {
-            'entry_node' => {},
+            'element_node' => {},
             'index_entry' => {
               'entry_element' => {},
               'entry_number' => 103,
@@ -5238,7 +5238,7 @@ $result_trees{'index_table_chapter_no_node'} = {
           ],
           'cmdname' => 'cindex',
           'extra' => {
-            'entry_node' => {},
+            'element_node' => {},
             'index_entry' => {
               'entry_element' => {},
               'entry_number' => 104,
@@ -5277,7 +5277,7 @@ $result_trees{'index_table_chapter_no_node'} = {
           ],
           'cmdname' => 'cindex',
           'extra' => {
-            'entry_node' => {},
+            'element_node' => {},
             'index_entry' => {
               'entry_element' => {},
               'entry_number' => 105,
@@ -5316,7 +5316,7 @@ $result_trees{'index_table_chapter_no_node'} = {
           ],
           'cmdname' => 'cindex',
           'extra' => {
-            'entry_node' => {},
+            'element_node' => {},
             'index_entry' => {
               'entry_element' => {},
               'entry_number' => 106,
@@ -5355,7 +5355,7 @@ $result_trees{'index_table_chapter_no_node'} = {
           ],
           'cmdname' => 'cindex',
           'extra' => {
-            'entry_node' => {},
+            'element_node' => {},
             'index_entry' => {
               'entry_element' => {},
               'entry_number' => 107,
@@ -5394,7 +5394,7 @@ $result_trees{'index_table_chapter_no_node'} = {
           ],
           'cmdname' => 'cindex',
           'extra' => {
-            'entry_node' => {},
+            'element_node' => {},
             'index_entry' => {
               'entry_element' => {},
               'entry_number' => 108,
@@ -5433,7 +5433,7 @@ $result_trees{'index_table_chapter_no_node'} = {
           ],
           'cmdname' => 'cindex',
           'extra' => {
-            'entry_node' => {},
+            'element_node' => {},
             'index_entry' => {
               'entry_element' => {},
               'entry_number' => 109,
@@ -5472,7 +5472,7 @@ $result_trees{'index_table_chapter_no_node'} = {
           ],
           'cmdname' => 'cindex',
           'extra' => {
-            'entry_node' => {},
+            'element_node' => {},
             'index_entry' => {
               'entry_element' => {},
               'entry_number' => 110,
@@ -5511,7 +5511,7 @@ $result_trees{'index_table_chapter_no_node'} = {
           ],
           'cmdname' => 'cindex',
           'extra' => {
-            'entry_node' => {},
+            'element_node' => {},
             'index_entry' => {
               'entry_element' => {},
               'entry_number' => 111,
@@ -5550,7 +5550,7 @@ $result_trees{'index_table_chapter_no_node'} = {
           ],
           'cmdname' => 'cindex',
           'extra' => {
-            'entry_node' => {},
+            'element_node' => {},
             'index_entry' => {
               'entry_element' => {},
               'entry_number' => 112,
@@ -5589,7 +5589,7 @@ $result_trees{'index_table_chapter_no_node'} = {
           ],
           'cmdname' => 'cindex',
           'extra' => {
-            'entry_node' => {},
+            'element_node' => {},
             'index_entry' => {
               'entry_element' => {},
               'entry_number' => 113,
@@ -5628,7 +5628,7 @@ $result_trees{'index_table_chapter_no_node'} = {
           ],
           'cmdname' => 'cindex',
           'extra' => {
-            'entry_node' => {},
+            'element_node' => {},
             'index_entry' => {
               'entry_element' => {},
               'entry_number' => 114,
@@ -5667,7 +5667,7 @@ $result_trees{'index_table_chapter_no_node'} = {
           ],
           'cmdname' => 'cindex',
           'extra' => {
-            'entry_node' => {},
+            'element_node' => {},
             'index_entry' => {
               'entry_element' => {},
               'entry_number' => 115,
@@ -5706,7 +5706,7 @@ $result_trees{'index_table_chapter_no_node'} = {
           ],
           'cmdname' => 'cindex',
           'extra' => {
-            'entry_node' => {},
+            'element_node' => {},
             'index_entry' => {
               'entry_element' => {},
               'entry_number' => 116,
@@ -5745,7 +5745,7 @@ $result_trees{'index_table_chapter_no_node'} = {
           ],
           'cmdname' => 'cindex',
           'extra' => {
-            'entry_node' => {},
+            'element_node' => {},
             'index_entry' => {
               'entry_element' => {},
               'entry_number' => 117,
@@ -5784,7 +5784,7 @@ $result_trees{'index_table_chapter_no_node'} = {
           ],
           'cmdname' => 'cindex',
           'extra' => {
-            'entry_node' => {},
+            'element_node' => {},
             'index_entry' => {
               'entry_element' => {},
               'entry_number' => 118,
@@ -5823,7 +5823,7 @@ $result_trees{'index_table_chapter_no_node'} = {
           ],
           'cmdname' => 'cindex',
           'extra' => {
-            'entry_node' => {},
+            'element_node' => {},
             'index_entry' => {
               'entry_element' => {},
               'entry_number' => 119,
@@ -5862,7 +5862,7 @@ $result_trees{'index_table_chapter_no_node'} = {
           ],
           'cmdname' => 'cindex',
           'extra' => {
-            'entry_node' => {},
+            'element_node' => {},
             'index_entry' => {
               'entry_element' => {},
               'entry_number' => 120,
@@ -5901,7 +5901,7 @@ $result_trees{'index_table_chapter_no_node'} = {
           ],
           'cmdname' => 'cindex',
           'extra' => {
-            'entry_node' => {},
+            'element_node' => {},
             'index_entry' => {
               'entry_element' => {},
               'entry_number' => 121,
@@ -5940,7 +5940,7 @@ $result_trees{'index_table_chapter_no_node'} = {
           ],
           'cmdname' => 'cindex',
           'extra' => {
-            'entry_node' => {},
+            'element_node' => {},
             'index_entry' => {
               'entry_element' => {},
               'entry_number' => 122,
@@ -5979,7 +5979,7 @@ $result_trees{'index_table_chapter_no_node'} = {
           ],
           'cmdname' => 'cindex',
           'extra' => {
-            'entry_node' => {},
+            'element_node' => {},
             'index_entry' => {
               'entry_element' => {},
               'entry_number' => 123,
@@ -6018,7 +6018,7 @@ $result_trees{'index_table_chapter_no_node'} = {
           ],
           'cmdname' => 'cindex',
           'extra' => {
-            'entry_node' => {},
+            'element_node' => {},
             'index_entry' => {
               'entry_element' => {},
               'entry_number' => 124,
@@ -6057,7 +6057,7 @@ $result_trees{'index_table_chapter_no_node'} = {
           ],
           'cmdname' => 'cindex',
           'extra' => {
-            'entry_node' => {},
+            'element_node' => {},
             'index_entry' => {
               'entry_element' => {},
               'entry_number' => 125,
@@ -6096,7 +6096,7 @@ $result_trees{'index_table_chapter_no_node'} = {
           ],
           'cmdname' => 'cindex',
           'extra' => {
-            'entry_node' => {},
+            'element_node' => {},
             'index_entry' => {
               'entry_element' => {},
               'entry_number' => 126,
@@ -6135,7 +6135,7 @@ $result_trees{'index_table_chapter_no_node'} = {
           ],
           'cmdname' => 'cindex',
           'extra' => {
-            'entry_node' => {},
+            'element_node' => {},
             'index_entry' => {
               'entry_element' => {},
               'entry_number' => 127,
@@ -6174,7 +6174,7 @@ $result_trees{'index_table_chapter_no_node'} = {
           ],
           'cmdname' => 'cindex',
           'extra' => {
-            'entry_node' => {},
+            'element_node' => {},
             'index_entry' => {
               'entry_element' => {},
               'entry_number' => 128,
@@ -6213,7 +6213,7 @@ $result_trees{'index_table_chapter_no_node'} = {
           ],
           'cmdname' => 'cindex',
           'extra' => {
-            'entry_node' => {},
+            'element_node' => {},
             'index_entry' => {
               'entry_element' => {},
               'entry_number' => 129,
@@ -6252,7 +6252,7 @@ $result_trees{'index_table_chapter_no_node'} = {
           ],
           'cmdname' => 'cindex',
           'extra' => {
-            'entry_node' => {},
+            'element_node' => {},
             'index_entry' => {
               'entry_element' => {},
               'entry_number' => 130,
@@ -6502,20 +6502,20 @@ 
$result_trees{'index_table_chapter_no_node'}{'contents'}[2]{'contents'}[0]{'cont
 
$result_trees{'index_table_chapter_no_node'}{'contents'}[2]{'contents'}[0]{'contents'}[2]{'extra'}{'menu_entry_node_label'}{'node_content'}[0]
 = 
$result_trees{'index_table_chapter_no_node'}{'contents'}[2]{'contents'}[0]{'contents'}[2]{'contents'}[1]{'contents'}[0];
 
$result_trees{'index_table_chapter_no_node'}{'contents'}[3]{'extra'}{'node_content'}[0]
 = 
$result_trees{'index_table_chapter_no_node'}{'contents'}[3]{'args'}[0]{'contents'}[0];
 
$result_trees{'index_table_chapter_no_node'}{'contents'}[3]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = 
$result_trees{'index_table_chapter_no_node'}{'contents'}[3]{'args'}[0]{'contents'}[0];
-$result_trees{'index_table_chapter_no_node'}{'contents'}[4]{'contents'}[1]{'extra'}{'entry_node'}
 = $result_trees{'index_table_chapter_no_node'}{'contents'}[3];
+$result_trees{'index_table_chapter_no_node'}{'contents'}[4]{'contents'}[1]{'extra'}{'element_node'}
 = $result_trees{'index_table_chapter_no_node'}{'contents'}[3];
 
$result_trees{'index_table_chapter_no_node'}{'contents'}[4]{'contents'}[1]{'extra'}{'index_entry'}{'entry_element'}
 = $result_trees{'index_table_chapter_no_node'}{'contents'}[4]{'contents'}[1];
-$result_trees{'index_table_chapter_no_node'}{'contents'}[4]{'contents'}[3]{'contents'}[1]{'extra'}{'entry_node'}
 = $result_trees{'index_table_chapter_no_node'}{'contents'}[3];
+$result_trees{'index_table_chapter_no_node'}{'contents'}[4]{'contents'}[3]{'contents'}[1]{'extra'}{'element_node'}
 = $result_trees{'index_table_chapter_no_node'}{'contents'}[3];
 
$result_trees{'index_table_chapter_no_node'}{'contents'}[4]{'contents'}[3]{'contents'}[1]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'index_table_chapter_no_node'}{'contents'}[4]{'contents'}[3]{'contents'}[1];
-$result_trees{'index_table_chapter_no_node'}{'contents'}[4]{'contents'}[7]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'extra'}{'entry_node'}
 = $result_trees{'index_table_chapter_no_node'}{'contents'}[3];
+$result_trees{'index_table_chapter_no_node'}{'contents'}[4]{'contents'}[7]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'extra'}{'element_node'}
 = $result_trees{'index_table_chapter_no_node'}{'contents'}[3];
 
$result_trees{'index_table_chapter_no_node'}{'contents'}[4]{'contents'}[7]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'index_table_chapter_no_node'}{'contents'}[4]{'contents'}[7]{'contents'}[0]{'contents'}[0]{'contents'}[0];
-$result_trees{'index_table_chapter_no_node'}{'contents'}[4]{'contents'}[7]{'contents'}[0]{'contents'}[0]{'contents'}[1]{'extra'}{'entry_node'}
 = $result_trees{'index_table_chapter_no_node'}{'contents'}[3];
+$result_trees{'index_table_chapter_no_node'}{'contents'}[4]{'contents'}[7]{'contents'}[0]{'contents'}[0]{'contents'}[1]{'extra'}{'element_node'}
 = $result_trees{'index_table_chapter_no_node'}{'contents'}[3];
 
$result_trees{'index_table_chapter_no_node'}{'contents'}[4]{'contents'}[7]{'contents'}[0]{'contents'}[0]{'contents'}[1]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'index_table_chapter_no_node'}{'contents'}[4]{'contents'}[7]{'contents'}[0]{'contents'}[0]{'contents'}[1];
 
$result_trees{'index_table_chapter_no_node'}{'contents'}[4]{'contents'}[7]{'extra'}{'command_as_argument'}
 = 
$result_trees{'index_table_chapter_no_node'}{'contents'}[4]{'contents'}[7]{'args'}[0];
-$result_trees{'index_table_chapter_no_node'}{'contents'}[4]{'contents'}[10]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'extra'}{'entry_node'}
 = $result_trees{'index_table_chapter_no_node'}{'contents'}[3];
+$result_trees{'index_table_chapter_no_node'}{'contents'}[4]{'contents'}[10]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'extra'}{'element_node'}
 = $result_trees{'index_table_chapter_no_node'}{'contents'}[3];
 
$result_trees{'index_table_chapter_no_node'}{'contents'}[4]{'contents'}[10]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'index_table_chapter_no_node'}{'contents'}[4]{'contents'}[10]{'contents'}[0]{'contents'}[0]{'contents'}[0];
-$result_trees{'index_table_chapter_no_node'}{'contents'}[4]{'contents'}[10]{'contents'}[0]{'contents'}[0]{'contents'}[1]{'extra'}{'entry_node'}
 = $result_trees{'index_table_chapter_no_node'}{'contents'}[3];
+$result_trees{'index_table_chapter_no_node'}{'contents'}[4]{'contents'}[10]{'contents'}[0]{'contents'}[0]{'contents'}[1]{'extra'}{'element_node'}
 = $result_trees{'index_table_chapter_no_node'}{'contents'}[3];
 
$result_trees{'index_table_chapter_no_node'}{'contents'}[4]{'contents'}[10]{'contents'}[0]{'contents'}[0]{'contents'}[1]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'index_table_chapter_no_node'}{'contents'}[4]{'contents'}[10]{'contents'}[0]{'contents'}[0]{'contents'}[1];
-$result_trees{'index_table_chapter_no_node'}{'contents'}[4]{'contents'}[10]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'extra'}{'entry_node'}
 = $result_trees{'index_table_chapter_no_node'}{'contents'}[3];
+$result_trees{'index_table_chapter_no_node'}{'contents'}[4]{'contents'}[10]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'extra'}{'element_node'}
 = $result_trees{'index_table_chapter_no_node'}{'contents'}[3];
 
$result_trees{'index_table_chapter_no_node'}{'contents'}[4]{'contents'}[10]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'index_table_chapter_no_node'}{'contents'}[4]{'contents'}[10]{'contents'}[1]{'contents'}[0]{'contents'}[0];
 
$result_trees{'index_table_chapter_no_node'}{'contents'}[4]{'contents'}[10]{'extra'}{'command_as_argument'}
 = 
$result_trees{'index_table_chapter_no_node'}{'contents'}[4]{'contents'}[10]{'args'}[0];
 
$result_trees{'index_table_chapter_no_node'}{'contents'}[5]{'extra'}{'node_content'}[0]
 = 
$result_trees{'index_table_chapter_no_node'}{'contents'}[5]{'args'}[0]{'contents'}[0];
@@ -6523,261 +6523,261 @@ 
$result_trees{'index_table_chapter_no_node'}{'contents'}[5]{'extra'}{'nodes_manu
 
$result_trees{'index_table_chapter_no_node'}{'contents'}[7]{'extra'}{'node_content'}[0]
 = 
$result_trees{'index_table_chapter_no_node'}{'contents'}[7]{'args'}[0]{'contents'}[0];
 
$result_trees{'index_table_chapter_no_node'}{'contents'}[7]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = 
$result_trees{'index_table_chapter_no_node'}{'contents'}[7]{'args'}[0]{'contents'}[0];
 
$result_trees{'index_table_chapter_no_node'}{'contents'}[8]{'contents'}[0]{'contents'}[0]{'extra'}{'menu_entry_node_label'}{'node_content'}[0]
 = 
$result_trees{'index_table_chapter_no_node'}{'contents'}[8]{'contents'}[0]{'contents'}[0]{'contents'}[1]{'contents'}[0];
-$result_trees{'index_table_chapter_no_node'}{'contents'}[8]{'contents'}[1]{'extra'}{'entry_node'}
 = $result_trees{'index_table_chapter_no_node'}{'contents'}[7];
+$result_trees{'index_table_chapter_no_node'}{'contents'}[8]{'contents'}[1]{'extra'}{'element_node'}
 = $result_trees{'index_table_chapter_no_node'}{'contents'}[7];
 
$result_trees{'index_table_chapter_no_node'}{'contents'}[8]{'contents'}[1]{'extra'}{'index_entry'}{'entry_element'}
 = $result_trees{'index_table_chapter_no_node'}{'contents'}[8]{'contents'}[1];
-$result_trees{'index_table_chapter_no_node'}{'contents'}[8]{'contents'}[2]{'extra'}{'entry_node'}
 = $result_trees{'index_table_chapter_no_node'}{'contents'}[7];
+$result_trees{'index_table_chapter_no_node'}{'contents'}[8]{'contents'}[2]{'extra'}{'element_node'}
 = $result_trees{'index_table_chapter_no_node'}{'contents'}[7];
 
$result_trees{'index_table_chapter_no_node'}{'contents'}[8]{'contents'}[2]{'extra'}{'index_entry'}{'entry_element'}
 = $result_trees{'index_table_chapter_no_node'}{'contents'}[8]{'contents'}[2];
-$result_trees{'index_table_chapter_no_node'}{'contents'}[8]{'contents'}[3]{'extra'}{'entry_node'}
 = $result_trees{'index_table_chapter_no_node'}{'contents'}[7];
+$result_trees{'index_table_chapter_no_node'}{'contents'}[8]{'contents'}[3]{'extra'}{'element_node'}
 = $result_trees{'index_table_chapter_no_node'}{'contents'}[7];
 
$result_trees{'index_table_chapter_no_node'}{'contents'}[8]{'contents'}[3]{'extra'}{'index_entry'}{'entry_element'}
 = $result_trees{'index_table_chapter_no_node'}{'contents'}[8]{'contents'}[3];
-$result_trees{'index_table_chapter_no_node'}{'contents'}[8]{'contents'}[4]{'extra'}{'entry_node'}
 = $result_trees{'index_table_chapter_no_node'}{'contents'}[7];
+$result_trees{'index_table_chapter_no_node'}{'contents'}[8]{'contents'}[4]{'extra'}{'element_node'}
 = $result_trees{'index_table_chapter_no_node'}{'contents'}[7];
 
$result_trees{'index_table_chapter_no_node'}{'contents'}[8]{'contents'}[4]{'extra'}{'index_entry'}{'entry_element'}
 = $result_trees{'index_table_chapter_no_node'}{'contents'}[8]{'contents'}[4];
-$result_trees{'index_table_chapter_no_node'}{'contents'}[8]{'contents'}[5]{'extra'}{'entry_node'}
 = $result_trees{'index_table_chapter_no_node'}{'contents'}[7];
+$result_trees{'index_table_chapter_no_node'}{'contents'}[8]{'contents'}[5]{'extra'}{'element_node'}
 = $result_trees{'index_table_chapter_no_node'}{'contents'}[7];
 
$result_trees{'index_table_chapter_no_node'}{'contents'}[8]{'contents'}[5]{'extra'}{'index_entry'}{'entry_element'}
 = $result_trees{'index_table_chapter_no_node'}{'contents'}[8]{'contents'}[5];
-$result_trees{'index_table_chapter_no_node'}{'contents'}[8]{'contents'}[6]{'extra'}{'entry_node'}
 = $result_trees{'index_table_chapter_no_node'}{'contents'}[7];
+$result_trees{'index_table_chapter_no_node'}{'contents'}[8]{'contents'}[6]{'extra'}{'element_node'}
 = $result_trees{'index_table_chapter_no_node'}{'contents'}[7];
 
$result_trees{'index_table_chapter_no_node'}{'contents'}[8]{'contents'}[6]{'extra'}{'index_entry'}{'entry_element'}
 = $result_trees{'index_table_chapter_no_node'}{'contents'}[8]{'contents'}[6];
-$result_trees{'index_table_chapter_no_node'}{'contents'}[8]{'contents'}[7]{'extra'}{'entry_node'}
 = $result_trees{'index_table_chapter_no_node'}{'contents'}[7];
+$result_trees{'index_table_chapter_no_node'}{'contents'}[8]{'contents'}[7]{'extra'}{'element_node'}
 = $result_trees{'index_table_chapter_no_node'}{'contents'}[7];
 
$result_trees{'index_table_chapter_no_node'}{'contents'}[8]{'contents'}[7]{'extra'}{'index_entry'}{'entry_element'}
 = $result_trees{'index_table_chapter_no_node'}{'contents'}[8]{'contents'}[7];
-$result_trees{'index_table_chapter_no_node'}{'contents'}[8]{'contents'}[8]{'extra'}{'entry_node'}
 = $result_trees{'index_table_chapter_no_node'}{'contents'}[7];
+$result_trees{'index_table_chapter_no_node'}{'contents'}[8]{'contents'}[8]{'extra'}{'element_node'}
 = $result_trees{'index_table_chapter_no_node'}{'contents'}[7];
 
$result_trees{'index_table_chapter_no_node'}{'contents'}[8]{'contents'}[8]{'extra'}{'index_entry'}{'entry_element'}
 = $result_trees{'index_table_chapter_no_node'}{'contents'}[8]{'contents'}[8];
-$result_trees{'index_table_chapter_no_node'}{'contents'}[8]{'contents'}[9]{'extra'}{'entry_node'}
 = $result_trees{'index_table_chapter_no_node'}{'contents'}[7];
+$result_trees{'index_table_chapter_no_node'}{'contents'}[8]{'contents'}[9]{'extra'}{'element_node'}
 = $result_trees{'index_table_chapter_no_node'}{'contents'}[7];
 
$result_trees{'index_table_chapter_no_node'}{'contents'}[8]{'contents'}[9]{'extra'}{'index_entry'}{'entry_element'}
 = $result_trees{'index_table_chapter_no_node'}{'contents'}[8]{'contents'}[9];
-$result_trees{'index_table_chapter_no_node'}{'contents'}[8]{'contents'}[10]{'extra'}{'entry_node'}
 = $result_trees{'index_table_chapter_no_node'}{'contents'}[7];
+$result_trees{'index_table_chapter_no_node'}{'contents'}[8]{'contents'}[10]{'extra'}{'element_node'}
 = $result_trees{'index_table_chapter_no_node'}{'contents'}[7];
 
$result_trees{'index_table_chapter_no_node'}{'contents'}[8]{'contents'}[10]{'extra'}{'index_entry'}{'entry_element'}
 = $result_trees{'index_table_chapter_no_node'}{'contents'}[8]{'contents'}[10];
-$result_trees{'index_table_chapter_no_node'}{'contents'}[8]{'contents'}[11]{'extra'}{'entry_node'}
 = $result_trees{'index_table_chapter_no_node'}{'contents'}[7];
+$result_trees{'index_table_chapter_no_node'}{'contents'}[8]{'contents'}[11]{'extra'}{'element_node'}
 = $result_trees{'index_table_chapter_no_node'}{'contents'}[7];
 
$result_trees{'index_table_chapter_no_node'}{'contents'}[8]{'contents'}[11]{'extra'}{'index_entry'}{'entry_element'}
 = $result_trees{'index_table_chapter_no_node'}{'contents'}[8]{'contents'}[11];
-$result_trees{'index_table_chapter_no_node'}{'contents'}[8]{'contents'}[12]{'extra'}{'entry_node'}
 = $result_trees{'index_table_chapter_no_node'}{'contents'}[7];
+$result_trees{'index_table_chapter_no_node'}{'contents'}[8]{'contents'}[12]{'extra'}{'element_node'}
 = $result_trees{'index_table_chapter_no_node'}{'contents'}[7];
 
$result_trees{'index_table_chapter_no_node'}{'contents'}[8]{'contents'}[12]{'extra'}{'index_entry'}{'entry_element'}
 = $result_trees{'index_table_chapter_no_node'}{'contents'}[8]{'contents'}[12];
-$result_trees{'index_table_chapter_no_node'}{'contents'}[8]{'contents'}[13]{'extra'}{'entry_node'}
 = $result_trees{'index_table_chapter_no_node'}{'contents'}[7];
+$result_trees{'index_table_chapter_no_node'}{'contents'}[8]{'contents'}[13]{'extra'}{'element_node'}
 = $result_trees{'index_table_chapter_no_node'}{'contents'}[7];
 
$result_trees{'index_table_chapter_no_node'}{'contents'}[8]{'contents'}[13]{'extra'}{'index_entry'}{'entry_element'}
 = $result_trees{'index_table_chapter_no_node'}{'contents'}[8]{'contents'}[13];
-$result_trees{'index_table_chapter_no_node'}{'contents'}[8]{'contents'}[14]{'extra'}{'entry_node'}
 = $result_trees{'index_table_chapter_no_node'}{'contents'}[7];
+$result_trees{'index_table_chapter_no_node'}{'contents'}[8]{'contents'}[14]{'extra'}{'element_node'}
 = $result_trees{'index_table_chapter_no_node'}{'contents'}[7];
 
$result_trees{'index_table_chapter_no_node'}{'contents'}[8]{'contents'}[14]{'extra'}{'index_entry'}{'entry_element'}
 = $result_trees{'index_table_chapter_no_node'}{'contents'}[8]{'contents'}[14];
-$result_trees{'index_table_chapter_no_node'}{'contents'}[8]{'contents'}[15]{'extra'}{'entry_node'}
 = $result_trees{'index_table_chapter_no_node'}{'contents'}[7];
+$result_trees{'index_table_chapter_no_node'}{'contents'}[8]{'contents'}[15]{'extra'}{'element_node'}
 = $result_trees{'index_table_chapter_no_node'}{'contents'}[7];
 
$result_trees{'index_table_chapter_no_node'}{'contents'}[8]{'contents'}[15]{'extra'}{'index_entry'}{'entry_element'}
 = $result_trees{'index_table_chapter_no_node'}{'contents'}[8]{'contents'}[15];
-$result_trees{'index_table_chapter_no_node'}{'contents'}[8]{'contents'}[16]{'extra'}{'entry_node'}
 = $result_trees{'index_table_chapter_no_node'}{'contents'}[7];
+$result_trees{'index_table_chapter_no_node'}{'contents'}[8]{'contents'}[16]{'extra'}{'element_node'}
 = $result_trees{'index_table_chapter_no_node'}{'contents'}[7];
 
$result_trees{'index_table_chapter_no_node'}{'contents'}[8]{'contents'}[16]{'extra'}{'index_entry'}{'entry_element'}
 = $result_trees{'index_table_chapter_no_node'}{'contents'}[8]{'contents'}[16];
-$result_trees{'index_table_chapter_no_node'}{'contents'}[8]{'contents'}[17]{'extra'}{'entry_node'}
 = $result_trees{'index_table_chapter_no_node'}{'contents'}[7];
+$result_trees{'index_table_chapter_no_node'}{'contents'}[8]{'contents'}[17]{'extra'}{'element_node'}
 = $result_trees{'index_table_chapter_no_node'}{'contents'}[7];
 
$result_trees{'index_table_chapter_no_node'}{'contents'}[8]{'contents'}[17]{'extra'}{'index_entry'}{'entry_element'}
 = $result_trees{'index_table_chapter_no_node'}{'contents'}[8]{'contents'}[17];
-$result_trees{'index_table_chapter_no_node'}{'contents'}[8]{'contents'}[18]{'extra'}{'entry_node'}
 = $result_trees{'index_table_chapter_no_node'}{'contents'}[7];
+$result_trees{'index_table_chapter_no_node'}{'contents'}[8]{'contents'}[18]{'extra'}{'element_node'}
 = $result_trees{'index_table_chapter_no_node'}{'contents'}[7];
 
$result_trees{'index_table_chapter_no_node'}{'contents'}[8]{'contents'}[18]{'extra'}{'index_entry'}{'entry_element'}
 = $result_trees{'index_table_chapter_no_node'}{'contents'}[8]{'contents'}[18];
-$result_trees{'index_table_chapter_no_node'}{'contents'}[8]{'contents'}[19]{'extra'}{'entry_node'}
 = $result_trees{'index_table_chapter_no_node'}{'contents'}[7];
+$result_trees{'index_table_chapter_no_node'}{'contents'}[8]{'contents'}[19]{'extra'}{'element_node'}
 = $result_trees{'index_table_chapter_no_node'}{'contents'}[7];
 
$result_trees{'index_table_chapter_no_node'}{'contents'}[8]{'contents'}[19]{'extra'}{'index_entry'}{'entry_element'}
 = $result_trees{'index_table_chapter_no_node'}{'contents'}[8]{'contents'}[19];
-$result_trees{'index_table_chapter_no_node'}{'contents'}[8]{'contents'}[20]{'extra'}{'entry_node'}
 = $result_trees{'index_table_chapter_no_node'}{'contents'}[7];
+$result_trees{'index_table_chapter_no_node'}{'contents'}[8]{'contents'}[20]{'extra'}{'element_node'}
 = $result_trees{'index_table_chapter_no_node'}{'contents'}[7];
 
$result_trees{'index_table_chapter_no_node'}{'contents'}[8]{'contents'}[20]{'extra'}{'index_entry'}{'entry_element'}
 = $result_trees{'index_table_chapter_no_node'}{'contents'}[8]{'contents'}[20];
-$result_trees{'index_table_chapter_no_node'}{'contents'}[8]{'contents'}[21]{'extra'}{'entry_node'}
 = $result_trees{'index_table_chapter_no_node'}{'contents'}[7];
+$result_trees{'index_table_chapter_no_node'}{'contents'}[8]{'contents'}[21]{'extra'}{'element_node'}
 = $result_trees{'index_table_chapter_no_node'}{'contents'}[7];
 
$result_trees{'index_table_chapter_no_node'}{'contents'}[8]{'contents'}[21]{'extra'}{'index_entry'}{'entry_element'}
 = $result_trees{'index_table_chapter_no_node'}{'contents'}[8]{'contents'}[21];
-$result_trees{'index_table_chapter_no_node'}{'contents'}[8]{'contents'}[22]{'extra'}{'entry_node'}
 = $result_trees{'index_table_chapter_no_node'}{'contents'}[7];
+$result_trees{'index_table_chapter_no_node'}{'contents'}[8]{'contents'}[22]{'extra'}{'element_node'}
 = $result_trees{'index_table_chapter_no_node'}{'contents'}[7];
 
$result_trees{'index_table_chapter_no_node'}{'contents'}[8]{'contents'}[22]{'extra'}{'index_entry'}{'entry_element'}
 = $result_trees{'index_table_chapter_no_node'}{'contents'}[8]{'contents'}[22];
-$result_trees{'index_table_chapter_no_node'}{'contents'}[8]{'contents'}[23]{'extra'}{'entry_node'}
 = $result_trees{'index_table_chapter_no_node'}{'contents'}[7];
+$result_trees{'index_table_chapter_no_node'}{'contents'}[8]{'contents'}[23]{'extra'}{'element_node'}
 = $result_trees{'index_table_chapter_no_node'}{'contents'}[7];
 
$result_trees{'index_table_chapter_no_node'}{'contents'}[8]{'contents'}[23]{'extra'}{'index_entry'}{'entry_element'}
 = $result_trees{'index_table_chapter_no_node'}{'contents'}[8]{'contents'}[23];
-$result_trees{'index_table_chapter_no_node'}{'contents'}[8]{'contents'}[24]{'extra'}{'entry_node'}
 = $result_trees{'index_table_chapter_no_node'}{'contents'}[7];
+$result_trees{'index_table_chapter_no_node'}{'contents'}[8]{'contents'}[24]{'extra'}{'element_node'}
 = $result_trees{'index_table_chapter_no_node'}{'contents'}[7];
 
$result_trees{'index_table_chapter_no_node'}{'contents'}[8]{'contents'}[24]{'extra'}{'index_entry'}{'entry_element'}
 = $result_trees{'index_table_chapter_no_node'}{'contents'}[8]{'contents'}[24];
-$result_trees{'index_table_chapter_no_node'}{'contents'}[8]{'contents'}[25]{'extra'}{'entry_node'}
 = $result_trees{'index_table_chapter_no_node'}{'contents'}[7];
+$result_trees{'index_table_chapter_no_node'}{'contents'}[8]{'contents'}[25]{'extra'}{'element_node'}
 = $result_trees{'index_table_chapter_no_node'}{'contents'}[7];
 
$result_trees{'index_table_chapter_no_node'}{'contents'}[8]{'contents'}[25]{'extra'}{'index_entry'}{'entry_element'}
 = $result_trees{'index_table_chapter_no_node'}{'contents'}[8]{'contents'}[25];
-$result_trees{'index_table_chapter_no_node'}{'contents'}[8]{'contents'}[26]{'extra'}{'entry_node'}
 = $result_trees{'index_table_chapter_no_node'}{'contents'}[7];
+$result_trees{'index_table_chapter_no_node'}{'contents'}[8]{'contents'}[26]{'extra'}{'element_node'}
 = $result_trees{'index_table_chapter_no_node'}{'contents'}[7];
 
$result_trees{'index_table_chapter_no_node'}{'contents'}[8]{'contents'}[26]{'extra'}{'index_entry'}{'entry_element'}
 = $result_trees{'index_table_chapter_no_node'}{'contents'}[8]{'contents'}[26];
-$result_trees{'index_table_chapter_no_node'}{'contents'}[8]{'contents'}[27]{'extra'}{'entry_node'}
 = $result_trees{'index_table_chapter_no_node'}{'contents'}[7];
+$result_trees{'index_table_chapter_no_node'}{'contents'}[8]{'contents'}[27]{'extra'}{'element_node'}
 = $result_trees{'index_table_chapter_no_node'}{'contents'}[7];
 
$result_trees{'index_table_chapter_no_node'}{'contents'}[8]{'contents'}[27]{'extra'}{'index_entry'}{'entry_element'}
 = $result_trees{'index_table_chapter_no_node'}{'contents'}[8]{'contents'}[27];
-$result_trees{'index_table_chapter_no_node'}{'contents'}[8]{'contents'}[28]{'extra'}{'entry_node'}
 = $result_trees{'index_table_chapter_no_node'}{'contents'}[7];
+$result_trees{'index_table_chapter_no_node'}{'contents'}[8]{'contents'}[28]{'extra'}{'element_node'}
 = $result_trees{'index_table_chapter_no_node'}{'contents'}[7];
 
$result_trees{'index_table_chapter_no_node'}{'contents'}[8]{'contents'}[28]{'extra'}{'index_entry'}{'entry_element'}
 = $result_trees{'index_table_chapter_no_node'}{'contents'}[8]{'contents'}[28];
-$result_trees{'index_table_chapter_no_node'}{'contents'}[8]{'contents'}[29]{'extra'}{'entry_node'}
 = $result_trees{'index_table_chapter_no_node'}{'contents'}[7];
+$result_trees{'index_table_chapter_no_node'}{'contents'}[8]{'contents'}[29]{'extra'}{'element_node'}
 = $result_trees{'index_table_chapter_no_node'}{'contents'}[7];
 
$result_trees{'index_table_chapter_no_node'}{'contents'}[8]{'contents'}[29]{'extra'}{'index_entry'}{'entry_element'}
 = $result_trees{'index_table_chapter_no_node'}{'contents'}[8]{'contents'}[29];
-$result_trees{'index_table_chapter_no_node'}{'contents'}[8]{'contents'}[30]{'extra'}{'entry_node'}
 = $result_trees{'index_table_chapter_no_node'}{'contents'}[7];
+$result_trees{'index_table_chapter_no_node'}{'contents'}[8]{'contents'}[30]{'extra'}{'element_node'}
 = $result_trees{'index_table_chapter_no_node'}{'contents'}[7];
 
$result_trees{'index_table_chapter_no_node'}{'contents'}[8]{'contents'}[30]{'extra'}{'index_entry'}{'entry_element'}
 = $result_trees{'index_table_chapter_no_node'}{'contents'}[8]{'contents'}[30];
-$result_trees{'index_table_chapter_no_node'}{'contents'}[8]{'contents'}[31]{'extra'}{'entry_node'}
 = $result_trees{'index_table_chapter_no_node'}{'contents'}[7];
+$result_trees{'index_table_chapter_no_node'}{'contents'}[8]{'contents'}[31]{'extra'}{'element_node'}
 = $result_trees{'index_table_chapter_no_node'}{'contents'}[7];
 
$result_trees{'index_table_chapter_no_node'}{'contents'}[8]{'contents'}[31]{'extra'}{'index_entry'}{'entry_element'}
 = $result_trees{'index_table_chapter_no_node'}{'contents'}[8]{'contents'}[31];
-$result_trees{'index_table_chapter_no_node'}{'contents'}[8]{'contents'}[32]{'extra'}{'entry_node'}
 = $result_trees{'index_table_chapter_no_node'}{'contents'}[7];
+$result_trees{'index_table_chapter_no_node'}{'contents'}[8]{'contents'}[32]{'extra'}{'element_node'}
 = $result_trees{'index_table_chapter_no_node'}{'contents'}[7];
 
$result_trees{'index_table_chapter_no_node'}{'contents'}[8]{'contents'}[32]{'extra'}{'index_entry'}{'entry_element'}
 = $result_trees{'index_table_chapter_no_node'}{'contents'}[8]{'contents'}[32];
-$result_trees{'index_table_chapter_no_node'}{'contents'}[8]{'contents'}[33]{'extra'}{'entry_node'}
 = $result_trees{'index_table_chapter_no_node'}{'contents'}[7];
+$result_trees{'index_table_chapter_no_node'}{'contents'}[8]{'contents'}[33]{'extra'}{'element_node'}
 = $result_trees{'index_table_chapter_no_node'}{'contents'}[7];
 
$result_trees{'index_table_chapter_no_node'}{'contents'}[8]{'contents'}[33]{'extra'}{'index_entry'}{'entry_element'}
 = $result_trees{'index_table_chapter_no_node'}{'contents'}[8]{'contents'}[33];
-$result_trees{'index_table_chapter_no_node'}{'contents'}[8]{'contents'}[34]{'extra'}{'entry_node'}
 = $result_trees{'index_table_chapter_no_node'}{'contents'}[7];
+$result_trees{'index_table_chapter_no_node'}{'contents'}[8]{'contents'}[34]{'extra'}{'element_node'}
 = $result_trees{'index_table_chapter_no_node'}{'contents'}[7];
 
$result_trees{'index_table_chapter_no_node'}{'contents'}[8]{'contents'}[34]{'extra'}{'index_entry'}{'entry_element'}
 = $result_trees{'index_table_chapter_no_node'}{'contents'}[8]{'contents'}[34];
-$result_trees{'index_table_chapter_no_node'}{'contents'}[8]{'contents'}[35]{'extra'}{'entry_node'}
 = $result_trees{'index_table_chapter_no_node'}{'contents'}[7];
+$result_trees{'index_table_chapter_no_node'}{'contents'}[8]{'contents'}[35]{'extra'}{'element_node'}
 = $result_trees{'index_table_chapter_no_node'}{'contents'}[7];
 
$result_trees{'index_table_chapter_no_node'}{'contents'}[8]{'contents'}[35]{'extra'}{'index_entry'}{'entry_element'}
 = $result_trees{'index_table_chapter_no_node'}{'contents'}[8]{'contents'}[35];
-$result_trees{'index_table_chapter_no_node'}{'contents'}[8]{'contents'}[36]{'extra'}{'entry_node'}
 = $result_trees{'index_table_chapter_no_node'}{'contents'}[7];
+$result_trees{'index_table_chapter_no_node'}{'contents'}[8]{'contents'}[36]{'extra'}{'element_node'}
 = $result_trees{'index_table_chapter_no_node'}{'contents'}[7];
 
$result_trees{'index_table_chapter_no_node'}{'contents'}[8]{'contents'}[36]{'extra'}{'index_entry'}{'entry_element'}
 = $result_trees{'index_table_chapter_no_node'}{'contents'}[8]{'contents'}[36];
-$result_trees{'index_table_chapter_no_node'}{'contents'}[8]{'contents'}[37]{'extra'}{'entry_node'}
 = $result_trees{'index_table_chapter_no_node'}{'contents'}[7];
+$result_trees{'index_table_chapter_no_node'}{'contents'}[8]{'contents'}[37]{'extra'}{'element_node'}
 = $result_trees{'index_table_chapter_no_node'}{'contents'}[7];
 
$result_trees{'index_table_chapter_no_node'}{'contents'}[8]{'contents'}[37]{'extra'}{'index_entry'}{'entry_element'}
 = $result_trees{'index_table_chapter_no_node'}{'contents'}[8]{'contents'}[37];
-$result_trees{'index_table_chapter_no_node'}{'contents'}[8]{'contents'}[38]{'extra'}{'entry_node'}
 = $result_trees{'index_table_chapter_no_node'}{'contents'}[7];
+$result_trees{'index_table_chapter_no_node'}{'contents'}[8]{'contents'}[38]{'extra'}{'element_node'}
 = $result_trees{'index_table_chapter_no_node'}{'contents'}[7];
 
$result_trees{'index_table_chapter_no_node'}{'contents'}[8]{'contents'}[38]{'extra'}{'index_entry'}{'entry_element'}
 = $result_trees{'index_table_chapter_no_node'}{'contents'}[8]{'contents'}[38];
-$result_trees{'index_table_chapter_no_node'}{'contents'}[8]{'contents'}[39]{'extra'}{'entry_node'}
 = $result_trees{'index_table_chapter_no_node'}{'contents'}[7];
+$result_trees{'index_table_chapter_no_node'}{'contents'}[8]{'contents'}[39]{'extra'}{'element_node'}
 = $result_trees{'index_table_chapter_no_node'}{'contents'}[7];
 
$result_trees{'index_table_chapter_no_node'}{'contents'}[8]{'contents'}[39]{'extra'}{'index_entry'}{'entry_element'}
 = $result_trees{'index_table_chapter_no_node'}{'contents'}[8]{'contents'}[39];
-$result_trees{'index_table_chapter_no_node'}{'contents'}[8]{'contents'}[40]{'extra'}{'entry_node'}
 = $result_trees{'index_table_chapter_no_node'}{'contents'}[7];
+$result_trees{'index_table_chapter_no_node'}{'contents'}[8]{'contents'}[40]{'extra'}{'element_node'}
 = $result_trees{'index_table_chapter_no_node'}{'contents'}[7];
 
$result_trees{'index_table_chapter_no_node'}{'contents'}[8]{'contents'}[40]{'extra'}{'index_entry'}{'entry_element'}
 = $result_trees{'index_table_chapter_no_node'}{'contents'}[8]{'contents'}[40];
-$result_trees{'index_table_chapter_no_node'}{'contents'}[8]{'contents'}[41]{'extra'}{'entry_node'}
 = $result_trees{'index_table_chapter_no_node'}{'contents'}[7];
+$result_trees{'index_table_chapter_no_node'}{'contents'}[8]{'contents'}[41]{'extra'}{'element_node'}
 = $result_trees{'index_table_chapter_no_node'}{'contents'}[7];
 
$result_trees{'index_table_chapter_no_node'}{'contents'}[8]{'contents'}[41]{'extra'}{'index_entry'}{'entry_element'}
 = $result_trees{'index_table_chapter_no_node'}{'contents'}[8]{'contents'}[41];
-$result_trees{'index_table_chapter_no_node'}{'contents'}[8]{'contents'}[42]{'extra'}{'entry_node'}
 = $result_trees{'index_table_chapter_no_node'}{'contents'}[7];
+$result_trees{'index_table_chapter_no_node'}{'contents'}[8]{'contents'}[42]{'extra'}{'element_node'}
 = $result_trees{'index_table_chapter_no_node'}{'contents'}[7];
 
$result_trees{'index_table_chapter_no_node'}{'contents'}[8]{'contents'}[42]{'extra'}{'index_entry'}{'entry_element'}
 = $result_trees{'index_table_chapter_no_node'}{'contents'}[8]{'contents'}[42];
-$result_trees{'index_table_chapter_no_node'}{'contents'}[8]{'contents'}[43]{'extra'}{'entry_node'}
 = $result_trees{'index_table_chapter_no_node'}{'contents'}[7];
+$result_trees{'index_table_chapter_no_node'}{'contents'}[8]{'contents'}[43]{'extra'}{'element_node'}
 = $result_trees{'index_table_chapter_no_node'}{'contents'}[7];
 
$result_trees{'index_table_chapter_no_node'}{'contents'}[8]{'contents'}[43]{'extra'}{'index_entry'}{'entry_element'}
 = $result_trees{'index_table_chapter_no_node'}{'contents'}[8]{'contents'}[43];
-$result_trees{'index_table_chapter_no_node'}{'contents'}[8]{'contents'}[44]{'extra'}{'entry_node'}
 = $result_trees{'index_table_chapter_no_node'}{'contents'}[7];
+$result_trees{'index_table_chapter_no_node'}{'contents'}[8]{'contents'}[44]{'extra'}{'element_node'}
 = $result_trees{'index_table_chapter_no_node'}{'contents'}[7];
 
$result_trees{'index_table_chapter_no_node'}{'contents'}[8]{'contents'}[44]{'extra'}{'index_entry'}{'entry_element'}
 = $result_trees{'index_table_chapter_no_node'}{'contents'}[8]{'contents'}[44];
-$result_trees{'index_table_chapter_no_node'}{'contents'}[8]{'contents'}[45]{'extra'}{'entry_node'}
 = $result_trees{'index_table_chapter_no_node'}{'contents'}[7];
+$result_trees{'index_table_chapter_no_node'}{'contents'}[8]{'contents'}[45]{'extra'}{'element_node'}
 = $result_trees{'index_table_chapter_no_node'}{'contents'}[7];
 
$result_trees{'index_table_chapter_no_node'}{'contents'}[8]{'contents'}[45]{'extra'}{'index_entry'}{'entry_element'}
 = $result_trees{'index_table_chapter_no_node'}{'contents'}[8]{'contents'}[45];
-$result_trees{'index_table_chapter_no_node'}{'contents'}[8]{'contents'}[46]{'extra'}{'entry_node'}
 = $result_trees{'index_table_chapter_no_node'}{'contents'}[7];
+$result_trees{'index_table_chapter_no_node'}{'contents'}[8]{'contents'}[46]{'extra'}{'element_node'}
 = $result_trees{'index_table_chapter_no_node'}{'contents'}[7];
 
$result_trees{'index_table_chapter_no_node'}{'contents'}[8]{'contents'}[46]{'extra'}{'index_entry'}{'entry_element'}
 = $result_trees{'index_table_chapter_no_node'}{'contents'}[8]{'contents'}[46];
-$result_trees{'index_table_chapter_no_node'}{'contents'}[8]{'contents'}[47]{'extra'}{'entry_node'}
 = $result_trees{'index_table_chapter_no_node'}{'contents'}[7];
+$result_trees{'index_table_chapter_no_node'}{'contents'}[8]{'contents'}[47]{'extra'}{'element_node'}
 = $result_trees{'index_table_chapter_no_node'}{'contents'}[7];
 
$result_trees{'index_table_chapter_no_node'}{'contents'}[8]{'contents'}[47]{'extra'}{'index_entry'}{'entry_element'}
 = $result_trees{'index_table_chapter_no_node'}{'contents'}[8]{'contents'}[47];
-$result_trees{'index_table_chapter_no_node'}{'contents'}[8]{'contents'}[48]{'extra'}{'entry_node'}
 = $result_trees{'index_table_chapter_no_node'}{'contents'}[7];
+$result_trees{'index_table_chapter_no_node'}{'contents'}[8]{'contents'}[48]{'extra'}{'element_node'}
 = $result_trees{'index_table_chapter_no_node'}{'contents'}[7];
 
$result_trees{'index_table_chapter_no_node'}{'contents'}[8]{'contents'}[48]{'extra'}{'index_entry'}{'entry_element'}
 = $result_trees{'index_table_chapter_no_node'}{'contents'}[8]{'contents'}[48];
-$result_trees{'index_table_chapter_no_node'}{'contents'}[8]{'contents'}[49]{'extra'}{'entry_node'}
 = $result_trees{'index_table_chapter_no_node'}{'contents'}[7];
+$result_trees{'index_table_chapter_no_node'}{'contents'}[8]{'contents'}[49]{'extra'}{'element_node'}
 = $result_trees{'index_table_chapter_no_node'}{'contents'}[7];
 
$result_trees{'index_table_chapter_no_node'}{'contents'}[8]{'contents'}[49]{'extra'}{'index_entry'}{'entry_element'}
 = $result_trees{'index_table_chapter_no_node'}{'contents'}[8]{'contents'}[49];
-$result_trees{'index_table_chapter_no_node'}{'contents'}[8]{'contents'}[50]{'extra'}{'entry_node'}
 = $result_trees{'index_table_chapter_no_node'}{'contents'}[7];
+$result_trees{'index_table_chapter_no_node'}{'contents'}[8]{'contents'}[50]{'extra'}{'element_node'}
 = $result_trees{'index_table_chapter_no_node'}{'contents'}[7];
 
$result_trees{'index_table_chapter_no_node'}{'contents'}[8]{'contents'}[50]{'extra'}{'index_entry'}{'entry_element'}
 = $result_trees{'index_table_chapter_no_node'}{'contents'}[8]{'contents'}[50];
-$result_trees{'index_table_chapter_no_node'}{'contents'}[8]{'contents'}[51]{'extra'}{'entry_node'}
 = $result_trees{'index_table_chapter_no_node'}{'contents'}[7];
+$result_trees{'index_table_chapter_no_node'}{'contents'}[8]{'contents'}[51]{'extra'}{'element_node'}
 = $result_trees{'index_table_chapter_no_node'}{'contents'}[7];
 
$result_trees{'index_table_chapter_no_node'}{'contents'}[8]{'contents'}[51]{'extra'}{'index_entry'}{'entry_element'}
 = $result_trees{'index_table_chapter_no_node'}{'contents'}[8]{'contents'}[51];
-$result_trees{'index_table_chapter_no_node'}{'contents'}[8]{'contents'}[52]{'extra'}{'entry_node'}
 = $result_trees{'index_table_chapter_no_node'}{'contents'}[7];
+$result_trees{'index_table_chapter_no_node'}{'contents'}[8]{'contents'}[52]{'extra'}{'element_node'}
 = $result_trees{'index_table_chapter_no_node'}{'contents'}[7];
 
$result_trees{'index_table_chapter_no_node'}{'contents'}[8]{'contents'}[52]{'extra'}{'index_entry'}{'entry_element'}
 = $result_trees{'index_table_chapter_no_node'}{'contents'}[8]{'contents'}[52];
-$result_trees{'index_table_chapter_no_node'}{'contents'}[8]{'contents'}[53]{'extra'}{'entry_node'}
 = $result_trees{'index_table_chapter_no_node'}{'contents'}[7];
+$result_trees{'index_table_chapter_no_node'}{'contents'}[8]{'contents'}[53]{'extra'}{'element_node'}
 = $result_trees{'index_table_chapter_no_node'}{'contents'}[7];
 
$result_trees{'index_table_chapter_no_node'}{'contents'}[8]{'contents'}[53]{'extra'}{'index_entry'}{'entry_element'}
 = $result_trees{'index_table_chapter_no_node'}{'contents'}[8]{'contents'}[53];
-$result_trees{'index_table_chapter_no_node'}{'contents'}[8]{'contents'}[54]{'extra'}{'entry_node'}
 = $result_trees{'index_table_chapter_no_node'}{'contents'}[7];
+$result_trees{'index_table_chapter_no_node'}{'contents'}[8]{'contents'}[54]{'extra'}{'element_node'}
 = $result_trees{'index_table_chapter_no_node'}{'contents'}[7];
 
$result_trees{'index_table_chapter_no_node'}{'contents'}[8]{'contents'}[54]{'extra'}{'index_entry'}{'entry_element'}
 = $result_trees{'index_table_chapter_no_node'}{'contents'}[8]{'contents'}[54];
-$result_trees{'index_table_chapter_no_node'}{'contents'}[8]{'contents'}[55]{'extra'}{'entry_node'}
 = $result_trees{'index_table_chapter_no_node'}{'contents'}[7];
+$result_trees{'index_table_chapter_no_node'}{'contents'}[8]{'contents'}[55]{'extra'}{'element_node'}
 = $result_trees{'index_table_chapter_no_node'}{'contents'}[7];
 
$result_trees{'index_table_chapter_no_node'}{'contents'}[8]{'contents'}[55]{'extra'}{'index_entry'}{'entry_element'}
 = $result_trees{'index_table_chapter_no_node'}{'contents'}[8]{'contents'}[55];
-$result_trees{'index_table_chapter_no_node'}{'contents'}[8]{'contents'}[56]{'extra'}{'entry_node'}
 = $result_trees{'index_table_chapter_no_node'}{'contents'}[7];
+$result_trees{'index_table_chapter_no_node'}{'contents'}[8]{'contents'}[56]{'extra'}{'element_node'}
 = $result_trees{'index_table_chapter_no_node'}{'contents'}[7];
 
$result_trees{'index_table_chapter_no_node'}{'contents'}[8]{'contents'}[56]{'extra'}{'index_entry'}{'entry_element'}
 = $result_trees{'index_table_chapter_no_node'}{'contents'}[8]{'contents'}[56];
-$result_trees{'index_table_chapter_no_node'}{'contents'}[8]{'contents'}[57]{'extra'}{'entry_node'}
 = $result_trees{'index_table_chapter_no_node'}{'contents'}[7];
+$result_trees{'index_table_chapter_no_node'}{'contents'}[8]{'contents'}[57]{'extra'}{'element_node'}
 = $result_trees{'index_table_chapter_no_node'}{'contents'}[7];
 
$result_trees{'index_table_chapter_no_node'}{'contents'}[8]{'contents'}[57]{'extra'}{'index_entry'}{'entry_element'}
 = $result_trees{'index_table_chapter_no_node'}{'contents'}[8]{'contents'}[57];
-$result_trees{'index_table_chapter_no_node'}{'contents'}[8]{'contents'}[58]{'extra'}{'entry_node'}
 = $result_trees{'index_table_chapter_no_node'}{'contents'}[7];
+$result_trees{'index_table_chapter_no_node'}{'contents'}[8]{'contents'}[58]{'extra'}{'element_node'}
 = $result_trees{'index_table_chapter_no_node'}{'contents'}[7];
 
$result_trees{'index_table_chapter_no_node'}{'contents'}[8]{'contents'}[58]{'extra'}{'index_entry'}{'entry_element'}
 = $result_trees{'index_table_chapter_no_node'}{'contents'}[8]{'contents'}[58];
-$result_trees{'index_table_chapter_no_node'}{'contents'}[8]{'contents'}[59]{'extra'}{'entry_node'}
 = $result_trees{'index_table_chapter_no_node'}{'contents'}[7];
+$result_trees{'index_table_chapter_no_node'}{'contents'}[8]{'contents'}[59]{'extra'}{'element_node'}
 = $result_trees{'index_table_chapter_no_node'}{'contents'}[7];
 
$result_trees{'index_table_chapter_no_node'}{'contents'}[8]{'contents'}[59]{'extra'}{'index_entry'}{'entry_element'}
 = $result_trees{'index_table_chapter_no_node'}{'contents'}[8]{'contents'}[59];
-$result_trees{'index_table_chapter_no_node'}{'contents'}[8]{'contents'}[60]{'extra'}{'entry_node'}
 = $result_trees{'index_table_chapter_no_node'}{'contents'}[7];
+$result_trees{'index_table_chapter_no_node'}{'contents'}[8]{'contents'}[60]{'extra'}{'element_node'}
 = $result_trees{'index_table_chapter_no_node'}{'contents'}[7];
 
$result_trees{'index_table_chapter_no_node'}{'contents'}[8]{'contents'}[60]{'extra'}{'index_entry'}{'entry_element'}
 = $result_trees{'index_table_chapter_no_node'}{'contents'}[8]{'contents'}[60];
-$result_trees{'index_table_chapter_no_node'}{'contents'}[8]{'contents'}[61]{'extra'}{'entry_node'}
 = $result_trees{'index_table_chapter_no_node'}{'contents'}[7];
+$result_trees{'index_table_chapter_no_node'}{'contents'}[8]{'contents'}[61]{'extra'}{'element_node'}
 = $result_trees{'index_table_chapter_no_node'}{'contents'}[7];
 
$result_trees{'index_table_chapter_no_node'}{'contents'}[8]{'contents'}[61]{'extra'}{'index_entry'}{'entry_element'}
 = $result_trees{'index_table_chapter_no_node'}{'contents'}[8]{'contents'}[61];
-$result_trees{'index_table_chapter_no_node'}{'contents'}[8]{'contents'}[62]{'extra'}{'entry_node'}
 = $result_trees{'index_table_chapter_no_node'}{'contents'}[7];
+$result_trees{'index_table_chapter_no_node'}{'contents'}[8]{'contents'}[62]{'extra'}{'element_node'}
 = $result_trees{'index_table_chapter_no_node'}{'contents'}[7];
 
$result_trees{'index_table_chapter_no_node'}{'contents'}[8]{'contents'}[62]{'extra'}{'index_entry'}{'entry_element'}
 = $result_trees{'index_table_chapter_no_node'}{'contents'}[8]{'contents'}[62];
-$result_trees{'index_table_chapter_no_node'}{'contents'}[8]{'contents'}[63]{'extra'}{'entry_node'}
 = $result_trees{'index_table_chapter_no_node'}{'contents'}[7];
+$result_trees{'index_table_chapter_no_node'}{'contents'}[8]{'contents'}[63]{'extra'}{'element_node'}
 = $result_trees{'index_table_chapter_no_node'}{'contents'}[7];
 
$result_trees{'index_table_chapter_no_node'}{'contents'}[8]{'contents'}[63]{'extra'}{'index_entry'}{'entry_element'}
 = $result_trees{'index_table_chapter_no_node'}{'contents'}[8]{'contents'}[63];
-$result_trees{'index_table_chapter_no_node'}{'contents'}[8]{'contents'}[64]{'extra'}{'entry_node'}
 = $result_trees{'index_table_chapter_no_node'}{'contents'}[7];
+$result_trees{'index_table_chapter_no_node'}{'contents'}[8]{'contents'}[64]{'extra'}{'element_node'}
 = $result_trees{'index_table_chapter_no_node'}{'contents'}[7];
 
$result_trees{'index_table_chapter_no_node'}{'contents'}[8]{'contents'}[64]{'extra'}{'index_entry'}{'entry_element'}
 = $result_trees{'index_table_chapter_no_node'}{'contents'}[8]{'contents'}[64];
-$result_trees{'index_table_chapter_no_node'}{'contents'}[8]{'contents'}[65]{'extra'}{'entry_node'}
 = $result_trees{'index_table_chapter_no_node'}{'contents'}[7];
+$result_trees{'index_table_chapter_no_node'}{'contents'}[8]{'contents'}[65]{'extra'}{'element_node'}
 = $result_trees{'index_table_chapter_no_node'}{'contents'}[7];
 
$result_trees{'index_table_chapter_no_node'}{'contents'}[8]{'contents'}[65]{'extra'}{'index_entry'}{'entry_element'}
 = $result_trees{'index_table_chapter_no_node'}{'contents'}[8]{'contents'}[65];
-$result_trees{'index_table_chapter_no_node'}{'contents'}[8]{'contents'}[66]{'extra'}{'entry_node'}
 = $result_trees{'index_table_chapter_no_node'}{'contents'}[7];
+$result_trees{'index_table_chapter_no_node'}{'contents'}[8]{'contents'}[66]{'extra'}{'element_node'}
 = $result_trees{'index_table_chapter_no_node'}{'contents'}[7];
 
$result_trees{'index_table_chapter_no_node'}{'contents'}[8]{'contents'}[66]{'extra'}{'index_entry'}{'entry_element'}
 = $result_trees{'index_table_chapter_no_node'}{'contents'}[8]{'contents'}[66];
-$result_trees{'index_table_chapter_no_node'}{'contents'}[8]{'contents'}[67]{'extra'}{'entry_node'}
 = $result_trees{'index_table_chapter_no_node'}{'contents'}[7];
+$result_trees{'index_table_chapter_no_node'}{'contents'}[8]{'contents'}[67]{'extra'}{'element_node'}
 = $result_trees{'index_table_chapter_no_node'}{'contents'}[7];
 
$result_trees{'index_table_chapter_no_node'}{'contents'}[8]{'contents'}[67]{'extra'}{'index_entry'}{'entry_element'}
 = $result_trees{'index_table_chapter_no_node'}{'contents'}[8]{'contents'}[67];
-$result_trees{'index_table_chapter_no_node'}{'contents'}[8]{'contents'}[68]{'extra'}{'entry_node'}
 = $result_trees{'index_table_chapter_no_node'}{'contents'}[7];
+$result_trees{'index_table_chapter_no_node'}{'contents'}[8]{'contents'}[68]{'extra'}{'element_node'}
 = $result_trees{'index_table_chapter_no_node'}{'contents'}[7];
 
$result_trees{'index_table_chapter_no_node'}{'contents'}[8]{'contents'}[68]{'extra'}{'index_entry'}{'entry_element'}
 = $result_trees{'index_table_chapter_no_node'}{'contents'}[8]{'contents'}[68];
-$result_trees{'index_table_chapter_no_node'}{'contents'}[8]{'contents'}[69]{'extra'}{'entry_node'}
 = $result_trees{'index_table_chapter_no_node'}{'contents'}[7];
+$result_trees{'index_table_chapter_no_node'}{'contents'}[8]{'contents'}[69]{'extra'}{'element_node'}
 = $result_trees{'index_table_chapter_no_node'}{'contents'}[7];
 
$result_trees{'index_table_chapter_no_node'}{'contents'}[8]{'contents'}[69]{'extra'}{'index_entry'}{'entry_element'}
 = $result_trees{'index_table_chapter_no_node'}{'contents'}[8]{'contents'}[69];
-$result_trees{'index_table_chapter_no_node'}{'contents'}[8]{'contents'}[70]{'extra'}{'entry_node'}
 = $result_trees{'index_table_chapter_no_node'}{'contents'}[7];
+$result_trees{'index_table_chapter_no_node'}{'contents'}[8]{'contents'}[70]{'extra'}{'element_node'}
 = $result_trees{'index_table_chapter_no_node'}{'contents'}[7];
 
$result_trees{'index_table_chapter_no_node'}{'contents'}[8]{'contents'}[70]{'extra'}{'index_entry'}{'entry_element'}
 = $result_trees{'index_table_chapter_no_node'}{'contents'}[8]{'contents'}[70];
-$result_trees{'index_table_chapter_no_node'}{'contents'}[8]{'contents'}[71]{'extra'}{'entry_node'}
 = $result_trees{'index_table_chapter_no_node'}{'contents'}[7];
+$result_trees{'index_table_chapter_no_node'}{'contents'}[8]{'contents'}[71]{'extra'}{'element_node'}
 = $result_trees{'index_table_chapter_no_node'}{'contents'}[7];
 
$result_trees{'index_table_chapter_no_node'}{'contents'}[8]{'contents'}[71]{'extra'}{'index_entry'}{'entry_element'}
 = $result_trees{'index_table_chapter_no_node'}{'contents'}[8]{'contents'}[71];
-$result_trees{'index_table_chapter_no_node'}{'contents'}[8]{'contents'}[72]{'extra'}{'entry_node'}
 = $result_trees{'index_table_chapter_no_node'}{'contents'}[7];
+$result_trees{'index_table_chapter_no_node'}{'contents'}[8]{'contents'}[72]{'extra'}{'element_node'}
 = $result_trees{'index_table_chapter_no_node'}{'contents'}[7];
 
$result_trees{'index_table_chapter_no_node'}{'contents'}[8]{'contents'}[72]{'extra'}{'index_entry'}{'entry_element'}
 = $result_trees{'index_table_chapter_no_node'}{'contents'}[8]{'contents'}[72];
-$result_trees{'index_table_chapter_no_node'}{'contents'}[8]{'contents'}[73]{'extra'}{'entry_node'}
 = $result_trees{'index_table_chapter_no_node'}{'contents'}[7];
+$result_trees{'index_table_chapter_no_node'}{'contents'}[8]{'contents'}[73]{'extra'}{'element_node'}
 = $result_trees{'index_table_chapter_no_node'}{'contents'}[7];
 
$result_trees{'index_table_chapter_no_node'}{'contents'}[8]{'contents'}[73]{'extra'}{'index_entry'}{'entry_element'}
 = $result_trees{'index_table_chapter_no_node'}{'contents'}[8]{'contents'}[73];
-$result_trees{'index_table_chapter_no_node'}{'contents'}[8]{'contents'}[74]{'extra'}{'entry_node'}
 = $result_trees{'index_table_chapter_no_node'}{'contents'}[7];
+$result_trees{'index_table_chapter_no_node'}{'contents'}[8]{'contents'}[74]{'extra'}{'element_node'}
 = $result_trees{'index_table_chapter_no_node'}{'contents'}[7];
 
$result_trees{'index_table_chapter_no_node'}{'contents'}[8]{'contents'}[74]{'extra'}{'index_entry'}{'entry_element'}
 = $result_trees{'index_table_chapter_no_node'}{'contents'}[8]{'contents'}[74];
-$result_trees{'index_table_chapter_no_node'}{'contents'}[8]{'contents'}[75]{'extra'}{'entry_node'}
 = $result_trees{'index_table_chapter_no_node'}{'contents'}[7];
+$result_trees{'index_table_chapter_no_node'}{'contents'}[8]{'contents'}[75]{'extra'}{'element_node'}
 = $result_trees{'index_table_chapter_no_node'}{'contents'}[7];
 
$result_trees{'index_table_chapter_no_node'}{'contents'}[8]{'contents'}[75]{'extra'}{'index_entry'}{'entry_element'}
 = $result_trees{'index_table_chapter_no_node'}{'contents'}[8]{'contents'}[75];
-$result_trees{'index_table_chapter_no_node'}{'contents'}[8]{'contents'}[76]{'extra'}{'entry_node'}
 = $result_trees{'index_table_chapter_no_node'}{'contents'}[7];
+$result_trees{'index_table_chapter_no_node'}{'contents'}[8]{'contents'}[76]{'extra'}{'element_node'}
 = $result_trees{'index_table_chapter_no_node'}{'contents'}[7];
 
$result_trees{'index_table_chapter_no_node'}{'contents'}[8]{'contents'}[76]{'extra'}{'index_entry'}{'entry_element'}
 = $result_trees{'index_table_chapter_no_node'}{'contents'}[8]{'contents'}[76];
-$result_trees{'index_table_chapter_no_node'}{'contents'}[8]{'contents'}[77]{'extra'}{'entry_node'}
 = $result_trees{'index_table_chapter_no_node'}{'contents'}[7];
+$result_trees{'index_table_chapter_no_node'}{'contents'}[8]{'contents'}[77]{'extra'}{'element_node'}
 = $result_trees{'index_table_chapter_no_node'}{'contents'}[7];
 
$result_trees{'index_table_chapter_no_node'}{'contents'}[8]{'contents'}[77]{'extra'}{'index_entry'}{'entry_element'}
 = $result_trees{'index_table_chapter_no_node'}{'contents'}[8]{'contents'}[77];
-$result_trees{'index_table_chapter_no_node'}{'contents'}[8]{'contents'}[78]{'extra'}{'entry_node'}
 = $result_trees{'index_table_chapter_no_node'}{'contents'}[7];
+$result_trees{'index_table_chapter_no_node'}{'contents'}[8]{'contents'}[78]{'extra'}{'element_node'}
 = $result_trees{'index_table_chapter_no_node'}{'contents'}[7];
 
$result_trees{'index_table_chapter_no_node'}{'contents'}[8]{'contents'}[78]{'extra'}{'index_entry'}{'entry_element'}
 = $result_trees{'index_table_chapter_no_node'}{'contents'}[8]{'contents'}[78];
-$result_trees{'index_table_chapter_no_node'}{'contents'}[8]{'contents'}[79]{'extra'}{'entry_node'}
 = $result_trees{'index_table_chapter_no_node'}{'contents'}[7];
+$result_trees{'index_table_chapter_no_node'}{'contents'}[8]{'contents'}[79]{'extra'}{'element_node'}
 = $result_trees{'index_table_chapter_no_node'}{'contents'}[7];
 
$result_trees{'index_table_chapter_no_node'}{'contents'}[8]{'contents'}[79]{'extra'}{'index_entry'}{'entry_element'}
 = $result_trees{'index_table_chapter_no_node'}{'contents'}[8]{'contents'}[79];
-$result_trees{'index_table_chapter_no_node'}{'contents'}[8]{'contents'}[80]{'extra'}{'entry_node'}
 = $result_trees{'index_table_chapter_no_node'}{'contents'}[7];
+$result_trees{'index_table_chapter_no_node'}{'contents'}[8]{'contents'}[80]{'extra'}{'element_node'}
 = $result_trees{'index_table_chapter_no_node'}{'contents'}[7];
 
$result_trees{'index_table_chapter_no_node'}{'contents'}[8]{'contents'}[80]{'extra'}{'index_entry'}{'entry_element'}
 = $result_trees{'index_table_chapter_no_node'}{'contents'}[8]{'contents'}[80];
-$result_trees{'index_table_chapter_no_node'}{'contents'}[8]{'contents'}[81]{'extra'}{'entry_node'}
 = $result_trees{'index_table_chapter_no_node'}{'contents'}[7];
+$result_trees{'index_table_chapter_no_node'}{'contents'}[8]{'contents'}[81]{'extra'}{'element_node'}
 = $result_trees{'index_table_chapter_no_node'}{'contents'}[7];
 
$result_trees{'index_table_chapter_no_node'}{'contents'}[8]{'contents'}[81]{'extra'}{'index_entry'}{'entry_element'}
 = $result_trees{'index_table_chapter_no_node'}{'contents'}[8]{'contents'}[81];
-$result_trees{'index_table_chapter_no_node'}{'contents'}[8]{'contents'}[82]{'extra'}{'entry_node'}
 = $result_trees{'index_table_chapter_no_node'}{'contents'}[7];
+$result_trees{'index_table_chapter_no_node'}{'contents'}[8]{'contents'}[82]{'extra'}{'element_node'}
 = $result_trees{'index_table_chapter_no_node'}{'contents'}[7];
 
$result_trees{'index_table_chapter_no_node'}{'contents'}[8]{'contents'}[82]{'extra'}{'index_entry'}{'entry_element'}
 = $result_trees{'index_table_chapter_no_node'}{'contents'}[8]{'contents'}[82];
-$result_trees{'index_table_chapter_no_node'}{'contents'}[8]{'contents'}[83]{'extra'}{'entry_node'}
 = $result_trees{'index_table_chapter_no_node'}{'contents'}[7];
+$result_trees{'index_table_chapter_no_node'}{'contents'}[8]{'contents'}[83]{'extra'}{'element_node'}
 = $result_trees{'index_table_chapter_no_node'}{'contents'}[7];
 
$result_trees{'index_table_chapter_no_node'}{'contents'}[8]{'contents'}[83]{'extra'}{'index_entry'}{'entry_element'}
 = $result_trees{'index_table_chapter_no_node'}{'contents'}[8]{'contents'}[83];
-$result_trees{'index_table_chapter_no_node'}{'contents'}[8]{'contents'}[84]{'extra'}{'entry_node'}
 = $result_trees{'index_table_chapter_no_node'}{'contents'}[7];
+$result_trees{'index_table_chapter_no_node'}{'contents'}[8]{'contents'}[84]{'extra'}{'element_node'}
 = $result_trees{'index_table_chapter_no_node'}{'contents'}[7];
 
$result_trees{'index_table_chapter_no_node'}{'contents'}[8]{'contents'}[84]{'extra'}{'index_entry'}{'entry_element'}
 = $result_trees{'index_table_chapter_no_node'}{'contents'}[8]{'contents'}[84];
-$result_trees{'index_table_chapter_no_node'}{'contents'}[8]{'contents'}[85]{'extra'}{'entry_node'}
 = $result_trees{'index_table_chapter_no_node'}{'contents'}[7];
+$result_trees{'index_table_chapter_no_node'}{'contents'}[8]{'contents'}[85]{'extra'}{'element_node'}
 = $result_trees{'index_table_chapter_no_node'}{'contents'}[7];
 
$result_trees{'index_table_chapter_no_node'}{'contents'}[8]{'contents'}[85]{'extra'}{'index_entry'}{'entry_element'}
 = $result_trees{'index_table_chapter_no_node'}{'contents'}[8]{'contents'}[85];
-$result_trees{'index_table_chapter_no_node'}{'contents'}[8]{'contents'}[86]{'extra'}{'entry_node'}
 = $result_trees{'index_table_chapter_no_node'}{'contents'}[7];
+$result_trees{'index_table_chapter_no_node'}{'contents'}[8]{'contents'}[86]{'extra'}{'element_node'}
 = $result_trees{'index_table_chapter_no_node'}{'contents'}[7];
 
$result_trees{'index_table_chapter_no_node'}{'contents'}[8]{'contents'}[86]{'extra'}{'index_entry'}{'entry_element'}
 = $result_trees{'index_table_chapter_no_node'}{'contents'}[8]{'contents'}[86];
-$result_trees{'index_table_chapter_no_node'}{'contents'}[8]{'contents'}[87]{'extra'}{'entry_node'}
 = $result_trees{'index_table_chapter_no_node'}{'contents'}[7];
+$result_trees{'index_table_chapter_no_node'}{'contents'}[8]{'contents'}[87]{'extra'}{'element_node'}
 = $result_trees{'index_table_chapter_no_node'}{'contents'}[7];
 
$result_trees{'index_table_chapter_no_node'}{'contents'}[8]{'contents'}[87]{'extra'}{'index_entry'}{'entry_element'}
 = $result_trees{'index_table_chapter_no_node'}{'contents'}[8]{'contents'}[87];
-$result_trees{'index_table_chapter_no_node'}{'contents'}[8]{'contents'}[88]{'extra'}{'entry_node'}
 = $result_trees{'index_table_chapter_no_node'}{'contents'}[7];
+$result_trees{'index_table_chapter_no_node'}{'contents'}[8]{'contents'}[88]{'extra'}{'element_node'}
 = $result_trees{'index_table_chapter_no_node'}{'contents'}[7];
 
$result_trees{'index_table_chapter_no_node'}{'contents'}[8]{'contents'}[88]{'extra'}{'index_entry'}{'entry_element'}
 = $result_trees{'index_table_chapter_no_node'}{'contents'}[8]{'contents'}[88];
-$result_trees{'index_table_chapter_no_node'}{'contents'}[8]{'contents'}[89]{'extra'}{'entry_node'}
 = $result_trees{'index_table_chapter_no_node'}{'contents'}[7];
+$result_trees{'index_table_chapter_no_node'}{'contents'}[8]{'contents'}[89]{'extra'}{'element_node'}
 = $result_trees{'index_table_chapter_no_node'}{'contents'}[7];
 
$result_trees{'index_table_chapter_no_node'}{'contents'}[8]{'contents'}[89]{'extra'}{'index_entry'}{'entry_element'}
 = $result_trees{'index_table_chapter_no_node'}{'contents'}[8]{'contents'}[89];
-$result_trees{'index_table_chapter_no_node'}{'contents'}[8]{'contents'}[90]{'extra'}{'entry_node'}
 = $result_trees{'index_table_chapter_no_node'}{'contents'}[7];
+$result_trees{'index_table_chapter_no_node'}{'contents'}[8]{'contents'}[90]{'extra'}{'element_node'}
 = $result_trees{'index_table_chapter_no_node'}{'contents'}[7];
 
$result_trees{'index_table_chapter_no_node'}{'contents'}[8]{'contents'}[90]{'extra'}{'index_entry'}{'entry_element'}
 = $result_trees{'index_table_chapter_no_node'}{'contents'}[8]{'contents'}[90];
-$result_trees{'index_table_chapter_no_node'}{'contents'}[8]{'contents'}[91]{'extra'}{'entry_node'}
 = $result_trees{'index_table_chapter_no_node'}{'contents'}[7];
+$result_trees{'index_table_chapter_no_node'}{'contents'}[8]{'contents'}[91]{'extra'}{'element_node'}
 = $result_trees{'index_table_chapter_no_node'}{'contents'}[7];
 
$result_trees{'index_table_chapter_no_node'}{'contents'}[8]{'contents'}[91]{'extra'}{'index_entry'}{'entry_element'}
 = $result_trees{'index_table_chapter_no_node'}{'contents'}[8]{'contents'}[91];
-$result_trees{'index_table_chapter_no_node'}{'contents'}[8]{'contents'}[92]{'extra'}{'entry_node'}
 = $result_trees{'index_table_chapter_no_node'}{'contents'}[7];
+$result_trees{'index_table_chapter_no_node'}{'contents'}[8]{'contents'}[92]{'extra'}{'element_node'}
 = $result_trees{'index_table_chapter_no_node'}{'contents'}[7];
 
$result_trees{'index_table_chapter_no_node'}{'contents'}[8]{'contents'}[92]{'extra'}{'index_entry'}{'entry_element'}
 = $result_trees{'index_table_chapter_no_node'}{'contents'}[8]{'contents'}[92];
-$result_trees{'index_table_chapter_no_node'}{'contents'}[8]{'contents'}[93]{'extra'}{'entry_node'}
 = $result_trees{'index_table_chapter_no_node'}{'contents'}[7];
+$result_trees{'index_table_chapter_no_node'}{'contents'}[8]{'contents'}[93]{'extra'}{'element_node'}
 = $result_trees{'index_table_chapter_no_node'}{'contents'}[7];
 
$result_trees{'index_table_chapter_no_node'}{'contents'}[8]{'contents'}[93]{'extra'}{'index_entry'}{'entry_element'}
 = $result_trees{'index_table_chapter_no_node'}{'contents'}[8]{'contents'}[93];
-$result_trees{'index_table_chapter_no_node'}{'contents'}[8]{'contents'}[94]{'extra'}{'entry_node'}
 = $result_trees{'index_table_chapter_no_node'}{'contents'}[7];
+$result_trees{'index_table_chapter_no_node'}{'contents'}[8]{'contents'}[94]{'extra'}{'element_node'}
 = $result_trees{'index_table_chapter_no_node'}{'contents'}[7];
 
$result_trees{'index_table_chapter_no_node'}{'contents'}[8]{'contents'}[94]{'extra'}{'index_entry'}{'entry_element'}
 = $result_trees{'index_table_chapter_no_node'}{'contents'}[8]{'contents'}[94];
-$result_trees{'index_table_chapter_no_node'}{'contents'}[8]{'contents'}[95]{'extra'}{'entry_node'}
 = $result_trees{'index_table_chapter_no_node'}{'contents'}[7];
+$result_trees{'index_table_chapter_no_node'}{'contents'}[8]{'contents'}[95]{'extra'}{'element_node'}
 = $result_trees{'index_table_chapter_no_node'}{'contents'}[7];
 
$result_trees{'index_table_chapter_no_node'}{'contents'}[8]{'contents'}[95]{'extra'}{'index_entry'}{'entry_element'}
 = $result_trees{'index_table_chapter_no_node'}{'contents'}[8]{'contents'}[95];
-$result_trees{'index_table_chapter_no_node'}{'contents'}[8]{'contents'}[96]{'extra'}{'entry_node'}
 = $result_trees{'index_table_chapter_no_node'}{'contents'}[7];
+$result_trees{'index_table_chapter_no_node'}{'contents'}[8]{'contents'}[96]{'extra'}{'element_node'}
 = $result_trees{'index_table_chapter_no_node'}{'contents'}[7];
 
$result_trees{'index_table_chapter_no_node'}{'contents'}[8]{'contents'}[96]{'extra'}{'index_entry'}{'entry_element'}
 = $result_trees{'index_table_chapter_no_node'}{'contents'}[8]{'contents'}[96];
-$result_trees{'index_table_chapter_no_node'}{'contents'}[8]{'contents'}[97]{'extra'}{'entry_node'}
 = $result_trees{'index_table_chapter_no_node'}{'contents'}[7];
+$result_trees{'index_table_chapter_no_node'}{'contents'}[8]{'contents'}[97]{'extra'}{'element_node'}
 = $result_trees{'index_table_chapter_no_node'}{'contents'}[7];
 
$result_trees{'index_table_chapter_no_node'}{'contents'}[8]{'contents'}[97]{'extra'}{'index_entry'}{'entry_element'}
 = $result_trees{'index_table_chapter_no_node'}{'contents'}[8]{'contents'}[97];
-$result_trees{'index_table_chapter_no_node'}{'contents'}[8]{'contents'}[98]{'extra'}{'entry_node'}
 = $result_trees{'index_table_chapter_no_node'}{'contents'}[7];
+$result_trees{'index_table_chapter_no_node'}{'contents'}[8]{'contents'}[98]{'extra'}{'element_node'}
 = $result_trees{'index_table_chapter_no_node'}{'contents'}[7];
 
$result_trees{'index_table_chapter_no_node'}{'contents'}[8]{'contents'}[98]{'extra'}{'index_entry'}{'entry_element'}
 = $result_trees{'index_table_chapter_no_node'}{'contents'}[8]{'contents'}[98];
-$result_trees{'index_table_chapter_no_node'}{'contents'}[8]{'contents'}[99]{'extra'}{'entry_node'}
 = $result_trees{'index_table_chapter_no_node'}{'contents'}[7];
+$result_trees{'index_table_chapter_no_node'}{'contents'}[8]{'contents'}[99]{'extra'}{'element_node'}
 = $result_trees{'index_table_chapter_no_node'}{'contents'}[7];
 
$result_trees{'index_table_chapter_no_node'}{'contents'}[8]{'contents'}[99]{'extra'}{'index_entry'}{'entry_element'}
 = $result_trees{'index_table_chapter_no_node'}{'contents'}[8]{'contents'}[99];
-$result_trees{'index_table_chapter_no_node'}{'contents'}[8]{'contents'}[100]{'extra'}{'entry_node'}
 = $result_trees{'index_table_chapter_no_node'}{'contents'}[7];
+$result_trees{'index_table_chapter_no_node'}{'contents'}[8]{'contents'}[100]{'extra'}{'element_node'}
 = $result_trees{'index_table_chapter_no_node'}{'contents'}[7];
 
$result_trees{'index_table_chapter_no_node'}{'contents'}[8]{'contents'}[100]{'extra'}{'index_entry'}{'entry_element'}
 = $result_trees{'index_table_chapter_no_node'}{'contents'}[8]{'contents'}[100];
-$result_trees{'index_table_chapter_no_node'}{'contents'}[8]{'contents'}[101]{'extra'}{'entry_node'}
 = $result_trees{'index_table_chapter_no_node'}{'contents'}[7];
+$result_trees{'index_table_chapter_no_node'}{'contents'}[8]{'contents'}[101]{'extra'}{'element_node'}
 = $result_trees{'index_table_chapter_no_node'}{'contents'}[7];
 
$result_trees{'index_table_chapter_no_node'}{'contents'}[8]{'contents'}[101]{'extra'}{'index_entry'}{'entry_element'}
 = $result_trees{'index_table_chapter_no_node'}{'contents'}[8]{'contents'}[101];
-$result_trees{'index_table_chapter_no_node'}{'contents'}[8]{'contents'}[102]{'extra'}{'entry_node'}
 = $result_trees{'index_table_chapter_no_node'}{'contents'}[7];
+$result_trees{'index_table_chapter_no_node'}{'contents'}[8]{'contents'}[102]{'extra'}{'element_node'}
 = $result_trees{'index_table_chapter_no_node'}{'contents'}[7];
 
$result_trees{'index_table_chapter_no_node'}{'contents'}[8]{'contents'}[102]{'extra'}{'index_entry'}{'entry_element'}
 = $result_trees{'index_table_chapter_no_node'}{'contents'}[8]{'contents'}[102];
-$result_trees{'index_table_chapter_no_node'}{'contents'}[8]{'contents'}[103]{'extra'}{'entry_node'}
 = $result_trees{'index_table_chapter_no_node'}{'contents'}[7];
+$result_trees{'index_table_chapter_no_node'}{'contents'}[8]{'contents'}[103]{'extra'}{'element_node'}
 = $result_trees{'index_table_chapter_no_node'}{'contents'}[7];
 
$result_trees{'index_table_chapter_no_node'}{'contents'}[8]{'contents'}[103]{'extra'}{'index_entry'}{'entry_element'}
 = $result_trees{'index_table_chapter_no_node'}{'contents'}[8]{'contents'}[103];
-$result_trees{'index_table_chapter_no_node'}{'contents'}[8]{'contents'}[104]{'extra'}{'entry_node'}
 = $result_trees{'index_table_chapter_no_node'}{'contents'}[7];
+$result_trees{'index_table_chapter_no_node'}{'contents'}[8]{'contents'}[104]{'extra'}{'element_node'}
 = $result_trees{'index_table_chapter_no_node'}{'contents'}[7];
 
$result_trees{'index_table_chapter_no_node'}{'contents'}[8]{'contents'}[104]{'extra'}{'index_entry'}{'entry_element'}
 = $result_trees{'index_table_chapter_no_node'}{'contents'}[8]{'contents'}[104];
-$result_trees{'index_table_chapter_no_node'}{'contents'}[8]{'contents'}[105]{'extra'}{'entry_node'}
 = $result_trees{'index_table_chapter_no_node'}{'contents'}[7];
+$result_trees{'index_table_chapter_no_node'}{'contents'}[8]{'contents'}[105]{'extra'}{'element_node'}
 = $result_trees{'index_table_chapter_no_node'}{'contents'}[7];
 
$result_trees{'index_table_chapter_no_node'}{'contents'}[8]{'contents'}[105]{'extra'}{'index_entry'}{'entry_element'}
 = $result_trees{'index_table_chapter_no_node'}{'contents'}[8]{'contents'}[105];
-$result_trees{'index_table_chapter_no_node'}{'contents'}[8]{'contents'}[106]{'extra'}{'entry_node'}
 = $result_trees{'index_table_chapter_no_node'}{'contents'}[7];
+$result_trees{'index_table_chapter_no_node'}{'contents'}[8]{'contents'}[106]{'extra'}{'element_node'}
 = $result_trees{'index_table_chapter_no_node'}{'contents'}[7];
 
$result_trees{'index_table_chapter_no_node'}{'contents'}[8]{'contents'}[106]{'extra'}{'index_entry'}{'entry_element'}
 = $result_trees{'index_table_chapter_no_node'}{'contents'}[8]{'contents'}[106];
-$result_trees{'index_table_chapter_no_node'}{'contents'}[8]{'contents'}[107]{'extra'}{'entry_node'}
 = $result_trees{'index_table_chapter_no_node'}{'contents'}[7];
+$result_trees{'index_table_chapter_no_node'}{'contents'}[8]{'contents'}[107]{'extra'}{'element_node'}
 = $result_trees{'index_table_chapter_no_node'}{'contents'}[7];
 
$result_trees{'index_table_chapter_no_node'}{'contents'}[8]{'contents'}[107]{'extra'}{'index_entry'}{'entry_element'}
 = $result_trees{'index_table_chapter_no_node'}{'contents'}[8]{'contents'}[107];
-$result_trees{'index_table_chapter_no_node'}{'contents'}[8]{'contents'}[108]{'extra'}{'entry_node'}
 = $result_trees{'index_table_chapter_no_node'}{'contents'}[7];
+$result_trees{'index_table_chapter_no_node'}{'contents'}[8]{'contents'}[108]{'extra'}{'element_node'}
 = $result_trees{'index_table_chapter_no_node'}{'contents'}[7];
 
$result_trees{'index_table_chapter_no_node'}{'contents'}[8]{'contents'}[108]{'extra'}{'index_entry'}{'entry_element'}
 = $result_trees{'index_table_chapter_no_node'}{'contents'}[8]{'contents'}[108];
-$result_trees{'index_table_chapter_no_node'}{'contents'}[8]{'contents'}[109]{'extra'}{'entry_node'}
 = $result_trees{'index_table_chapter_no_node'}{'contents'}[7];
+$result_trees{'index_table_chapter_no_node'}{'contents'}[8]{'contents'}[109]{'extra'}{'element_node'}
 = $result_trees{'index_table_chapter_no_node'}{'contents'}[7];
 
$result_trees{'index_table_chapter_no_node'}{'contents'}[8]{'contents'}[109]{'extra'}{'index_entry'}{'entry_element'}
 = $result_trees{'index_table_chapter_no_node'}{'contents'}[8]{'contents'}[109];
-$result_trees{'index_table_chapter_no_node'}{'contents'}[8]{'contents'}[110]{'extra'}{'entry_node'}
 = $result_trees{'index_table_chapter_no_node'}{'contents'}[7];
+$result_trees{'index_table_chapter_no_node'}{'contents'}[8]{'contents'}[110]{'extra'}{'element_node'}
 = $result_trees{'index_table_chapter_no_node'}{'contents'}[7];
 
$result_trees{'index_table_chapter_no_node'}{'contents'}[8]{'contents'}[110]{'extra'}{'index_entry'}{'entry_element'}
 = $result_trees{'index_table_chapter_no_node'}{'contents'}[8]{'contents'}[110];
-$result_trees{'index_table_chapter_no_node'}{'contents'}[8]{'contents'}[111]{'extra'}{'entry_node'}
 = $result_trees{'index_table_chapter_no_node'}{'contents'}[7];
+$result_trees{'index_table_chapter_no_node'}{'contents'}[8]{'contents'}[111]{'extra'}{'element_node'}
 = $result_trees{'index_table_chapter_no_node'}{'contents'}[7];
 
$result_trees{'index_table_chapter_no_node'}{'contents'}[8]{'contents'}[111]{'extra'}{'index_entry'}{'entry_element'}
 = $result_trees{'index_table_chapter_no_node'}{'contents'}[8]{'contents'}[111];
-$result_trees{'index_table_chapter_no_node'}{'contents'}[8]{'contents'}[112]{'extra'}{'entry_node'}
 = $result_trees{'index_table_chapter_no_node'}{'contents'}[7];
+$result_trees{'index_table_chapter_no_node'}{'contents'}[8]{'contents'}[112]{'extra'}{'element_node'}
 = $result_trees{'index_table_chapter_no_node'}{'contents'}[7];
 
$result_trees{'index_table_chapter_no_node'}{'contents'}[8]{'contents'}[112]{'extra'}{'index_entry'}{'entry_element'}
 = $result_trees{'index_table_chapter_no_node'}{'contents'}[8]{'contents'}[112];
-$result_trees{'index_table_chapter_no_node'}{'contents'}[8]{'contents'}[113]{'extra'}{'entry_node'}
 = $result_trees{'index_table_chapter_no_node'}{'contents'}[7];
+$result_trees{'index_table_chapter_no_node'}{'contents'}[8]{'contents'}[113]{'extra'}{'element_node'}
 = $result_trees{'index_table_chapter_no_node'}{'contents'}[7];
 
$result_trees{'index_table_chapter_no_node'}{'contents'}[8]{'contents'}[113]{'extra'}{'index_entry'}{'entry_element'}
 = $result_trees{'index_table_chapter_no_node'}{'contents'}[8]{'contents'}[113];
-$result_trees{'index_table_chapter_no_node'}{'contents'}[8]{'contents'}[114]{'extra'}{'entry_node'}
 = $result_trees{'index_table_chapter_no_node'}{'contents'}[7];
+$result_trees{'index_table_chapter_no_node'}{'contents'}[8]{'contents'}[114]{'extra'}{'element_node'}
 = $result_trees{'index_table_chapter_no_node'}{'contents'}[7];
 
$result_trees{'index_table_chapter_no_node'}{'contents'}[8]{'contents'}[114]{'extra'}{'index_entry'}{'entry_element'}
 = $result_trees{'index_table_chapter_no_node'}{'contents'}[8]{'contents'}[114];
-$result_trees{'index_table_chapter_no_node'}{'contents'}[8]{'contents'}[115]{'extra'}{'entry_node'}
 = $result_trees{'index_table_chapter_no_node'}{'contents'}[7];
+$result_trees{'index_table_chapter_no_node'}{'contents'}[8]{'contents'}[115]{'extra'}{'element_node'}
 = $result_trees{'index_table_chapter_no_node'}{'contents'}[7];
 
$result_trees{'index_table_chapter_no_node'}{'contents'}[8]{'contents'}[115]{'extra'}{'index_entry'}{'entry_element'}
 = $result_trees{'index_table_chapter_no_node'}{'contents'}[8]{'contents'}[115];
-$result_trees{'index_table_chapter_no_node'}{'contents'}[8]{'contents'}[116]{'extra'}{'entry_node'}
 = $result_trees{'index_table_chapter_no_node'}{'contents'}[7];
+$result_trees{'index_table_chapter_no_node'}{'contents'}[8]{'contents'}[116]{'extra'}{'element_node'}
 = $result_trees{'index_table_chapter_no_node'}{'contents'}[7];
 
$result_trees{'index_table_chapter_no_node'}{'contents'}[8]{'contents'}[116]{'extra'}{'index_entry'}{'entry_element'}
 = $result_trees{'index_table_chapter_no_node'}{'contents'}[8]{'contents'}[116];
-$result_trees{'index_table_chapter_no_node'}{'contents'}[8]{'contents'}[117]{'extra'}{'entry_node'}
 = $result_trees{'index_table_chapter_no_node'}{'contents'}[7];
+$result_trees{'index_table_chapter_no_node'}{'contents'}[8]{'contents'}[117]{'extra'}{'element_node'}
 = $result_trees{'index_table_chapter_no_node'}{'contents'}[7];
 
$result_trees{'index_table_chapter_no_node'}{'contents'}[8]{'contents'}[117]{'extra'}{'index_entry'}{'entry_element'}
 = $result_trees{'index_table_chapter_no_node'}{'contents'}[8]{'contents'}[117];
-$result_trees{'index_table_chapter_no_node'}{'contents'}[8]{'contents'}[118]{'extra'}{'entry_node'}
 = $result_trees{'index_table_chapter_no_node'}{'contents'}[7];
+$result_trees{'index_table_chapter_no_node'}{'contents'}[8]{'contents'}[118]{'extra'}{'element_node'}
 = $result_trees{'index_table_chapter_no_node'}{'contents'}[7];
 
$result_trees{'index_table_chapter_no_node'}{'contents'}[8]{'contents'}[118]{'extra'}{'index_entry'}{'entry_element'}
 = $result_trees{'index_table_chapter_no_node'}{'contents'}[8]{'contents'}[118];
-$result_trees{'index_table_chapter_no_node'}{'contents'}[8]{'contents'}[119]{'extra'}{'entry_node'}
 = $result_trees{'index_table_chapter_no_node'}{'contents'}[7];
+$result_trees{'index_table_chapter_no_node'}{'contents'}[8]{'contents'}[119]{'extra'}{'element_node'}
 = $result_trees{'index_table_chapter_no_node'}{'contents'}[7];
 
$result_trees{'index_table_chapter_no_node'}{'contents'}[8]{'contents'}[119]{'extra'}{'index_entry'}{'entry_element'}
 = $result_trees{'index_table_chapter_no_node'}{'contents'}[8]{'contents'}[119];
-$result_trees{'index_table_chapter_no_node'}{'contents'}[8]{'contents'}[120]{'extra'}{'entry_node'}
 = $result_trees{'index_table_chapter_no_node'}{'contents'}[7];
+$result_trees{'index_table_chapter_no_node'}{'contents'}[8]{'contents'}[120]{'extra'}{'element_node'}
 = $result_trees{'index_table_chapter_no_node'}{'contents'}[7];
 
$result_trees{'index_table_chapter_no_node'}{'contents'}[8]{'contents'}[120]{'extra'}{'index_entry'}{'entry_element'}
 = $result_trees{'index_table_chapter_no_node'}{'contents'}[8]{'contents'}[120];
-$result_trees{'index_table_chapter_no_node'}{'contents'}[8]{'contents'}[121]{'extra'}{'entry_node'}
 = $result_trees{'index_table_chapter_no_node'}{'contents'}[7];
+$result_trees{'index_table_chapter_no_node'}{'contents'}[8]{'contents'}[121]{'extra'}{'element_node'}
 = $result_trees{'index_table_chapter_no_node'}{'contents'}[7];
 
$result_trees{'index_table_chapter_no_node'}{'contents'}[8]{'contents'}[121]{'extra'}{'index_entry'}{'entry_element'}
 = $result_trees{'index_table_chapter_no_node'}{'contents'}[8]{'contents'}[121];
-$result_trees{'index_table_chapter_no_node'}{'contents'}[8]{'contents'}[122]{'extra'}{'entry_node'}
 = $result_trees{'index_table_chapter_no_node'}{'contents'}[7];
+$result_trees{'index_table_chapter_no_node'}{'contents'}[8]{'contents'}[122]{'extra'}{'element_node'}
 = $result_trees{'index_table_chapter_no_node'}{'contents'}[7];
 
$result_trees{'index_table_chapter_no_node'}{'contents'}[8]{'contents'}[122]{'extra'}{'index_entry'}{'entry_element'}
 = $result_trees{'index_table_chapter_no_node'}{'contents'}[8]{'contents'}[122];
-$result_trees{'index_table_chapter_no_node'}{'contents'}[8]{'contents'}[123]{'extra'}{'entry_node'}
 = $result_trees{'index_table_chapter_no_node'}{'contents'}[7];
+$result_trees{'index_table_chapter_no_node'}{'contents'}[8]{'contents'}[123]{'extra'}{'element_node'}
 = $result_trees{'index_table_chapter_no_node'}{'contents'}[7];
 
$result_trees{'index_table_chapter_no_node'}{'contents'}[8]{'contents'}[123]{'extra'}{'index_entry'}{'entry_element'}
 = $result_trees{'index_table_chapter_no_node'}{'contents'}[8]{'contents'}[123];
-$result_trees{'index_table_chapter_no_node'}{'contents'}[8]{'contents'}[124]{'extra'}{'entry_node'}
 = $result_trees{'index_table_chapter_no_node'}{'contents'}[7];
+$result_trees{'index_table_chapter_no_node'}{'contents'}[8]{'contents'}[124]{'extra'}{'element_node'}
 = $result_trees{'index_table_chapter_no_node'}{'contents'}[7];
 
$result_trees{'index_table_chapter_no_node'}{'contents'}[8]{'contents'}[124]{'extra'}{'index_entry'}{'entry_element'}
 = $result_trees{'index_table_chapter_no_node'}{'contents'}[8]{'contents'}[124];
-$result_trees{'index_table_chapter_no_node'}{'contents'}[8]{'contents'}[125]{'extra'}{'entry_node'}
 = $result_trees{'index_table_chapter_no_node'}{'contents'}[7];
+$result_trees{'index_table_chapter_no_node'}{'contents'}[8]{'contents'}[125]{'extra'}{'element_node'}
 = $result_trees{'index_table_chapter_no_node'}{'contents'}[7];
 
$result_trees{'index_table_chapter_no_node'}{'contents'}[8]{'contents'}[125]{'extra'}{'index_entry'}{'entry_element'}
 = $result_trees{'index_table_chapter_no_node'}{'contents'}[8]{'contents'}[125];
-$result_trees{'index_table_chapter_no_node'}{'contents'}[8]{'contents'}[126]{'extra'}{'entry_node'}
 = $result_trees{'index_table_chapter_no_node'}{'contents'}[7];
+$result_trees{'index_table_chapter_no_node'}{'contents'}[8]{'contents'}[126]{'extra'}{'element_node'}
 = $result_trees{'index_table_chapter_no_node'}{'contents'}[7];
 
$result_trees{'index_table_chapter_no_node'}{'contents'}[8]{'contents'}[126]{'extra'}{'index_entry'}{'entry_element'}
 = $result_trees{'index_table_chapter_no_node'}{'contents'}[8]{'contents'}[126];
-$result_trees{'index_table_chapter_no_node'}{'contents'}[8]{'contents'}[127]{'extra'}{'entry_node'}
 = $result_trees{'index_table_chapter_no_node'}{'contents'}[7];
+$result_trees{'index_table_chapter_no_node'}{'contents'}[8]{'contents'}[127]{'extra'}{'element_node'}
 = $result_trees{'index_table_chapter_no_node'}{'contents'}[7];
 
$result_trees{'index_table_chapter_no_node'}{'contents'}[8]{'contents'}[127]{'extra'}{'index_entry'}{'entry_element'}
 = $result_trees{'index_table_chapter_no_node'}{'contents'}[8]{'contents'}[127];
-$result_trees{'index_table_chapter_no_node'}{'contents'}[8]{'contents'}[128]{'extra'}{'entry_node'}
 = $result_trees{'index_table_chapter_no_node'}{'contents'}[7];
+$result_trees{'index_table_chapter_no_node'}{'contents'}[8]{'contents'}[128]{'extra'}{'element_node'}
 = $result_trees{'index_table_chapter_no_node'}{'contents'}[7];
 
$result_trees{'index_table_chapter_no_node'}{'contents'}[8]{'contents'}[128]{'extra'}{'index_entry'}{'entry_element'}
 = $result_trees{'index_table_chapter_no_node'}{'contents'}[8]{'contents'}[128];
 
$result_trees{'index_table_chapter_no_node'}{'contents'}[9]{'extra'}{'node_content'}[0]
 = 
$result_trees{'index_table_chapter_no_node'}{'contents'}[9]{'args'}[0]{'contents'}[0];
 
$result_trees{'index_table_chapter_no_node'}{'contents'}[9]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = 
$result_trees{'index_table_chapter_no_node'}{'contents'}[9]{'args'}[0]{'contents'}[0];
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 6223df52c9..b93f625651 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
@@ -251,7 +251,7 @@ 
$result_trees{'multiple_index_text_sortas_seeentry_seealso'} = {
           ],
           'cmdname' => 'cindex',
           'extra' => {
-            'entry_node' => {},
+            'element_node' => {},
             'index_entry' => {
               'entry_element' => {},
               'entry_number' => 1,
@@ -321,7 +321,7 @@ 
$result_trees{'multiple_index_text_sortas_seeentry_seealso'} = {
           ],
           'cmdname' => 'cindex',
           'extra' => {
-            'entry_node' => {},
+            'element_node' => {},
             'index_entry' => {
               'entry_element' => {},
               'entry_number' => 2,
@@ -389,7 +389,7 @@ 
$result_trees{'multiple_index_text_sortas_seeentry_seealso'} = {
           ],
           'cmdname' => 'cindex',
           'extra' => {
-            'entry_node' => {},
+            'element_node' => {},
             'index_entry' => {
               'entry_element' => {},
               'entry_number' => 3,
@@ -469,13 +469,13 @@ 
$result_trees{'multiple_index_text_sortas_seeentry_seealso'}{'contents'}[1]{'ext
 
$result_trees{'multiple_index_text_sortas_seeentry_seealso'}{'contents'}[1]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = 
$result_trees{'multiple_index_text_sortas_seeentry_seealso'}{'contents'}[1]{'args'}[0]{'contents'}[0];
 
$result_trees{'multiple_index_text_sortas_seeentry_seealso'}{'contents'}[3]{'extra'}{'node_content'}[0]
 = 
$result_trees{'multiple_index_text_sortas_seeentry_seealso'}{'contents'}[3]{'args'}[0]{'contents'}[0];
 
$result_trees{'multiple_index_text_sortas_seeentry_seealso'}{'contents'}[3]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = 
$result_trees{'multiple_index_text_sortas_seeentry_seealso'}{'contents'}[3]{'args'}[0]{'contents'}[0];
-$result_trees{'multiple_index_text_sortas_seeentry_seealso'}{'contents'}[4]{'contents'}[1]{'extra'}{'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'}{'element_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_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'}{'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'}[2]{'extra'}{'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'}{'element_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_element'}
 = 
$result_trees{'multiple_index_text_sortas_seeentry_seealso'}{'contents'}[4]{'contents'}[2];
-$result_trees{'multiple_index_text_sortas_seeentry_seealso'}{'contents'}[4]{'contents'}[3]{'extra'}{'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'}{'element_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_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'}{'seeentry'}
 = 
$result_trees{'multiple_index_text_sortas_seeentry_seealso'}{'contents'}[4]{'contents'}[3]{'args'}[0]{'contents'}[2];
 
diff --git a/tp/t/results/indices/nodes_before_top.pl 
b/tp/t/results/indices/nodes_before_top.pl
index 686700ce4e..7a1c410e56 100644
--- a/tp/t/results/indices/nodes_before_top.pl
+++ b/tp/t/results/indices/nodes_before_top.pl
@@ -131,7 +131,7 @@ $result_trees{'nodes_before_top'} = {
           ],
           'cmdname' => 'cindex',
           'extra' => {
-            'entry_node' => {},
+            'element_node' => {},
             'index_entry' => {
               'entry_element' => {},
               'entry_number' => 1,
@@ -396,7 +396,7 @@ $result_trees{'nodes_before_top'} = {
           ],
           'cmdname' => 'cindex',
           'extra' => {
-            'entry_node' => {},
+            'element_node' => {},
             'index_entry' => {
               'entry_element' => {},
               'entry_number' => 2,
@@ -483,7 +483,7 @@ $result_trees{'nodes_before_top'} = {
           ],
           'cmdname' => 'cindex',
           'extra' => {
-            'entry_node' => {},
+            'element_node' => {},
             'index_entry' => {
               'entry_element' => {},
               'entry_number' => 3,
@@ -602,7 +602,7 @@ $result_trees{'nodes_before_top'} = {
           ],
           'cmdname' => 'cindex',
           'extra' => {
-            'entry_node' => {},
+            'element_node' => {},
             'index_entry' => {
               'entry_element' => {},
               'entry_number' => 4,
@@ -964,7 +964,7 @@ $result_trees{'nodes_before_top'} = {
               ],
               'cmdname' => 'cindex',
               'extra' => {
-                'entry_node' => {},
+                'element_node' => {},
                 'index_entry' => {
                   'entry_element' => {},
                   'entry_number' => 5,
@@ -1003,7 +1003,7 @@ $result_trees{'nodes_before_top'} = {
               ],
               'cmdname' => 'findex',
               'extra' => {
-                'entry_node' => {},
+                'element_node' => {},
                 'index_entry' => {
                   'entry_element' => {},
                   'entry_number' => 1,
@@ -1042,7 +1042,7 @@ $result_trees{'nodes_before_top'} = {
               ],
               'cmdname' => 'cindex',
               'extra' => {
-                'entry_node' => {},
+                'element_node' => {},
                 'index_entry' => {
                   'entry_element' => {},
                   'entry_number' => 6,
@@ -1591,7 +1591,7 @@ $result_trees{'nodes_before_top'} = {
           ],
           'cmdname' => 'cindex',
           'extra' => {
-            'entry_node' => {},
+            'element_node' => {},
             'index_entry' => {
               'entry_element' => {},
               'entry_number' => 7,
@@ -1630,7 +1630,7 @@ $result_trees{'nodes_before_top'} = {
           ],
           'cmdname' => 'findex',
           'extra' => {
-            'entry_node' => {},
+            'element_node' => {},
             'index_entry' => {
               'entry_element' => {},
               'entry_number' => 2,
@@ -1669,7 +1669,7 @@ $result_trees{'nodes_before_top'} = {
           ],
           'cmdname' => 'cindex',
           'extra' => {
-            'entry_node' => {},
+            'element_node' => {},
             'index_entry' => {
               'entry_element' => {},
               'entry_number' => 8,
@@ -1800,7 +1800,7 @@ $result_trees{'nodes_before_top'} = {
           ],
           'cmdname' => 'cindex',
           'extra' => {
-            'entry_node' => {},
+            'element_node' => {},
             'index_entry' => {
               'entry_element' => {},
               'entry_number' => 9,
@@ -1883,7 +1883,7 @@ $result_trees{'nodes_before_top'} = {
           ],
           'cmdname' => 'findex',
           'extra' => {
-            'entry_node' => {},
+            'element_node' => {},
             'index_entry' => {
               'entry_element' => {},
               'entry_number' => 3,
@@ -1922,7 +1922,7 @@ $result_trees{'nodes_before_top'} = {
           ],
           'cmdname' => 'cindex',
           'extra' => {
-            'entry_node' => {},
+            'element_node' => {},
             'index_entry' => {
               'entry_element' => {},
               'entry_number' => 10,
@@ -2039,31 +2039,31 @@ $result_trees{'nodes_before_top'} = {
   ],
   'type' => 'document_root'
 };
-$result_trees{'nodes_before_top'}{'contents'}[1]{'contents'}[0]{'extra'}{'entry_node'}
 = $result_trees{'nodes_before_top'}{'contents'}[1];
+$result_trees{'nodes_before_top'}{'contents'}[1]{'contents'}[0]{'extra'}{'element_node'}
 = $result_trees{'nodes_before_top'}{'contents'}[1];
 
$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'}[3]{'contents'}[0]{'extra'}{'menu_entry_node_label'}{'node_content'}[0]
 = 
$result_trees{'nodes_before_top'}{'contents'}[1]{'contents'}[3]{'contents'}[0]{'contents'}[1]{'contents'}[0];
 $result_trees{'nodes_before_top'}{'contents'}[1]{'extra'}{'node_content'}[0] = 
$result_trees{'nodes_before_top'}{'contents'}[1]{'args'}[0]{'contents'}[0];
 
$result_trees{'nodes_before_top'}{'contents'}[1]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = $result_trees{'nodes_before_top'}{'contents'}[1]{'args'}[0]{'contents'}[0];
 
$result_trees{'nodes_before_top'}{'contents'}[1]{'extra'}{'nodes_manuals'}[1]{'node_content'}[0]
 = $result_trees{'nodes_before_top'}{'contents'}[1]{'args'}[1]{'contents'}[0];
 
$result_trees{'nodes_before_top'}{'contents'}[1]{'extra'}{'nodes_manuals'}[3]{'manual_content'}[0]
 = $result_trees{'nodes_before_top'}{'contents'}[1]{'args'}[3]{'contents'}[1];
-$result_trees{'nodes_before_top'}{'contents'}[2]{'contents'}[1]{'extra'}{'entry_node'}
 = $result_trees{'nodes_before_top'}{'contents'}[2];
+$result_trees{'nodes_before_top'}{'contents'}[2]{'contents'}[1]{'extra'}{'element_node'}
 = $result_trees{'nodes_before_top'}{'contents'}[2];
 
$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'}[5]{'extra'}{'entry_node'}
 = $result_trees{'nodes_before_top'}{'contents'}[2];
+$result_trees{'nodes_before_top'}{'contents'}[2]{'contents'}[5]{'extra'}{'element_node'}
 = $result_trees{'nodes_before_top'}{'contents'}[2];
 
$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]{'extra'}{'node_content'}[0] = 
$result_trees{'nodes_before_top'}{'contents'}[2]{'args'}[0]{'contents'}[0];
 
$result_trees{'nodes_before_top'}{'contents'}[2]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = $result_trees{'nodes_before_top'}{'contents'}[2]{'args'}[0]{'contents'}[0];
 
$result_trees{'nodes_before_top'}{'contents'}[2]{'extra'}{'nodes_manuals'}[3]{'node_content'}[0]
 = $result_trees{'nodes_before_top'}{'contents'}[2]{'args'}[3]{'contents'}[0];
-$result_trees{'nodes_before_top'}{'contents'}[3]{'contents'}[0]{'extra'}{'entry_node'}
 = $result_trees{'nodes_before_top'}{'contents'}[3];
+$result_trees{'nodes_before_top'}{'contents'}[3]{'contents'}[0]{'extra'}{'element_node'}
 = $result_trees{'nodes_before_top'}{'contents'}[3];
 
$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'}[10]{'contents'}[0]{'extra'}{'menu_entry_node_label'}{'node_content'}[0]
 = 
$result_trees{'nodes_before_top'}{'contents'}[3]{'contents'}[10]{'contents'}[0]{'contents'}[1]{'contents'}[0];
 $result_trees{'nodes_before_top'}{'contents'}[3]{'extra'}{'node_content'}[0] = 
$result_trees{'nodes_before_top'}{'contents'}[3]{'args'}[0]{'contents'}[0];
 
$result_trees{'nodes_before_top'}{'contents'}[3]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = $result_trees{'nodes_before_top'}{'contents'}[3]{'args'}[0]{'contents'}[0];
 
$result_trees{'nodes_before_top'}{'contents'}[3]{'extra'}{'nodes_manuals'}[2]{'node_content'}[0]
 = $result_trees{'nodes_before_top'}{'contents'}[3]{'args'}[2]{'contents'}[0];
-$result_trees{'nodes_before_top'}{'contents'}[4]{'contents'}[0]{'contents'}[1]{'extra'}{'entry_node'}
 = $result_trees{'nodes_before_top'}{'contents'}[4];
+$result_trees{'nodes_before_top'}{'contents'}[4]{'contents'}[0]{'contents'}[1]{'extra'}{'element_node'}
 = $result_trees{'nodes_before_top'}{'contents'}[4];
 
$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'}[2]{'extra'}{'entry_node'}
 = $result_trees{'nodes_before_top'}{'contents'}[4];
+$result_trees{'nodes_before_top'}{'contents'}[4]{'contents'}[0]{'contents'}[2]{'extra'}{'element_node'}
 = $result_trees{'nodes_before_top'}{'contents'}[4];
 
$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'}[3]{'extra'}{'entry_node'}
 = $result_trees{'nodes_before_top'}{'contents'}[4];
+$result_trees{'nodes_before_top'}{'contents'}[4]{'contents'}[0]{'contents'}[3]{'extra'}{'element_node'}
 = $result_trees{'nodes_before_top'}{'contents'}[4];
 
$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'}[4]{'contents'}[0]{'extra'}{'menu_entry_node_label'}{'node_content'}[0]
 = 
$result_trees{'nodes_before_top'}{'contents'}[4]{'contents'}[4]{'contents'}[0]{'contents'}[1]{'contents'}[0];
 $result_trees{'nodes_before_top'}{'contents'}[4]{'extra'}{'node_content'}[0] = 
$result_trees{'nodes_before_top'}{'contents'}[4]{'args'}[0]{'contents'}[0];
@@ -2075,21 +2075,21 @@ 
$result_trees{'nodes_before_top'}{'contents'}[5]{'contents'}[0]{'contents'}[1]{'
 $result_trees{'nodes_before_top'}{'contents'}[5]{'extra'}{'node_content'}[0] = 
$result_trees{'nodes_before_top'}{'contents'}[5]{'args'}[0]{'contents'}[0];
 
$result_trees{'nodes_before_top'}{'contents'}[5]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = $result_trees{'nodes_before_top'}{'contents'}[5]{'args'}[0]{'contents'}[0];
 
$result_trees{'nodes_before_top'}{'contents'}[5]{'extra'}{'nodes_manuals'}[3]{'node_content'}[0]
 = $result_trees{'nodes_before_top'}{'contents'}[5]{'args'}[3]{'contents'}[0];
-$result_trees{'nodes_before_top'}{'contents'}[6]{'contents'}[1]{'extra'}{'entry_node'}
 = $result_trees{'nodes_before_top'}{'contents'}[6];
+$result_trees{'nodes_before_top'}{'contents'}[6]{'contents'}[1]{'extra'}{'element_node'}
 = $result_trees{'nodes_before_top'}{'contents'}[6];
 
$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'}[2]{'extra'}{'entry_node'}
 = $result_trees{'nodes_before_top'}{'contents'}[6];
+$result_trees{'nodes_before_top'}{'contents'}[6]{'contents'}[2]{'extra'}{'element_node'}
 = $result_trees{'nodes_before_top'}{'contents'}[6];
 
$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'}[3]{'extra'}{'entry_node'}
 = $result_trees{'nodes_before_top'}{'contents'}[6];
+$result_trees{'nodes_before_top'}{'contents'}[6]{'contents'}[3]{'extra'}{'element_node'}
 = $result_trees{'nodes_before_top'}{'contents'}[6];
 
$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]{'extra'}{'node_content'}[0] = 
$result_trees{'nodes_before_top'}{'contents'}[6]{'args'}[0]{'contents'}[0];
 
$result_trees{'nodes_before_top'}{'contents'}[6]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = $result_trees{'nodes_before_top'}{'contents'}[6]{'args'}[0]{'contents'}[0];
 
$result_trees{'nodes_before_top'}{'contents'}[6]{'extra'}{'nodes_manuals'}[2]{'node_content'}[0]
 = $result_trees{'nodes_before_top'}{'contents'}[6]{'args'}[2]{'contents'}[0];
 
$result_trees{'nodes_before_top'}{'contents'}[6]{'extra'}{'nodes_manuals'}[3]{'node_content'}[0]
 = $result_trees{'nodes_before_top'}{'contents'}[6]{'args'}[3]{'contents'}[0];
-$result_trees{'nodes_before_top'}{'contents'}[7]{'contents'}[0]{'extra'}{'entry_node'}
 = $result_trees{'nodes_before_top'}{'contents'}[7];
+$result_trees{'nodes_before_top'}{'contents'}[7]{'contents'}[0]{'extra'}{'element_node'}
 = $result_trees{'nodes_before_top'}{'contents'}[7];
 
$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'}[4]{'extra'}{'entry_node'}
 = $result_trees{'nodes_before_top'}{'contents'}[7];
+$result_trees{'nodes_before_top'}{'contents'}[7]{'contents'}[4]{'extra'}{'element_node'}
 = $result_trees{'nodes_before_top'}{'contents'}[7];
 
$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'}[5]{'extra'}{'entry_node'}
 = $result_trees{'nodes_before_top'}{'contents'}[7];
+$result_trees{'nodes_before_top'}{'contents'}[7]{'contents'}[5]{'extra'}{'element_node'}
 = $result_trees{'nodes_before_top'}{'contents'}[7];
 
$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]{'extra'}{'node_content'}[0] = 
$result_trees{'nodes_before_top'}{'contents'}[7]{'args'}[0]{'contents'}[0];
 
$result_trees{'nodes_before_top'}{'contents'}[7]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = $result_trees{'nodes_before_top'}{'contents'}[7]{'args'}[0]{'contents'}[0];
diff --git a/tp/t/results/indices/nodes_before_top_and_sections_chapter.pl 
b/tp/t/results/indices/nodes_before_top_and_sections_chapter.pl
index d816492d3d..739b8ce924 100644
--- a/tp/t/results/indices/nodes_before_top_and_sections_chapter.pl
+++ b/tp/t/results/indices/nodes_before_top_and_sections_chapter.pl
@@ -104,7 +104,7 @@ $result_trees{'nodes_before_top_and_sections_chapter'} = {
           ],
           'cmdname' => 'cindex',
           'extra' => {
-            'entry_node' => {},
+            'element_node' => {},
             'index_entry' => {
               'entry_element' => {},
               'entry_number' => 1,
@@ -426,7 +426,7 @@ $result_trees{'nodes_before_top_and_sections_chapter'} = {
           ],
           'cmdname' => 'cindex',
           'extra' => {
-            'entry_node' => {},
+            'element_node' => {},
             'index_entry' => {
               'entry_element' => {},
               'entry_number' => 2,
@@ -522,7 +522,7 @@ $result_trees{'nodes_before_top_and_sections_chapter'} = {
           ],
           'cmdname' => 'cindex',
           'extra' => {
-            'entry_node' => {},
+            'element_node' => {},
             'index_entry' => {
               'entry_element' => {},
               'entry_number' => 3,
@@ -641,7 +641,7 @@ $result_trees{'nodes_before_top_and_sections_chapter'} = {
           ],
           'cmdname' => 'cindex',
           'extra' => {
-            'entry_node' => {},
+            'element_node' => {},
             'index_entry' => {
               'entry_element' => {},
               'entry_number' => 4,
@@ -873,7 +873,7 @@ $result_trees{'nodes_before_top_and_sections_chapter'} = {
           ],
           'cmdname' => 'cindex',
           'extra' => {
-            'entry_node' => {},
+            'element_node' => {},
             'index_entry' => {
               'entry_element' => {},
               'entry_number' => 5,
@@ -1193,7 +1193,7 @@ $result_trees{'nodes_before_top_and_sections_chapter'} = {
               ],
               'cmdname' => 'cindex',
               'extra' => {
-                'entry_node' => {},
+                'element_node' => {},
                 'index_entry' => {
                   'entry_element' => {},
                   'entry_number' => 6,
@@ -1232,7 +1232,7 @@ $result_trees{'nodes_before_top_and_sections_chapter'} = {
               ],
               'cmdname' => 'findex',
               'extra' => {
-                'entry_node' => {},
+                'element_node' => {},
                 'index_entry' => {
                   'entry_element' => {},
                   'entry_number' => 1,
@@ -1271,7 +1271,7 @@ $result_trees{'nodes_before_top_and_sections_chapter'} = {
               ],
               'cmdname' => 'cindex',
               'extra' => {
-                'entry_node' => {},
+                'element_node' => {},
                 'index_entry' => {
                   'entry_element' => {},
                   'entry_number' => 7,
@@ -1820,7 +1820,7 @@ $result_trees{'nodes_before_top_and_sections_chapter'} = {
           ],
           'cmdname' => 'cindex',
           'extra' => {
-            'entry_node' => {},
+            'element_node' => {},
             'index_entry' => {
               'entry_element' => {},
               'entry_number' => 8,
@@ -1859,7 +1859,7 @@ $result_trees{'nodes_before_top_and_sections_chapter'} = {
           ],
           'cmdname' => 'findex',
           'extra' => {
-            'entry_node' => {},
+            'element_node' => {},
             'index_entry' => {
               'entry_element' => {},
               'entry_number' => 2,
@@ -1898,7 +1898,7 @@ $result_trees{'nodes_before_top_and_sections_chapter'} = {
           ],
           'cmdname' => 'cindex',
           'extra' => {
-            'entry_node' => {},
+            'element_node' => {},
             'index_entry' => {
               'entry_element' => {},
               'entry_number' => 9,
@@ -2029,7 +2029,7 @@ $result_trees{'nodes_before_top_and_sections_chapter'} = {
           ],
           'cmdname' => 'cindex',
           'extra' => {
-            'entry_node' => {},
+            'element_node' => {},
             'index_entry' => {
               'entry_element' => {},
               'entry_number' => 10,
@@ -2112,7 +2112,7 @@ $result_trees{'nodes_before_top_and_sections_chapter'} = {
           ],
           'cmdname' => 'findex',
           'extra' => {
-            'entry_node' => {},
+            'element_node' => {},
             'index_entry' => {
               'entry_element' => {},
               'entry_number' => 3,
@@ -2151,7 +2151,7 @@ $result_trees{'nodes_before_top_and_sections_chapter'} = {
           ],
           'cmdname' => 'cindex',
           'extra' => {
-            'entry_node' => {},
+            'element_node' => {},
             'index_entry' => {
               'entry_element' => {},
               'entry_number' => 11,
@@ -2474,7 +2474,7 @@ $result_trees{'nodes_before_top_and_sections_chapter'} = {
           ],
           'cmdname' => 'cindex',
           'extra' => {
-            'entry_node' => {},
+            'element_node' => {},
             'index_entry' => {
               'entry_element' => {},
               'entry_number' => 12,
@@ -2551,35 +2551,35 @@ $result_trees{'nodes_before_top_and_sections_chapter'} 
= {
   ],
   'type' => 'document_root'
 };
-$result_trees{'nodes_before_top_and_sections_chapter'}{'contents'}[1]{'contents'}[0]{'extra'}{'entry_node'}
 = $result_trees{'nodes_before_top_and_sections_chapter'}{'contents'}[1];
+$result_trees{'nodes_before_top_and_sections_chapter'}{'contents'}[1]{'contents'}[0]{'extra'}{'element_node'}
 = $result_trees{'nodes_before_top_and_sections_chapter'}{'contents'}[1];
 
$result_trees{'nodes_before_top_and_sections_chapter'}{'contents'}[1]{'contents'}[0]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'nodes_before_top_and_sections_chapter'}{'contents'}[1]{'contents'}[0];
 
$result_trees{'nodes_before_top_and_sections_chapter'}{'contents'}[1]{'contents'}[7]{'contents'}[0]{'extra'}{'menu_entry_node_label'}{'node_content'}[0]
 = 
$result_trees{'nodes_before_top_and_sections_chapter'}{'contents'}[1]{'contents'}[7]{'contents'}[0]{'contents'}[1]{'contents'}[0];
 
$result_trees{'nodes_before_top_and_sections_chapter'}{'contents'}[1]{'extra'}{'node_content'}[0]
 = 
$result_trees{'nodes_before_top_and_sections_chapter'}{'contents'}[1]{'args'}[0]{'contents'}[0];
 
$result_trees{'nodes_before_top_and_sections_chapter'}{'contents'}[1]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = 
$result_trees{'nodes_before_top_and_sections_chapter'}{'contents'}[1]{'args'}[0]{'contents'}[0];
 
$result_trees{'nodes_before_top_and_sections_chapter'}{'contents'}[1]{'extra'}{'nodes_manuals'}[1]{'node_content'}[0]
 = 
$result_trees{'nodes_before_top_and_sections_chapter'}{'contents'}[1]{'args'}[1]{'contents'}[0];
 
$result_trees{'nodes_before_top_and_sections_chapter'}{'contents'}[1]{'extra'}{'nodes_manuals'}[3]{'manual_content'}[0]
 = 
$result_trees{'nodes_before_top_and_sections_chapter'}{'contents'}[1]{'args'}[3]{'contents'}[1];
-$result_trees{'nodes_before_top_and_sections_chapter'}{'contents'}[2]{'contents'}[1]{'extra'}{'entry_node'}
 = $result_trees{'nodes_before_top_and_sections_chapter'}{'contents'}[2];
+$result_trees{'nodes_before_top_and_sections_chapter'}{'contents'}[2]{'contents'}[1]{'extra'}{'element_node'}
 = $result_trees{'nodes_before_top_and_sections_chapter'}{'contents'}[2];
 
$result_trees{'nodes_before_top_and_sections_chapter'}{'contents'}[2]{'contents'}[1]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'nodes_before_top_and_sections_chapter'}{'contents'}[2]{'contents'}[1];
-$result_trees{'nodes_before_top_and_sections_chapter'}{'contents'}[2]{'contents'}[6]{'extra'}{'entry_node'}
 = $result_trees{'nodes_before_top_and_sections_chapter'}{'contents'}[2];
+$result_trees{'nodes_before_top_and_sections_chapter'}{'contents'}[2]{'contents'}[6]{'extra'}{'element_node'}
 = $result_trees{'nodes_before_top_and_sections_chapter'}{'contents'}[2];
 
$result_trees{'nodes_before_top_and_sections_chapter'}{'contents'}[2]{'contents'}[6]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'nodes_before_top_and_sections_chapter'}{'contents'}[2]{'contents'}[6];
 
$result_trees{'nodes_before_top_and_sections_chapter'}{'contents'}[2]{'extra'}{'node_content'}[0]
 = 
$result_trees{'nodes_before_top_and_sections_chapter'}{'contents'}[2]{'args'}[0]{'contents'}[0];
 
$result_trees{'nodes_before_top_and_sections_chapter'}{'contents'}[2]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = 
$result_trees{'nodes_before_top_and_sections_chapter'}{'contents'}[2]{'args'}[0]{'contents'}[0];
 
$result_trees{'nodes_before_top_and_sections_chapter'}{'contents'}[2]{'extra'}{'nodes_manuals'}[3]{'node_content'}[0]
 = 
$result_trees{'nodes_before_top_and_sections_chapter'}{'contents'}[2]{'args'}[3]{'contents'}[0];
-$result_trees{'nodes_before_top_and_sections_chapter'}{'contents'}[3]{'contents'}[0]{'extra'}{'entry_node'}
 = $result_trees{'nodes_before_top_and_sections_chapter'}{'contents'}[3];
+$result_trees{'nodes_before_top_and_sections_chapter'}{'contents'}[3]{'contents'}[0]{'extra'}{'element_node'}
 = $result_trees{'nodes_before_top_and_sections_chapter'}{'contents'}[3];
 
$result_trees{'nodes_before_top_and_sections_chapter'}{'contents'}[3]{'contents'}[0]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'nodes_before_top_and_sections_chapter'}{'contents'}[3]{'contents'}[0];
 
$result_trees{'nodes_before_top_and_sections_chapter'}{'contents'}[3]{'extra'}{'node_content'}[0]
 = 
$result_trees{'nodes_before_top_and_sections_chapter'}{'contents'}[3]{'args'}[0]{'contents'}[0];
 
$result_trees{'nodes_before_top_and_sections_chapter'}{'contents'}[3]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = 
$result_trees{'nodes_before_top_and_sections_chapter'}{'contents'}[3]{'args'}[0]{'contents'}[0];
 
$result_trees{'nodes_before_top_and_sections_chapter'}{'contents'}[3]{'extra'}{'nodes_manuals'}[2]{'node_content'}[0]
 = 
$result_trees{'nodes_before_top_and_sections_chapter'}{'contents'}[3]{'args'}[2]{'contents'}[0];
-$result_trees{'nodes_before_top_and_sections_chapter'}{'contents'}[4]{'contents'}[0]{'extra'}{'entry_node'}
 = $result_trees{'nodes_before_top_and_sections_chapter'}{'contents'}[3];
+$result_trees{'nodes_before_top_and_sections_chapter'}{'contents'}[4]{'contents'}[0]{'extra'}{'element_node'}
 = $result_trees{'nodes_before_top_and_sections_chapter'}{'contents'}[3];
 
$result_trees{'nodes_before_top_and_sections_chapter'}{'contents'}[4]{'contents'}[0]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'nodes_before_top_and_sections_chapter'}{'contents'}[4]{'contents'}[0];
 
$result_trees{'nodes_before_top_and_sections_chapter'}{'contents'}[4]{'contents'}[4]{'contents'}[0]{'extra'}{'menu_entry_node_label'}{'node_content'}[0]
 = 
$result_trees{'nodes_before_top_and_sections_chapter'}{'contents'}[4]{'contents'}[4]{'contents'}[0]{'contents'}[1]{'contents'}[0];
 
$result_trees{'nodes_before_top_and_sections_chapter'}{'contents'}[4]{'contents'}[4]{'contents'}[1]{'extra'}{'menu_entry_node_label'}{'node_content'}[0]
 = 
$result_trees{'nodes_before_top_and_sections_chapter'}{'contents'}[4]{'contents'}[4]{'contents'}[1]{'contents'}[1]{'contents'}[0];
 
$result_trees{'nodes_before_top_and_sections_chapter'}{'contents'}[4]{'contents'}[4]{'contents'}[2]{'extra'}{'menu_entry_node_label'}{'node_content'}[0]
 = 
$result_trees{'nodes_before_top_and_sections_chapter'}{'contents'}[4]{'contents'}[4]{'contents'}[2]{'contents'}[1]{'contents'}[0];
-$result_trees{'nodes_before_top_and_sections_chapter'}{'contents'}[5]{'contents'}[0]{'contents'}[1]{'extra'}{'entry_node'}
 = $result_trees{'nodes_before_top_and_sections_chapter'}{'contents'}[5];
+$result_trees{'nodes_before_top_and_sections_chapter'}{'contents'}[5]{'contents'}[0]{'contents'}[1]{'extra'}{'element_node'}
 = $result_trees{'nodes_before_top_and_sections_chapter'}{'contents'}[5];
 
$result_trees{'nodes_before_top_and_sections_chapter'}{'contents'}[5]{'contents'}[0]{'contents'}[1]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'nodes_before_top_and_sections_chapter'}{'contents'}[5]{'contents'}[0]{'contents'}[1];
-$result_trees{'nodes_before_top_and_sections_chapter'}{'contents'}[5]{'contents'}[0]{'contents'}[2]{'extra'}{'entry_node'}
 = $result_trees{'nodes_before_top_and_sections_chapter'}{'contents'}[5];
+$result_trees{'nodes_before_top_and_sections_chapter'}{'contents'}[5]{'contents'}[0]{'contents'}[2]{'extra'}{'element_node'}
 = $result_trees{'nodes_before_top_and_sections_chapter'}{'contents'}[5];
 
$result_trees{'nodes_before_top_and_sections_chapter'}{'contents'}[5]{'contents'}[0]{'contents'}[2]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'nodes_before_top_and_sections_chapter'}{'contents'}[5]{'contents'}[0]{'contents'}[2];
-$result_trees{'nodes_before_top_and_sections_chapter'}{'contents'}[5]{'contents'}[0]{'contents'}[3]{'extra'}{'entry_node'}
 = $result_trees{'nodes_before_top_and_sections_chapter'}{'contents'}[5];
+$result_trees{'nodes_before_top_and_sections_chapter'}{'contents'}[5]{'contents'}[0]{'contents'}[3]{'extra'}{'element_node'}
 = $result_trees{'nodes_before_top_and_sections_chapter'}{'contents'}[5];
 
$result_trees{'nodes_before_top_and_sections_chapter'}{'contents'}[5]{'contents'}[0]{'contents'}[3]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'nodes_before_top_and_sections_chapter'}{'contents'}[5]{'contents'}[0]{'contents'}[3];
 
$result_trees{'nodes_before_top_and_sections_chapter'}{'contents'}[5]{'contents'}[4]{'contents'}[0]{'extra'}{'menu_entry_node_label'}{'node_content'}[0]
 = 
$result_trees{'nodes_before_top_and_sections_chapter'}{'contents'}[5]{'contents'}[4]{'contents'}[0]{'contents'}[1]{'contents'}[0];
 
$result_trees{'nodes_before_top_and_sections_chapter'}{'contents'}[5]{'extra'}{'node_content'}[0]
 = 
$result_trees{'nodes_before_top_and_sections_chapter'}{'contents'}[5]{'args'}[0]{'contents'}[0];
@@ -2591,21 +2591,21 @@ 
$result_trees{'nodes_before_top_and_sections_chapter'}{'contents'}[6]{'contents'
 
$result_trees{'nodes_before_top_and_sections_chapter'}{'contents'}[6]{'extra'}{'node_content'}[0]
 = 
$result_trees{'nodes_before_top_and_sections_chapter'}{'contents'}[6]{'args'}[0]{'contents'}[0];
 
$result_trees{'nodes_before_top_and_sections_chapter'}{'contents'}[6]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = 
$result_trees{'nodes_before_top_and_sections_chapter'}{'contents'}[6]{'args'}[0]{'contents'}[0];
 
$result_trees{'nodes_before_top_and_sections_chapter'}{'contents'}[6]{'extra'}{'nodes_manuals'}[3]{'node_content'}[0]
 = 
$result_trees{'nodes_before_top_and_sections_chapter'}{'contents'}[6]{'args'}[3]{'contents'}[0];
-$result_trees{'nodes_before_top_and_sections_chapter'}{'contents'}[7]{'contents'}[1]{'extra'}{'entry_node'}
 = $result_trees{'nodes_before_top_and_sections_chapter'}{'contents'}[7];
+$result_trees{'nodes_before_top_and_sections_chapter'}{'contents'}[7]{'contents'}[1]{'extra'}{'element_node'}
 = $result_trees{'nodes_before_top_and_sections_chapter'}{'contents'}[7];
 
$result_trees{'nodes_before_top_and_sections_chapter'}{'contents'}[7]{'contents'}[1]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'nodes_before_top_and_sections_chapter'}{'contents'}[7]{'contents'}[1];
-$result_trees{'nodes_before_top_and_sections_chapter'}{'contents'}[7]{'contents'}[2]{'extra'}{'entry_node'}
 = $result_trees{'nodes_before_top_and_sections_chapter'}{'contents'}[7];
+$result_trees{'nodes_before_top_and_sections_chapter'}{'contents'}[7]{'contents'}[2]{'extra'}{'element_node'}
 = $result_trees{'nodes_before_top_and_sections_chapter'}{'contents'}[7];
 
$result_trees{'nodes_before_top_and_sections_chapter'}{'contents'}[7]{'contents'}[2]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'nodes_before_top_and_sections_chapter'}{'contents'}[7]{'contents'}[2];
-$result_trees{'nodes_before_top_and_sections_chapter'}{'contents'}[7]{'contents'}[3]{'extra'}{'entry_node'}
 = $result_trees{'nodes_before_top_and_sections_chapter'}{'contents'}[7];
+$result_trees{'nodes_before_top_and_sections_chapter'}{'contents'}[7]{'contents'}[3]{'extra'}{'element_node'}
 = $result_trees{'nodes_before_top_and_sections_chapter'}{'contents'}[7];
 
$result_trees{'nodes_before_top_and_sections_chapter'}{'contents'}[7]{'contents'}[3]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'nodes_before_top_and_sections_chapter'}{'contents'}[7]{'contents'}[3];
 
$result_trees{'nodes_before_top_and_sections_chapter'}{'contents'}[7]{'extra'}{'node_content'}[0]
 = 
$result_trees{'nodes_before_top_and_sections_chapter'}{'contents'}[7]{'args'}[0]{'contents'}[0];
 
$result_trees{'nodes_before_top_and_sections_chapter'}{'contents'}[7]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = 
$result_trees{'nodes_before_top_and_sections_chapter'}{'contents'}[7]{'args'}[0]{'contents'}[0];
 
$result_trees{'nodes_before_top_and_sections_chapter'}{'contents'}[7]{'extra'}{'nodes_manuals'}[2]{'node_content'}[0]
 = 
$result_trees{'nodes_before_top_and_sections_chapter'}{'contents'}[7]{'args'}[2]{'contents'}[0];
 
$result_trees{'nodes_before_top_and_sections_chapter'}{'contents'}[7]{'extra'}{'nodes_manuals'}[3]{'node_content'}[0]
 = 
$result_trees{'nodes_before_top_and_sections_chapter'}{'contents'}[7]{'args'}[3]{'contents'}[0];
-$result_trees{'nodes_before_top_and_sections_chapter'}{'contents'}[8]{'contents'}[0]{'extra'}{'entry_node'}
 = $result_trees{'nodes_before_top_and_sections_chapter'}{'contents'}[8];
+$result_trees{'nodes_before_top_and_sections_chapter'}{'contents'}[8]{'contents'}[0]{'extra'}{'element_node'}
 = $result_trees{'nodes_before_top_and_sections_chapter'}{'contents'}[8];
 
$result_trees{'nodes_before_top_and_sections_chapter'}{'contents'}[8]{'contents'}[0]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'nodes_before_top_and_sections_chapter'}{'contents'}[8]{'contents'}[0];
-$result_trees{'nodes_before_top_and_sections_chapter'}{'contents'}[8]{'contents'}[4]{'extra'}{'entry_node'}
 = $result_trees{'nodes_before_top_and_sections_chapter'}{'contents'}[8];
+$result_trees{'nodes_before_top_and_sections_chapter'}{'contents'}[8]{'contents'}[4]{'extra'}{'element_node'}
 = $result_trees{'nodes_before_top_and_sections_chapter'}{'contents'}[8];
 
$result_trees{'nodes_before_top_and_sections_chapter'}{'contents'}[8]{'contents'}[4]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'nodes_before_top_and_sections_chapter'}{'contents'}[8]{'contents'}[4];
-$result_trees{'nodes_before_top_and_sections_chapter'}{'contents'}[8]{'contents'}[5]{'extra'}{'entry_node'}
 = $result_trees{'nodes_before_top_and_sections_chapter'}{'contents'}[8];
+$result_trees{'nodes_before_top_and_sections_chapter'}{'contents'}[8]{'contents'}[5]{'extra'}{'element_node'}
 = $result_trees{'nodes_before_top_and_sections_chapter'}{'contents'}[8];
 
$result_trees{'nodes_before_top_and_sections_chapter'}{'contents'}[8]{'contents'}[5]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'nodes_before_top_and_sections_chapter'}{'contents'}[8]{'contents'}[5];
 
$result_trees{'nodes_before_top_and_sections_chapter'}{'contents'}[8]{'extra'}{'node_content'}[0]
 = 
$result_trees{'nodes_before_top_and_sections_chapter'}{'contents'}[8]{'args'}[0]{'contents'}[0];
 
$result_trees{'nodes_before_top_and_sections_chapter'}{'contents'}[8]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = 
$result_trees{'nodes_before_top_and_sections_chapter'}{'contents'}[8]{'args'}[0]{'contents'}[0];
@@ -2615,7 +2615,7 @@ 
$result_trees{'nodes_before_top_and_sections_chapter'}{'contents'}[9]{'extra'}{'
 
$result_trees{'nodes_before_top_and_sections_chapter'}{'contents'}[9]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = 
$result_trees{'nodes_before_top_and_sections_chapter'}{'contents'}[9]{'args'}[0]{'contents'}[0];
 
$result_trees{'nodes_before_top_and_sections_chapter'}{'contents'}[9]{'extra'}{'nodes_manuals'}[1]{'node_content'}[0]
 = 
$result_trees{'nodes_before_top_and_sections_chapter'}{'contents'}[9]{'args'}[1]{'contents'}[0];
 
$result_trees{'nodes_before_top_and_sections_chapter'}{'contents'}[9]{'extra'}{'nodes_manuals'}[3]{'node_content'}[0]
 = 
$result_trees{'nodes_before_top_and_sections_chapter'}{'contents'}[9]{'args'}[3]{'contents'}[0];
-$result_trees{'nodes_before_top_and_sections_chapter'}{'contents'}[11]{'contents'}[1]{'extra'}{'entry_node'}
 = $result_trees{'nodes_before_top_and_sections_chapter'}{'contents'}[11];
+$result_trees{'nodes_before_top_and_sections_chapter'}{'contents'}[11]{'contents'}[1]{'extra'}{'element_node'}
 = $result_trees{'nodes_before_top_and_sections_chapter'}{'contents'}[11];
 
$result_trees{'nodes_before_top_and_sections_chapter'}{'contents'}[11]{'contents'}[1]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'nodes_before_top_and_sections_chapter'}{'contents'}[11]{'contents'}[1];
 
$result_trees{'nodes_before_top_and_sections_chapter'}{'contents'}[11]{'extra'}{'node_content'}[0]
 = 
$result_trees{'nodes_before_top_and_sections_chapter'}{'contents'}[11]{'args'}[0]{'contents'}[0];
 
$result_trees{'nodes_before_top_and_sections_chapter'}{'contents'}[11]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = 
$result_trees{'nodes_before_top_and_sections_chapter'}{'contents'}[11]{'args'}[0]{'contents'}[0];
diff --git 
a/tp/t/results/indices/nodes_before_top_and_sections_chapter_no_node.pl 
b/tp/t/results/indices/nodes_before_top_and_sections_chapter_no_node.pl
index aedda373a8..09002df040 100644
--- a/tp/t/results/indices/nodes_before_top_and_sections_chapter_no_node.pl
+++ b/tp/t/results/indices/nodes_before_top_and_sections_chapter_no_node.pl
@@ -104,7 +104,7 @@ 
$result_trees{'nodes_before_top_and_sections_chapter_no_node'} = {
           ],
           'cmdname' => 'cindex',
           'extra' => {
-            'entry_node' => {},
+            'element_node' => {},
             'index_entry' => {
               'entry_element' => {},
               'entry_number' => 1,
@@ -426,7 +426,7 @@ 
$result_trees{'nodes_before_top_and_sections_chapter_no_node'} = {
           ],
           'cmdname' => 'cindex',
           'extra' => {
-            'entry_node' => {},
+            'element_node' => {},
             'index_entry' => {
               'entry_element' => {},
               'entry_number' => 2,
@@ -522,7 +522,7 @@ 
$result_trees{'nodes_before_top_and_sections_chapter_no_node'} = {
           ],
           'cmdname' => 'cindex',
           'extra' => {
-            'entry_node' => {},
+            'element_node' => {},
             'index_entry' => {
               'entry_element' => {},
               'entry_number' => 3,
@@ -641,7 +641,7 @@ 
$result_trees{'nodes_before_top_and_sections_chapter_no_node'} = {
           ],
           'cmdname' => 'cindex',
           'extra' => {
-            'entry_node' => {},
+            'element_node' => {},
             'index_entry' => {
               'entry_element' => {},
               'entry_number' => 4,
@@ -873,7 +873,7 @@ 
$result_trees{'nodes_before_top_and_sections_chapter_no_node'} = {
           ],
           'cmdname' => 'cindex',
           'extra' => {
-            'entry_node' => {},
+            'element_node' => {},
             'index_entry' => {
               'entry_element' => {},
               'entry_number' => 5,
@@ -1193,7 +1193,7 @@ 
$result_trees{'nodes_before_top_and_sections_chapter_no_node'} = {
               ],
               'cmdname' => 'cindex',
               'extra' => {
-                'entry_node' => {},
+                'element_node' => {},
                 'index_entry' => {
                   'entry_element' => {},
                   'entry_number' => 6,
@@ -1232,7 +1232,7 @@ 
$result_trees{'nodes_before_top_and_sections_chapter_no_node'} = {
               ],
               'cmdname' => 'findex',
               'extra' => {
-                'entry_node' => {},
+                'element_node' => {},
                 'index_entry' => {
                   'entry_element' => {},
                   'entry_number' => 1,
@@ -1271,7 +1271,7 @@ 
$result_trees{'nodes_before_top_and_sections_chapter_no_node'} = {
               ],
               'cmdname' => 'cindex',
               'extra' => {
-                'entry_node' => {},
+                'element_node' => {},
                 'index_entry' => {
                   'entry_element' => {},
                   'entry_number' => 7,
@@ -1820,7 +1820,7 @@ 
$result_trees{'nodes_before_top_and_sections_chapter_no_node'} = {
           ],
           'cmdname' => 'cindex',
           'extra' => {
-            'entry_node' => {},
+            'element_node' => {},
             'index_entry' => {
               'entry_element' => {},
               'entry_number' => 8,
@@ -1859,7 +1859,7 @@ 
$result_trees{'nodes_before_top_and_sections_chapter_no_node'} = {
           ],
           'cmdname' => 'findex',
           'extra' => {
-            'entry_node' => {},
+            'element_node' => {},
             'index_entry' => {
               'entry_element' => {},
               'entry_number' => 2,
@@ -1898,7 +1898,7 @@ 
$result_trees{'nodes_before_top_and_sections_chapter_no_node'} = {
           ],
           'cmdname' => 'cindex',
           'extra' => {
-            'entry_node' => {},
+            'element_node' => {},
             'index_entry' => {
               'entry_element' => {},
               'entry_number' => 9,
@@ -2029,7 +2029,7 @@ 
$result_trees{'nodes_before_top_and_sections_chapter_no_node'} = {
           ],
           'cmdname' => 'cindex',
           'extra' => {
-            'entry_node' => {},
+            'element_node' => {},
             'index_entry' => {
               'entry_element' => {},
               'entry_number' => 10,
@@ -2112,7 +2112,7 @@ 
$result_trees{'nodes_before_top_and_sections_chapter_no_node'} = {
           ],
           'cmdname' => 'findex',
           'extra' => {
-            'entry_node' => {},
+            'element_node' => {},
             'index_entry' => {
               'entry_element' => {},
               'entry_number' => 3,
@@ -2151,7 +2151,7 @@ 
$result_trees{'nodes_before_top_and_sections_chapter_no_node'} = {
           ],
           'cmdname' => 'cindex',
           'extra' => {
-            'entry_node' => {},
+            'element_node' => {},
             'index_entry' => {
               'entry_element' => {},
               'entry_number' => 11,
@@ -2474,7 +2474,7 @@ 
$result_trees{'nodes_before_top_and_sections_chapter_no_node'} = {
           ],
           'cmdname' => 'cindex',
           'extra' => {
-            'entry_node' => {},
+            'element_node' => {},
             'index_entry' => {
               'entry_element' => {},
               'entry_number' => 12,
@@ -2551,35 +2551,35 @@ 
$result_trees{'nodes_before_top_and_sections_chapter_no_node'} = {
   ],
   'type' => 'document_root'
 };
-$result_trees{'nodes_before_top_and_sections_chapter_no_node'}{'contents'}[1]{'contents'}[0]{'extra'}{'entry_node'}
 = 
$result_trees{'nodes_before_top_and_sections_chapter_no_node'}{'contents'}[1];
+$result_trees{'nodes_before_top_and_sections_chapter_no_node'}{'contents'}[1]{'contents'}[0]{'extra'}{'element_node'}
 = 
$result_trees{'nodes_before_top_and_sections_chapter_no_node'}{'contents'}[1];
 
$result_trees{'nodes_before_top_and_sections_chapter_no_node'}{'contents'}[1]{'contents'}[0]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'nodes_before_top_and_sections_chapter_no_node'}{'contents'}[1]{'contents'}[0];
 
$result_trees{'nodes_before_top_and_sections_chapter_no_node'}{'contents'}[1]{'contents'}[7]{'contents'}[0]{'extra'}{'menu_entry_node_label'}{'node_content'}[0]
 = 
$result_trees{'nodes_before_top_and_sections_chapter_no_node'}{'contents'}[1]{'contents'}[7]{'contents'}[0]{'contents'}[1]{'contents'}[0];
 
$result_trees{'nodes_before_top_and_sections_chapter_no_node'}{'contents'}[1]{'extra'}{'node_content'}[0]
 = 
$result_trees{'nodes_before_top_and_sections_chapter_no_node'}{'contents'}[1]{'args'}[0]{'contents'}[0];
 
$result_trees{'nodes_before_top_and_sections_chapter_no_node'}{'contents'}[1]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = 
$result_trees{'nodes_before_top_and_sections_chapter_no_node'}{'contents'}[1]{'args'}[0]{'contents'}[0];
 
$result_trees{'nodes_before_top_and_sections_chapter_no_node'}{'contents'}[1]{'extra'}{'nodes_manuals'}[1]{'node_content'}[0]
 = 
$result_trees{'nodes_before_top_and_sections_chapter_no_node'}{'contents'}[1]{'args'}[1]{'contents'}[0];
 
$result_trees{'nodes_before_top_and_sections_chapter_no_node'}{'contents'}[1]{'extra'}{'nodes_manuals'}[3]{'manual_content'}[0]
 = 
$result_trees{'nodes_before_top_and_sections_chapter_no_node'}{'contents'}[1]{'args'}[3]{'contents'}[1];
-$result_trees{'nodes_before_top_and_sections_chapter_no_node'}{'contents'}[2]{'contents'}[1]{'extra'}{'entry_node'}
 = 
$result_trees{'nodes_before_top_and_sections_chapter_no_node'}{'contents'}[2];
+$result_trees{'nodes_before_top_and_sections_chapter_no_node'}{'contents'}[2]{'contents'}[1]{'extra'}{'element_node'}
 = 
$result_trees{'nodes_before_top_and_sections_chapter_no_node'}{'contents'}[2];
 
$result_trees{'nodes_before_top_and_sections_chapter_no_node'}{'contents'}[2]{'contents'}[1]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'nodes_before_top_and_sections_chapter_no_node'}{'contents'}[2]{'contents'}[1];
-$result_trees{'nodes_before_top_and_sections_chapter_no_node'}{'contents'}[2]{'contents'}[6]{'extra'}{'entry_node'}
 = 
$result_trees{'nodes_before_top_and_sections_chapter_no_node'}{'contents'}[2];
+$result_trees{'nodes_before_top_and_sections_chapter_no_node'}{'contents'}[2]{'contents'}[6]{'extra'}{'element_node'}
 = 
$result_trees{'nodes_before_top_and_sections_chapter_no_node'}{'contents'}[2];
 
$result_trees{'nodes_before_top_and_sections_chapter_no_node'}{'contents'}[2]{'contents'}[6]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'nodes_before_top_and_sections_chapter_no_node'}{'contents'}[2]{'contents'}[6];
 
$result_trees{'nodes_before_top_and_sections_chapter_no_node'}{'contents'}[2]{'extra'}{'node_content'}[0]
 = 
$result_trees{'nodes_before_top_and_sections_chapter_no_node'}{'contents'}[2]{'args'}[0]{'contents'}[0];
 
$result_trees{'nodes_before_top_and_sections_chapter_no_node'}{'contents'}[2]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = 
$result_trees{'nodes_before_top_and_sections_chapter_no_node'}{'contents'}[2]{'args'}[0]{'contents'}[0];
 
$result_trees{'nodes_before_top_and_sections_chapter_no_node'}{'contents'}[2]{'extra'}{'nodes_manuals'}[3]{'node_content'}[0]
 = 
$result_trees{'nodes_before_top_and_sections_chapter_no_node'}{'contents'}[2]{'args'}[3]{'contents'}[0];
-$result_trees{'nodes_before_top_and_sections_chapter_no_node'}{'contents'}[3]{'contents'}[0]{'extra'}{'entry_node'}
 = 
$result_trees{'nodes_before_top_and_sections_chapter_no_node'}{'contents'}[3];
+$result_trees{'nodes_before_top_and_sections_chapter_no_node'}{'contents'}[3]{'contents'}[0]{'extra'}{'element_node'}
 = 
$result_trees{'nodes_before_top_and_sections_chapter_no_node'}{'contents'}[3];
 
$result_trees{'nodes_before_top_and_sections_chapter_no_node'}{'contents'}[3]{'contents'}[0]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'nodes_before_top_and_sections_chapter_no_node'}{'contents'}[3]{'contents'}[0];
 
$result_trees{'nodes_before_top_and_sections_chapter_no_node'}{'contents'}[3]{'extra'}{'node_content'}[0]
 = 
$result_trees{'nodes_before_top_and_sections_chapter_no_node'}{'contents'}[3]{'args'}[0]{'contents'}[0];
 
$result_trees{'nodes_before_top_and_sections_chapter_no_node'}{'contents'}[3]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = 
$result_trees{'nodes_before_top_and_sections_chapter_no_node'}{'contents'}[3]{'args'}[0]{'contents'}[0];
 
$result_trees{'nodes_before_top_and_sections_chapter_no_node'}{'contents'}[3]{'extra'}{'nodes_manuals'}[2]{'node_content'}[0]
 = 
$result_trees{'nodes_before_top_and_sections_chapter_no_node'}{'contents'}[3]{'args'}[2]{'contents'}[0];
-$result_trees{'nodes_before_top_and_sections_chapter_no_node'}{'contents'}[4]{'contents'}[0]{'extra'}{'entry_node'}
 = 
$result_trees{'nodes_before_top_and_sections_chapter_no_node'}{'contents'}[3];
+$result_trees{'nodes_before_top_and_sections_chapter_no_node'}{'contents'}[4]{'contents'}[0]{'extra'}{'element_node'}
 = 
$result_trees{'nodes_before_top_and_sections_chapter_no_node'}{'contents'}[3];
 
$result_trees{'nodes_before_top_and_sections_chapter_no_node'}{'contents'}[4]{'contents'}[0]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'nodes_before_top_and_sections_chapter_no_node'}{'contents'}[4]{'contents'}[0];
 
$result_trees{'nodes_before_top_and_sections_chapter_no_node'}{'contents'}[4]{'contents'}[4]{'contents'}[0]{'extra'}{'menu_entry_node_label'}{'node_content'}[0]
 = 
$result_trees{'nodes_before_top_and_sections_chapter_no_node'}{'contents'}[4]{'contents'}[4]{'contents'}[0]{'contents'}[1]{'contents'}[0];
 
$result_trees{'nodes_before_top_and_sections_chapter_no_node'}{'contents'}[4]{'contents'}[4]{'contents'}[1]{'extra'}{'menu_entry_node_label'}{'node_content'}[0]
 = 
$result_trees{'nodes_before_top_and_sections_chapter_no_node'}{'contents'}[4]{'contents'}[4]{'contents'}[1]{'contents'}[1]{'contents'}[0];
 
$result_trees{'nodes_before_top_and_sections_chapter_no_node'}{'contents'}[4]{'contents'}[4]{'contents'}[2]{'extra'}{'menu_entry_node_label'}{'node_content'}[0]
 = 
$result_trees{'nodes_before_top_and_sections_chapter_no_node'}{'contents'}[4]{'contents'}[4]{'contents'}[2]{'contents'}[1]{'contents'}[0];
-$result_trees{'nodes_before_top_and_sections_chapter_no_node'}{'contents'}[5]{'contents'}[0]{'contents'}[1]{'extra'}{'entry_node'}
 = 
$result_trees{'nodes_before_top_and_sections_chapter_no_node'}{'contents'}[5];
+$result_trees{'nodes_before_top_and_sections_chapter_no_node'}{'contents'}[5]{'contents'}[0]{'contents'}[1]{'extra'}{'element_node'}
 = 
$result_trees{'nodes_before_top_and_sections_chapter_no_node'}{'contents'}[5];
 
$result_trees{'nodes_before_top_and_sections_chapter_no_node'}{'contents'}[5]{'contents'}[0]{'contents'}[1]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'nodes_before_top_and_sections_chapter_no_node'}{'contents'}[5]{'contents'}[0]{'contents'}[1];
-$result_trees{'nodes_before_top_and_sections_chapter_no_node'}{'contents'}[5]{'contents'}[0]{'contents'}[2]{'extra'}{'entry_node'}
 = 
$result_trees{'nodes_before_top_and_sections_chapter_no_node'}{'contents'}[5];
+$result_trees{'nodes_before_top_and_sections_chapter_no_node'}{'contents'}[5]{'contents'}[0]{'contents'}[2]{'extra'}{'element_node'}
 = 
$result_trees{'nodes_before_top_and_sections_chapter_no_node'}{'contents'}[5];
 
$result_trees{'nodes_before_top_and_sections_chapter_no_node'}{'contents'}[5]{'contents'}[0]{'contents'}[2]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'nodes_before_top_and_sections_chapter_no_node'}{'contents'}[5]{'contents'}[0]{'contents'}[2];
-$result_trees{'nodes_before_top_and_sections_chapter_no_node'}{'contents'}[5]{'contents'}[0]{'contents'}[3]{'extra'}{'entry_node'}
 = 
$result_trees{'nodes_before_top_and_sections_chapter_no_node'}{'contents'}[5];
+$result_trees{'nodes_before_top_and_sections_chapter_no_node'}{'contents'}[5]{'contents'}[0]{'contents'}[3]{'extra'}{'element_node'}
 = 
$result_trees{'nodes_before_top_and_sections_chapter_no_node'}{'contents'}[5];
 
$result_trees{'nodes_before_top_and_sections_chapter_no_node'}{'contents'}[5]{'contents'}[0]{'contents'}[3]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'nodes_before_top_and_sections_chapter_no_node'}{'contents'}[5]{'contents'}[0]{'contents'}[3];
 
$result_trees{'nodes_before_top_and_sections_chapter_no_node'}{'contents'}[5]{'contents'}[4]{'contents'}[0]{'extra'}{'menu_entry_node_label'}{'node_content'}[0]
 = 
$result_trees{'nodes_before_top_and_sections_chapter_no_node'}{'contents'}[5]{'contents'}[4]{'contents'}[0]{'contents'}[1]{'contents'}[0];
 
$result_trees{'nodes_before_top_and_sections_chapter_no_node'}{'contents'}[5]{'extra'}{'node_content'}[0]
 = 
$result_trees{'nodes_before_top_and_sections_chapter_no_node'}{'contents'}[5]{'args'}[0]{'contents'}[0];
@@ -2591,21 +2591,21 @@ 
$result_trees{'nodes_before_top_and_sections_chapter_no_node'}{'contents'}[6]{'c
 
$result_trees{'nodes_before_top_and_sections_chapter_no_node'}{'contents'}[6]{'extra'}{'node_content'}[0]
 = 
$result_trees{'nodes_before_top_and_sections_chapter_no_node'}{'contents'}[6]{'args'}[0]{'contents'}[0];
 
$result_trees{'nodes_before_top_and_sections_chapter_no_node'}{'contents'}[6]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = 
$result_trees{'nodes_before_top_and_sections_chapter_no_node'}{'contents'}[6]{'args'}[0]{'contents'}[0];
 
$result_trees{'nodes_before_top_and_sections_chapter_no_node'}{'contents'}[6]{'extra'}{'nodes_manuals'}[3]{'node_content'}[0]
 = 
$result_trees{'nodes_before_top_and_sections_chapter_no_node'}{'contents'}[6]{'args'}[3]{'contents'}[0];
-$result_trees{'nodes_before_top_and_sections_chapter_no_node'}{'contents'}[7]{'contents'}[1]{'extra'}{'entry_node'}
 = 
$result_trees{'nodes_before_top_and_sections_chapter_no_node'}{'contents'}[7];
+$result_trees{'nodes_before_top_and_sections_chapter_no_node'}{'contents'}[7]{'contents'}[1]{'extra'}{'element_node'}
 = 
$result_trees{'nodes_before_top_and_sections_chapter_no_node'}{'contents'}[7];
 
$result_trees{'nodes_before_top_and_sections_chapter_no_node'}{'contents'}[7]{'contents'}[1]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'nodes_before_top_and_sections_chapter_no_node'}{'contents'}[7]{'contents'}[1];
-$result_trees{'nodes_before_top_and_sections_chapter_no_node'}{'contents'}[7]{'contents'}[2]{'extra'}{'entry_node'}
 = 
$result_trees{'nodes_before_top_and_sections_chapter_no_node'}{'contents'}[7];
+$result_trees{'nodes_before_top_and_sections_chapter_no_node'}{'contents'}[7]{'contents'}[2]{'extra'}{'element_node'}
 = 
$result_trees{'nodes_before_top_and_sections_chapter_no_node'}{'contents'}[7];
 
$result_trees{'nodes_before_top_and_sections_chapter_no_node'}{'contents'}[7]{'contents'}[2]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'nodes_before_top_and_sections_chapter_no_node'}{'contents'}[7]{'contents'}[2];
-$result_trees{'nodes_before_top_and_sections_chapter_no_node'}{'contents'}[7]{'contents'}[3]{'extra'}{'entry_node'}
 = 
$result_trees{'nodes_before_top_and_sections_chapter_no_node'}{'contents'}[7];
+$result_trees{'nodes_before_top_and_sections_chapter_no_node'}{'contents'}[7]{'contents'}[3]{'extra'}{'element_node'}
 = 
$result_trees{'nodes_before_top_and_sections_chapter_no_node'}{'contents'}[7];
 
$result_trees{'nodes_before_top_and_sections_chapter_no_node'}{'contents'}[7]{'contents'}[3]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'nodes_before_top_and_sections_chapter_no_node'}{'contents'}[7]{'contents'}[3];
 
$result_trees{'nodes_before_top_and_sections_chapter_no_node'}{'contents'}[7]{'extra'}{'node_content'}[0]
 = 
$result_trees{'nodes_before_top_and_sections_chapter_no_node'}{'contents'}[7]{'args'}[0]{'contents'}[0];
 
$result_trees{'nodes_before_top_and_sections_chapter_no_node'}{'contents'}[7]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = 
$result_trees{'nodes_before_top_and_sections_chapter_no_node'}{'contents'}[7]{'args'}[0]{'contents'}[0];
 
$result_trees{'nodes_before_top_and_sections_chapter_no_node'}{'contents'}[7]{'extra'}{'nodes_manuals'}[2]{'node_content'}[0]
 = 
$result_trees{'nodes_before_top_and_sections_chapter_no_node'}{'contents'}[7]{'args'}[2]{'contents'}[0];
 
$result_trees{'nodes_before_top_and_sections_chapter_no_node'}{'contents'}[7]{'extra'}{'nodes_manuals'}[3]{'node_content'}[0]
 = 
$result_trees{'nodes_before_top_and_sections_chapter_no_node'}{'contents'}[7]{'args'}[3]{'contents'}[0];
-$result_trees{'nodes_before_top_and_sections_chapter_no_node'}{'contents'}[8]{'contents'}[0]{'extra'}{'entry_node'}
 = 
$result_trees{'nodes_before_top_and_sections_chapter_no_node'}{'contents'}[8];
+$result_trees{'nodes_before_top_and_sections_chapter_no_node'}{'contents'}[8]{'contents'}[0]{'extra'}{'element_node'}
 = 
$result_trees{'nodes_before_top_and_sections_chapter_no_node'}{'contents'}[8];
 
$result_trees{'nodes_before_top_and_sections_chapter_no_node'}{'contents'}[8]{'contents'}[0]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'nodes_before_top_and_sections_chapter_no_node'}{'contents'}[8]{'contents'}[0];
-$result_trees{'nodes_before_top_and_sections_chapter_no_node'}{'contents'}[8]{'contents'}[4]{'extra'}{'entry_node'}
 = 
$result_trees{'nodes_before_top_and_sections_chapter_no_node'}{'contents'}[8];
+$result_trees{'nodes_before_top_and_sections_chapter_no_node'}{'contents'}[8]{'contents'}[4]{'extra'}{'element_node'}
 = 
$result_trees{'nodes_before_top_and_sections_chapter_no_node'}{'contents'}[8];
 
$result_trees{'nodes_before_top_and_sections_chapter_no_node'}{'contents'}[8]{'contents'}[4]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'nodes_before_top_and_sections_chapter_no_node'}{'contents'}[8]{'contents'}[4];
-$result_trees{'nodes_before_top_and_sections_chapter_no_node'}{'contents'}[8]{'contents'}[5]{'extra'}{'entry_node'}
 = 
$result_trees{'nodes_before_top_and_sections_chapter_no_node'}{'contents'}[8];
+$result_trees{'nodes_before_top_and_sections_chapter_no_node'}{'contents'}[8]{'contents'}[5]{'extra'}{'element_node'}
 = 
$result_trees{'nodes_before_top_and_sections_chapter_no_node'}{'contents'}[8];
 
$result_trees{'nodes_before_top_and_sections_chapter_no_node'}{'contents'}[8]{'contents'}[5]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'nodes_before_top_and_sections_chapter_no_node'}{'contents'}[8]{'contents'}[5];
 
$result_trees{'nodes_before_top_and_sections_chapter_no_node'}{'contents'}[8]{'extra'}{'node_content'}[0]
 = 
$result_trees{'nodes_before_top_and_sections_chapter_no_node'}{'contents'}[8]{'args'}[0]{'contents'}[0];
 
$result_trees{'nodes_before_top_and_sections_chapter_no_node'}{'contents'}[8]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = 
$result_trees{'nodes_before_top_and_sections_chapter_no_node'}{'contents'}[8]{'args'}[0]{'contents'}[0];
@@ -2615,7 +2615,7 @@ 
$result_trees{'nodes_before_top_and_sections_chapter_no_node'}{'contents'}[9]{'e
 
$result_trees{'nodes_before_top_and_sections_chapter_no_node'}{'contents'}[9]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = 
$result_trees{'nodes_before_top_and_sections_chapter_no_node'}{'contents'}[9]{'args'}[0]{'contents'}[0];
 
$result_trees{'nodes_before_top_and_sections_chapter_no_node'}{'contents'}[9]{'extra'}{'nodes_manuals'}[1]{'node_content'}[0]
 = 
$result_trees{'nodes_before_top_and_sections_chapter_no_node'}{'contents'}[9]{'args'}[1]{'contents'}[0];
 
$result_trees{'nodes_before_top_and_sections_chapter_no_node'}{'contents'}[9]{'extra'}{'nodes_manuals'}[3]{'node_content'}[0]
 = 
$result_trees{'nodes_before_top_and_sections_chapter_no_node'}{'contents'}[9]{'args'}[3]{'contents'}[0];
-$result_trees{'nodes_before_top_and_sections_chapter_no_node'}{'contents'}[11]{'contents'}[1]{'extra'}{'entry_node'}
 = 
$result_trees{'nodes_before_top_and_sections_chapter_no_node'}{'contents'}[11];
+$result_trees{'nodes_before_top_and_sections_chapter_no_node'}{'contents'}[11]{'contents'}[1]{'extra'}{'element_node'}
 = 
$result_trees{'nodes_before_top_and_sections_chapter_no_node'}{'contents'}[11];
 
$result_trees{'nodes_before_top_and_sections_chapter_no_node'}{'contents'}[11]{'contents'}[1]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'nodes_before_top_and_sections_chapter_no_node'}{'contents'}[11]{'contents'}[1];
 
$result_trees{'nodes_before_top_and_sections_chapter_no_node'}{'contents'}[11]{'extra'}{'node_content'}[0]
 = 
$result_trees{'nodes_before_top_and_sections_chapter_no_node'}{'contents'}[11]{'args'}[0]{'contents'}[0];
 
$result_trees{'nodes_before_top_and_sections_chapter_no_node'}{'contents'}[11]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = 
$result_trees{'nodes_before_top_and_sections_chapter_no_node'}{'contents'}[11]{'args'}[0]{'contents'}[0];
diff --git 
a/tp/t/results/indices/nodes_before_top_and_sections_unsplit_no_nodes.pl 
b/tp/t/results/indices/nodes_before_top_and_sections_unsplit_no_nodes.pl
index b7feee9faa..279f59a8b5 100644
--- a/tp/t/results/indices/nodes_before_top_and_sections_unsplit_no_nodes.pl
+++ b/tp/t/results/indices/nodes_before_top_and_sections_unsplit_no_nodes.pl
@@ -104,7 +104,7 @@ 
$result_trees{'nodes_before_top_and_sections_unsplit_no_nodes'} = {
           ],
           'cmdname' => 'cindex',
           'extra' => {
-            'entry_node' => {},
+            'element_node' => {},
             'index_entry' => {
               'entry_element' => {},
               'entry_number' => 1,
@@ -426,7 +426,7 @@ 
$result_trees{'nodes_before_top_and_sections_unsplit_no_nodes'} = {
           ],
           'cmdname' => 'cindex',
           'extra' => {
-            'entry_node' => {},
+            'element_node' => {},
             'index_entry' => {
               'entry_element' => {},
               'entry_number' => 2,
@@ -522,7 +522,7 @@ 
$result_trees{'nodes_before_top_and_sections_unsplit_no_nodes'} = {
           ],
           'cmdname' => 'cindex',
           'extra' => {
-            'entry_node' => {},
+            'element_node' => {},
             'index_entry' => {
               'entry_element' => {},
               'entry_number' => 3,
@@ -641,7 +641,7 @@ 
$result_trees{'nodes_before_top_and_sections_unsplit_no_nodes'} = {
           ],
           'cmdname' => 'cindex',
           'extra' => {
-            'entry_node' => {},
+            'element_node' => {},
             'index_entry' => {
               'entry_element' => {},
               'entry_number' => 4,
@@ -873,7 +873,7 @@ 
$result_trees{'nodes_before_top_and_sections_unsplit_no_nodes'} = {
           ],
           'cmdname' => 'cindex',
           'extra' => {
-            'entry_node' => {},
+            'element_node' => {},
             'index_entry' => {
               'entry_element' => {},
               'entry_number' => 5,
@@ -1193,7 +1193,7 @@ 
$result_trees{'nodes_before_top_and_sections_unsplit_no_nodes'} = {
               ],
               'cmdname' => 'cindex',
               'extra' => {
-                'entry_node' => {},
+                'element_node' => {},
                 'index_entry' => {
                   'entry_element' => {},
                   'entry_number' => 6,
@@ -1232,7 +1232,7 @@ 
$result_trees{'nodes_before_top_and_sections_unsplit_no_nodes'} = {
               ],
               'cmdname' => 'findex',
               'extra' => {
-                'entry_node' => {},
+                'element_node' => {},
                 'index_entry' => {
                   'entry_element' => {},
                   'entry_number' => 1,
@@ -1271,7 +1271,7 @@ 
$result_trees{'nodes_before_top_and_sections_unsplit_no_nodes'} = {
               ],
               'cmdname' => 'cindex',
               'extra' => {
-                'entry_node' => {},
+                'element_node' => {},
                 'index_entry' => {
                   'entry_element' => {},
                   'entry_number' => 7,
@@ -1820,7 +1820,7 @@ 
$result_trees{'nodes_before_top_and_sections_unsplit_no_nodes'} = {
           ],
           'cmdname' => 'cindex',
           'extra' => {
-            'entry_node' => {},
+            'element_node' => {},
             'index_entry' => {
               'entry_element' => {},
               'entry_number' => 8,
@@ -1859,7 +1859,7 @@ 
$result_trees{'nodes_before_top_and_sections_unsplit_no_nodes'} = {
           ],
           'cmdname' => 'findex',
           'extra' => {
-            'entry_node' => {},
+            'element_node' => {},
             'index_entry' => {
               'entry_element' => {},
               'entry_number' => 2,
@@ -1898,7 +1898,7 @@ 
$result_trees{'nodes_before_top_and_sections_unsplit_no_nodes'} = {
           ],
           'cmdname' => 'cindex',
           'extra' => {
-            'entry_node' => {},
+            'element_node' => {},
             'index_entry' => {
               'entry_element' => {},
               'entry_number' => 9,
@@ -2029,7 +2029,7 @@ 
$result_trees{'nodes_before_top_and_sections_unsplit_no_nodes'} = {
           ],
           'cmdname' => 'cindex',
           'extra' => {
-            'entry_node' => {},
+            'element_node' => {},
             'index_entry' => {
               'entry_element' => {},
               'entry_number' => 10,
@@ -2112,7 +2112,7 @@ 
$result_trees{'nodes_before_top_and_sections_unsplit_no_nodes'} = {
           ],
           'cmdname' => 'findex',
           'extra' => {
-            'entry_node' => {},
+            'element_node' => {},
             'index_entry' => {
               'entry_element' => {},
               'entry_number' => 3,
@@ -2151,7 +2151,7 @@ 
$result_trees{'nodes_before_top_and_sections_unsplit_no_nodes'} = {
           ],
           'cmdname' => 'cindex',
           'extra' => {
-            'entry_node' => {},
+            'element_node' => {},
             'index_entry' => {
               'entry_element' => {},
               'entry_number' => 11,
@@ -2474,7 +2474,7 @@ 
$result_trees{'nodes_before_top_and_sections_unsplit_no_nodes'} = {
           ],
           'cmdname' => 'cindex',
           'extra' => {
-            'entry_node' => {},
+            'element_node' => {},
             'index_entry' => {
               'entry_element' => {},
               'entry_number' => 12,
@@ -2551,35 +2551,35 @@ 
$result_trees{'nodes_before_top_and_sections_unsplit_no_nodes'} = {
   ],
   'type' => 'document_root'
 };
-$result_trees{'nodes_before_top_and_sections_unsplit_no_nodes'}{'contents'}[1]{'contents'}[0]{'extra'}{'entry_node'}
 = 
$result_trees{'nodes_before_top_and_sections_unsplit_no_nodes'}{'contents'}[1];
+$result_trees{'nodes_before_top_and_sections_unsplit_no_nodes'}{'contents'}[1]{'contents'}[0]{'extra'}{'element_node'}
 = 
$result_trees{'nodes_before_top_and_sections_unsplit_no_nodes'}{'contents'}[1];
 
$result_trees{'nodes_before_top_and_sections_unsplit_no_nodes'}{'contents'}[1]{'contents'}[0]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'nodes_before_top_and_sections_unsplit_no_nodes'}{'contents'}[1]{'contents'}[0];
 
$result_trees{'nodes_before_top_and_sections_unsplit_no_nodes'}{'contents'}[1]{'contents'}[7]{'contents'}[0]{'extra'}{'menu_entry_node_label'}{'node_content'}[0]
 = 
$result_trees{'nodes_before_top_and_sections_unsplit_no_nodes'}{'contents'}[1]{'contents'}[7]{'contents'}[0]{'contents'}[1]{'contents'}[0];
 
$result_trees{'nodes_before_top_and_sections_unsplit_no_nodes'}{'contents'}[1]{'extra'}{'node_content'}[0]
 = 
$result_trees{'nodes_before_top_and_sections_unsplit_no_nodes'}{'contents'}[1]{'args'}[0]{'contents'}[0];
 
$result_trees{'nodes_before_top_and_sections_unsplit_no_nodes'}{'contents'}[1]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = 
$result_trees{'nodes_before_top_and_sections_unsplit_no_nodes'}{'contents'}[1]{'args'}[0]{'contents'}[0];
 
$result_trees{'nodes_before_top_and_sections_unsplit_no_nodes'}{'contents'}[1]{'extra'}{'nodes_manuals'}[1]{'node_content'}[0]
 = 
$result_trees{'nodes_before_top_and_sections_unsplit_no_nodes'}{'contents'}[1]{'args'}[1]{'contents'}[0];
 
$result_trees{'nodes_before_top_and_sections_unsplit_no_nodes'}{'contents'}[1]{'extra'}{'nodes_manuals'}[3]{'manual_content'}[0]
 = 
$result_trees{'nodes_before_top_and_sections_unsplit_no_nodes'}{'contents'}[1]{'args'}[3]{'contents'}[1];
-$result_trees{'nodes_before_top_and_sections_unsplit_no_nodes'}{'contents'}[2]{'contents'}[1]{'extra'}{'entry_node'}
 = 
$result_trees{'nodes_before_top_and_sections_unsplit_no_nodes'}{'contents'}[2];
+$result_trees{'nodes_before_top_and_sections_unsplit_no_nodes'}{'contents'}[2]{'contents'}[1]{'extra'}{'element_node'}
 = 
$result_trees{'nodes_before_top_and_sections_unsplit_no_nodes'}{'contents'}[2];
 
$result_trees{'nodes_before_top_and_sections_unsplit_no_nodes'}{'contents'}[2]{'contents'}[1]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'nodes_before_top_and_sections_unsplit_no_nodes'}{'contents'}[2]{'contents'}[1];
-$result_trees{'nodes_before_top_and_sections_unsplit_no_nodes'}{'contents'}[2]{'contents'}[6]{'extra'}{'entry_node'}
 = 
$result_trees{'nodes_before_top_and_sections_unsplit_no_nodes'}{'contents'}[2];
+$result_trees{'nodes_before_top_and_sections_unsplit_no_nodes'}{'contents'}[2]{'contents'}[6]{'extra'}{'element_node'}
 = 
$result_trees{'nodes_before_top_and_sections_unsplit_no_nodes'}{'contents'}[2];
 
$result_trees{'nodes_before_top_and_sections_unsplit_no_nodes'}{'contents'}[2]{'contents'}[6]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'nodes_before_top_and_sections_unsplit_no_nodes'}{'contents'}[2]{'contents'}[6];
 
$result_trees{'nodes_before_top_and_sections_unsplit_no_nodes'}{'contents'}[2]{'extra'}{'node_content'}[0]
 = 
$result_trees{'nodes_before_top_and_sections_unsplit_no_nodes'}{'contents'}[2]{'args'}[0]{'contents'}[0];
 
$result_trees{'nodes_before_top_and_sections_unsplit_no_nodes'}{'contents'}[2]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = 
$result_trees{'nodes_before_top_and_sections_unsplit_no_nodes'}{'contents'}[2]{'args'}[0]{'contents'}[0];
 
$result_trees{'nodes_before_top_and_sections_unsplit_no_nodes'}{'contents'}[2]{'extra'}{'nodes_manuals'}[3]{'node_content'}[0]
 = 
$result_trees{'nodes_before_top_and_sections_unsplit_no_nodes'}{'contents'}[2]{'args'}[3]{'contents'}[0];
-$result_trees{'nodes_before_top_and_sections_unsplit_no_nodes'}{'contents'}[3]{'contents'}[0]{'extra'}{'entry_node'}
 = 
$result_trees{'nodes_before_top_and_sections_unsplit_no_nodes'}{'contents'}[3];
+$result_trees{'nodes_before_top_and_sections_unsplit_no_nodes'}{'contents'}[3]{'contents'}[0]{'extra'}{'element_node'}
 = 
$result_trees{'nodes_before_top_and_sections_unsplit_no_nodes'}{'contents'}[3];
 
$result_trees{'nodes_before_top_and_sections_unsplit_no_nodes'}{'contents'}[3]{'contents'}[0]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'nodes_before_top_and_sections_unsplit_no_nodes'}{'contents'}[3]{'contents'}[0];
 
$result_trees{'nodes_before_top_and_sections_unsplit_no_nodes'}{'contents'}[3]{'extra'}{'node_content'}[0]
 = 
$result_trees{'nodes_before_top_and_sections_unsplit_no_nodes'}{'contents'}[3]{'args'}[0]{'contents'}[0];
 
$result_trees{'nodes_before_top_and_sections_unsplit_no_nodes'}{'contents'}[3]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = 
$result_trees{'nodes_before_top_and_sections_unsplit_no_nodes'}{'contents'}[3]{'args'}[0]{'contents'}[0];
 
$result_trees{'nodes_before_top_and_sections_unsplit_no_nodes'}{'contents'}[3]{'extra'}{'nodes_manuals'}[2]{'node_content'}[0]
 = 
$result_trees{'nodes_before_top_and_sections_unsplit_no_nodes'}{'contents'}[3]{'args'}[2]{'contents'}[0];
-$result_trees{'nodes_before_top_and_sections_unsplit_no_nodes'}{'contents'}[4]{'contents'}[0]{'extra'}{'entry_node'}
 = 
$result_trees{'nodes_before_top_and_sections_unsplit_no_nodes'}{'contents'}[3];
+$result_trees{'nodes_before_top_and_sections_unsplit_no_nodes'}{'contents'}[4]{'contents'}[0]{'extra'}{'element_node'}
 = 
$result_trees{'nodes_before_top_and_sections_unsplit_no_nodes'}{'contents'}[3];
 
$result_trees{'nodes_before_top_and_sections_unsplit_no_nodes'}{'contents'}[4]{'contents'}[0]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'nodes_before_top_and_sections_unsplit_no_nodes'}{'contents'}[4]{'contents'}[0];
 
$result_trees{'nodes_before_top_and_sections_unsplit_no_nodes'}{'contents'}[4]{'contents'}[4]{'contents'}[0]{'extra'}{'menu_entry_node_label'}{'node_content'}[0]
 = 
$result_trees{'nodes_before_top_and_sections_unsplit_no_nodes'}{'contents'}[4]{'contents'}[4]{'contents'}[0]{'contents'}[1]{'contents'}[0];
 
$result_trees{'nodes_before_top_and_sections_unsplit_no_nodes'}{'contents'}[4]{'contents'}[4]{'contents'}[1]{'extra'}{'menu_entry_node_label'}{'node_content'}[0]
 = 
$result_trees{'nodes_before_top_and_sections_unsplit_no_nodes'}{'contents'}[4]{'contents'}[4]{'contents'}[1]{'contents'}[1]{'contents'}[0];
 
$result_trees{'nodes_before_top_and_sections_unsplit_no_nodes'}{'contents'}[4]{'contents'}[4]{'contents'}[2]{'extra'}{'menu_entry_node_label'}{'node_content'}[0]
 = 
$result_trees{'nodes_before_top_and_sections_unsplit_no_nodes'}{'contents'}[4]{'contents'}[4]{'contents'}[2]{'contents'}[1]{'contents'}[0];
-$result_trees{'nodes_before_top_and_sections_unsplit_no_nodes'}{'contents'}[5]{'contents'}[0]{'contents'}[1]{'extra'}{'entry_node'}
 = 
$result_trees{'nodes_before_top_and_sections_unsplit_no_nodes'}{'contents'}[5];
+$result_trees{'nodes_before_top_and_sections_unsplit_no_nodes'}{'contents'}[5]{'contents'}[0]{'contents'}[1]{'extra'}{'element_node'}
 = 
$result_trees{'nodes_before_top_and_sections_unsplit_no_nodes'}{'contents'}[5];
 
$result_trees{'nodes_before_top_and_sections_unsplit_no_nodes'}{'contents'}[5]{'contents'}[0]{'contents'}[1]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'nodes_before_top_and_sections_unsplit_no_nodes'}{'contents'}[5]{'contents'}[0]{'contents'}[1];
-$result_trees{'nodes_before_top_and_sections_unsplit_no_nodes'}{'contents'}[5]{'contents'}[0]{'contents'}[2]{'extra'}{'entry_node'}
 = 
$result_trees{'nodes_before_top_and_sections_unsplit_no_nodes'}{'contents'}[5];
+$result_trees{'nodes_before_top_and_sections_unsplit_no_nodes'}{'contents'}[5]{'contents'}[0]{'contents'}[2]{'extra'}{'element_node'}
 = 
$result_trees{'nodes_before_top_and_sections_unsplit_no_nodes'}{'contents'}[5];
 
$result_trees{'nodes_before_top_and_sections_unsplit_no_nodes'}{'contents'}[5]{'contents'}[0]{'contents'}[2]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'nodes_before_top_and_sections_unsplit_no_nodes'}{'contents'}[5]{'contents'}[0]{'contents'}[2];
-$result_trees{'nodes_before_top_and_sections_unsplit_no_nodes'}{'contents'}[5]{'contents'}[0]{'contents'}[3]{'extra'}{'entry_node'}
 = 
$result_trees{'nodes_before_top_and_sections_unsplit_no_nodes'}{'contents'}[5];
+$result_trees{'nodes_before_top_and_sections_unsplit_no_nodes'}{'contents'}[5]{'contents'}[0]{'contents'}[3]{'extra'}{'element_node'}
 = 
$result_trees{'nodes_before_top_and_sections_unsplit_no_nodes'}{'contents'}[5];
 
$result_trees{'nodes_before_top_and_sections_unsplit_no_nodes'}{'contents'}[5]{'contents'}[0]{'contents'}[3]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'nodes_before_top_and_sections_unsplit_no_nodes'}{'contents'}[5]{'contents'}[0]{'contents'}[3];
 
$result_trees{'nodes_before_top_and_sections_unsplit_no_nodes'}{'contents'}[5]{'contents'}[4]{'contents'}[0]{'extra'}{'menu_entry_node_label'}{'node_content'}[0]
 = 
$result_trees{'nodes_before_top_and_sections_unsplit_no_nodes'}{'contents'}[5]{'contents'}[4]{'contents'}[0]{'contents'}[1]{'contents'}[0];
 
$result_trees{'nodes_before_top_and_sections_unsplit_no_nodes'}{'contents'}[5]{'extra'}{'node_content'}[0]
 = 
$result_trees{'nodes_before_top_and_sections_unsplit_no_nodes'}{'contents'}[5]{'args'}[0]{'contents'}[0];
@@ -2591,21 +2591,21 @@ 
$result_trees{'nodes_before_top_and_sections_unsplit_no_nodes'}{'contents'}[6]{'
 
$result_trees{'nodes_before_top_and_sections_unsplit_no_nodes'}{'contents'}[6]{'extra'}{'node_content'}[0]
 = 
$result_trees{'nodes_before_top_and_sections_unsplit_no_nodes'}{'contents'}[6]{'args'}[0]{'contents'}[0];
 
$result_trees{'nodes_before_top_and_sections_unsplit_no_nodes'}{'contents'}[6]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = 
$result_trees{'nodes_before_top_and_sections_unsplit_no_nodes'}{'contents'}[6]{'args'}[0]{'contents'}[0];
 
$result_trees{'nodes_before_top_and_sections_unsplit_no_nodes'}{'contents'}[6]{'extra'}{'nodes_manuals'}[3]{'node_content'}[0]
 = 
$result_trees{'nodes_before_top_and_sections_unsplit_no_nodes'}{'contents'}[6]{'args'}[3]{'contents'}[0];
-$result_trees{'nodes_before_top_and_sections_unsplit_no_nodes'}{'contents'}[7]{'contents'}[1]{'extra'}{'entry_node'}
 = 
$result_trees{'nodes_before_top_and_sections_unsplit_no_nodes'}{'contents'}[7];
+$result_trees{'nodes_before_top_and_sections_unsplit_no_nodes'}{'contents'}[7]{'contents'}[1]{'extra'}{'element_node'}
 = 
$result_trees{'nodes_before_top_and_sections_unsplit_no_nodes'}{'contents'}[7];
 
$result_trees{'nodes_before_top_and_sections_unsplit_no_nodes'}{'contents'}[7]{'contents'}[1]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'nodes_before_top_and_sections_unsplit_no_nodes'}{'contents'}[7]{'contents'}[1];
-$result_trees{'nodes_before_top_and_sections_unsplit_no_nodes'}{'contents'}[7]{'contents'}[2]{'extra'}{'entry_node'}
 = 
$result_trees{'nodes_before_top_and_sections_unsplit_no_nodes'}{'contents'}[7];
+$result_trees{'nodes_before_top_and_sections_unsplit_no_nodes'}{'contents'}[7]{'contents'}[2]{'extra'}{'element_node'}
 = 
$result_trees{'nodes_before_top_and_sections_unsplit_no_nodes'}{'contents'}[7];
 
$result_trees{'nodes_before_top_and_sections_unsplit_no_nodes'}{'contents'}[7]{'contents'}[2]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'nodes_before_top_and_sections_unsplit_no_nodes'}{'contents'}[7]{'contents'}[2];
-$result_trees{'nodes_before_top_and_sections_unsplit_no_nodes'}{'contents'}[7]{'contents'}[3]{'extra'}{'entry_node'}
 = 
$result_trees{'nodes_before_top_and_sections_unsplit_no_nodes'}{'contents'}[7];
+$result_trees{'nodes_before_top_and_sections_unsplit_no_nodes'}{'contents'}[7]{'contents'}[3]{'extra'}{'element_node'}
 = 
$result_trees{'nodes_before_top_and_sections_unsplit_no_nodes'}{'contents'}[7];
 
$result_trees{'nodes_before_top_and_sections_unsplit_no_nodes'}{'contents'}[7]{'contents'}[3]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'nodes_before_top_and_sections_unsplit_no_nodes'}{'contents'}[7]{'contents'}[3];
 
$result_trees{'nodes_before_top_and_sections_unsplit_no_nodes'}{'contents'}[7]{'extra'}{'node_content'}[0]
 = 
$result_trees{'nodes_before_top_and_sections_unsplit_no_nodes'}{'contents'}[7]{'args'}[0]{'contents'}[0];
 
$result_trees{'nodes_before_top_and_sections_unsplit_no_nodes'}{'contents'}[7]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = 
$result_trees{'nodes_before_top_and_sections_unsplit_no_nodes'}{'contents'}[7]{'args'}[0]{'contents'}[0];
 
$result_trees{'nodes_before_top_and_sections_unsplit_no_nodes'}{'contents'}[7]{'extra'}{'nodes_manuals'}[2]{'node_content'}[0]
 = 
$result_trees{'nodes_before_top_and_sections_unsplit_no_nodes'}{'contents'}[7]{'args'}[2]{'contents'}[0];
 
$result_trees{'nodes_before_top_and_sections_unsplit_no_nodes'}{'contents'}[7]{'extra'}{'nodes_manuals'}[3]{'node_content'}[0]
 = 
$result_trees{'nodes_before_top_and_sections_unsplit_no_nodes'}{'contents'}[7]{'args'}[3]{'contents'}[0];
-$result_trees{'nodes_before_top_and_sections_unsplit_no_nodes'}{'contents'}[8]{'contents'}[0]{'extra'}{'entry_node'}
 = 
$result_trees{'nodes_before_top_and_sections_unsplit_no_nodes'}{'contents'}[8];
+$result_trees{'nodes_before_top_and_sections_unsplit_no_nodes'}{'contents'}[8]{'contents'}[0]{'extra'}{'element_node'}
 = 
$result_trees{'nodes_before_top_and_sections_unsplit_no_nodes'}{'contents'}[8];
 
$result_trees{'nodes_before_top_and_sections_unsplit_no_nodes'}{'contents'}[8]{'contents'}[0]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'nodes_before_top_and_sections_unsplit_no_nodes'}{'contents'}[8]{'contents'}[0];
-$result_trees{'nodes_before_top_and_sections_unsplit_no_nodes'}{'contents'}[8]{'contents'}[4]{'extra'}{'entry_node'}
 = 
$result_trees{'nodes_before_top_and_sections_unsplit_no_nodes'}{'contents'}[8];
+$result_trees{'nodes_before_top_and_sections_unsplit_no_nodes'}{'contents'}[8]{'contents'}[4]{'extra'}{'element_node'}
 = 
$result_trees{'nodes_before_top_and_sections_unsplit_no_nodes'}{'contents'}[8];
 
$result_trees{'nodes_before_top_and_sections_unsplit_no_nodes'}{'contents'}[8]{'contents'}[4]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'nodes_before_top_and_sections_unsplit_no_nodes'}{'contents'}[8]{'contents'}[4];
-$result_trees{'nodes_before_top_and_sections_unsplit_no_nodes'}{'contents'}[8]{'contents'}[5]{'extra'}{'entry_node'}
 = 
$result_trees{'nodes_before_top_and_sections_unsplit_no_nodes'}{'contents'}[8];
+$result_trees{'nodes_before_top_and_sections_unsplit_no_nodes'}{'contents'}[8]{'contents'}[5]{'extra'}{'element_node'}
 = 
$result_trees{'nodes_before_top_and_sections_unsplit_no_nodes'}{'contents'}[8];
 
$result_trees{'nodes_before_top_and_sections_unsplit_no_nodes'}{'contents'}[8]{'contents'}[5]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'nodes_before_top_and_sections_unsplit_no_nodes'}{'contents'}[8]{'contents'}[5];
 
$result_trees{'nodes_before_top_and_sections_unsplit_no_nodes'}{'contents'}[8]{'extra'}{'node_content'}[0]
 = 
$result_trees{'nodes_before_top_and_sections_unsplit_no_nodes'}{'contents'}[8]{'args'}[0]{'contents'}[0];
 
$result_trees{'nodes_before_top_and_sections_unsplit_no_nodes'}{'contents'}[8]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = 
$result_trees{'nodes_before_top_and_sections_unsplit_no_nodes'}{'contents'}[8]{'args'}[0]{'contents'}[0];
@@ -2615,7 +2615,7 @@ 
$result_trees{'nodes_before_top_and_sections_unsplit_no_nodes'}{'contents'}[9]{'
 
$result_trees{'nodes_before_top_and_sections_unsplit_no_nodes'}{'contents'}[9]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = 
$result_trees{'nodes_before_top_and_sections_unsplit_no_nodes'}{'contents'}[9]{'args'}[0]{'contents'}[0];
 
$result_trees{'nodes_before_top_and_sections_unsplit_no_nodes'}{'contents'}[9]{'extra'}{'nodes_manuals'}[1]{'node_content'}[0]
 = 
$result_trees{'nodes_before_top_and_sections_unsplit_no_nodes'}{'contents'}[9]{'args'}[1]{'contents'}[0];
 
$result_trees{'nodes_before_top_and_sections_unsplit_no_nodes'}{'contents'}[9]{'extra'}{'nodes_manuals'}[3]{'node_content'}[0]
 = 
$result_trees{'nodes_before_top_and_sections_unsplit_no_nodes'}{'contents'}[9]{'args'}[3]{'contents'}[0];
-$result_trees{'nodes_before_top_and_sections_unsplit_no_nodes'}{'contents'}[11]{'contents'}[1]{'extra'}{'entry_node'}
 = 
$result_trees{'nodes_before_top_and_sections_unsplit_no_nodes'}{'contents'}[11];
+$result_trees{'nodes_before_top_and_sections_unsplit_no_nodes'}{'contents'}[11]{'contents'}[1]{'extra'}{'element_node'}
 = 
$result_trees{'nodes_before_top_and_sections_unsplit_no_nodes'}{'contents'}[11];
 
$result_trees{'nodes_before_top_and_sections_unsplit_no_nodes'}{'contents'}[11]{'contents'}[1]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'nodes_before_top_and_sections_unsplit_no_nodes'}{'contents'}[11]{'contents'}[1];
 
$result_trees{'nodes_before_top_and_sections_unsplit_no_nodes'}{'contents'}[11]{'extra'}{'node_content'}[0]
 = 
$result_trees{'nodes_before_top_and_sections_unsplit_no_nodes'}{'contents'}[11]{'args'}[0]{'contents'}[0];
 
$result_trees{'nodes_before_top_and_sections_unsplit_no_nodes'}{'contents'}[11]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = 
$result_trees{'nodes_before_top_and_sections_unsplit_no_nodes'}{'contents'}[11]{'args'}[0]{'contents'}[0];
diff --git a/tp/t/results/indices/nodes_before_top_split_chapter.pl 
b/tp/t/results/indices/nodes_before_top_split_chapter.pl
index 73350473db..7b46ac5025 100644
--- a/tp/t/results/indices/nodes_before_top_split_chapter.pl
+++ b/tp/t/results/indices/nodes_before_top_split_chapter.pl
@@ -131,7 +131,7 @@ $result_trees{'nodes_before_top_split_chapter'} = {
           ],
           'cmdname' => 'cindex',
           'extra' => {
-            'entry_node' => {},
+            'element_node' => {},
             'index_entry' => {
               'entry_element' => {},
               'entry_number' => 1,
@@ -396,7 +396,7 @@ $result_trees{'nodes_before_top_split_chapter'} = {
           ],
           'cmdname' => 'cindex',
           'extra' => {
-            'entry_node' => {},
+            'element_node' => {},
             'index_entry' => {
               'entry_element' => {},
               'entry_number' => 2,
@@ -483,7 +483,7 @@ $result_trees{'nodes_before_top_split_chapter'} = {
           ],
           'cmdname' => 'cindex',
           'extra' => {
-            'entry_node' => {},
+            'element_node' => {},
             'index_entry' => {
               'entry_element' => {},
               'entry_number' => 3,
@@ -602,7 +602,7 @@ $result_trees{'nodes_before_top_split_chapter'} = {
           ],
           'cmdname' => 'cindex',
           'extra' => {
-            'entry_node' => {},
+            'element_node' => {},
             'index_entry' => {
               'entry_element' => {},
               'entry_number' => 4,
@@ -964,7 +964,7 @@ $result_trees{'nodes_before_top_split_chapter'} = {
               ],
               'cmdname' => 'cindex',
               'extra' => {
-                'entry_node' => {},
+                'element_node' => {},
                 'index_entry' => {
                   'entry_element' => {},
                   'entry_number' => 5,
@@ -1003,7 +1003,7 @@ $result_trees{'nodes_before_top_split_chapter'} = {
               ],
               'cmdname' => 'findex',
               'extra' => {
-                'entry_node' => {},
+                'element_node' => {},
                 'index_entry' => {
                   'entry_element' => {},
                   'entry_number' => 1,
@@ -1042,7 +1042,7 @@ $result_trees{'nodes_before_top_split_chapter'} = {
               ],
               'cmdname' => 'cindex',
               'extra' => {
-                'entry_node' => {},
+                'element_node' => {},
                 'index_entry' => {
                   'entry_element' => {},
                   'entry_number' => 6,
@@ -1591,7 +1591,7 @@ $result_trees{'nodes_before_top_split_chapter'} = {
           ],
           'cmdname' => 'cindex',
           'extra' => {
-            'entry_node' => {},
+            'element_node' => {},
             'index_entry' => {
               'entry_element' => {},
               'entry_number' => 7,
@@ -1630,7 +1630,7 @@ $result_trees{'nodes_before_top_split_chapter'} = {
           ],
           'cmdname' => 'findex',
           'extra' => {
-            'entry_node' => {},
+            'element_node' => {},
             'index_entry' => {
               'entry_element' => {},
               'entry_number' => 2,
@@ -1669,7 +1669,7 @@ $result_trees{'nodes_before_top_split_chapter'} = {
           ],
           'cmdname' => 'cindex',
           'extra' => {
-            'entry_node' => {},
+            'element_node' => {},
             'index_entry' => {
               'entry_element' => {},
               'entry_number' => 8,
@@ -1800,7 +1800,7 @@ $result_trees{'nodes_before_top_split_chapter'} = {
           ],
           'cmdname' => 'cindex',
           'extra' => {
-            'entry_node' => {},
+            'element_node' => {},
             'index_entry' => {
               'entry_element' => {},
               'entry_number' => 9,
@@ -1883,7 +1883,7 @@ $result_trees{'nodes_before_top_split_chapter'} = {
           ],
           'cmdname' => 'findex',
           'extra' => {
-            'entry_node' => {},
+            'element_node' => {},
             'index_entry' => {
               'entry_element' => {},
               'entry_number' => 3,
@@ -1922,7 +1922,7 @@ $result_trees{'nodes_before_top_split_chapter'} = {
           ],
           'cmdname' => 'cindex',
           'extra' => {
-            'entry_node' => {},
+            'element_node' => {},
             'index_entry' => {
               'entry_element' => {},
               'entry_number' => 10,
@@ -2039,31 +2039,31 @@ $result_trees{'nodes_before_top_split_chapter'} = {
   ],
   'type' => 'document_root'
 };
-$result_trees{'nodes_before_top_split_chapter'}{'contents'}[1]{'contents'}[0]{'extra'}{'entry_node'}
 = $result_trees{'nodes_before_top_split_chapter'}{'contents'}[1];
+$result_trees{'nodes_before_top_split_chapter'}{'contents'}[1]{'contents'}[0]{'extra'}{'element_node'}
 = $result_trees{'nodes_before_top_split_chapter'}{'contents'}[1];
 
$result_trees{'nodes_before_top_split_chapter'}{'contents'}[1]{'contents'}[0]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'nodes_before_top_split_chapter'}{'contents'}[1]{'contents'}[0];
 
$result_trees{'nodes_before_top_split_chapter'}{'contents'}[1]{'contents'}[3]{'contents'}[0]{'extra'}{'menu_entry_node_label'}{'node_content'}[0]
 = 
$result_trees{'nodes_before_top_split_chapter'}{'contents'}[1]{'contents'}[3]{'contents'}[0]{'contents'}[1]{'contents'}[0];
 
$result_trees{'nodes_before_top_split_chapter'}{'contents'}[1]{'extra'}{'node_content'}[0]
 = 
$result_trees{'nodes_before_top_split_chapter'}{'contents'}[1]{'args'}[0]{'contents'}[0];
 
$result_trees{'nodes_before_top_split_chapter'}{'contents'}[1]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = 
$result_trees{'nodes_before_top_split_chapter'}{'contents'}[1]{'args'}[0]{'contents'}[0];
 
$result_trees{'nodes_before_top_split_chapter'}{'contents'}[1]{'extra'}{'nodes_manuals'}[1]{'node_content'}[0]
 = 
$result_trees{'nodes_before_top_split_chapter'}{'contents'}[1]{'args'}[1]{'contents'}[0];
 
$result_trees{'nodes_before_top_split_chapter'}{'contents'}[1]{'extra'}{'nodes_manuals'}[3]{'manual_content'}[0]
 = 
$result_trees{'nodes_before_top_split_chapter'}{'contents'}[1]{'args'}[3]{'contents'}[1];
-$result_trees{'nodes_before_top_split_chapter'}{'contents'}[2]{'contents'}[1]{'extra'}{'entry_node'}
 = $result_trees{'nodes_before_top_split_chapter'}{'contents'}[2];
+$result_trees{'nodes_before_top_split_chapter'}{'contents'}[2]{'contents'}[1]{'extra'}{'element_node'}
 = $result_trees{'nodes_before_top_split_chapter'}{'contents'}[2];
 
$result_trees{'nodes_before_top_split_chapter'}{'contents'}[2]{'contents'}[1]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'nodes_before_top_split_chapter'}{'contents'}[2]{'contents'}[1];
-$result_trees{'nodes_before_top_split_chapter'}{'contents'}[2]{'contents'}[5]{'extra'}{'entry_node'}
 = $result_trees{'nodes_before_top_split_chapter'}{'contents'}[2];
+$result_trees{'nodes_before_top_split_chapter'}{'contents'}[2]{'contents'}[5]{'extra'}{'element_node'}
 = $result_trees{'nodes_before_top_split_chapter'}{'contents'}[2];
 
$result_trees{'nodes_before_top_split_chapter'}{'contents'}[2]{'contents'}[5]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'nodes_before_top_split_chapter'}{'contents'}[2]{'contents'}[5];
 
$result_trees{'nodes_before_top_split_chapter'}{'contents'}[2]{'extra'}{'node_content'}[0]
 = 
$result_trees{'nodes_before_top_split_chapter'}{'contents'}[2]{'args'}[0]{'contents'}[0];
 
$result_trees{'nodes_before_top_split_chapter'}{'contents'}[2]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = 
$result_trees{'nodes_before_top_split_chapter'}{'contents'}[2]{'args'}[0]{'contents'}[0];
 
$result_trees{'nodes_before_top_split_chapter'}{'contents'}[2]{'extra'}{'nodes_manuals'}[3]{'node_content'}[0]
 = 
$result_trees{'nodes_before_top_split_chapter'}{'contents'}[2]{'args'}[3]{'contents'}[0];
-$result_trees{'nodes_before_top_split_chapter'}{'contents'}[3]{'contents'}[0]{'extra'}{'entry_node'}
 = $result_trees{'nodes_before_top_split_chapter'}{'contents'}[3];
+$result_trees{'nodes_before_top_split_chapter'}{'contents'}[3]{'contents'}[0]{'extra'}{'element_node'}
 = $result_trees{'nodes_before_top_split_chapter'}{'contents'}[3];
 
$result_trees{'nodes_before_top_split_chapter'}{'contents'}[3]{'contents'}[0]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'nodes_before_top_split_chapter'}{'contents'}[3]{'contents'}[0];
 
$result_trees{'nodes_before_top_split_chapter'}{'contents'}[3]{'contents'}[10]{'contents'}[0]{'extra'}{'menu_entry_node_label'}{'node_content'}[0]
 = 
$result_trees{'nodes_before_top_split_chapter'}{'contents'}[3]{'contents'}[10]{'contents'}[0]{'contents'}[1]{'contents'}[0];
 
$result_trees{'nodes_before_top_split_chapter'}{'contents'}[3]{'extra'}{'node_content'}[0]
 = 
$result_trees{'nodes_before_top_split_chapter'}{'contents'}[3]{'args'}[0]{'contents'}[0];
 
$result_trees{'nodes_before_top_split_chapter'}{'contents'}[3]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = 
$result_trees{'nodes_before_top_split_chapter'}{'contents'}[3]{'args'}[0]{'contents'}[0];
 
$result_trees{'nodes_before_top_split_chapter'}{'contents'}[3]{'extra'}{'nodes_manuals'}[2]{'node_content'}[0]
 = 
$result_trees{'nodes_before_top_split_chapter'}{'contents'}[3]{'args'}[2]{'contents'}[0];
-$result_trees{'nodes_before_top_split_chapter'}{'contents'}[4]{'contents'}[0]{'contents'}[1]{'extra'}{'entry_node'}
 = $result_trees{'nodes_before_top_split_chapter'}{'contents'}[4];
+$result_trees{'nodes_before_top_split_chapter'}{'contents'}[4]{'contents'}[0]{'contents'}[1]{'extra'}{'element_node'}
 = $result_trees{'nodes_before_top_split_chapter'}{'contents'}[4];
 
$result_trees{'nodes_before_top_split_chapter'}{'contents'}[4]{'contents'}[0]{'contents'}[1]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'nodes_before_top_split_chapter'}{'contents'}[4]{'contents'}[0]{'contents'}[1];
-$result_trees{'nodes_before_top_split_chapter'}{'contents'}[4]{'contents'}[0]{'contents'}[2]{'extra'}{'entry_node'}
 = $result_trees{'nodes_before_top_split_chapter'}{'contents'}[4];
+$result_trees{'nodes_before_top_split_chapter'}{'contents'}[4]{'contents'}[0]{'contents'}[2]{'extra'}{'element_node'}
 = $result_trees{'nodes_before_top_split_chapter'}{'contents'}[4];
 
$result_trees{'nodes_before_top_split_chapter'}{'contents'}[4]{'contents'}[0]{'contents'}[2]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'nodes_before_top_split_chapter'}{'contents'}[4]{'contents'}[0]{'contents'}[2];
-$result_trees{'nodes_before_top_split_chapter'}{'contents'}[4]{'contents'}[0]{'contents'}[3]{'extra'}{'entry_node'}
 = $result_trees{'nodes_before_top_split_chapter'}{'contents'}[4];
+$result_trees{'nodes_before_top_split_chapter'}{'contents'}[4]{'contents'}[0]{'contents'}[3]{'extra'}{'element_node'}
 = $result_trees{'nodes_before_top_split_chapter'}{'contents'}[4];
 
$result_trees{'nodes_before_top_split_chapter'}{'contents'}[4]{'contents'}[0]{'contents'}[3]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'nodes_before_top_split_chapter'}{'contents'}[4]{'contents'}[0]{'contents'}[3];
 
$result_trees{'nodes_before_top_split_chapter'}{'contents'}[4]{'contents'}[4]{'contents'}[0]{'extra'}{'menu_entry_node_label'}{'node_content'}[0]
 = 
$result_trees{'nodes_before_top_split_chapter'}{'contents'}[4]{'contents'}[4]{'contents'}[0]{'contents'}[1]{'contents'}[0];
 
$result_trees{'nodes_before_top_split_chapter'}{'contents'}[4]{'extra'}{'node_content'}[0]
 = 
$result_trees{'nodes_before_top_split_chapter'}{'contents'}[4]{'args'}[0]{'contents'}[0];
@@ -2075,21 +2075,21 @@ 
$result_trees{'nodes_before_top_split_chapter'}{'contents'}[5]{'contents'}[0]{'c
 
$result_trees{'nodes_before_top_split_chapter'}{'contents'}[5]{'extra'}{'node_content'}[0]
 = 
$result_trees{'nodes_before_top_split_chapter'}{'contents'}[5]{'args'}[0]{'contents'}[0];
 
$result_trees{'nodes_before_top_split_chapter'}{'contents'}[5]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = 
$result_trees{'nodes_before_top_split_chapter'}{'contents'}[5]{'args'}[0]{'contents'}[0];
 
$result_trees{'nodes_before_top_split_chapter'}{'contents'}[5]{'extra'}{'nodes_manuals'}[3]{'node_content'}[0]
 = 
$result_trees{'nodes_before_top_split_chapter'}{'contents'}[5]{'args'}[3]{'contents'}[0];
-$result_trees{'nodes_before_top_split_chapter'}{'contents'}[6]{'contents'}[1]{'extra'}{'entry_node'}
 = $result_trees{'nodes_before_top_split_chapter'}{'contents'}[6];
+$result_trees{'nodes_before_top_split_chapter'}{'contents'}[6]{'contents'}[1]{'extra'}{'element_node'}
 = $result_trees{'nodes_before_top_split_chapter'}{'contents'}[6];
 
$result_trees{'nodes_before_top_split_chapter'}{'contents'}[6]{'contents'}[1]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'nodes_before_top_split_chapter'}{'contents'}[6]{'contents'}[1];
-$result_trees{'nodes_before_top_split_chapter'}{'contents'}[6]{'contents'}[2]{'extra'}{'entry_node'}
 = $result_trees{'nodes_before_top_split_chapter'}{'contents'}[6];
+$result_trees{'nodes_before_top_split_chapter'}{'contents'}[6]{'contents'}[2]{'extra'}{'element_node'}
 = $result_trees{'nodes_before_top_split_chapter'}{'contents'}[6];
 
$result_trees{'nodes_before_top_split_chapter'}{'contents'}[6]{'contents'}[2]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'nodes_before_top_split_chapter'}{'contents'}[6]{'contents'}[2];
-$result_trees{'nodes_before_top_split_chapter'}{'contents'}[6]{'contents'}[3]{'extra'}{'entry_node'}
 = $result_trees{'nodes_before_top_split_chapter'}{'contents'}[6];
+$result_trees{'nodes_before_top_split_chapter'}{'contents'}[6]{'contents'}[3]{'extra'}{'element_node'}
 = $result_trees{'nodes_before_top_split_chapter'}{'contents'}[6];
 
$result_trees{'nodes_before_top_split_chapter'}{'contents'}[6]{'contents'}[3]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'nodes_before_top_split_chapter'}{'contents'}[6]{'contents'}[3];
 
$result_trees{'nodes_before_top_split_chapter'}{'contents'}[6]{'extra'}{'node_content'}[0]
 = 
$result_trees{'nodes_before_top_split_chapter'}{'contents'}[6]{'args'}[0]{'contents'}[0];
 
$result_trees{'nodes_before_top_split_chapter'}{'contents'}[6]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = 
$result_trees{'nodes_before_top_split_chapter'}{'contents'}[6]{'args'}[0]{'contents'}[0];
 
$result_trees{'nodes_before_top_split_chapter'}{'contents'}[6]{'extra'}{'nodes_manuals'}[2]{'node_content'}[0]
 = 
$result_trees{'nodes_before_top_split_chapter'}{'contents'}[6]{'args'}[2]{'contents'}[0];
 
$result_trees{'nodes_before_top_split_chapter'}{'contents'}[6]{'extra'}{'nodes_manuals'}[3]{'node_content'}[0]
 = 
$result_trees{'nodes_before_top_split_chapter'}{'contents'}[6]{'args'}[3]{'contents'}[0];
-$result_trees{'nodes_before_top_split_chapter'}{'contents'}[7]{'contents'}[0]{'extra'}{'entry_node'}
 = $result_trees{'nodes_before_top_split_chapter'}{'contents'}[7];
+$result_trees{'nodes_before_top_split_chapter'}{'contents'}[7]{'contents'}[0]{'extra'}{'element_node'}
 = $result_trees{'nodes_before_top_split_chapter'}{'contents'}[7];
 
$result_trees{'nodes_before_top_split_chapter'}{'contents'}[7]{'contents'}[0]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'nodes_before_top_split_chapter'}{'contents'}[7]{'contents'}[0];
-$result_trees{'nodes_before_top_split_chapter'}{'contents'}[7]{'contents'}[4]{'extra'}{'entry_node'}
 = $result_trees{'nodes_before_top_split_chapter'}{'contents'}[7];
+$result_trees{'nodes_before_top_split_chapter'}{'contents'}[7]{'contents'}[4]{'extra'}{'element_node'}
 = $result_trees{'nodes_before_top_split_chapter'}{'contents'}[7];
 
$result_trees{'nodes_before_top_split_chapter'}{'contents'}[7]{'contents'}[4]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'nodes_before_top_split_chapter'}{'contents'}[7]{'contents'}[4];
-$result_trees{'nodes_before_top_split_chapter'}{'contents'}[7]{'contents'}[5]{'extra'}{'entry_node'}
 = $result_trees{'nodes_before_top_split_chapter'}{'contents'}[7];
+$result_trees{'nodes_before_top_split_chapter'}{'contents'}[7]{'contents'}[5]{'extra'}{'element_node'}
 = $result_trees{'nodes_before_top_split_chapter'}{'contents'}[7];
 
$result_trees{'nodes_before_top_split_chapter'}{'contents'}[7]{'contents'}[5]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'nodes_before_top_split_chapter'}{'contents'}[7]{'contents'}[5];
 
$result_trees{'nodes_before_top_split_chapter'}{'contents'}[7]{'extra'}{'node_content'}[0]
 = 
$result_trees{'nodes_before_top_split_chapter'}{'contents'}[7]{'args'}[0]{'contents'}[0];
 
$result_trees{'nodes_before_top_split_chapter'}{'contents'}[7]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = 
$result_trees{'nodes_before_top_split_chapter'}{'contents'}[7]{'args'}[0]{'contents'}[0];
diff --git a/tp/t/results/indices/nodes_before_top_split_chapter_no_nodes.pl 
b/tp/t/results/indices/nodes_before_top_split_chapter_no_nodes.pl
index ab852c96c1..53ace95170 100644
--- a/tp/t/results/indices/nodes_before_top_split_chapter_no_nodes.pl
+++ b/tp/t/results/indices/nodes_before_top_split_chapter_no_nodes.pl
@@ -131,7 +131,7 @@ $result_trees{'nodes_before_top_split_chapter_no_nodes'} = {
           ],
           'cmdname' => 'cindex',
           'extra' => {
-            'entry_node' => {},
+            'element_node' => {},
             'index_entry' => {
               'entry_element' => {},
               'entry_number' => 1,
@@ -396,7 +396,7 @@ $result_trees{'nodes_before_top_split_chapter_no_nodes'} = {
           ],
           'cmdname' => 'cindex',
           'extra' => {
-            'entry_node' => {},
+            'element_node' => {},
             'index_entry' => {
               'entry_element' => {},
               'entry_number' => 2,
@@ -483,7 +483,7 @@ $result_trees{'nodes_before_top_split_chapter_no_nodes'} = {
           ],
           'cmdname' => 'cindex',
           'extra' => {
-            'entry_node' => {},
+            'element_node' => {},
             'index_entry' => {
               'entry_element' => {},
               'entry_number' => 3,
@@ -602,7 +602,7 @@ $result_trees{'nodes_before_top_split_chapter_no_nodes'} = {
           ],
           'cmdname' => 'cindex',
           'extra' => {
-            'entry_node' => {},
+            'element_node' => {},
             'index_entry' => {
               'entry_element' => {},
               'entry_number' => 4,
@@ -964,7 +964,7 @@ $result_trees{'nodes_before_top_split_chapter_no_nodes'} = {
               ],
               'cmdname' => 'cindex',
               'extra' => {
-                'entry_node' => {},
+                'element_node' => {},
                 'index_entry' => {
                   'entry_element' => {},
                   'entry_number' => 5,
@@ -1003,7 +1003,7 @@ $result_trees{'nodes_before_top_split_chapter_no_nodes'} 
= {
               ],
               'cmdname' => 'findex',
               'extra' => {
-                'entry_node' => {},
+                'element_node' => {},
                 'index_entry' => {
                   'entry_element' => {},
                   'entry_number' => 1,
@@ -1042,7 +1042,7 @@ $result_trees{'nodes_before_top_split_chapter_no_nodes'} 
= {
               ],
               'cmdname' => 'cindex',
               'extra' => {
-                'entry_node' => {},
+                'element_node' => {},
                 'index_entry' => {
                   'entry_element' => {},
                   'entry_number' => 6,
@@ -1591,7 +1591,7 @@ $result_trees{'nodes_before_top_split_chapter_no_nodes'} 
= {
           ],
           'cmdname' => 'cindex',
           'extra' => {
-            'entry_node' => {},
+            'element_node' => {},
             'index_entry' => {
               'entry_element' => {},
               'entry_number' => 7,
@@ -1630,7 +1630,7 @@ $result_trees{'nodes_before_top_split_chapter_no_nodes'} 
= {
           ],
           'cmdname' => 'findex',
           'extra' => {
-            'entry_node' => {},
+            'element_node' => {},
             'index_entry' => {
               'entry_element' => {},
               'entry_number' => 2,
@@ -1669,7 +1669,7 @@ $result_trees{'nodes_before_top_split_chapter_no_nodes'} 
= {
           ],
           'cmdname' => 'cindex',
           'extra' => {
-            'entry_node' => {},
+            'element_node' => {},
             'index_entry' => {
               'entry_element' => {},
               'entry_number' => 8,
@@ -1800,7 +1800,7 @@ $result_trees{'nodes_before_top_split_chapter_no_nodes'} 
= {
           ],
           'cmdname' => 'cindex',
           'extra' => {
-            'entry_node' => {},
+            'element_node' => {},
             'index_entry' => {
               'entry_element' => {},
               'entry_number' => 9,
@@ -1883,7 +1883,7 @@ $result_trees{'nodes_before_top_split_chapter_no_nodes'} 
= {
           ],
           'cmdname' => 'findex',
           'extra' => {
-            'entry_node' => {},
+            'element_node' => {},
             'index_entry' => {
               'entry_element' => {},
               'entry_number' => 3,
@@ -1922,7 +1922,7 @@ $result_trees{'nodes_before_top_split_chapter_no_nodes'} 
= {
           ],
           'cmdname' => 'cindex',
           'extra' => {
-            'entry_node' => {},
+            'element_node' => {},
             'index_entry' => {
               'entry_element' => {},
               'entry_number' => 10,
@@ -2039,31 +2039,31 @@ 
$result_trees{'nodes_before_top_split_chapter_no_nodes'} = {
   ],
   'type' => 'document_root'
 };
-$result_trees{'nodes_before_top_split_chapter_no_nodes'}{'contents'}[1]{'contents'}[0]{'extra'}{'entry_node'}
 = $result_trees{'nodes_before_top_split_chapter_no_nodes'}{'contents'}[1];
+$result_trees{'nodes_before_top_split_chapter_no_nodes'}{'contents'}[1]{'contents'}[0]{'extra'}{'element_node'}
 = $result_trees{'nodes_before_top_split_chapter_no_nodes'}{'contents'}[1];
 
$result_trees{'nodes_before_top_split_chapter_no_nodes'}{'contents'}[1]{'contents'}[0]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'nodes_before_top_split_chapter_no_nodes'}{'contents'}[1]{'contents'}[0];
 
$result_trees{'nodes_before_top_split_chapter_no_nodes'}{'contents'}[1]{'contents'}[3]{'contents'}[0]{'extra'}{'menu_entry_node_label'}{'node_content'}[0]
 = 
$result_trees{'nodes_before_top_split_chapter_no_nodes'}{'contents'}[1]{'contents'}[3]{'contents'}[0]{'contents'}[1]{'contents'}[0];
 
$result_trees{'nodes_before_top_split_chapter_no_nodes'}{'contents'}[1]{'extra'}{'node_content'}[0]
 = 
$result_trees{'nodes_before_top_split_chapter_no_nodes'}{'contents'}[1]{'args'}[0]{'contents'}[0];
 
$result_trees{'nodes_before_top_split_chapter_no_nodes'}{'contents'}[1]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = 
$result_trees{'nodes_before_top_split_chapter_no_nodes'}{'contents'}[1]{'args'}[0]{'contents'}[0];
 
$result_trees{'nodes_before_top_split_chapter_no_nodes'}{'contents'}[1]{'extra'}{'nodes_manuals'}[1]{'node_content'}[0]
 = 
$result_trees{'nodes_before_top_split_chapter_no_nodes'}{'contents'}[1]{'args'}[1]{'contents'}[0];
 
$result_trees{'nodes_before_top_split_chapter_no_nodes'}{'contents'}[1]{'extra'}{'nodes_manuals'}[3]{'manual_content'}[0]
 = 
$result_trees{'nodes_before_top_split_chapter_no_nodes'}{'contents'}[1]{'args'}[3]{'contents'}[1];
-$result_trees{'nodes_before_top_split_chapter_no_nodes'}{'contents'}[2]{'contents'}[1]{'extra'}{'entry_node'}
 = $result_trees{'nodes_before_top_split_chapter_no_nodes'}{'contents'}[2];
+$result_trees{'nodes_before_top_split_chapter_no_nodes'}{'contents'}[2]{'contents'}[1]{'extra'}{'element_node'}
 = $result_trees{'nodes_before_top_split_chapter_no_nodes'}{'contents'}[2];
 
$result_trees{'nodes_before_top_split_chapter_no_nodes'}{'contents'}[2]{'contents'}[1]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'nodes_before_top_split_chapter_no_nodes'}{'contents'}[2]{'contents'}[1];
-$result_trees{'nodes_before_top_split_chapter_no_nodes'}{'contents'}[2]{'contents'}[5]{'extra'}{'entry_node'}
 = $result_trees{'nodes_before_top_split_chapter_no_nodes'}{'contents'}[2];
+$result_trees{'nodes_before_top_split_chapter_no_nodes'}{'contents'}[2]{'contents'}[5]{'extra'}{'element_node'}
 = $result_trees{'nodes_before_top_split_chapter_no_nodes'}{'contents'}[2];
 
$result_trees{'nodes_before_top_split_chapter_no_nodes'}{'contents'}[2]{'contents'}[5]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'nodes_before_top_split_chapter_no_nodes'}{'contents'}[2]{'contents'}[5];
 
$result_trees{'nodes_before_top_split_chapter_no_nodes'}{'contents'}[2]{'extra'}{'node_content'}[0]
 = 
$result_trees{'nodes_before_top_split_chapter_no_nodes'}{'contents'}[2]{'args'}[0]{'contents'}[0];
 
$result_trees{'nodes_before_top_split_chapter_no_nodes'}{'contents'}[2]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = 
$result_trees{'nodes_before_top_split_chapter_no_nodes'}{'contents'}[2]{'args'}[0]{'contents'}[0];
 
$result_trees{'nodes_before_top_split_chapter_no_nodes'}{'contents'}[2]{'extra'}{'nodes_manuals'}[3]{'node_content'}[0]
 = 
$result_trees{'nodes_before_top_split_chapter_no_nodes'}{'contents'}[2]{'args'}[3]{'contents'}[0];
-$result_trees{'nodes_before_top_split_chapter_no_nodes'}{'contents'}[3]{'contents'}[0]{'extra'}{'entry_node'}
 = $result_trees{'nodes_before_top_split_chapter_no_nodes'}{'contents'}[3];
+$result_trees{'nodes_before_top_split_chapter_no_nodes'}{'contents'}[3]{'contents'}[0]{'extra'}{'element_node'}
 = $result_trees{'nodes_before_top_split_chapter_no_nodes'}{'contents'}[3];
 
$result_trees{'nodes_before_top_split_chapter_no_nodes'}{'contents'}[3]{'contents'}[0]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'nodes_before_top_split_chapter_no_nodes'}{'contents'}[3]{'contents'}[0];
 
$result_trees{'nodes_before_top_split_chapter_no_nodes'}{'contents'}[3]{'contents'}[10]{'contents'}[0]{'extra'}{'menu_entry_node_label'}{'node_content'}[0]
 = 
$result_trees{'nodes_before_top_split_chapter_no_nodes'}{'contents'}[3]{'contents'}[10]{'contents'}[0]{'contents'}[1]{'contents'}[0];
 
$result_trees{'nodes_before_top_split_chapter_no_nodes'}{'contents'}[3]{'extra'}{'node_content'}[0]
 = 
$result_trees{'nodes_before_top_split_chapter_no_nodes'}{'contents'}[3]{'args'}[0]{'contents'}[0];
 
$result_trees{'nodes_before_top_split_chapter_no_nodes'}{'contents'}[3]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = 
$result_trees{'nodes_before_top_split_chapter_no_nodes'}{'contents'}[3]{'args'}[0]{'contents'}[0];
 
$result_trees{'nodes_before_top_split_chapter_no_nodes'}{'contents'}[3]{'extra'}{'nodes_manuals'}[2]{'node_content'}[0]
 = 
$result_trees{'nodes_before_top_split_chapter_no_nodes'}{'contents'}[3]{'args'}[2]{'contents'}[0];
-$result_trees{'nodes_before_top_split_chapter_no_nodes'}{'contents'}[4]{'contents'}[0]{'contents'}[1]{'extra'}{'entry_node'}
 = $result_trees{'nodes_before_top_split_chapter_no_nodes'}{'contents'}[4];
+$result_trees{'nodes_before_top_split_chapter_no_nodes'}{'contents'}[4]{'contents'}[0]{'contents'}[1]{'extra'}{'element_node'}
 = $result_trees{'nodes_before_top_split_chapter_no_nodes'}{'contents'}[4];
 
$result_trees{'nodes_before_top_split_chapter_no_nodes'}{'contents'}[4]{'contents'}[0]{'contents'}[1]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'nodes_before_top_split_chapter_no_nodes'}{'contents'}[4]{'contents'}[0]{'contents'}[1];
-$result_trees{'nodes_before_top_split_chapter_no_nodes'}{'contents'}[4]{'contents'}[0]{'contents'}[2]{'extra'}{'entry_node'}
 = $result_trees{'nodes_before_top_split_chapter_no_nodes'}{'contents'}[4];
+$result_trees{'nodes_before_top_split_chapter_no_nodes'}{'contents'}[4]{'contents'}[0]{'contents'}[2]{'extra'}{'element_node'}
 = $result_trees{'nodes_before_top_split_chapter_no_nodes'}{'contents'}[4];
 
$result_trees{'nodes_before_top_split_chapter_no_nodes'}{'contents'}[4]{'contents'}[0]{'contents'}[2]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'nodes_before_top_split_chapter_no_nodes'}{'contents'}[4]{'contents'}[0]{'contents'}[2];
-$result_trees{'nodes_before_top_split_chapter_no_nodes'}{'contents'}[4]{'contents'}[0]{'contents'}[3]{'extra'}{'entry_node'}
 = $result_trees{'nodes_before_top_split_chapter_no_nodes'}{'contents'}[4];
+$result_trees{'nodes_before_top_split_chapter_no_nodes'}{'contents'}[4]{'contents'}[0]{'contents'}[3]{'extra'}{'element_node'}
 = $result_trees{'nodes_before_top_split_chapter_no_nodes'}{'contents'}[4];
 
$result_trees{'nodes_before_top_split_chapter_no_nodes'}{'contents'}[4]{'contents'}[0]{'contents'}[3]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'nodes_before_top_split_chapter_no_nodes'}{'contents'}[4]{'contents'}[0]{'contents'}[3];
 
$result_trees{'nodes_before_top_split_chapter_no_nodes'}{'contents'}[4]{'contents'}[4]{'contents'}[0]{'extra'}{'menu_entry_node_label'}{'node_content'}[0]
 = 
$result_trees{'nodes_before_top_split_chapter_no_nodes'}{'contents'}[4]{'contents'}[4]{'contents'}[0]{'contents'}[1]{'contents'}[0];
 
$result_trees{'nodes_before_top_split_chapter_no_nodes'}{'contents'}[4]{'extra'}{'node_content'}[0]
 = 
$result_trees{'nodes_before_top_split_chapter_no_nodes'}{'contents'}[4]{'args'}[0]{'contents'}[0];
@@ -2075,21 +2075,21 @@ 
$result_trees{'nodes_before_top_split_chapter_no_nodes'}{'contents'}[5]{'content
 
$result_trees{'nodes_before_top_split_chapter_no_nodes'}{'contents'}[5]{'extra'}{'node_content'}[0]
 = 
$result_trees{'nodes_before_top_split_chapter_no_nodes'}{'contents'}[5]{'args'}[0]{'contents'}[0];
 
$result_trees{'nodes_before_top_split_chapter_no_nodes'}{'contents'}[5]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = 
$result_trees{'nodes_before_top_split_chapter_no_nodes'}{'contents'}[5]{'args'}[0]{'contents'}[0];
 
$result_trees{'nodes_before_top_split_chapter_no_nodes'}{'contents'}[5]{'extra'}{'nodes_manuals'}[3]{'node_content'}[0]
 = 
$result_trees{'nodes_before_top_split_chapter_no_nodes'}{'contents'}[5]{'args'}[3]{'contents'}[0];
-$result_trees{'nodes_before_top_split_chapter_no_nodes'}{'contents'}[6]{'contents'}[1]{'extra'}{'entry_node'}
 = $result_trees{'nodes_before_top_split_chapter_no_nodes'}{'contents'}[6];
+$result_trees{'nodes_before_top_split_chapter_no_nodes'}{'contents'}[6]{'contents'}[1]{'extra'}{'element_node'}
 = $result_trees{'nodes_before_top_split_chapter_no_nodes'}{'contents'}[6];
 
$result_trees{'nodes_before_top_split_chapter_no_nodes'}{'contents'}[6]{'contents'}[1]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'nodes_before_top_split_chapter_no_nodes'}{'contents'}[6]{'contents'}[1];
-$result_trees{'nodes_before_top_split_chapter_no_nodes'}{'contents'}[6]{'contents'}[2]{'extra'}{'entry_node'}
 = $result_trees{'nodes_before_top_split_chapter_no_nodes'}{'contents'}[6];
+$result_trees{'nodes_before_top_split_chapter_no_nodes'}{'contents'}[6]{'contents'}[2]{'extra'}{'element_node'}
 = $result_trees{'nodes_before_top_split_chapter_no_nodes'}{'contents'}[6];
 
$result_trees{'nodes_before_top_split_chapter_no_nodes'}{'contents'}[6]{'contents'}[2]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'nodes_before_top_split_chapter_no_nodes'}{'contents'}[6]{'contents'}[2];
-$result_trees{'nodes_before_top_split_chapter_no_nodes'}{'contents'}[6]{'contents'}[3]{'extra'}{'entry_node'}
 = $result_trees{'nodes_before_top_split_chapter_no_nodes'}{'contents'}[6];
+$result_trees{'nodes_before_top_split_chapter_no_nodes'}{'contents'}[6]{'contents'}[3]{'extra'}{'element_node'}
 = $result_trees{'nodes_before_top_split_chapter_no_nodes'}{'contents'}[6];
 
$result_trees{'nodes_before_top_split_chapter_no_nodes'}{'contents'}[6]{'contents'}[3]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'nodes_before_top_split_chapter_no_nodes'}{'contents'}[6]{'contents'}[3];
 
$result_trees{'nodes_before_top_split_chapter_no_nodes'}{'contents'}[6]{'extra'}{'node_content'}[0]
 = 
$result_trees{'nodes_before_top_split_chapter_no_nodes'}{'contents'}[6]{'args'}[0]{'contents'}[0];
 
$result_trees{'nodes_before_top_split_chapter_no_nodes'}{'contents'}[6]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = 
$result_trees{'nodes_before_top_split_chapter_no_nodes'}{'contents'}[6]{'args'}[0]{'contents'}[0];
 
$result_trees{'nodes_before_top_split_chapter_no_nodes'}{'contents'}[6]{'extra'}{'nodes_manuals'}[2]{'node_content'}[0]
 = 
$result_trees{'nodes_before_top_split_chapter_no_nodes'}{'contents'}[6]{'args'}[2]{'contents'}[0];
 
$result_trees{'nodes_before_top_split_chapter_no_nodes'}{'contents'}[6]{'extra'}{'nodes_manuals'}[3]{'node_content'}[0]
 = 
$result_trees{'nodes_before_top_split_chapter_no_nodes'}{'contents'}[6]{'args'}[3]{'contents'}[0];
-$result_trees{'nodes_before_top_split_chapter_no_nodes'}{'contents'}[7]{'contents'}[0]{'extra'}{'entry_node'}
 = $result_trees{'nodes_before_top_split_chapter_no_nodes'}{'contents'}[7];
+$result_trees{'nodes_before_top_split_chapter_no_nodes'}{'contents'}[7]{'contents'}[0]{'extra'}{'element_node'}
 = $result_trees{'nodes_before_top_split_chapter_no_nodes'}{'contents'}[7];
 
$result_trees{'nodes_before_top_split_chapter_no_nodes'}{'contents'}[7]{'contents'}[0]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'nodes_before_top_split_chapter_no_nodes'}{'contents'}[7]{'contents'}[0];
-$result_trees{'nodes_before_top_split_chapter_no_nodes'}{'contents'}[7]{'contents'}[4]{'extra'}{'entry_node'}
 = $result_trees{'nodes_before_top_split_chapter_no_nodes'}{'contents'}[7];
+$result_trees{'nodes_before_top_split_chapter_no_nodes'}{'contents'}[7]{'contents'}[4]{'extra'}{'element_node'}
 = $result_trees{'nodes_before_top_split_chapter_no_nodes'}{'contents'}[7];
 
$result_trees{'nodes_before_top_split_chapter_no_nodes'}{'contents'}[7]{'contents'}[4]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'nodes_before_top_split_chapter_no_nodes'}{'contents'}[7]{'contents'}[4];
-$result_trees{'nodes_before_top_split_chapter_no_nodes'}{'contents'}[7]{'contents'}[5]{'extra'}{'entry_node'}
 = $result_trees{'nodes_before_top_split_chapter_no_nodes'}{'contents'}[7];
+$result_trees{'nodes_before_top_split_chapter_no_nodes'}{'contents'}[7]{'contents'}[5]{'extra'}{'element_node'}
 = $result_trees{'nodes_before_top_split_chapter_no_nodes'}{'contents'}[7];
 
$result_trees{'nodes_before_top_split_chapter_no_nodes'}{'contents'}[7]{'contents'}[5]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'nodes_before_top_split_chapter_no_nodes'}{'contents'}[7]{'contents'}[5];
 
$result_trees{'nodes_before_top_split_chapter_no_nodes'}{'contents'}[7]{'extra'}{'node_content'}[0]
 = 
$result_trees{'nodes_before_top_split_chapter_no_nodes'}{'contents'}[7]{'args'}[0]{'contents'}[0];
 
$result_trees{'nodes_before_top_split_chapter_no_nodes'}{'contents'}[7]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = 
$result_trees{'nodes_before_top_split_chapter_no_nodes'}{'contents'}[7]{'args'}[0]{'contents'}[0];
diff --git a/tp/t/results/indices/printindex_between_node_section.pl 
b/tp/t/results/indices/printindex_between_node_section.pl
index 16b9544ffb..1e7fd0356a 100644
--- a/tp/t/results/indices/printindex_between_node_section.pl
+++ b/tp/t/results/indices/printindex_between_node_section.pl
@@ -102,7 +102,7 @@ $result_trees{'printindex_between_node_section'} = {
           ],
           'cmdname' => 'cindex',
           'extra' => {
-            'entry_node' => {},
+            'element_node' => {},
             'index_entry' => {
               'entry_element' => {},
               'entry_number' => 1,
@@ -141,7 +141,7 @@ $result_trees{'printindex_between_node_section'} = {
           ],
           'cmdname' => 'cindex',
           'extra' => {
-            'entry_node' => {},
+            'element_node' => {},
             'index_entry' => {
               'entry_element' => {},
               'entry_number' => 2,
@@ -180,7 +180,7 @@ $result_trees{'printindex_between_node_section'} = {
           ],
           'cmdname' => 'cindex',
           'extra' => {
-            'entry_node' => {},
+            'element_node' => {},
             'index_entry' => {
               'entry_element' => {},
               'entry_number' => 3,
@@ -219,7 +219,7 @@ $result_trees{'printindex_between_node_section'} = {
           ],
           'cmdname' => 'cindex',
           'extra' => {
-            'entry_node' => {},
+            'element_node' => {},
             'index_entry' => {
               'entry_element' => {},
               'entry_number' => 4,
@@ -343,7 +343,7 @@ $result_trees{'printindex_between_node_section'} = {
           ],
           'cmdname' => 'cindex',
           'extra' => {
-            'entry_node' => {},
+            'element_node' => {},
             'index_entry' => {
               'entry_element' => {},
               'entry_number' => 5,
@@ -382,7 +382,7 @@ $result_trees{'printindex_between_node_section'} = {
           ],
           'cmdname' => 'cindex',
           'extra' => {
-            'entry_node' => {},
+            'element_node' => {},
             'index_entry' => {
               'entry_element' => {},
               'entry_number' => 6,
@@ -535,19 +535,19 @@ $result_trees{'printindex_between_node_section'} = {
 };
 
$result_trees{'printindex_between_node_section'}{'contents'}[1]{'extra'}{'node_content'}[0]
 = 
$result_trees{'printindex_between_node_section'}{'contents'}[1]{'args'}[0]{'contents'}[0];
 
$result_trees{'printindex_between_node_section'}{'contents'}[1]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = 
$result_trees{'printindex_between_node_section'}{'contents'}[1]{'args'}[0]{'contents'}[0];
-$result_trees{'printindex_between_node_section'}{'contents'}[2]{'contents'}[1]{'extra'}{'entry_node'}
 = $result_trees{'printindex_between_node_section'}{'contents'}[1];
+$result_trees{'printindex_between_node_section'}{'contents'}[2]{'contents'}[1]{'extra'}{'element_node'}
 = $result_trees{'printindex_between_node_section'}{'contents'}[1];
 
$result_trees{'printindex_between_node_section'}{'contents'}[2]{'contents'}[1]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'printindex_between_node_section'}{'contents'}[2]{'contents'}[1];
-$result_trees{'printindex_between_node_section'}{'contents'}[2]{'contents'}[2]{'extra'}{'entry_node'}
 = $result_trees{'printindex_between_node_section'}{'contents'}[1];
+$result_trees{'printindex_between_node_section'}{'contents'}[2]{'contents'}[2]{'extra'}{'element_node'}
 = $result_trees{'printindex_between_node_section'}{'contents'}[1];
 
$result_trees{'printindex_between_node_section'}{'contents'}[2]{'contents'}[2]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'printindex_between_node_section'}{'contents'}[2]{'contents'}[2];
-$result_trees{'printindex_between_node_section'}{'contents'}[2]{'contents'}[3]{'extra'}{'entry_node'}
 = $result_trees{'printindex_between_node_section'}{'contents'}[1];
+$result_trees{'printindex_between_node_section'}{'contents'}[2]{'contents'}[3]{'extra'}{'element_node'}
 = $result_trees{'printindex_between_node_section'}{'contents'}[1];
 
$result_trees{'printindex_between_node_section'}{'contents'}[2]{'contents'}[3]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'printindex_between_node_section'}{'contents'}[2]{'contents'}[3];
-$result_trees{'printindex_between_node_section'}{'contents'}[2]{'contents'}[4]{'extra'}{'entry_node'}
 = $result_trees{'printindex_between_node_section'}{'contents'}[1];
+$result_trees{'printindex_between_node_section'}{'contents'}[2]{'contents'}[4]{'extra'}{'element_node'}
 = $result_trees{'printindex_between_node_section'}{'contents'}[1];
 
$result_trees{'printindex_between_node_section'}{'contents'}[2]{'contents'}[4]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'printindex_between_node_section'}{'contents'}[2]{'contents'}[4];
 
$result_trees{'printindex_between_node_section'}{'contents'}[3]{'extra'}{'node_content'}[0]
 = 
$result_trees{'printindex_between_node_section'}{'contents'}[3]{'args'}[0]{'contents'}[0];
 
$result_trees{'printindex_between_node_section'}{'contents'}[3]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = 
$result_trees{'printindex_between_node_section'}{'contents'}[3]{'args'}[0]{'contents'}[0];
-$result_trees{'printindex_between_node_section'}{'contents'}[4]{'contents'}[1]{'extra'}{'entry_node'}
 = $result_trees{'printindex_between_node_section'}{'contents'}[3];
+$result_trees{'printindex_between_node_section'}{'contents'}[4]{'contents'}[1]{'extra'}{'element_node'}
 = $result_trees{'printindex_between_node_section'}{'contents'}[3];
 
$result_trees{'printindex_between_node_section'}{'contents'}[4]{'contents'}[1]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'printindex_between_node_section'}{'contents'}[4]{'contents'}[1];
-$result_trees{'printindex_between_node_section'}{'contents'}[4]{'contents'}[2]{'extra'}{'entry_node'}
 = $result_trees{'printindex_between_node_section'}{'contents'}[3];
+$result_trees{'printindex_between_node_section'}{'contents'}[4]{'contents'}[2]{'extra'}{'element_node'}
 = $result_trees{'printindex_between_node_section'}{'contents'}[3];
 
$result_trees{'printindex_between_node_section'}{'contents'}[4]{'contents'}[2]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'printindex_between_node_section'}{'contents'}[4]{'contents'}[2];
 
$result_trees{'printindex_between_node_section'}{'contents'}[5]{'extra'}{'node_content'}[0]
 = 
$result_trees{'printindex_between_node_section'}{'contents'}[5]{'args'}[0]{'contents'}[0];
 
$result_trees{'printindex_between_node_section'}{'contents'}[5]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = 
$result_trees{'printindex_between_node_section'}{'contents'}[5]{'args'}[0]{'contents'}[0];
diff --git a/tp/t/results/indices/printindex_between_part_chapter.pl 
b/tp/t/results/indices/printindex_between_part_chapter.pl
index 56dff73dcb..8e7c67a7e4 100644
--- a/tp/t/results/indices/printindex_between_part_chapter.pl
+++ b/tp/t/results/indices/printindex_between_part_chapter.pl
@@ -103,7 +103,7 @@ $result_trees{'printindex_between_part_chapter'} = {
           ],
           'cmdname' => 'cindex',
           'extra' => {
-            'entry_node' => {},
+            'element_node' => {},
             'index_entry' => {
               'entry_element' => {},
               'entry_number' => 1,
@@ -142,7 +142,7 @@ $result_trees{'printindex_between_part_chapter'} = {
           ],
           'cmdname' => 'cindex',
           'extra' => {
-            'entry_node' => {},
+            'element_node' => {},
             'index_entry' => {
               'entry_element' => {},
               'entry_number' => 2,
@@ -181,7 +181,7 @@ $result_trees{'printindex_between_part_chapter'} = {
           ],
           'cmdname' => 'cindex',
           'extra' => {
-            'entry_node' => {},
+            'element_node' => {},
             'index_entry' => {
               'entry_element' => {},
               'entry_number' => 3,
@@ -220,7 +220,7 @@ $result_trees{'printindex_between_part_chapter'} = {
           ],
           'cmdname' => 'cindex',
           'extra' => {
-            'entry_node' => {},
+            'element_node' => {},
             'index_entry' => {
               'entry_element' => {},
               'entry_number' => 4,
@@ -502,7 +502,7 @@ $result_trees{'printindex_between_part_chapter'} = {
           ],
           'cmdname' => 'cindex',
           'extra' => {
-            'entry_node' => {},
+            'element_node' => {},
             'index_entry' => {
               'entry_element' => {},
               'entry_number' => 5,
@@ -541,7 +541,7 @@ $result_trees{'printindex_between_part_chapter'} = {
           ],
           'cmdname' => 'cindex',
           'extra' => {
-            'entry_node' => {},
+            'element_node' => {},
             'index_entry' => {
               'entry_element' => {},
               'entry_number' => 6,
@@ -584,22 +584,22 @@ $result_trees{'printindex_between_part_chapter'} = {
 };
 
$result_trees{'printindex_between_part_chapter'}{'contents'}[1]{'extra'}{'node_content'}[0]
 = 
$result_trees{'printindex_between_part_chapter'}{'contents'}[1]{'args'}[0]{'contents'}[0];
 
$result_trees{'printindex_between_part_chapter'}{'contents'}[1]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = 
$result_trees{'printindex_between_part_chapter'}{'contents'}[1]{'args'}[0]{'contents'}[0];
-$result_trees{'printindex_between_part_chapter'}{'contents'}[2]{'contents'}[1]{'extra'}{'entry_node'}
 = $result_trees{'printindex_between_part_chapter'}{'contents'}[1];
+$result_trees{'printindex_between_part_chapter'}{'contents'}[2]{'contents'}[1]{'extra'}{'element_node'}
 = $result_trees{'printindex_between_part_chapter'}{'contents'}[1];
 
$result_trees{'printindex_between_part_chapter'}{'contents'}[2]{'contents'}[1]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'printindex_between_part_chapter'}{'contents'}[2]{'contents'}[1];
-$result_trees{'printindex_between_part_chapter'}{'contents'}[2]{'contents'}[2]{'extra'}{'entry_node'}
 = $result_trees{'printindex_between_part_chapter'}{'contents'}[1];
+$result_trees{'printindex_between_part_chapter'}{'contents'}[2]{'contents'}[2]{'extra'}{'element_node'}
 = $result_trees{'printindex_between_part_chapter'}{'contents'}[1];
 
$result_trees{'printindex_between_part_chapter'}{'contents'}[2]{'contents'}[2]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'printindex_between_part_chapter'}{'contents'}[2]{'contents'}[2];
-$result_trees{'printindex_between_part_chapter'}{'contents'}[2]{'contents'}[3]{'extra'}{'entry_node'}
 = $result_trees{'printindex_between_part_chapter'}{'contents'}[1];
+$result_trees{'printindex_between_part_chapter'}{'contents'}[2]{'contents'}[3]{'extra'}{'element_node'}
 = $result_trees{'printindex_between_part_chapter'}{'contents'}[1];
 
$result_trees{'printindex_between_part_chapter'}{'contents'}[2]{'contents'}[3]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'printindex_between_part_chapter'}{'contents'}[2]{'contents'}[3];
-$result_trees{'printindex_between_part_chapter'}{'contents'}[2]{'contents'}[4]{'extra'}{'entry_node'}
 = $result_trees{'printindex_between_part_chapter'}{'contents'}[1];
+$result_trees{'printindex_between_part_chapter'}{'contents'}[2]{'contents'}[4]{'extra'}{'element_node'}
 = $result_trees{'printindex_between_part_chapter'}{'contents'}[1];
 
$result_trees{'printindex_between_part_chapter'}{'contents'}[2]{'contents'}[4]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'printindex_between_part_chapter'}{'contents'}[2]{'contents'}[4];
 
$result_trees{'printindex_between_part_chapter'}{'contents'}[4]{'extra'}{'node_content'}[0]
 = 
$result_trees{'printindex_between_part_chapter'}{'contents'}[4]{'args'}[0]{'contents'}[0];
 
$result_trees{'printindex_between_part_chapter'}{'contents'}[4]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = 
$result_trees{'printindex_between_part_chapter'}{'contents'}[4]{'args'}[0]{'contents'}[0];
 
$result_trees{'printindex_between_part_chapter'}{'contents'}[5]{'extra'}{'associated_part'}
 = $result_trees{'printindex_between_part_chapter'}{'contents'}[3];
 
$result_trees{'printindex_between_part_chapter'}{'contents'}[6]{'extra'}{'node_content'}[0]
 = 
$result_trees{'printindex_between_part_chapter'}{'contents'}[6]{'args'}[0]{'contents'}[0];
 
$result_trees{'printindex_between_part_chapter'}{'contents'}[6]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = 
$result_trees{'printindex_between_part_chapter'}{'contents'}[6]{'args'}[0]{'contents'}[0];
-$result_trees{'printindex_between_part_chapter'}{'contents'}[7]{'contents'}[1]{'extra'}{'entry_node'}
 = $result_trees{'printindex_between_part_chapter'}{'contents'}[6];
+$result_trees{'printindex_between_part_chapter'}{'contents'}[7]{'contents'}[1]{'extra'}{'element_node'}
 = $result_trees{'printindex_between_part_chapter'}{'contents'}[6];
 
$result_trees{'printindex_between_part_chapter'}{'contents'}[7]{'contents'}[1]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'printindex_between_part_chapter'}{'contents'}[7]{'contents'}[1];
-$result_trees{'printindex_between_part_chapter'}{'contents'}[7]{'contents'}[2]{'extra'}{'entry_node'}
 = $result_trees{'printindex_between_part_chapter'}{'contents'}[6];
+$result_trees{'printindex_between_part_chapter'}{'contents'}[7]{'contents'}[2]{'extra'}{'element_node'}
 = $result_trees{'printindex_between_part_chapter'}{'contents'}[6];
 
$result_trees{'printindex_between_part_chapter'}{'contents'}[7]{'contents'}[2]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'printindex_between_part_chapter'}{'contents'}[7]{'contents'}[2];
 
 $result_texis{'printindex_between_part_chapter'} = '@node Top
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 f9872324e8..2f3fae4156 100644
--- a/tp/t/results/indices/printindex_index_entry_in_copying.pl
+++ b/tp/t/results/indices/printindex_index_entry_in_copying.pl
@@ -49,7 +49,7 @@ $result_trees{'printindex_index_entry_in_copying'} = {
                   ],
                   'cmdname' => 'findex',
                   'extra' => {
-                    'entry_region' => 'copying',
+                    'element_region' => 'copying',
                     'index_entry' => {
                       'entry_element' => {},
                       'entry_number' => 1,
@@ -135,7 +135,7 @@ $result_trees{'printindex_index_entry_in_copying'} = {
                           'category' => {},
                           'name' => {}
                         },
-                        'entry_region' => 'copying',
+                        'element_region' => 'copying',
                         'index_entry' => {
                           'entry_element' => {},
                           'entry_number' => 2,
@@ -210,7 +210,7 @@ $result_trees{'printindex_index_entry_in_copying'} = {
                           'category' => {},
                           'name' => {}
                         },
-                        'entry_region' => 'copying',
+                        'element_region' => 'copying',
                         'index_entry' => {
                           'entry_element' => {},
                           'entry_number' => 3,
@@ -342,7 +342,7 @@ $result_trees{'printindex_index_entry_in_copying'} = {
                               ],
                               'cmdname' => 'item',
                               'extra' => {
-                                'entry_region' => 'copying',
+                                'element_region' => 'copying',
                                 'index_entry' => {
                                   'entry_element' => {},
                                   'entry_number' => 4,
@@ -380,7 +380,7 @@ $result_trees{'printindex_index_entry_in_copying'} = {
                               ],
                               'cmdname' => 'itemx',
                               'extra' => {
-                                'entry_region' => 'copying',
+                                'element_region' => 'copying',
                                 'index_entry' => {
                                   'entry_element' => {},
                                   'entry_number' => 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 31f38e967d..1e2f66f9be 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
@@ -64,7 +64,7 @@ 
$result_trees{'printindex_index_entry_in_copying_in_footnote'} = {
                                   ],
                                   'cmdname' => 'cindex',
                                   'extra' => {
-                                    'entry_region' => 'copying',
+                                    'element_region' => 'copying',
                                     'index_entry' => {
                                       'entry_element' => {},
                                       'entry_number' => 1,
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 4935d40f24..38f31557ef 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
@@ -49,7 +49,7 @@ 
$result_trees{'printindex_index_entry_in_copying_no_insertcopying'} = {
                   ],
                   'cmdname' => 'findex',
                   'extra' => {
-                    'entry_region' => 'copying',
+                    'element_region' => 'copying',
                     'index_entry' => {
                       'entry_element' => {},
                       'entry_number' => 1,
@@ -135,7 +135,7 @@ 
$result_trees{'printindex_index_entry_in_copying_no_insertcopying'} = {
                           'category' => {},
                           'name' => {}
                         },
-                        'entry_region' => 'copying',
+                        'element_region' => 'copying',
                         'index_entry' => {
                           'entry_element' => {},
                           'entry_number' => 2,
@@ -210,7 +210,7 @@ 
$result_trees{'printindex_index_entry_in_copying_no_insertcopying'} = {
                           'category' => {},
                           'name' => {}
                         },
-                        'entry_region' => 'copying',
+                        'element_region' => 'copying',
                         'index_entry' => {
                           'entry_element' => {},
                           'entry_number' => 3,
@@ -342,7 +342,7 @@ 
$result_trees{'printindex_index_entry_in_copying_no_insertcopying'} = {
                               ],
                               'cmdname' => 'item',
                               'extra' => {
-                                'entry_region' => 'copying',
+                                'element_region' => 'copying',
                                 'index_entry' => {
                                   'entry_element' => {},
                                   'entry_number' => 4,
@@ -380,7 +380,7 @@ 
$result_trees{'printindex_index_entry_in_copying_no_insertcopying'} = {
                               ],
                               'cmdname' => 'itemx',
                               'extra' => {
-                                'entry_region' => 'copying',
+                                'element_region' => 'copying',
                                 'index_entry' => {
                                   'entry_element' => {},
                                   'entry_number' => 5,
diff --git a/tp/t/results/indices/printindex_with_space_before.pl 
b/tp/t/results/indices/printindex_with_space_before.pl
index 239b864b28..ffd8a43fdf 100644
Binary files a/tp/t/results/indices/printindex_with_space_before.pl and 
b/tp/t/results/indices/printindex_with_space_before.pl differ
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 a05f33dcb8..9ce42d5376 100644
--- a/tp/t/results/indices/same_index_entry_merged_indices.pl
+++ b/tp/t/results/indices/same_index_entry_merged_indices.pl
@@ -280,7 +280,7 @@ $result_trees{'same_index_entry_merged_indices'} = {
                   'category' => {},
                   'name' => {}
                 },
-                'entry_node' => {},
+                'element_node' => {},
                 'index_entry' => {
                   'entry_element' => {},
                   'entry_number' => 1,
@@ -407,7 +407,7 @@ $result_trees{'same_index_entry_merged_indices'} = {
                   'category' => {},
                   'name' => {}
                 },
-                'entry_node' => {},
+                'element_node' => {},
                 'index_entry' => {
                   'entry_element' => {},
                   'entry_number' => 1,
@@ -543,12 +543,12 @@ 
$result_trees{'same_index_entry_merged_indices'}{'contents'}[3]{'extra'}{'nodes_
 
$result_trees{'same_index_entry_merged_indices'}{'contents'}[4]{'contents'}[3]{'contents'}[0]{'extra'}{'def_index_element'}
 = 
$result_trees{'same_index_entry_merged_indices'}{'contents'}[4]{'contents'}[3]{'contents'}[0]{'args'}[0]{'contents'}[2];
 
$result_trees{'same_index_entry_merged_indices'}{'contents'}[4]{'contents'}[3]{'contents'}[0]{'extra'}{'def_parsed_hash'}{'category'}
 = 
$result_trees{'same_index_entry_merged_indices'}{'contents'}[4]{'contents'}[3]{'contents'}[0]{'args'}[0]{'contents'}[0];
 
$result_trees{'same_index_entry_merged_indices'}{'contents'}[4]{'contents'}[3]{'contents'}[0]{'extra'}{'def_parsed_hash'}{'name'}
 = 
$result_trees{'same_index_entry_merged_indices'}{'contents'}[4]{'contents'}[3]{'contents'}[0]{'args'}[0]{'contents'}[2];
-$result_trees{'same_index_entry_merged_indices'}{'contents'}[4]{'contents'}[3]{'contents'}[0]{'extra'}{'entry_node'}
 = $result_trees{'same_index_entry_merged_indices'}{'contents'}[3];
+$result_trees{'same_index_entry_merged_indices'}{'contents'}[4]{'contents'}[3]{'contents'}[0]{'extra'}{'element_node'}
 = $result_trees{'same_index_entry_merged_indices'}{'contents'}[3];
 
$result_trees{'same_index_entry_merged_indices'}{'contents'}[4]{'contents'}[3]{'contents'}[0]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'same_index_entry_merged_indices'}{'contents'}[4]{'contents'}[3]{'contents'}[0];
 
$result_trees{'same_index_entry_merged_indices'}{'contents'}[4]{'contents'}[5]{'contents'}[0]{'extra'}{'def_index_element'}
 = 
$result_trees{'same_index_entry_merged_indices'}{'contents'}[4]{'contents'}[5]{'contents'}[0]{'args'}[0]{'contents'}[2];
 
$result_trees{'same_index_entry_merged_indices'}{'contents'}[4]{'contents'}[5]{'contents'}[0]{'extra'}{'def_parsed_hash'}{'category'}
 = 
$result_trees{'same_index_entry_merged_indices'}{'contents'}[4]{'contents'}[5]{'contents'}[0]{'args'}[0]{'contents'}[0];
 
$result_trees{'same_index_entry_merged_indices'}{'contents'}[4]{'contents'}[5]{'contents'}[0]{'extra'}{'def_parsed_hash'}{'name'}
 = 
$result_trees{'same_index_entry_merged_indices'}{'contents'}[4]{'contents'}[5]{'contents'}[0]{'args'}[0]{'contents'}[2];
-$result_trees{'same_index_entry_merged_indices'}{'contents'}[4]{'contents'}[5]{'contents'}[0]{'extra'}{'entry_node'}
 = $result_trees{'same_index_entry_merged_indices'}{'contents'}[3];
+$result_trees{'same_index_entry_merged_indices'}{'contents'}[4]{'contents'}[5]{'contents'}[0]{'extra'}{'element_node'}
 = $result_trees{'same_index_entry_merged_indices'}{'contents'}[3];
 
$result_trees{'same_index_entry_merged_indices'}{'contents'}[4]{'contents'}[5]{'contents'}[0]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'same_index_entry_merged_indices'}{'contents'}[4]{'contents'}[5]{'contents'}[0];
 
 $result_texis{'same_index_entry_merged_indices'} = '@syncodeindex vr fn
diff --git a/tp/t/results/indices/same_only_seealso_seeentry.pl 
b/tp/t/results/indices/same_only_seealso_seeentry.pl
index e729b0db55..6ab9513b86 100644
--- a/tp/t/results/indices/same_only_seealso_seeentry.pl
+++ b/tp/t/results/indices/same_only_seealso_seeentry.pl
@@ -205,7 +205,7 @@ $result_trees{'same_only_seealso_seeentry'} = {
           ],
           'cmdname' => 'cindex',
           'extra' => {
-            'entry_node' => {},
+            'element_node' => {},
             'index_entry' => {
               'entry_element' => {},
               'entry_number' => 1,
@@ -267,7 +267,7 @@ $result_trees{'same_only_seealso_seeentry'} = {
           ],
           'cmdname' => 'cindex',
           'extra' => {
-            'entry_node' => {},
+            'element_node' => {},
             'index_entry' => {
               'entry_element' => {},
               'entry_number' => 2,
@@ -334,7 +334,7 @@ $result_trees{'same_only_seealso_seeentry'} = {
           ],
           'cmdname' => 'cindex',
           'extra' => {
-            'entry_node' => {},
+            'element_node' => {},
             'index_entry' => {
               'entry_element' => {},
               'entry_number' => 3,
@@ -396,7 +396,7 @@ $result_trees{'same_only_seealso_seeentry'} = {
           ],
           'cmdname' => 'cindex',
           'extra' => {
-            'entry_node' => {},
+            'element_node' => {},
             'index_entry' => {
               'entry_element' => {},
               'entry_number' => 4,
@@ -463,7 +463,7 @@ $result_trees{'same_only_seealso_seeentry'} = {
           ],
           'cmdname' => 'cindex',
           'extra' => {
-            'entry_node' => {},
+            'element_node' => {},
             'index_entry' => {
               'entry_element' => {},
               'entry_number' => 5,
@@ -525,7 +525,7 @@ $result_trees{'same_only_seealso_seeentry'} = {
           ],
           'cmdname' => 'cindex',
           'extra' => {
-            'entry_node' => {},
+            'element_node' => {},
             'index_entry' => {
               'entry_element' => {},
               'entry_number' => 6,
@@ -605,22 +605,22 @@ 
$result_trees{'same_only_seealso_seeentry'}{'contents'}[1]{'extra'}{'node_conten
 
$result_trees{'same_only_seealso_seeentry'}{'contents'}[1]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = 
$result_trees{'same_only_seealso_seeentry'}{'contents'}[1]{'args'}[0]{'contents'}[0];
 
$result_trees{'same_only_seealso_seeentry'}{'contents'}[3]{'extra'}{'node_content'}[0]
 = 
$result_trees{'same_only_seealso_seeentry'}{'contents'}[3]{'args'}[0]{'contents'}[0];
 
$result_trees{'same_only_seealso_seeentry'}{'contents'}[3]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = 
$result_trees{'same_only_seealso_seeentry'}{'contents'}[3]{'args'}[0]{'contents'}[0];
-$result_trees{'same_only_seealso_seeentry'}{'contents'}[4]{'contents'}[1]{'extra'}{'entry_node'}
 = $result_trees{'same_only_seealso_seeentry'}{'contents'}[3];
+$result_trees{'same_only_seealso_seeentry'}{'contents'}[4]{'contents'}[1]{'extra'}{'element_node'}
 = $result_trees{'same_only_seealso_seeentry'}{'contents'}[3];
 
$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'}{'seealso'}
 = 
$result_trees{'same_only_seealso_seeentry'}{'contents'}[4]{'contents'}[1]{'args'}[0]{'contents'}[2];
-$result_trees{'same_only_seealso_seeentry'}{'contents'}[4]{'contents'}[2]{'extra'}{'entry_node'}
 = $result_trees{'same_only_seealso_seeentry'}{'contents'}[3];
+$result_trees{'same_only_seealso_seeentry'}{'contents'}[4]{'contents'}[2]{'extra'}{'element_node'}
 = $result_trees{'same_only_seealso_seeentry'}{'contents'}[3];
 
$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'}{'seealso'}
 = 
$result_trees{'same_only_seealso_seeentry'}{'contents'}[4]{'contents'}[2]{'args'}[0]{'contents'}[2];
-$result_trees{'same_only_seealso_seeentry'}{'contents'}[4]{'contents'}[4]{'extra'}{'entry_node'}
 = $result_trees{'same_only_seealso_seeentry'}{'contents'}[3];
+$result_trees{'same_only_seealso_seeentry'}{'contents'}[4]{'contents'}[4]{'extra'}{'element_node'}
 = $result_trees{'same_only_seealso_seeentry'}{'contents'}[3];
 
$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'}{'seeentry'}
 = 
$result_trees{'same_only_seealso_seeentry'}{'contents'}[4]{'contents'}[4]{'args'}[0]{'contents'}[2];
-$result_trees{'same_only_seealso_seeentry'}{'contents'}[4]{'contents'}[5]{'extra'}{'entry_node'}
 = $result_trees{'same_only_seealso_seeentry'}{'contents'}[3];
+$result_trees{'same_only_seealso_seeentry'}{'contents'}[4]{'contents'}[5]{'extra'}{'element_node'}
 = $result_trees{'same_only_seealso_seeentry'}{'contents'}[3];
 
$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'}{'seeentry'}
 = 
$result_trees{'same_only_seealso_seeentry'}{'contents'}[4]{'contents'}[5]{'args'}[0]{'contents'}[2];
-$result_trees{'same_only_seealso_seeentry'}{'contents'}[4]{'contents'}[7]{'extra'}{'entry_node'}
 = $result_trees{'same_only_seealso_seeentry'}{'contents'}[3];
+$result_trees{'same_only_seealso_seeentry'}{'contents'}[4]{'contents'}[7]{'extra'}{'element_node'}
 = $result_trees{'same_only_seealso_seeentry'}{'contents'}[3];
 
$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'}{'seealso'}
 = 
$result_trees{'same_only_seealso_seeentry'}{'contents'}[4]{'contents'}[7]{'args'}[0]{'contents'}[2];
-$result_trees{'same_only_seealso_seeentry'}{'contents'}[4]{'contents'}[8]{'extra'}{'entry_node'}
 = $result_trees{'same_only_seealso_seeentry'}{'contents'}[3];
+$result_trees{'same_only_seealso_seeentry'}{'contents'}[4]{'contents'}[8]{'extra'}{'element_node'}
 = $result_trees{'same_only_seealso_seeentry'}{'contents'}[3];
 
$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'}{'seeentry'}
 = 
$result_trees{'same_only_seealso_seeentry'}{'contents'}[4]{'contents'}[8]{'args'}[0]{'contents'}[2];
 
diff --git a/tp/t/results/indices/same_seealso_seeentry.pl 
b/tp/t/results/indices/same_seealso_seeentry.pl
index 6410ad1b70..88d1b2fd10 100644
--- a/tp/t/results/indices/same_seealso_seeentry.pl
+++ b/tp/t/results/indices/same_seealso_seeentry.pl
@@ -205,7 +205,7 @@ $result_trees{'same_seealso_seeentry'} = {
           ],
           'cmdname' => 'cindex',
           'extra' => {
-            'entry_node' => {},
+            'element_node' => {},
             'index_entry' => {
               'entry_element' => {},
               'entry_number' => 1,
@@ -267,7 +267,7 @@ $result_trees{'same_seealso_seeentry'} = {
           ],
           'cmdname' => 'cindex',
           'extra' => {
-            'entry_node' => {},
+            'element_node' => {},
             'index_entry' => {
               'entry_element' => {},
               'entry_number' => 2,
@@ -334,7 +334,7 @@ $result_trees{'same_seealso_seeentry'} = {
           ],
           'cmdname' => 'cindex',
           'extra' => {
-            'entry_node' => {},
+            'element_node' => {},
             'index_entry' => {
               'entry_element' => {},
               'entry_number' => 3,
@@ -396,7 +396,7 @@ $result_trees{'same_seealso_seeentry'} = {
           ],
           'cmdname' => 'cindex',
           'extra' => {
-            'entry_node' => {},
+            'element_node' => {},
             'index_entry' => {
               'entry_element' => {},
               'entry_number' => 4,
@@ -463,7 +463,7 @@ $result_trees{'same_seealso_seeentry'} = {
           ],
           'cmdname' => 'cindex',
           'extra' => {
-            'entry_node' => {},
+            'element_node' => {},
             'index_entry' => {
               'entry_element' => {},
               'entry_number' => 5,
@@ -525,7 +525,7 @@ $result_trees{'same_seealso_seeentry'} = {
           ],
           'cmdname' => 'cindex',
           'extra' => {
-            'entry_node' => {},
+            'element_node' => {},
             'index_entry' => {
               'entry_element' => {},
               'entry_number' => 6,
@@ -570,7 +570,7 @@ $result_trees{'same_seealso_seeentry'} = {
           ],
           'cmdname' => 'cindex',
           'extra' => {
-            'entry_node' => {},
+            'element_node' => {},
             'index_entry' => {
               'entry_element' => {},
               'entry_number' => 7,
@@ -649,25 +649,25 @@ 
$result_trees{'same_seealso_seeentry'}{'contents'}[1]{'extra'}{'node_content'}[0
 
$result_trees{'same_seealso_seeentry'}{'contents'}[1]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = 
$result_trees{'same_seealso_seeentry'}{'contents'}[1]{'args'}[0]{'contents'}[0];
 
$result_trees{'same_seealso_seeentry'}{'contents'}[3]{'extra'}{'node_content'}[0]
 = 
$result_trees{'same_seealso_seeentry'}{'contents'}[3]{'args'}[0]{'contents'}[0];
 
$result_trees{'same_seealso_seeentry'}{'contents'}[3]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = 
$result_trees{'same_seealso_seeentry'}{'contents'}[3]{'args'}[0]{'contents'}[0];
-$result_trees{'same_seealso_seeentry'}{'contents'}[4]{'contents'}[1]{'extra'}{'entry_node'}
 = $result_trees{'same_seealso_seeentry'}{'contents'}[3];
+$result_trees{'same_seealso_seeentry'}{'contents'}[4]{'contents'}[1]{'extra'}{'element_node'}
 = $result_trees{'same_seealso_seeentry'}{'contents'}[3];
 
$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'}{'seealso'}
 = 
$result_trees{'same_seealso_seeentry'}{'contents'}[4]{'contents'}[1]{'args'}[0]{'contents'}[2];
-$result_trees{'same_seealso_seeentry'}{'contents'}[4]{'contents'}[2]{'extra'}{'entry_node'}
 = $result_trees{'same_seealso_seeentry'}{'contents'}[3];
+$result_trees{'same_seealso_seeentry'}{'contents'}[4]{'contents'}[2]{'extra'}{'element_node'}
 = $result_trees{'same_seealso_seeentry'}{'contents'}[3];
 
$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'}{'seealso'}
 = 
$result_trees{'same_seealso_seeentry'}{'contents'}[4]{'contents'}[2]{'args'}[0]{'contents'}[2];
-$result_trees{'same_seealso_seeentry'}{'contents'}[4]{'contents'}[4]{'extra'}{'entry_node'}
 = $result_trees{'same_seealso_seeentry'}{'contents'}[3];
+$result_trees{'same_seealso_seeentry'}{'contents'}[4]{'contents'}[4]{'extra'}{'element_node'}
 = $result_trees{'same_seealso_seeentry'}{'contents'}[3];
 
$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'}{'seeentry'}
 = 
$result_trees{'same_seealso_seeentry'}{'contents'}[4]{'contents'}[4]{'args'}[0]{'contents'}[2];
-$result_trees{'same_seealso_seeentry'}{'contents'}[4]{'contents'}[5]{'extra'}{'entry_node'}
 = $result_trees{'same_seealso_seeentry'}{'contents'}[3];
+$result_trees{'same_seealso_seeentry'}{'contents'}[4]{'contents'}[5]{'extra'}{'element_node'}
 = $result_trees{'same_seealso_seeentry'}{'contents'}[3];
 
$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'}{'seeentry'}
 = 
$result_trees{'same_seealso_seeentry'}{'contents'}[4]{'contents'}[5]{'args'}[0]{'contents'}[2];
-$result_trees{'same_seealso_seeentry'}{'contents'}[4]{'contents'}[7]{'extra'}{'entry_node'}
 = $result_trees{'same_seealso_seeentry'}{'contents'}[3];
+$result_trees{'same_seealso_seeentry'}{'contents'}[4]{'contents'}[7]{'extra'}{'element_node'}
 = $result_trees{'same_seealso_seeentry'}{'contents'}[3];
 
$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'}{'seealso'}
 = 
$result_trees{'same_seealso_seeentry'}{'contents'}[4]{'contents'}[7]{'args'}[0]{'contents'}[2];
-$result_trees{'same_seealso_seeentry'}{'contents'}[4]{'contents'}[8]{'extra'}{'entry_node'}
 = $result_trees{'same_seealso_seeentry'}{'contents'}[3];
+$result_trees{'same_seealso_seeentry'}{'contents'}[4]{'contents'}[8]{'extra'}{'element_node'}
 = $result_trees{'same_seealso_seeentry'}{'contents'}[3];
 
$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'}{'seeentry'}
 = 
$result_trees{'same_seealso_seeentry'}{'contents'}[4]{'contents'}[8]{'args'}[0]{'contents'}[2];
-$result_trees{'same_seealso_seeentry'}{'contents'}[4]{'contents'}[10]{'extra'}{'entry_node'}
 = $result_trees{'same_seealso_seeentry'}{'contents'}[3];
+$result_trees{'same_seealso_seeentry'}{'contents'}[4]{'contents'}[10]{'extra'}{'element_node'}
 = $result_trees{'same_seealso_seeentry'}{'contents'}[3];
 
$result_trees{'same_seealso_seeentry'}{'contents'}[4]{'contents'}[10]{'extra'}{'index_entry'}{'entry_element'}
 = $result_trees{'same_seealso_seeentry'}{'contents'}[4]{'contents'}[10];
 
 $result_texis{'same_seealso_seeentry'} = '@node Top
diff --git a/tp/t/results/indices/seealso_duplicate.pl 
b/tp/t/results/indices/seealso_duplicate.pl
index aa5db0de26..8ce4e00dac 100644
--- a/tp/t/results/indices/seealso_duplicate.pl
+++ b/tp/t/results/indices/seealso_duplicate.pl
@@ -116,7 +116,7 @@ $result_trees{'seealso_duplicate'} = {
           ],
           'cmdname' => 'cindex',
           'extra' => {
-            'entry_node' => {},
+            'element_node' => {},
             'index_entry' => {
               'entry_element' => {},
               'entry_number' => 1,
@@ -202,7 +202,7 @@ $result_trees{'seealso_duplicate'} = {
           ],
           'cmdname' => 'cindex',
           'extra' => {
-            'entry_node' => {},
+            'element_node' => {},
             'index_entry' => {
               'entry_element' => {},
               'entry_number' => 2,
@@ -367,10 +367,10 @@ $result_trees{'seealso_duplicate'} = {
 };
 $result_trees{'seealso_duplicate'}{'contents'}[1]{'extra'}{'node_content'}[0] 
= $result_trees{'seealso_duplicate'}{'contents'}[1]{'args'}[0]{'contents'}[0];
 
$result_trees{'seealso_duplicate'}{'contents'}[1]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = $result_trees{'seealso_duplicate'}{'contents'}[1]{'args'}[0]{'contents'}[0];
-$result_trees{'seealso_duplicate'}{'contents'}[2]{'contents'}[1]{'extra'}{'entry_node'}
 = $result_trees{'seealso_duplicate'}{'contents'}[2];
+$result_trees{'seealso_duplicate'}{'contents'}[2]{'contents'}[1]{'extra'}{'element_node'}
 = $result_trees{'seealso_duplicate'}{'contents'}[2];
 
$result_trees{'seealso_duplicate'}{'contents'}[2]{'contents'}[1]{'extra'}{'index_entry'}{'entry_element'}
 = $result_trees{'seealso_duplicate'}{'contents'}[2]{'contents'}[1];
 $result_trees{'seealso_duplicate'}{'contents'}[2]{'contents'}[2] = 
$result_trees{'seealso_duplicate'}{'contents'}[2]{'contents'}[1]{'extra'}{'subentry'};
-$result_trees{'seealso_duplicate'}{'contents'}[2]{'contents'}[3]{'extra'}{'entry_node'}
 = $result_trees{'seealso_duplicate'}{'contents'}[2];
+$result_trees{'seealso_duplicate'}{'contents'}[2]{'contents'}[3]{'extra'}{'element_node'}
 = $result_trees{'seealso_duplicate'}{'contents'}[2];
 
$result_trees{'seealso_duplicate'}{'contents'}[2]{'contents'}[3]{'extra'}{'index_entry'}{'entry_element'}
 = $result_trees{'seealso_duplicate'}{'contents'}[2]{'contents'}[3];
 
$result_trees{'seealso_duplicate'}{'contents'}[2]{'contents'}[3]{'extra'}{'subentry'}{'extra'}{'seealso'}
 = 
$result_trees{'seealso_duplicate'}{'contents'}[2]{'contents'}[3]{'extra'}{'subentry'}{'args'}[0]{'contents'}[2];
 $result_trees{'seealso_duplicate'}{'contents'}[2]{'contents'}[4] = 
$result_trees{'seealso_duplicate'}{'contents'}[2]{'contents'}[3]{'extra'}{'subentry'};
diff --git a/tp/t/results/indices/seeentry.pl b/tp/t/results/indices/seeentry.pl
index 84ecf7d6db..cb9b2dd285 100644
--- a/tp/t/results/indices/seeentry.pl
+++ b/tp/t/results/indices/seeentry.pl
@@ -195,7 +195,7 @@ $result_trees{'seeentry'} = {
           ],
           'cmdname' => 'cindex',
           'extra' => {
-            'entry_node' => {},
+            'element_node' => {},
             'index_entry' => {
               'entry_element' => {},
               'entry_number' => 1,
@@ -257,7 +257,7 @@ $result_trees{'seeentry'} = {
           ],
           'cmdname' => 'cindex',
           'extra' => {
-            'entry_node' => {},
+            'element_node' => {},
             'index_entry' => {
               'entry_element' => {},
               'entry_number' => 2,
@@ -324,7 +324,7 @@ $result_trees{'seeentry'} = {
           ],
           'cmdname' => 'findex',
           'extra' => {
-            'entry_node' => {},
+            'element_node' => {},
             'index_entry' => {
               'entry_element' => {},
               'entry_number' => 1,
@@ -386,7 +386,7 @@ $result_trees{'seeentry'} = {
           ],
           'cmdname' => 'findex',
           'extra' => {
-            'entry_node' => {},
+            'element_node' => {},
             'index_entry' => {
               'entry_element' => {},
               'entry_number' => 2,
@@ -500,16 +500,16 @@ 
$result_trees{'seeentry'}{'contents'}[1]{'extra'}{'node_content'}[0] = $result_t
 
$result_trees{'seeentry'}{'contents'}[1]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = $result_trees{'seeentry'}{'contents'}[1]{'args'}[0]{'contents'}[0];
 $result_trees{'seeentry'}{'contents'}[3]{'extra'}{'node_content'}[0] = 
$result_trees{'seeentry'}{'contents'}[3]{'args'}[0]{'contents'}[0];
 
$result_trees{'seeentry'}{'contents'}[3]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = $result_trees{'seeentry'}{'contents'}[3]{'args'}[0]{'contents'}[0];
-$result_trees{'seeentry'}{'contents'}[4]{'contents'}[1]{'extra'}{'entry_node'} 
= $result_trees{'seeentry'}{'contents'}[3];
+$result_trees{'seeentry'}{'contents'}[4]{'contents'}[1]{'extra'}{'element_node'}
 = $result_trees{'seeentry'}{'contents'}[3];
 
$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'}{'seeentry'} = 
$result_trees{'seeentry'}{'contents'}[4]{'contents'}[1]{'args'}[0]{'contents'}[2];
-$result_trees{'seeentry'}{'contents'}[4]{'contents'}[2]{'extra'}{'entry_node'} 
= $result_trees{'seeentry'}{'contents'}[3];
+$result_trees{'seeentry'}{'contents'}[4]{'contents'}[2]{'extra'}{'element_node'}
 = $result_trees{'seeentry'}{'contents'}[3];
 
$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'}{'seealso'} = 
$result_trees{'seeentry'}{'contents'}[4]{'contents'}[2]{'args'}[0]{'contents'}[0];
-$result_trees{'seeentry'}{'contents'}[4]{'contents'}[4]{'extra'}{'entry_node'} 
= $result_trees{'seeentry'}{'contents'}[3];
+$result_trees{'seeentry'}{'contents'}[4]{'contents'}[4]{'extra'}{'element_node'}
 = $result_trees{'seeentry'}{'contents'}[3];
 
$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'}{'seeentry'} = 
$result_trees{'seeentry'}{'contents'}[4]{'contents'}[4]{'args'}[0]{'contents'}[2];
-$result_trees{'seeentry'}{'contents'}[4]{'contents'}[5]{'extra'}{'entry_node'} 
= $result_trees{'seeentry'}{'contents'}[3];
+$result_trees{'seeentry'}{'contents'}[4]{'contents'}[5]{'extra'}{'element_node'}
 = $result_trees{'seeentry'}{'contents'}[3];
 
$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'}{'seealso'} = 
$result_trees{'seeentry'}{'contents'}[4]{'contents'}[5]{'args'}[0]{'contents'}[0];
 
diff --git a/tp/t/results/indices/sorted_subentries.pl 
b/tp/t/results/indices/sorted_subentries.pl
index 8de2257e5b..3626505178 100644
--- a/tp/t/results/indices/sorted_subentries.pl
+++ b/tp/t/results/indices/sorted_subentries.pl
@@ -171,7 +171,7 @@ $result_trees{'sorted_subentries'} = {
           ],
           'cmdname' => 'cindex',
           'extra' => {
-            'entry_node' => {},
+            'element_node' => {},
             'index_entry' => {
               'entry_element' => {},
               'entry_number' => 1,
@@ -242,7 +242,7 @@ $result_trees{'sorted_subentries'} = {
           ],
           'cmdname' => 'cindex',
           'extra' => {
-            'entry_node' => {},
+            'element_node' => {},
             'index_entry' => {
               'entry_element' => {},
               'entry_number' => 2,
@@ -313,7 +313,7 @@ $result_trees{'sorted_subentries'} = {
           ],
           'cmdname' => 'cindex',
           'extra' => {
-            'entry_node' => {},
+            'element_node' => {},
             'index_entry' => {
               'entry_element' => {},
               'entry_number' => 3,
@@ -384,7 +384,7 @@ $result_trees{'sorted_subentries'} = {
           ],
           'cmdname' => 'cindex',
           'extra' => {
-            'entry_node' => {},
+            'element_node' => {},
             'index_entry' => {
               'entry_element' => {},
               'entry_number' => 4,
@@ -460,7 +460,7 @@ $result_trees{'sorted_subentries'} = {
           ],
           'cmdname' => 'cindex',
           'extra' => {
-            'entry_node' => {},
+            'element_node' => {},
             'index_entry' => {
               'entry_element' => {},
               'entry_number' => 5,
@@ -563,7 +563,7 @@ $result_trees{'sorted_subentries'} = {
           ],
           'cmdname' => 'cindex',
           'extra' => {
-            'entry_node' => {},
+            'element_node' => {},
             'index_entry' => {
               'entry_element' => {},
               'entry_number' => 6,
@@ -635,7 +635,7 @@ $result_trees{'sorted_subentries'} = {
           ],
           'cmdname' => 'cindex',
           'extra' => {
-            'entry_node' => {},
+            'element_node' => {},
             'index_entry' => {
               'entry_element' => {},
               'entry_number' => 7,
@@ -673,7 +673,7 @@ $result_trees{'sorted_subentries'} = {
           ],
           'cmdname' => 'cindex',
           'extra' => {
-            'entry_node' => {},
+            'element_node' => {},
             'index_entry' => {
               'entry_element' => {},
               'entry_number' => 8,
@@ -744,7 +744,7 @@ $result_trees{'sorted_subentries'} = {
           ],
           'cmdname' => 'cindex',
           'extra' => {
-            'entry_node' => {},
+            'element_node' => {},
             'index_entry' => {
               'entry_element' => {},
               'entry_number' => 9,
@@ -807,7 +807,7 @@ $result_trees{'sorted_subentries'} = {
           ],
           'cmdname' => 'cindex',
           'extra' => {
-            'entry_node' => {},
+            'element_node' => {},
             'index_entry' => {
               'entry_element' => {},
               'entry_number' => 10,
@@ -845,7 +845,7 @@ $result_trees{'sorted_subentries'} = {
           ],
           'cmdname' => 'cindex',
           'extra' => {
-            'entry_node' => {},
+            'element_node' => {},
             'index_entry' => {
               'entry_element' => {},
               'entry_number' => 11,
@@ -1061,7 +1061,7 @@ $result_trees{'sorted_subentries'} = {
           ],
           'cmdname' => 'cindex',
           'extra' => {
-            'entry_node' => {},
+            'element_node' => {},
             'index_entry' => {
               'entry_element' => {},
               'entry_number' => 12,
@@ -1165,7 +1165,7 @@ $result_trees{'sorted_subentries'} = {
           ],
           'cmdname' => 'cindex',
           'extra' => {
-            'entry_node' => {},
+            'element_node' => {},
             'index_entry' => {
               'entry_element' => {},
               'entry_number' => 13,
@@ -1218,7 +1218,7 @@ $result_trees{'sorted_subentries'} = {
           ],
           'cmdname' => 'cindex',
           'extra' => {
-            'entry_node' => {},
+            'element_node' => {},
             'index_entry' => {
               'entry_element' => {},
               'entry_number' => 14,
@@ -1304,7 +1304,7 @@ $result_trees{'sorted_subentries'} = {
           ],
           'cmdname' => 'cindex',
           'extra' => {
-            'entry_node' => {},
+            'element_node' => {},
             'index_entry' => {
               'entry_element' => {},
               'entry_number' => 15,
@@ -1499,7 +1499,7 @@ $result_trees{'sorted_subentries'} = {
           ],
           'cmdname' => 'cindex',
           'extra' => {
-            'entry_node' => {},
+            'element_node' => {},
             'index_entry' => {
               'entry_element' => {},
               'entry_number' => 16,
@@ -1625,7 +1625,7 @@ $result_trees{'sorted_subentries'} = {
           ],
           'cmdname' => 'cindex',
           'extra' => {
-            'entry_node' => {},
+            'element_node' => {},
             'index_entry' => {
               'entry_element' => {},
               'entry_number' => 17,
@@ -1728,7 +1728,7 @@ $result_trees{'sorted_subentries'} = {
           ],
           'cmdname' => 'cindex',
           'extra' => {
-            'entry_node' => {},
+            'element_node' => {},
             'index_entry' => {
               'entry_element' => {},
               'entry_number' => 18,
@@ -1872,65 +1872,65 @@ 
$result_trees{'sorted_subentries'}{'contents'}[1]{'extra'}{'node_content'}[0] =
 
$result_trees{'sorted_subentries'}{'contents'}[1]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = $result_trees{'sorted_subentries'}{'contents'}[1]{'args'}[0]{'contents'}[0];
 $result_trees{'sorted_subentries'}{'contents'}[3]{'extra'}{'node_content'}[0] 
= $result_trees{'sorted_subentries'}{'contents'}[3]{'args'}[0]{'contents'}[0];
 
$result_trees{'sorted_subentries'}{'contents'}[3]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = $result_trees{'sorted_subentries'}{'contents'}[3]{'args'}[0]{'contents'}[0];
-$result_trees{'sorted_subentries'}{'contents'}[4]{'contents'}[1]{'extra'}{'entry_node'}
 = $result_trees{'sorted_subentries'}{'contents'}[3];
+$result_trees{'sorted_subentries'}{'contents'}[4]{'contents'}[1]{'extra'}{'element_node'}
 = $result_trees{'sorted_subentries'}{'contents'}[3];
 
$result_trees{'sorted_subentries'}{'contents'}[4]{'contents'}[1]{'extra'}{'index_entry'}{'entry_element'}
 = $result_trees{'sorted_subentries'}{'contents'}[4]{'contents'}[1];
 $result_trees{'sorted_subentries'}{'contents'}[4]{'contents'}[2] = 
$result_trees{'sorted_subentries'}{'contents'}[4]{'contents'}[1]{'extra'}{'subentry'};
-$result_trees{'sorted_subentries'}{'contents'}[4]{'contents'}[3]{'extra'}{'entry_node'}
 = $result_trees{'sorted_subentries'}{'contents'}[3];
+$result_trees{'sorted_subentries'}{'contents'}[4]{'contents'}[3]{'extra'}{'element_node'}
 = $result_trees{'sorted_subentries'}{'contents'}[3];
 
$result_trees{'sorted_subentries'}{'contents'}[4]{'contents'}[3]{'extra'}{'index_entry'}{'entry_element'}
 = $result_trees{'sorted_subentries'}{'contents'}[4]{'contents'}[3];
 $result_trees{'sorted_subentries'}{'contents'}[4]{'contents'}[4] = 
$result_trees{'sorted_subentries'}{'contents'}[4]{'contents'}[3]{'extra'}{'subentry'};
-$result_trees{'sorted_subentries'}{'contents'}[4]{'contents'}[5]{'extra'}{'entry_node'}
 = $result_trees{'sorted_subentries'}{'contents'}[3];
+$result_trees{'sorted_subentries'}{'contents'}[4]{'contents'}[5]{'extra'}{'element_node'}
 = $result_trees{'sorted_subentries'}{'contents'}[3];
 
$result_trees{'sorted_subentries'}{'contents'}[4]{'contents'}[5]{'extra'}{'index_entry'}{'entry_element'}
 = $result_trees{'sorted_subentries'}{'contents'}[4]{'contents'}[5];
 $result_trees{'sorted_subentries'}{'contents'}[4]{'contents'}[6] = 
$result_trees{'sorted_subentries'}{'contents'}[4]{'contents'}[5]{'extra'}{'subentry'};
-$result_trees{'sorted_subentries'}{'contents'}[4]{'contents'}[7]{'extra'}{'entry_node'}
 = $result_trees{'sorted_subentries'}{'contents'}[3];
+$result_trees{'sorted_subentries'}{'contents'}[4]{'contents'}[7]{'extra'}{'element_node'}
 = $result_trees{'sorted_subentries'}{'contents'}[3];
 
$result_trees{'sorted_subentries'}{'contents'}[4]{'contents'}[7]{'extra'}{'index_entry'}{'entry_element'}
 = $result_trees{'sorted_subentries'}{'contents'}[4]{'contents'}[7];
 $result_trees{'sorted_subentries'}{'contents'}[4]{'contents'}[8] = 
$result_trees{'sorted_subentries'}{'contents'}[4]{'contents'}[7]{'extra'}{'subentry'};
-$result_trees{'sorted_subentries'}{'contents'}[4]{'contents'}[10]{'extra'}{'entry_node'}
 = $result_trees{'sorted_subentries'}{'contents'}[3];
+$result_trees{'sorted_subentries'}{'contents'}[4]{'contents'}[10]{'extra'}{'element_node'}
 = $result_trees{'sorted_subentries'}{'contents'}[3];
 
$result_trees{'sorted_subentries'}{'contents'}[4]{'contents'}[10]{'extra'}{'index_entry'}{'entry_element'}
 = $result_trees{'sorted_subentries'}{'contents'}[4]{'contents'}[10];
 $result_trees{'sorted_subentries'}{'contents'}[4]{'contents'}[11] = 
$result_trees{'sorted_subentries'}{'contents'}[4]{'contents'}[10]{'extra'}{'subentry'};
 $result_trees{'sorted_subentries'}{'contents'}[4]{'contents'}[12] = 
$result_trees{'sorted_subentries'}{'contents'}[4]{'contents'}[10]{'extra'}{'subentry'}{'extra'}{'subentry'};
-$result_trees{'sorted_subentries'}{'contents'}[4]{'contents'}[13]{'extra'}{'entry_node'}
 = $result_trees{'sorted_subentries'}{'contents'}[3];
+$result_trees{'sorted_subentries'}{'contents'}[4]{'contents'}[13]{'extra'}{'element_node'}
 = $result_trees{'sorted_subentries'}{'contents'}[3];
 
$result_trees{'sorted_subentries'}{'contents'}[4]{'contents'}[13]{'extra'}{'index_entry'}{'entry_element'}
 = $result_trees{'sorted_subentries'}{'contents'}[4]{'contents'}[13];
 $result_trees{'sorted_subentries'}{'contents'}[4]{'contents'}[14] = 
$result_trees{'sorted_subentries'}{'contents'}[4]{'contents'}[13]{'extra'}{'subentry'};
-$result_trees{'sorted_subentries'}{'contents'}[4]{'contents'}[15]{'extra'}{'entry_node'}
 = $result_trees{'sorted_subentries'}{'contents'}[3];
+$result_trees{'sorted_subentries'}{'contents'}[4]{'contents'}[15]{'extra'}{'element_node'}
 = $result_trees{'sorted_subentries'}{'contents'}[3];
 
$result_trees{'sorted_subentries'}{'contents'}[4]{'contents'}[15]{'extra'}{'index_entry'}{'entry_element'}
 = $result_trees{'sorted_subentries'}{'contents'}[4]{'contents'}[15];
-$result_trees{'sorted_subentries'}{'contents'}[4]{'contents'}[16]{'extra'}{'entry_node'}
 = $result_trees{'sorted_subentries'}{'contents'}[3];
+$result_trees{'sorted_subentries'}{'contents'}[4]{'contents'}[16]{'extra'}{'element_node'}
 = $result_trees{'sorted_subentries'}{'contents'}[3];
 
$result_trees{'sorted_subentries'}{'contents'}[4]{'contents'}[16]{'extra'}{'index_entry'}{'entry_element'}
 = $result_trees{'sorted_subentries'}{'contents'}[4]{'contents'}[16];
 $result_trees{'sorted_subentries'}{'contents'}[4]{'contents'}[17] = 
$result_trees{'sorted_subentries'}{'contents'}[4]{'contents'}[16]{'extra'}{'subentry'};
-$result_trees{'sorted_subentries'}{'contents'}[4]{'contents'}[18]{'extra'}{'entry_node'}
 = $result_trees{'sorted_subentries'}{'contents'}[3];
+$result_trees{'sorted_subentries'}{'contents'}[4]{'contents'}[18]{'extra'}{'element_node'}
 = $result_trees{'sorted_subentries'}{'contents'}[3];
 
$result_trees{'sorted_subentries'}{'contents'}[4]{'contents'}[18]{'extra'}{'index_entry'}{'entry_element'}
 = $result_trees{'sorted_subentries'}{'contents'}[4]{'contents'}[18];
 $result_trees{'sorted_subentries'}{'contents'}[4]{'contents'}[19] = 
$result_trees{'sorted_subentries'}{'contents'}[4]{'contents'}[18]{'extra'}{'subentry'};
-$result_trees{'sorted_subentries'}{'contents'}[4]{'contents'}[20]{'extra'}{'entry_node'}
 = $result_trees{'sorted_subentries'}{'contents'}[3];
+$result_trees{'sorted_subentries'}{'contents'}[4]{'contents'}[20]{'extra'}{'element_node'}
 = $result_trees{'sorted_subentries'}{'contents'}[3];
 
$result_trees{'sorted_subentries'}{'contents'}[4]{'contents'}[20]{'extra'}{'index_entry'}{'entry_element'}
 = $result_trees{'sorted_subentries'}{'contents'}[4]{'contents'}[20];
-$result_trees{'sorted_subentries'}{'contents'}[4]{'contents'}[21]{'extra'}{'entry_node'}
 = $result_trees{'sorted_subentries'}{'contents'}[3];
+$result_trees{'sorted_subentries'}{'contents'}[4]{'contents'}[21]{'extra'}{'element_node'}
 = $result_trees{'sorted_subentries'}{'contents'}[3];
 
$result_trees{'sorted_subentries'}{'contents'}[4]{'contents'}[21]{'extra'}{'index_entry'}{'entry_element'}
 = $result_trees{'sorted_subentries'}{'contents'}[4]{'contents'}[21];
 $result_trees{'sorted_subentries'}{'contents'}[4]{'contents'}[22] = 
$result_trees{'sorted_subentries'}{'contents'}[4]{'contents'}[21]{'extra'}{'subentry'};
 $result_trees{'sorted_subentries'}{'contents'}[4]{'contents'}[23] = 
$result_trees{'sorted_subentries'}{'contents'}[4]{'contents'}[21]{'extra'}{'subentry'}{'extra'}{'subentry'};
 $result_trees{'sorted_subentries'}{'contents'}[4]{'contents'}[24] = 
$result_trees{'sorted_subentries'}{'contents'}[4]{'contents'}[21]{'extra'}{'subentry'}{'extra'}{'subentry'}{'extra'}{'subentry'};
 $result_trees{'sorted_subentries'}{'contents'}[5]{'extra'}{'node_content'}[0] 
= $result_trees{'sorted_subentries'}{'contents'}[5]{'args'}[0]{'contents'}[0];
 
$result_trees{'sorted_subentries'}{'contents'}[5]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = $result_trees{'sorted_subentries'}{'contents'}[5]{'args'}[0]{'contents'}[0];
-$result_trees{'sorted_subentries'}{'contents'}[6]{'contents'}[0]{'extra'}{'entry_node'}
 = $result_trees{'sorted_subentries'}{'contents'}[5];
+$result_trees{'sorted_subentries'}{'contents'}[6]{'contents'}[0]{'extra'}{'element_node'}
 = $result_trees{'sorted_subentries'}{'contents'}[5];
 
$result_trees{'sorted_subentries'}{'contents'}[6]{'contents'}[0]{'extra'}{'index_entry'}{'entry_element'}
 = $result_trees{'sorted_subentries'}{'contents'}[6]{'contents'}[0];
 $result_trees{'sorted_subentries'}{'contents'}[6]{'contents'}[1] = 
$result_trees{'sorted_subentries'}{'contents'}[6]{'contents'}[0]{'extra'}{'subentry'};
 $result_trees{'sorted_subentries'}{'contents'}[6]{'contents'}[2] = 
$result_trees{'sorted_subentries'}{'contents'}[6]{'contents'}[0]{'extra'}{'subentry'}{'extra'}{'subentry'};
-$result_trees{'sorted_subentries'}{'contents'}[6]{'contents'}[3]{'extra'}{'entry_node'}
 = $result_trees{'sorted_subentries'}{'contents'}[5];
+$result_trees{'sorted_subentries'}{'contents'}[6]{'contents'}[3]{'extra'}{'element_node'}
 = $result_trees{'sorted_subentries'}{'contents'}[5];
 
$result_trees{'sorted_subentries'}{'contents'}[6]{'contents'}[3]{'extra'}{'index_entry'}{'entry_element'}
 = $result_trees{'sorted_subentries'}{'contents'}[6]{'contents'}[3];
-$result_trees{'sorted_subentries'}{'contents'}[6]{'contents'}[4]{'extra'}{'entry_node'}
 = $result_trees{'sorted_subentries'}{'contents'}[5];
+$result_trees{'sorted_subentries'}{'contents'}[6]{'contents'}[4]{'extra'}{'element_node'}
 = $result_trees{'sorted_subentries'}{'contents'}[5];
 
$result_trees{'sorted_subentries'}{'contents'}[6]{'contents'}[4]{'extra'}{'index_entry'}{'entry_element'}
 = $result_trees{'sorted_subentries'}{'contents'}[6]{'contents'}[4];
 $result_trees{'sorted_subentries'}{'contents'}[6]{'contents'}[5] = 
$result_trees{'sorted_subentries'}{'contents'}[6]{'contents'}[4]{'extra'}{'subentry'};
-$result_trees{'sorted_subentries'}{'contents'}[6]{'contents'}[6]{'extra'}{'entry_node'}
 = $result_trees{'sorted_subentries'}{'contents'}[5];
+$result_trees{'sorted_subentries'}{'contents'}[6]{'contents'}[6]{'extra'}{'element_node'}
 = $result_trees{'sorted_subentries'}{'contents'}[5];
 
$result_trees{'sorted_subentries'}{'contents'}[6]{'contents'}[6]{'extra'}{'index_entry'}{'entry_element'}
 = $result_trees{'sorted_subentries'}{'contents'}[6]{'contents'}[6];
 $result_trees{'sorted_subentries'}{'contents'}[6]{'contents'}[7] = 
$result_trees{'sorted_subentries'}{'contents'}[6]{'contents'}[6]{'extra'}{'subentry'};
 $result_trees{'sorted_subentries'}{'contents'}[6]{'contents'}[8] = 
$result_trees{'sorted_subentries'}{'contents'}[6]{'contents'}[6]{'extra'}{'subentry'}{'extra'}{'subentry'};
 $result_trees{'sorted_subentries'}{'contents'}[6]{'contents'}[10] = 
$result_trees{'sorted_subentries'}{'contents'}[6]{'contents'}[9]{'extra'}{'subentry'};
-$result_trees{'sorted_subentries'}{'contents'}[6]{'contents'}[11]{'extra'}{'entry_node'}
 = $result_trees{'sorted_subentries'}{'contents'}[5];
+$result_trees{'sorted_subentries'}{'contents'}[6]{'contents'}[11]{'extra'}{'element_node'}
 = $result_trees{'sorted_subentries'}{'contents'}[5];
 
$result_trees{'sorted_subentries'}{'contents'}[6]{'contents'}[11]{'extra'}{'index_entry'}{'entry_element'}
 = $result_trees{'sorted_subentries'}{'contents'}[6]{'contents'}[11];
 $result_trees{'sorted_subentries'}{'contents'}[6]{'contents'}[12] = 
$result_trees{'sorted_subentries'}{'contents'}[6]{'contents'}[11]{'extra'}{'subentry'};
 $result_trees{'sorted_subentries'}{'contents'}[6]{'contents'}[13] = 
$result_trees{'sorted_subentries'}{'contents'}[6]{'contents'}[11]{'extra'}{'subentry'}{'extra'}{'subentry'};
-$result_trees{'sorted_subentries'}{'contents'}[6]{'contents'}[14]{'extra'}{'entry_node'}
 = $result_trees{'sorted_subentries'}{'contents'}[5];
+$result_trees{'sorted_subentries'}{'contents'}[6]{'contents'}[14]{'extra'}{'element_node'}
 = $result_trees{'sorted_subentries'}{'contents'}[5];
 
$result_trees{'sorted_subentries'}{'contents'}[6]{'contents'}[14]{'extra'}{'index_entry'}{'entry_element'}
 = $result_trees{'sorted_subentries'}{'contents'}[6]{'contents'}[14];
 $result_trees{'sorted_subentries'}{'contents'}[6]{'contents'}[15] = 
$result_trees{'sorted_subentries'}{'contents'}[6]{'contents'}[14]{'extra'}{'subentry'};
 $result_trees{'sorted_subentries'}{'contents'}[6]{'contents'}[16] = 
$result_trees{'sorted_subentries'}{'contents'}[6]{'contents'}[14]{'extra'}{'subentry'}{'extra'}{'subentry'};
-$result_trees{'sorted_subentries'}{'contents'}[6]{'contents'}[17]{'extra'}{'entry_node'}
 = $result_trees{'sorted_subentries'}{'contents'}[5];
+$result_trees{'sorted_subentries'}{'contents'}[6]{'contents'}[17]{'extra'}{'element_node'}
 = $result_trees{'sorted_subentries'}{'contents'}[5];
 
$result_trees{'sorted_subentries'}{'contents'}[6]{'contents'}[17]{'extra'}{'index_entry'}{'entry_element'}
 = $result_trees{'sorted_subentries'}{'contents'}[6]{'contents'}[17];
 $result_trees{'sorted_subentries'}{'contents'}[6]{'contents'}[18] = 
$result_trees{'sorted_subentries'}{'contents'}[6]{'contents'}[17]{'extra'}{'subentry'};
 $result_trees{'sorted_subentries'}{'contents'}[6]{'contents'}[19] = 
$result_trees{'sorted_subentries'}{'contents'}[6]{'contents'}[17]{'extra'}{'subentry'}{'extra'}{'subentry'};
diff --git a/tp/t/results/indices/split_chapter_index.pl 
b/tp/t/results/indices/split_chapter_index.pl
index 0d241e19cf..7839bce29d 100644
--- a/tp/t/results/indices/split_chapter_index.pl
+++ b/tp/t/results/indices/split_chapter_index.pl
@@ -155,7 +155,7 @@ $result_trees{'split_chapter_index'} = {
           ],
           'cmdname' => 'cindex',
           'extra' => {
-            'entry_node' => {},
+            'element_node' => {},
             'index_entry' => {
               'entry_element' => {},
               'entry_number' => 1,
@@ -411,7 +411,7 @@ $result_trees{'split_chapter_index'} = {
               ],
               'cmdname' => 'cindex',
               'extra' => {
-                'entry_node' => {},
+                'element_node' => {},
                 'index_entry' => {
                   'entry_element' => {},
                   'entry_number' => 2,
@@ -450,7 +450,7 @@ $result_trees{'split_chapter_index'} = {
               ],
               'cmdname' => 'cindex',
               'extra' => {
-                'entry_node' => {},
+                'element_node' => {},
                 'index_entry' => {
                   'entry_element' => {},
                   'entry_number' => 3,
@@ -489,7 +489,7 @@ $result_trees{'split_chapter_index'} = {
               ],
               'cmdname' => 'findex',
               'extra' => {
-                'entry_node' => {},
+                'element_node' => {},
                 'index_entry' => {
                   'entry_element' => {},
                   'entry_number' => 1,
@@ -528,7 +528,7 @@ $result_trees{'split_chapter_index'} = {
               ],
               'cmdname' => 'cindex',
               'extra' => {
-                'entry_node' => {},
+                'element_node' => {},
                 'index_entry' => {
                   'entry_element' => {},
                   'entry_number' => 4,
@@ -614,7 +614,7 @@ $result_trees{'split_chapter_index'} = {
           ],
           'cmdname' => 'cindex',
           'extra' => {
-            'entry_node' => {},
+            'element_node' => {},
             'index_entry' => {
               'entry_element' => {},
               'entry_number' => 5,
@@ -658,7 +658,7 @@ $result_trees{'split_chapter_index'} = {
           ],
           'cmdname' => 'findex',
           'extra' => {
-            'entry_node' => {},
+            'element_node' => {},
             'index_entry' => {
               'entry_element' => {},
               'entry_number' => 2,
@@ -697,7 +697,7 @@ $result_trees{'split_chapter_index'} = {
           ],
           'cmdname' => 'cindex',
           'extra' => {
-            'entry_node' => {},
+            'element_node' => {},
             'index_entry' => {
               'entry_element' => {},
               'entry_number' => 6,
@@ -736,7 +736,7 @@ $result_trees{'split_chapter_index'} = {
           ],
           'cmdname' => 'findex',
           'extra' => {
-            'entry_node' => {},
+            'element_node' => {},
             'index_entry' => {
               'entry_element' => {},
               'entry_number' => 3,
@@ -1072,7 +1072,7 @@ $result_trees{'split_chapter_index'} = {
           ],
           'cmdname' => 'cindex',
           'extra' => {
-            'entry_node' => {},
+            'element_node' => {},
             'index_entry' => {
               'entry_element' => {},
               'entry_number' => 7,
@@ -1116,7 +1116,7 @@ $result_trees{'split_chapter_index'} = {
           ],
           'cmdname' => 'cindex',
           'extra' => {
-            'entry_node' => {},
+            'element_node' => {},
             'index_entry' => {
               'entry_element' => {},
               'entry_number' => 8,
@@ -1254,7 +1254,7 @@ $result_trees{'split_chapter_index'} = {
           ],
           'cmdname' => 'cindex',
           'extra' => {
-            'entry_node' => {},
+            'element_node' => {},
             'index_entry' => {
               'entry_element' => {},
               'entry_number' => 9,
@@ -1307,38 +1307,38 @@ $result_trees{'split_chapter_index'} = {
 };
 
$result_trees{'split_chapter_index'}{'contents'}[1]{'extra'}{'node_content'}[0] 
= $result_trees{'split_chapter_index'}{'contents'}[1]{'args'}[0]{'contents'}[0];
 
$result_trees{'split_chapter_index'}{'contents'}[1]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = 
$result_trees{'split_chapter_index'}{'contents'}[1]{'args'}[0]{'contents'}[0];
-$result_trees{'split_chapter_index'}{'contents'}[2]{'contents'}[0]{'extra'}{'entry_node'}
 = $result_trees{'split_chapter_index'}{'contents'}[1];
+$result_trees{'split_chapter_index'}{'contents'}[2]{'contents'}[0]{'extra'}{'element_node'}
 = $result_trees{'split_chapter_index'}{'contents'}[1];
 
$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'}[5]{'contents'}[0]{'extra'}{'menu_entry_node_label'}{'node_content'}[0]
 = 
$result_trees{'split_chapter_index'}{'contents'}[2]{'contents'}[5]{'contents'}[0]{'contents'}[1]{'contents'}[0];
 
$result_trees{'split_chapter_index'}{'contents'}[3]{'extra'}{'node_content'}[0] 
= $result_trees{'split_chapter_index'}{'contents'}[3]{'args'}[0]{'contents'}[0];
 
$result_trees{'split_chapter_index'}{'contents'}[3]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = 
$result_trees{'split_chapter_index'}{'contents'}[3]{'args'}[0]{'contents'}[0];
-$result_trees{'split_chapter_index'}{'contents'}[4]{'contents'}[1]{'contents'}[1]{'extra'}{'entry_node'}
 = $result_trees{'split_chapter_index'}{'contents'}[3];
+$result_trees{'split_chapter_index'}{'contents'}[4]{'contents'}[1]{'contents'}[1]{'extra'}{'element_node'}
 = $result_trees{'split_chapter_index'}{'contents'}[3];
 
$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'}[2]{'extra'}{'entry_node'}
 = $result_trees{'split_chapter_index'}{'contents'}[3];
+$result_trees{'split_chapter_index'}{'contents'}[4]{'contents'}[1]{'contents'}[2]{'extra'}{'element_node'}
 = $result_trees{'split_chapter_index'}{'contents'}[3];
 
$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'}[3]{'extra'}{'entry_node'}
 = $result_trees{'split_chapter_index'}{'contents'}[3];
+$result_trees{'split_chapter_index'}{'contents'}[4]{'contents'}[1]{'contents'}[3]{'extra'}{'element_node'}
 = $result_trees{'split_chapter_index'}{'contents'}[3];
 
$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'}[4]{'extra'}{'entry_node'}
 = $result_trees{'split_chapter_index'}{'contents'}[3];
+$result_trees{'split_chapter_index'}{'contents'}[4]{'contents'}[1]{'contents'}[4]{'extra'}{'element_node'}
 = $result_trees{'split_chapter_index'}{'contents'}[3];
 
$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'}[5]{'extra'}{'entry_node'}
 = $result_trees{'split_chapter_index'}{'contents'}[3];
+$result_trees{'split_chapter_index'}{'contents'}[4]{'contents'}[5]{'extra'}{'element_node'}
 = $result_trees{'split_chapter_index'}{'contents'}[3];
 
$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'}[7]{'extra'}{'entry_node'}
 = $result_trees{'split_chapter_index'}{'contents'}[3];
+$result_trees{'split_chapter_index'}{'contents'}[4]{'contents'}[7]{'extra'}{'element_node'}
 = $result_trees{'split_chapter_index'}{'contents'}[3];
 
$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'}[8]{'extra'}{'entry_node'}
 = $result_trees{'split_chapter_index'}{'contents'}[3];
+$result_trees{'split_chapter_index'}{'contents'}[4]{'contents'}[8]{'extra'}{'element_node'}
 = $result_trees{'split_chapter_index'}{'contents'}[3];
 
$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'}[9]{'extra'}{'entry_node'}
 = $result_trees{'split_chapter_index'}{'contents'}[3];
+$result_trees{'split_chapter_index'}{'contents'}[4]{'contents'}[9]{'extra'}{'element_node'}
 = $result_trees{'split_chapter_index'}{'contents'}[3];
 
$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'}[11]{'contents'}[0]{'extra'}{'menu_entry_node_label'}{'node_content'}[0]
 = 
$result_trees{'split_chapter_index'}{'contents'}[4]{'contents'}[11]{'contents'}[0]{'contents'}[1]{'contents'}[0];
 
$result_trees{'split_chapter_index'}{'contents'}[5]{'extra'}{'node_content'}[0] 
= $result_trees{'split_chapter_index'}{'contents'}[5]{'args'}[0]{'contents'}[0];
 
$result_trees{'split_chapter_index'}{'contents'}[5]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = 
$result_trees{'split_chapter_index'}{'contents'}[5]{'args'}[0]{'contents'}[0];
 
$result_trees{'split_chapter_index'}{'contents'}[6]{'contents'}[1]{'contents'}[0]{'extra'}{'menu_entry_node_label'}{'node_content'}[0]
 = 
$result_trees{'split_chapter_index'}{'contents'}[6]{'contents'}[1]{'contents'}[0]{'contents'}[1]{'contents'}[0];
-$result_trees{'split_chapter_index'}{'contents'}[6]{'contents'}[3]{'extra'}{'entry_node'}
 = $result_trees{'split_chapter_index'}{'contents'}[5];
+$result_trees{'split_chapter_index'}{'contents'}[6]{'contents'}[3]{'extra'}{'element_node'}
 = $result_trees{'split_chapter_index'}{'contents'}[5];
 
$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'}[5]{'extra'}{'entry_node'}
 = $result_trees{'split_chapter_index'}{'contents'}[5];
+$result_trees{'split_chapter_index'}{'contents'}[6]{'contents'}[5]{'extra'}{'element_node'}
 = $result_trees{'split_chapter_index'}{'contents'}[5];
 
$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'}[7]{'extra'}{'node_content'}[0] 
= $result_trees{'split_chapter_index'}{'contents'}[7]{'args'}[0]{'contents'}[0];
 
$result_trees{'split_chapter_index'}{'contents'}[7]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = 
$result_trees{'split_chapter_index'}{'contents'}[7]{'args'}[0]{'contents'}[0];
-$result_trees{'split_chapter_index'}{'contents'}[8]{'contents'}[3]{'extra'}{'entry_node'}
 = $result_trees{'split_chapter_index'}{'contents'}[7];
+$result_trees{'split_chapter_index'}{'contents'}[8]{'contents'}[3]{'extra'}{'element_node'}
 = $result_trees{'split_chapter_index'}{'contents'}[7];
 
$result_trees{'split_chapter_index'}{'contents'}[8]{'contents'}[3]{'extra'}{'index_entry'}{'entry_element'}
 = $result_trees{'split_chapter_index'}{'contents'}[8]{'contents'}[3];
 
 $result_texis{'split_chapter_index'} = '\\input texinfo @c -*-texinfo-*-
diff --git a/tp/t/results/indices/subentries.pl 
b/tp/t/results/indices/subentries.pl
index 29f776bdd7..dbd7f9c050 100644
--- a/tp/t/results/indices/subentries.pl
+++ b/tp/t/results/indices/subentries.pl
@@ -173,7 +173,7 @@ $result_trees{'subentries'} = {
           ],
           'cmdname' => 'cindex',
           'extra' => {
-            'entry_node' => {},
+            'element_node' => {},
             'index_entry' => {
               'entry_element' => {},
               'entry_number' => 1,
@@ -211,7 +211,7 @@ $result_trees{'subentries'} = {
           ],
           'cmdname' => 'cindex',
           'extra' => {
-            'entry_node' => {},
+            'element_node' => {},
             'index_entry' => {
               'entry_element' => {},
               'entry_number' => 2,
@@ -282,7 +282,7 @@ $result_trees{'subentries'} = {
           ],
           'cmdname' => 'cindex',
           'extra' => {
-            'entry_node' => {},
+            'element_node' => {},
             'index_entry' => {
               'entry_element' => {},
               'entry_number' => 3,
@@ -385,7 +385,7 @@ $result_trees{'subentries'} = {
           ],
           'cmdname' => 'cindex',
           'extra' => {
-            'entry_node' => {},
+            'element_node' => {},
             'index_entry' => {
               'entry_element' => {},
               'entry_number' => 4,
@@ -526,7 +526,7 @@ $result_trees{'subentries'} = {
           ],
           'cmdname' => 'findex',
           'extra' => {
-            'entry_node' => {},
+            'element_node' => {},
             'index_entry' => {
               'entry_element' => {},
               'entry_number' => 1,
@@ -564,7 +564,7 @@ $result_trees{'subentries'} = {
           ],
           'cmdname' => 'findex',
           'extra' => {
-            'entry_node' => {},
+            'element_node' => {},
             'index_entry' => {
               'entry_element' => {},
               'entry_number' => 2,
@@ -635,7 +635,7 @@ $result_trees{'subentries'} = {
           ],
           'cmdname' => 'findex',
           'extra' => {
-            'entry_node' => {},
+            'element_node' => {},
             'index_entry' => {
               'entry_element' => {},
               'entry_number' => 3,
@@ -738,7 +738,7 @@ $result_trees{'subentries'} = {
           ],
           'cmdname' => 'findex',
           'extra' => {
-            'entry_node' => {},
+            'element_node' => {},
             'index_entry' => {
               'entry_element' => {},
               'entry_number' => 4,
@@ -948,30 +948,30 @@ 
$result_trees{'subentries'}{'contents'}[1]{'extra'}{'node_content'}[0] = $result
 
$result_trees{'subentries'}{'contents'}[1]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = $result_trees{'subentries'}{'contents'}[1]{'args'}[0]{'contents'}[0];
 $result_trees{'subentries'}{'contents'}[3]{'extra'}{'node_content'}[0] = 
$result_trees{'subentries'}{'contents'}[3]{'args'}[0]{'contents'}[0];
 
$result_trees{'subentries'}{'contents'}[3]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = $result_trees{'subentries'}{'contents'}[3]{'args'}[0]{'contents'}[0];
-$result_trees{'subentries'}{'contents'}[4]{'contents'}[1]{'extra'}{'entry_node'}
 = $result_trees{'subentries'}{'contents'}[3];
+$result_trees{'subentries'}{'contents'}[4]{'contents'}[1]{'extra'}{'element_node'}
 = $result_trees{'subentries'}{'contents'}[3];
 
$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'}[2]{'extra'}{'entry_node'}
 = $result_trees{'subentries'}{'contents'}[3];
+$result_trees{'subentries'}{'contents'}[4]{'contents'}[2]{'extra'}{'element_node'}
 = $result_trees{'subentries'}{'contents'}[3];
 
$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'}[3] = 
$result_trees{'subentries'}{'contents'}[4]{'contents'}[2]{'extra'}{'subentry'};
-$result_trees{'subentries'}{'contents'}[4]{'contents'}[4]{'extra'}{'entry_node'}
 = $result_trees{'subentries'}{'contents'}[3];
+$result_trees{'subentries'}{'contents'}[4]{'contents'}[4]{'extra'}{'element_node'}
 = $result_trees{'subentries'}{'contents'}[3];
 
$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'}[5] = 
$result_trees{'subentries'}{'contents'}[4]{'contents'}[4]{'extra'}{'subentry'};
 $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]{'extra'}{'entry_node'}
 = $result_trees{'subentries'}{'contents'}[3];
+$result_trees{'subentries'}{'contents'}[4]{'contents'}[7]{'extra'}{'element_node'}
 = $result_trees{'subentries'}{'contents'}[3];
 
$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'}[8] = 
$result_trees{'subentries'}{'contents'}[4]{'contents'}[7]{'extra'}{'subentry'};
 $result_trees{'subentries'}{'contents'}[4]{'contents'}[9] = 
$result_trees{'subentries'}{'contents'}[4]{'contents'}[7]{'extra'}{'subentry'}{'extra'}{'subentry'};
 $result_trees{'subentries'}{'contents'}[4]{'contents'}[10] = 
$result_trees{'subentries'}{'contents'}[4]{'contents'}[7]{'extra'}{'subentry'}{'extra'}{'subentry'}{'extra'}{'subentry'};
-$result_trees{'subentries'}{'contents'}[4]{'contents'}[12]{'extra'}{'entry_node'}
 = $result_trees{'subentries'}{'contents'}[3];
+$result_trees{'subentries'}{'contents'}[4]{'contents'}[12]{'extra'}{'element_node'}
 = $result_trees{'subentries'}{'contents'}[3];
 
$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'}[13]{'extra'}{'entry_node'}
 = $result_trees{'subentries'}{'contents'}[3];
+$result_trees{'subentries'}{'contents'}[4]{'contents'}[13]{'extra'}{'element_node'}
 = $result_trees{'subentries'}{'contents'}[3];
 
$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'}[14] = 
$result_trees{'subentries'}{'contents'}[4]{'contents'}[13]{'extra'}{'subentry'};
-$result_trees{'subentries'}{'contents'}[4]{'contents'}[15]{'extra'}{'entry_node'}
 = $result_trees{'subentries'}{'contents'}[3];
+$result_trees{'subentries'}{'contents'}[4]{'contents'}[15]{'extra'}{'element_node'}
 = $result_trees{'subentries'}{'contents'}[3];
 
$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'}[16] = 
$result_trees{'subentries'}{'contents'}[4]{'contents'}[15]{'extra'}{'subentry'};
 $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]{'extra'}{'entry_node'}
 = $result_trees{'subentries'}{'contents'}[3];
+$result_trees{'subentries'}{'contents'}[4]{'contents'}[18]{'extra'}{'element_node'}
 = $result_trees{'subentries'}{'contents'}[3];
 
$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'}[19] = 
$result_trees{'subentries'}{'contents'}[4]{'contents'}[18]{'extra'}{'subentry'};
 $result_trees{'subentries'}{'contents'}[4]{'contents'}[20] = 
$result_trees{'subentries'}{'contents'}[4]{'contents'}[18]{'extra'}{'subentry'}{'extra'}{'subentry'};
diff --git a/tp/t/results/indices/subentry_and_sortas.pl 
b/tp/t/results/indices/subentry_and_sortas.pl
index a6fc7e2ad7..ef011729d6 100644
--- a/tp/t/results/indices/subentry_and_sortas.pl
+++ b/tp/t/results/indices/subentry_and_sortas.pl
@@ -194,7 +194,7 @@ $result_trees{'subentry_and_sortas'} = {
           ],
           'cmdname' => 'cindex',
           'extra' => {
-            'entry_node' => {},
+            'element_node' => {},
             'index_entry' => {
               'entry_element' => {},
               'entry_number' => 1,
@@ -316,7 +316,7 @@ $result_trees{'subentry_and_sortas'} = {
           ],
           'cmdname' => 'findex',
           'extra' => {
-            'entry_node' => {},
+            'element_node' => {},
             'index_entry' => {
               'entry_element' => {},
               'entry_number' => 1,
@@ -486,10 +486,10 @@ 
$result_trees{'subentry_and_sortas'}{'contents'}[1]{'extra'}{'node_content'}[0]
 
$result_trees{'subentry_and_sortas'}{'contents'}[1]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = 
$result_trees{'subentry_and_sortas'}{'contents'}[1]{'args'}[0]{'contents'}[0];
 
$result_trees{'subentry_and_sortas'}{'contents'}[3]{'extra'}{'node_content'}[0] 
= $result_trees{'subentry_and_sortas'}{'contents'}[3]{'args'}[0]{'contents'}[0];
 
$result_trees{'subentry_and_sortas'}{'contents'}[3]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = 
$result_trees{'subentry_and_sortas'}{'contents'}[3]{'args'}[0]{'contents'}[0];
-$result_trees{'subentry_and_sortas'}{'contents'}[4]{'contents'}[1]{'extra'}{'entry_node'}
 = $result_trees{'subentry_and_sortas'}{'contents'}[3];
+$result_trees{'subentry_and_sortas'}{'contents'}[4]{'contents'}[1]{'extra'}{'element_node'}
 = $result_trees{'subentry_and_sortas'}{'contents'}[3];
 
$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'}[2] = 
$result_trees{'subentry_and_sortas'}{'contents'}[4]{'contents'}[1]{'extra'}{'subentry'};
-$result_trees{'subentry_and_sortas'}{'contents'}[4]{'contents'}[4]{'extra'}{'entry_node'}
 = $result_trees{'subentry_and_sortas'}{'contents'}[3];
+$result_trees{'subentry_and_sortas'}{'contents'}[4]{'contents'}[4]{'extra'}{'element_node'}
 = $result_trees{'subentry_and_sortas'}{'contents'}[3];
 
$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'}[5] = 
$result_trees{'subentry_and_sortas'}{'contents'}[4]{'contents'}[4]{'extra'}{'subentry'};
 
diff --git a/tp/t/results/indices/subentry_and_sortas_spaces.pl 
b/tp/t/results/indices/subentry_and_sortas_spaces.pl
index 7b430ad63d..a88fad40cf 100644
--- a/tp/t/results/indices/subentry_and_sortas_spaces.pl
+++ b/tp/t/results/indices/subentry_and_sortas_spaces.pl
@@ -189,7 +189,7 @@ $result_trees{'subentry_and_sortas_spaces'} = {
           ],
           'cmdname' => 'cindex',
           'extra' => {
-            'entry_node' => {},
+            'element_node' => {},
             'index_entry' => {
               'entry_element' => {},
               'entry_number' => 1,
@@ -280,7 +280,7 @@ $result_trees{'subentry_and_sortas_spaces'} = {
           ],
           'cmdname' => 'cindex',
           'extra' => {
-            'entry_node' => {},
+            'element_node' => {},
             'index_entry' => {
               'entry_element' => {},
               'entry_number' => 2,
@@ -357,7 +357,7 @@ $result_trees{'subentry_and_sortas_spaces'} = {
           ],
           'cmdname' => 'cindex',
           'extra' => {
-            'entry_node' => {},
+            'element_node' => {},
             'index_entry' => {
               'entry_element' => {},
               'entry_number' => 3,
@@ -479,7 +479,7 @@ $result_trees{'subentry_and_sortas_spaces'} = {
           ],
           'cmdname' => 'cindex',
           'extra' => {
-            'entry_node' => {},
+            'element_node' => {},
             'index_entry' => {
               'entry_element' => {},
               'entry_number' => 4,
@@ -618,17 +618,17 @@ 
$result_trees{'subentry_and_sortas_spaces'}{'contents'}[1]{'extra'}{'node_conten
 
$result_trees{'subentry_and_sortas_spaces'}{'contents'}[1]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = 
$result_trees{'subentry_and_sortas_spaces'}{'contents'}[1]{'args'}[0]{'contents'}[0];
 
$result_trees{'subentry_and_sortas_spaces'}{'contents'}[3]{'extra'}{'node_content'}[0]
 = 
$result_trees{'subentry_and_sortas_spaces'}{'contents'}[3]{'args'}[0]{'contents'}[0];
 
$result_trees{'subentry_and_sortas_spaces'}{'contents'}[3]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = 
$result_trees{'subentry_and_sortas_spaces'}{'contents'}[3]{'args'}[0]{'contents'}[0];
-$result_trees{'subentry_and_sortas_spaces'}{'contents'}[4]{'contents'}[1]{'extra'}{'entry_node'}
 = $result_trees{'subentry_and_sortas_spaces'}{'contents'}[3];
+$result_trees{'subentry_and_sortas_spaces'}{'contents'}[4]{'contents'}[1]{'extra'}{'element_node'}
 = $result_trees{'subentry_and_sortas_spaces'}{'contents'}[3];
 
$result_trees{'subentry_and_sortas_spaces'}{'contents'}[4]{'contents'}[1]{'extra'}{'index_entry'}{'entry_element'}
 = $result_trees{'subentry_and_sortas_spaces'}{'contents'}[4]{'contents'}[1];
 $result_trees{'subentry_and_sortas_spaces'}{'contents'}[4]{'contents'}[2] = 
$result_trees{'subentry_and_sortas_spaces'}{'contents'}[4]{'contents'}[1]{'extra'}{'subentry'};
-$result_trees{'subentry_and_sortas_spaces'}{'contents'}[4]{'contents'}[3]{'extra'}{'entry_node'}
 = $result_trees{'subentry_and_sortas_spaces'}{'contents'}[3];
+$result_trees{'subentry_and_sortas_spaces'}{'contents'}[4]{'contents'}[3]{'extra'}{'element_node'}
 = $result_trees{'subentry_and_sortas_spaces'}{'contents'}[3];
 
$result_trees{'subentry_and_sortas_spaces'}{'contents'}[4]{'contents'}[3]{'extra'}{'index_entry'}{'entry_element'}
 = $result_trees{'subentry_and_sortas_spaces'}{'contents'}[4]{'contents'}[3];
 $result_trees{'subentry_and_sortas_spaces'}{'contents'}[4]{'contents'}[4] = 
$result_trees{'subentry_and_sortas_spaces'}{'contents'}[4]{'contents'}[3]{'extra'}{'subentry'};
-$result_trees{'subentry_and_sortas_spaces'}{'contents'}[4]{'contents'}[5]{'extra'}{'entry_node'}
 = $result_trees{'subentry_and_sortas_spaces'}{'contents'}[3];
+$result_trees{'subentry_and_sortas_spaces'}{'contents'}[4]{'contents'}[5]{'extra'}{'element_node'}
 = $result_trees{'subentry_and_sortas_spaces'}{'contents'}[3];
 
$result_trees{'subentry_and_sortas_spaces'}{'contents'}[4]{'contents'}[5]{'extra'}{'index_entry'}{'entry_element'}
 = $result_trees{'subentry_and_sortas_spaces'}{'contents'}[4]{'contents'}[5];
 $result_trees{'subentry_and_sortas_spaces'}{'contents'}[4]{'contents'}[6] = 
$result_trees{'subentry_and_sortas_spaces'}{'contents'}[4]{'contents'}[5]{'extra'}{'subentry'};
 $result_trees{'subentry_and_sortas_spaces'}{'contents'}[4]{'contents'}[7] = 
$result_trees{'subentry_and_sortas_spaces'}{'contents'}[4]{'contents'}[5]{'extra'}{'subentry'}{'extra'}{'subentry'};
-$result_trees{'subentry_and_sortas_spaces'}{'contents'}[4]{'contents'}[8]{'extra'}{'entry_node'}
 = $result_trees{'subentry_and_sortas_spaces'}{'contents'}[3];
+$result_trees{'subentry_and_sortas_spaces'}{'contents'}[4]{'contents'}[8]{'extra'}{'element_node'}
 = $result_trees{'subentry_and_sortas_spaces'}{'contents'}[3];
 
$result_trees{'subentry_and_sortas_spaces'}{'contents'}[4]{'contents'}[8]{'extra'}{'index_entry'}{'entry_element'}
 = $result_trees{'subentry_and_sortas_spaces'}{'contents'}[4]{'contents'}[8];
 $result_trees{'subentry_and_sortas_spaces'}{'contents'}[4]{'contents'}[9] = 
$result_trees{'subentry_and_sortas_spaces'}{'contents'}[4]{'contents'}[8]{'extra'}{'subentry'};
 $result_trees{'subentry_and_sortas_spaces'}{'contents'}[4]{'contents'}[10] = 
$result_trees{'subentry_and_sortas_spaces'}{'contents'}[4]{'contents'}[8]{'extra'}{'subentry'}{'extra'}{'subentry'};
diff --git a/tp/t/results/indices/syncode_index_print_both.pl 
b/tp/t/results/indices/syncode_index_print_both.pl
index d76fd70290..a2d5401bfc 100644
--- a/tp/t/results/indices/syncode_index_print_both.pl
+++ b/tp/t/results/indices/syncode_index_print_both.pl
@@ -224,7 +224,7 @@ $result_trees{'syncode_index_print_both'} = {
           ],
           'cmdname' => 'cindex',
           'extra' => {
-            'entry_node' => {},
+            'element_node' => {},
             'index_entry' => {
               'entry_element' => {},
               'entry_number' => 1,
@@ -263,7 +263,7 @@ $result_trees{'syncode_index_print_both'} = {
           ],
           'cmdname' => 'findex',
           'extra' => {
-            'entry_node' => {},
+            'element_node' => {},
             'index_entry' => {
               'entry_element' => {},
               'entry_number' => 1,
@@ -419,9 +419,9 @@ 
$result_trees{'syncode_index_print_both'}{'contents'}[1]{'extra'}{'node_content'
 
$result_trees{'syncode_index_print_both'}{'contents'}[1]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = 
$result_trees{'syncode_index_print_both'}{'contents'}[1]{'args'}[0]{'contents'}[0];
 
$result_trees{'syncode_index_print_both'}{'contents'}[3]{'extra'}{'node_content'}[0]
 = 
$result_trees{'syncode_index_print_both'}{'contents'}[3]{'args'}[0]{'contents'}[0];
 
$result_trees{'syncode_index_print_both'}{'contents'}[3]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = 
$result_trees{'syncode_index_print_both'}{'contents'}[3]{'args'}[0]{'contents'}[0];
-$result_trees{'syncode_index_print_both'}{'contents'}[4]{'contents'}[1]{'extra'}{'entry_node'}
 = $result_trees{'syncode_index_print_both'}{'contents'}[3];
+$result_trees{'syncode_index_print_both'}{'contents'}[4]{'contents'}[1]{'extra'}{'element_node'}
 = $result_trees{'syncode_index_print_both'}{'contents'}[3];
 
$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'}[2]{'extra'}{'entry_node'}
 = $result_trees{'syncode_index_print_both'}{'contents'}[3];
+$result_trees{'syncode_index_print_both'}{'contents'}[4]{'contents'}[2]{'extra'}{'element_node'}
 = $result_trees{'syncode_index_print_both'}{'contents'}[3];
 
$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_texis{'syncode_index_print_both'} = '@syncodeindex fn cp
diff --git a/tp/t/results/indices/syncodeindex_to_plain.pl 
b/tp/t/results/indices/syncodeindex_to_plain.pl
index b2d34b5232..ac2c03688c 100644
--- a/tp/t/results/indices/syncodeindex_to_plain.pl
+++ b/tp/t/results/indices/syncodeindex_to_plain.pl
@@ -143,7 +143,7 @@ $result_trees{'syncodeindex_to_plain'} = {
           ],
           'cmdname' => 'kindex',
           'extra' => {
-            'entry_node' => {},
+            'element_node' => {},
             'index_entry' => {
               'entry_element' => {},
               'entry_number' => 1,
@@ -182,7 +182,7 @@ $result_trees{'syncodeindex_to_plain'} = {
           ],
           'cmdname' => 'vindex',
           'extra' => {
-            'entry_node' => {},
+            'element_node' => {},
             'index_entry' => {
               'entry_element' => {},
               'entry_number' => 1,
@@ -221,7 +221,7 @@ $result_trees{'syncodeindex_to_plain'} = {
           ],
           'cmdname' => 'cindex',
           'extra' => {
-            'entry_node' => {},
+            'element_node' => {},
             'index_entry' => {
               'entry_element' => {},
               'entry_number' => 1,
@@ -369,11 +369,11 @@ $result_trees{'syncodeindex_to_plain'} = {
 };
 
$result_trees{'syncodeindex_to_plain'}{'contents'}[1]{'extra'}{'node_content'}[0]
 = 
$result_trees{'syncodeindex_to_plain'}{'contents'}[1]{'args'}[0]{'contents'}[0];
 
$result_trees{'syncodeindex_to_plain'}{'contents'}[1]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = 
$result_trees{'syncodeindex_to_plain'}{'contents'}[1]{'args'}[0]{'contents'}[0];
-$result_trees{'syncodeindex_to_plain'}{'contents'}[2]{'contents'}[1]{'extra'}{'entry_node'}
 = $result_trees{'syncodeindex_to_plain'}{'contents'}[2];
+$result_trees{'syncodeindex_to_plain'}{'contents'}[2]{'contents'}[1]{'extra'}{'element_node'}
 = $result_trees{'syncodeindex_to_plain'}{'contents'}[2];
 
$result_trees{'syncodeindex_to_plain'}{'contents'}[2]{'contents'}[1]{'extra'}{'index_entry'}{'entry_element'}
 = $result_trees{'syncodeindex_to_plain'}{'contents'}[2]{'contents'}[1];
-$result_trees{'syncodeindex_to_plain'}{'contents'}[2]{'contents'}[2]{'extra'}{'entry_node'}
 = $result_trees{'syncodeindex_to_plain'}{'contents'}[2];
+$result_trees{'syncodeindex_to_plain'}{'contents'}[2]{'contents'}[2]{'extra'}{'element_node'}
 = $result_trees{'syncodeindex_to_plain'}{'contents'}[2];
 
$result_trees{'syncodeindex_to_plain'}{'contents'}[2]{'contents'}[2]{'extra'}{'index_entry'}{'entry_element'}
 = $result_trees{'syncodeindex_to_plain'}{'contents'}[2]{'contents'}[2];
-$result_trees{'syncodeindex_to_plain'}{'contents'}[2]{'contents'}[3]{'extra'}{'entry_node'}
 = $result_trees{'syncodeindex_to_plain'}{'contents'}[2];
+$result_trees{'syncodeindex_to_plain'}{'contents'}[2]{'contents'}[3]{'extra'}{'element_node'}
 = $result_trees{'syncodeindex_to_plain'}{'contents'}[2];
 
$result_trees{'syncodeindex_to_plain'}{'contents'}[2]{'contents'}[3]{'extra'}{'index_entry'}{'entry_element'}
 = $result_trees{'syncodeindex_to_plain'}{'contents'}[2]{'contents'}[3];
 
$result_trees{'syncodeindex_to_plain'}{'contents'}[2]{'extra'}{'node_content'}[0]
 = 
$result_trees{'syncodeindex_to_plain'}{'contents'}[2]{'args'}[0]{'contents'}[0];
 
$result_trees{'syncodeindex_to_plain'}{'contents'}[2]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = 
$result_trees{'syncodeindex_to_plain'}{'contents'}[2]{'args'}[0]{'contents'}[0];
diff --git a/tp/t/results/indices/transparent_sort_chars.pl 
b/tp/t/results/indices/transparent_sort_chars.pl
index c33f6e4a2e..96f0d4f91f 100644
--- a/tp/t/results/indices/transparent_sort_chars.pl
+++ b/tp/t/results/indices/transparent_sort_chars.pl
@@ -194,7 +194,7 @@ $result_trees{'transparent_sort_chars'} = {
           ],
           'cmdname' => 'cindex',
           'extra' => {
-            'entry_node' => {},
+            'element_node' => {},
             'index_entry' => {
               'entry_element' => {},
               'entry_number' => 1,
@@ -234,7 +234,7 @@ $result_trees{'transparent_sort_chars'} = {
           ],
           'cmdname' => 'cindex',
           'extra' => {
-            'entry_node' => {},
+            'element_node' => {},
             'index_entry' => {
               'entry_element' => {},
               'entry_number' => 2,
@@ -274,7 +274,7 @@ $result_trees{'transparent_sort_chars'} = {
           ],
           'cmdname' => 'cindex',
           'extra' => {
-            'entry_node' => {},
+            'element_node' => {},
             'index_entry' => {
               'entry_element' => {},
               'entry_number' => 3,
@@ -366,11 +366,11 @@ $result_trees{'transparent_sort_chars'} = {
 };
 
$result_trees{'transparent_sort_chars'}{'contents'}[1]{'extra'}{'node_content'}[0]
 = 
$result_trees{'transparent_sort_chars'}{'contents'}[1]{'args'}[0]{'contents'}[0];
 
$result_trees{'transparent_sort_chars'}{'contents'}[1]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = 
$result_trees{'transparent_sort_chars'}{'contents'}[1]{'args'}[0]{'contents'}[0];
-$result_trees{'transparent_sort_chars'}{'contents'}[3]{'contents'}[1]{'extra'}{'entry_node'}
 = $result_trees{'transparent_sort_chars'}{'contents'}[3];
+$result_trees{'transparent_sort_chars'}{'contents'}[3]{'contents'}[1]{'extra'}{'element_node'}
 = $result_trees{'transparent_sort_chars'}{'contents'}[3];
 
$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'}[2]{'extra'}{'entry_node'}
 = $result_trees{'transparent_sort_chars'}{'contents'}[3];
+$result_trees{'transparent_sort_chars'}{'contents'}[3]{'contents'}[2]{'extra'}{'element_node'}
 = $result_trees{'transparent_sort_chars'}{'contents'}[3];
 
$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'}[3]{'extra'}{'entry_node'}
 = $result_trees{'transparent_sort_chars'}{'contents'}[3];
+$result_trees{'transparent_sort_chars'}{'contents'}[3]{'contents'}[3]{'extra'}{'element_node'}
 = $result_trees{'transparent_sort_chars'}{'contents'}[3];
 
$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]{'extra'}{'node_content'}[0]
 = 
$result_trees{'transparent_sort_chars'}{'contents'}[3]{'args'}[0]{'contents'}[0];
 
$result_trees{'transparent_sort_chars'}{'contents'}[3]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = 
$result_trees{'transparent_sort_chars'}{'contents'}[3]{'args'}[0]{'contents'}[0];
diff --git a/tp/t/results/indices/w_lines_count.pl 
b/tp/t/results/indices/w_lines_count.pl
index 4ed6892ce5..33e543556c 100644
--- a/tp/t/results/indices/w_lines_count.pl
+++ b/tp/t/results/indices/w_lines_count.pl
@@ -149,7 +149,7 @@ $result_trees{'w_lines_count'} = {
           ],
           'cmdname' => 'findex',
           'extra' => {
-            'entry_node' => {},
+            'element_node' => {},
             'index_entry' => {
               'entry_element' => {},
               'entry_number' => 1,
@@ -266,7 +266,7 @@ $result_trees{'w_lines_count'} = {
 };
 $result_trees{'w_lines_count'}{'contents'}[1]{'extra'}{'node_content'}[0] = 
$result_trees{'w_lines_count'}{'contents'}[1]{'args'}[0]{'contents'}[0];
 
$result_trees{'w_lines_count'}{'contents'}[1]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = $result_trees{'w_lines_count'}{'contents'}[1]{'args'}[0]{'contents'}[0];
-$result_trees{'w_lines_count'}{'contents'}[2]{'contents'}[3]{'extra'}{'entry_node'}
 = $result_trees{'w_lines_count'}{'contents'}[1];
+$result_trees{'w_lines_count'}{'contents'}[2]{'contents'}[3]{'extra'}{'element_node'}
 = $result_trees{'w_lines_count'}{'contents'}[1];
 
$result_trees{'w_lines_count'}{'contents'}[2]{'contents'}[3]{'extra'}{'index_entry'}{'entry_element'}
 = $result_trees{'w_lines_count'}{'contents'}[2]{'contents'}[3];
 
 $result_texis{'w_lines_count'} = '@node Top
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 4371535922..c193e524fe 100644
--- a/tp/t/results/info_tests/colon_in_index_entry.pl
+++ b/tp/t/results/info_tests/colon_in_index_entry.pl
@@ -93,7 +93,7 @@ $result_trees{'colon_in_index_entry'} = {
           ],
           'cmdname' => 'cindex',
           'extra' => {
-            'entry_node' => {},
+            'element_node' => {},
             'index_entry' => {
               'entry_element' => {},
               'entry_number' => 1,
@@ -166,7 +166,7 @@ $result_trees{'colon_in_index_entry'} = {
                       ],
                       'cmdname' => 'item',
                       'extra' => {
-                        'entry_node' => {},
+                        'element_node' => {},
                         'index_entry' => {
                           'entry_element' => {},
                           'entry_number' => 1,
@@ -332,7 +332,7 @@ $result_trees{'colon_in_index_entry'} = {
                   'category' => {},
                   'name' => {}
                 },
-                'entry_node' => {},
+                'element_node' => {},
                 'index_entry' => {
                   'entry_element' => {},
                   'entry_number' => 2,
@@ -448,7 +448,7 @@ $result_trees{'colon_in_index_entry'} = {
                   'category' => {},
                   'name' => {}
                 },
-                'entry_node' => {},
+                'element_node' => {},
                 'index_entry' => {
                   'entry_element' => {},
                   'entry_number' => 3,
@@ -582,20 +582,20 @@ $result_trees{'colon_in_index_entry'} = {
   ],
   'type' => 'document_root'
 };
-$result_trees{'colon_in_index_entry'}{'contents'}[1]{'contents'}[3]{'extra'}{'entry_node'}
 = $result_trees{'colon_in_index_entry'}{'contents'}[1];
+$result_trees{'colon_in_index_entry'}{'contents'}[1]{'contents'}[3]{'extra'}{'element_node'}
 = $result_trees{'colon_in_index_entry'}{'contents'}[1];
 
$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'}[5]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'extra'}{'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'}{'element_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_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]{'extra'}{'command_as_argument'}
 = 
$result_trees{'colon_in_index_entry'}{'contents'}[1]{'contents'}[5]{'args'}[0]{'contents'}[0];
 
$result_trees{'colon_in_index_entry'}{'contents'}[1]{'contents'}[7]{'contents'}[0]{'extra'}{'def_index_element'}
 = 
$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'}{'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'}{'entry_node'}
 = $result_trees{'colon_in_index_entry'}{'contents'}[1];
+$result_trees{'colon_in_index_entry'}{'contents'}[1]{'contents'}[7]{'contents'}[0]{'extra'}{'element_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_element'}
 = 
$result_trees{'colon_in_index_entry'}{'contents'}[1]{'contents'}[7]{'contents'}[0];
 
$result_trees{'colon_in_index_entry'}{'contents'}[1]{'contents'}[7]{'contents'}[1]{'extra'}{'def_index_element'}
 = 
$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'}{'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'}{'entry_node'}
 = $result_trees{'colon_in_index_entry'}{'contents'}[1];
+$result_trees{'colon_in_index_entry'}{'contents'}[1]{'contents'}[7]{'contents'}[1]{'extra'}{'element_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_element'}
 = 
$result_trees{'colon_in_index_entry'}{'contents'}[1]{'contents'}[7]{'contents'}[1];
 
$result_trees{'colon_in_index_entry'}{'contents'}[1]{'extra'}{'node_content'}[0]
 = 
$result_trees{'colon_in_index_entry'}{'contents'}[1]{'args'}[0]{'contents'}[0];
 
$result_trees{'colon_in_index_entry'}{'contents'}[1]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = 
$result_trees{'colon_in_index_entry'}{'contents'}[1]{'args'}[0]{'contents'}[0];
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 03a4e32834..4a20f711a5 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
@@ -335,7 +335,7 @@ $result_trees{'colons_in_index_entries_and_node'} = {
           ],
           'cmdname' => 'cindex',
           'extra' => {
-            'entry_node' => {},
+            'element_node' => {},
             'index_entry' => {
               'entry_element' => {},
               'entry_number' => 1,
@@ -374,7 +374,7 @@ $result_trees{'colons_in_index_entries_and_node'} = {
           ],
           'cmdname' => 'cindex',
           'extra' => {
-            'entry_node' => {},
+            'element_node' => {},
             'index_entry' => {
               'entry_element' => {},
               'entry_number' => 2,
@@ -413,7 +413,7 @@ $result_trees{'colons_in_index_entries_and_node'} = {
           ],
           'cmdname' => 'cindex',
           'extra' => {
-            'entry_node' => {},
+            'element_node' => {},
             'index_entry' => {
               'entry_element' => {},
               'entry_number' => 3,
@@ -524,7 +524,7 @@ $result_trees{'colons_in_index_entries_and_node'} = {
           ],
           'cmdname' => 'cindex',
           'extra' => {
-            'entry_node' => {},
+            'element_node' => {},
             'index_entry' => {
               'entry_element' => {},
               'entry_number' => 4,
@@ -563,7 +563,7 @@ $result_trees{'colons_in_index_entries_and_node'} = {
           ],
           'cmdname' => 'cindex',
           'extra' => {
-            'entry_node' => {},
+            'element_node' => {},
             'index_entry' => {
               'entry_element' => {},
               'entry_number' => 5,
@@ -602,7 +602,7 @@ $result_trees{'colons_in_index_entries_and_node'} = {
           ],
           'cmdname' => 'cindex',
           'extra' => {
-            'entry_node' => {},
+            'element_node' => {},
             'index_entry' => {
               'entry_element' => {},
               'entry_number' => 6,
@@ -776,17 +776,17 @@ 
$result_trees{'colons_in_index_entries_and_node'}{'contents'}[1]{'contents'}[1]{
 
$result_trees{'colons_in_index_entries_and_node'}{'contents'}[1]{'contents'}[1]{'contents'}[1]{'extra'}{'menu_entry_node_label'}{'node_content'}[0]
 = 
$result_trees{'colons_in_index_entries_and_node'}{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[0];
 
$result_trees{'colons_in_index_entries_and_node'}{'contents'}[1]{'extra'}{'node_content'}[0]
 = 
$result_trees{'colons_in_index_entries_and_node'}{'contents'}[1]{'args'}[0]{'contents'}[0];
 
$result_trees{'colons_in_index_entries_and_node'}{'contents'}[1]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = 
$result_trees{'colons_in_index_entries_and_node'}{'contents'}[1]{'args'}[0]{'contents'}[0];
-$result_trees{'colons_in_index_entries_and_node'}{'contents'}[2]{'contents'}[1]{'extra'}{'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'}{'element_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_element'}
 = 
$result_trees{'colons_in_index_entries_and_node'}{'contents'}[2]{'contents'}[1];
-$result_trees{'colons_in_index_entries_and_node'}{'contents'}[2]{'contents'}[2]{'extra'}{'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'}{'element_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_element'}
 = 
$result_trees{'colons_in_index_entries_and_node'}{'contents'}[2]{'contents'}[2];
-$result_trees{'colons_in_index_entries_and_node'}{'contents'}[2]{'contents'}[3]{'extra'}{'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'}{'element_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_element'}
 = 
$result_trees{'colons_in_index_entries_and_node'}{'contents'}[2]{'contents'}[3];
-$result_trees{'colons_in_index_entries_and_node'}{'contents'}[2]{'contents'}[7]{'extra'}{'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'}{'element_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_element'}
 = 
$result_trees{'colons_in_index_entries_and_node'}{'contents'}[2]{'contents'}[7];
-$result_trees{'colons_in_index_entries_and_node'}{'contents'}[2]{'contents'}[8]{'extra'}{'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'}{'element_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_element'}
 = 
$result_trees{'colons_in_index_entries_and_node'}{'contents'}[2]{'contents'}[8];
-$result_trees{'colons_in_index_entries_and_node'}{'contents'}[2]{'contents'}[9]{'extra'}{'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'}{'element_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_element'}
 = 
$result_trees{'colons_in_index_entries_and_node'}{'contents'}[2]{'contents'}[9];
 
$result_trees{'colons_in_index_entries_and_node'}{'contents'}[2]{'extra'}{'node_content'}[0]
 = 
$result_trees{'colons_in_index_entries_and_node'}{'contents'}[2]{'args'}[0]{'contents'}[0];
 
$result_trees{'colons_in_index_entries_and_node'}{'contents'}[2]{'extra'}{'node_content'}[1]
 = 
$result_trees{'colons_in_index_entries_and_node'}{'contents'}[2]{'args'}[0]{'contents'}[1];
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 bb1067219c..ecafdadc6e 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
@@ -335,7 +335,7 @@ 
$result_trees{'colons_in_index_entries_and_node_no_quoting'} = {
           ],
           'cmdname' => 'cindex',
           'extra' => {
-            'entry_node' => {},
+            'element_node' => {},
             'index_entry' => {
               'entry_element' => {},
               'entry_number' => 1,
@@ -374,7 +374,7 @@ 
$result_trees{'colons_in_index_entries_and_node_no_quoting'} = {
           ],
           'cmdname' => 'cindex',
           'extra' => {
-            'entry_node' => {},
+            'element_node' => {},
             'index_entry' => {
               'entry_element' => {},
               'entry_number' => 2,
@@ -413,7 +413,7 @@ 
$result_trees{'colons_in_index_entries_and_node_no_quoting'} = {
           ],
           'cmdname' => 'cindex',
           'extra' => {
-            'entry_node' => {},
+            'element_node' => {},
             'index_entry' => {
               'entry_element' => {},
               'entry_number' => 3,
@@ -524,7 +524,7 @@ 
$result_trees{'colons_in_index_entries_and_node_no_quoting'} = {
           ],
           'cmdname' => 'cindex',
           'extra' => {
-            'entry_node' => {},
+            'element_node' => {},
             'index_entry' => {
               'entry_element' => {},
               'entry_number' => 4,
@@ -563,7 +563,7 @@ 
$result_trees{'colons_in_index_entries_and_node_no_quoting'} = {
           ],
           'cmdname' => 'cindex',
           'extra' => {
-            'entry_node' => {},
+            'element_node' => {},
             'index_entry' => {
               'entry_element' => {},
               'entry_number' => 5,
@@ -602,7 +602,7 @@ 
$result_trees{'colons_in_index_entries_and_node_no_quoting'} = {
           ],
           'cmdname' => 'cindex',
           'extra' => {
-            'entry_node' => {},
+            'element_node' => {},
             'index_entry' => {
               'entry_element' => {},
               'entry_number' => 6,
@@ -776,17 +776,17 @@ 
$result_trees{'colons_in_index_entries_and_node_no_quoting'}{'contents'}[1]{'con
 
$result_trees{'colons_in_index_entries_and_node_no_quoting'}{'contents'}[1]{'contents'}[1]{'contents'}[1]{'extra'}{'menu_entry_node_label'}{'node_content'}[0]
 = 
$result_trees{'colons_in_index_entries_and_node_no_quoting'}{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[0];
 
$result_trees{'colons_in_index_entries_and_node_no_quoting'}{'contents'}[1]{'extra'}{'node_content'}[0]
 = 
$result_trees{'colons_in_index_entries_and_node_no_quoting'}{'contents'}[1]{'args'}[0]{'contents'}[0];
 
$result_trees{'colons_in_index_entries_and_node_no_quoting'}{'contents'}[1]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = 
$result_trees{'colons_in_index_entries_and_node_no_quoting'}{'contents'}[1]{'args'}[0]{'contents'}[0];
-$result_trees{'colons_in_index_entries_and_node_no_quoting'}{'contents'}[2]{'contents'}[1]{'extra'}{'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'}{'element_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_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'}[2]{'extra'}{'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'}{'element_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_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'}[3]{'extra'}{'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'}{'element_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_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'}[7]{'extra'}{'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'}{'element_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_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'}[8]{'extra'}{'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'}{'element_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_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'}[9]{'extra'}{'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'}{'element_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_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]{'extra'}{'node_content'}[0]
 = 
$result_trees{'colons_in_index_entries_and_node_no_quoting'}{'contents'}[2]{'args'}[0]{'contents'}[0];
 
$result_trees{'colons_in_index_entries_and_node_no_quoting'}{'contents'}[2]{'extra'}{'node_content'}[1]
 = 
$result_trees{'colons_in_index_entries_and_node_no_quoting'}{'contents'}[2]{'args'}[0]{'contents'}[1];
diff --git a/tp/t/results/info_tests/def_in_copying.pl 
b/tp/t/results/info_tests/def_in_copying.pl
index e2c0e4c958..456aad3c72 100644
--- a/tp/t/results/info_tests/def_in_copying.pl
+++ b/tp/t/results/info_tests/def_in_copying.pl
@@ -255,7 +255,7 @@ $result_trees{'def_in_copying'} = {
                       'category' => {},
                       'name' => {}
                     },
-                    'entry_region' => 'copying',
+                    'element_region' => 'copying',
                     'index_entry' => {
                       'entry_element' => {},
                       'entry_number' => 1,
@@ -325,7 +325,7 @@ $result_trees{'def_in_copying'} = {
                       'category' => {},
                       'name' => {}
                     },
-                    'entry_region' => 'copying',
+                    'element_region' => 'copying',
                     'index_entry' => {
                       'entry_element' => {},
                       'entry_number' => 2,
@@ -540,7 +540,7 @@ $result_trees{'def_in_copying'} = {
                   'category' => {},
                   'name' => {}
                 },
-                'entry_node' => {},
+                'element_node' => {},
                 'index_entry' => {
                   'entry_element' => {},
                   'entry_number' => 3,
@@ -610,7 +610,7 @@ $result_trees{'def_in_copying'} = {
                   'category' => {},
                   'name' => {}
                 },
-                'entry_node' => {},
+                'element_node' => {},
                 'index_entry' => {
                   'entry_element' => {},
                   'entry_number' => 4,
@@ -765,12 +765,12 @@ 
$result_trees{'def_in_copying'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'co
 
$result_trees{'def_in_copying'}{'contents'}[2]{'contents'}[4]{'contents'}[0]{'extra'}{'def_index_element'}
 = 
$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'}{'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'}{'entry_node'}
 = $result_trees{'def_in_copying'}{'contents'}[1];
+$result_trees{'def_in_copying'}{'contents'}[2]{'contents'}[4]{'contents'}[0]{'extra'}{'element_node'}
 = $result_trees{'def_in_copying'}{'contents'}[1];
 
$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'}[1]{'extra'}{'def_index_element'}
 = 
$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'}{'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'}{'entry_node'}
 = $result_trees{'def_in_copying'}{'contents'}[1];
+$result_trees{'def_in_copying'}{'contents'}[2]{'contents'}[4]{'contents'}[1]{'extra'}{'element_node'}
 = $result_trees{'def_in_copying'}{'contents'}[1];
 
$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_texis{'def_in_copying'} = '@macro mymacro
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 f6230d0671..ec0e13f47d 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
@@ -271,7 +271,7 @@ $result_trees{'end_of_line_command_in_node_lines'} = {
           ],
           'cmdname' => 'cindex',
           'extra' => {
-            'entry_node' => {},
+            'element_node' => {},
             'index_entry' => {
               'entry_element' => {},
               'entry_number' => 1,
@@ -933,7 +933,7 @@ 
$result_trees{'end_of_line_command_in_node_lines'}{'contents'}[3]{'extra'}{'node
 
$result_trees{'end_of_line_command_in_node_lines'}{'contents'}[4]{'contents'}[1]{'extra'}{'node_content'}[0]
 = 
$result_trees{'end_of_line_command_in_node_lines'}{'contents'}[4]{'contents'}[1]{'args'}[0]{'contents'}[0];
 
$result_trees{'end_of_line_command_in_node_lines'}{'contents'}[4]{'contents'}[1]{'extra'}{'node_content'}[1]
 = 
$result_trees{'end_of_line_command_in_node_lines'}{'contents'}[4]{'contents'}[1]{'args'}[0]{'contents'}[1];
 
$result_trees{'end_of_line_command_in_node_lines'}{'contents'}[4]{'contents'}[1]{'extra'}{'node_content'}[2]
 = 
$result_trees{'end_of_line_command_in_node_lines'}{'contents'}[4]{'contents'}[1]{'args'}[0]{'contents'}[2];
-$result_trees{'end_of_line_command_in_node_lines'}{'contents'}[4]{'contents'}[6]{'extra'}{'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'}{'element_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_element'}
 = 
$result_trees{'end_of_line_command_in_node_lines'}{'contents'}[4]{'contents'}[6];
 
$result_trees{'end_of_line_command_in_node_lines'}{'contents'}[5]{'extra'}{'node_content'}[0]
 = 
$result_trees{'end_of_line_command_in_node_lines'}{'contents'}[5]{'args'}[0]{'contents'}[0];
 
$result_trees{'end_of_line_command_in_node_lines'}{'contents'}[5]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = 
$result_trees{'end_of_line_command_in_node_lines'}{'contents'}[5]{'args'}[0]{'contents'}[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 e9f059a4f2..f57ad8b59d 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
@@ -345,7 +345,7 @@ $result_trees{'index_entry_at_end_node'} = {
           ],
           'cmdname' => 'cindex',
           'extra' => {
-            'entry_node' => {},
+            'element_node' => {},
             'index_entry' => {
               'entry_element' => {},
               'entry_number' => 1,
@@ -507,7 +507,7 @@ 
$result_trees{'index_entry_at_end_node'}{'contents'}[2]{'contents'}[2]{'contents
 
$result_trees{'index_entry_at_end_node'}{'contents'}[2]{'contents'}[2]{'contents'}[1]{'extra'}{'menu_entry_node_label'}{'node_content'}[0]
 = 
$result_trees{'index_entry_at_end_node'}{'contents'}[2]{'contents'}[2]{'contents'}[1]{'contents'}[1]{'contents'}[0];
 
$result_trees{'index_entry_at_end_node'}{'contents'}[3]{'extra'}{'node_content'}[0]
 = 
$result_trees{'index_entry_at_end_node'}{'contents'}[3]{'args'}[0]{'contents'}[0];
 
$result_trees{'index_entry_at_end_node'}{'contents'}[3]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = 
$result_trees{'index_entry_at_end_node'}{'contents'}[3]{'args'}[0]{'contents'}[0];
-$result_trees{'index_entry_at_end_node'}{'contents'}[4]{'contents'}[3]{'extra'}{'entry_node'}
 = $result_trees{'index_entry_at_end_node'}{'contents'}[3];
+$result_trees{'index_entry_at_end_node'}{'contents'}[4]{'contents'}[3]{'extra'}{'element_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_element'}
 = $result_trees{'index_entry_at_end_node'}{'contents'}[4]{'contents'}[3];
 
$result_trees{'index_entry_at_end_node'}{'contents'}[5]{'extra'}{'node_content'}[0]
 = 
$result_trees{'index_entry_at_end_node'}{'contents'}[5]{'args'}[0]{'contents'}[0];
 
$result_trees{'index_entry_at_end_node'}{'contents'}[5]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = 
$result_trees{'index_entry_at_end_node'}{'contents'}[5]{'args'}[0]{'contents'}[0];
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 6e2c9cca13..b932db2302 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
@@ -279,7 +279,7 @@ $result_trees{'multitable_anchor_and_index_entry'} = {
                               ],
                               'cmdname' => 'cindex',
                               'extra' => {
-                                'entry_node' => {},
+                                'element_node' => {},
                                 'index_entry' => {
                                   'entry_element' => {},
                                   'entry_number' => 1,
@@ -590,7 +590,7 @@ $result_trees{'multitable_anchor_and_index_entry'} = {
                               ],
                               'cmdname' => 'cindex',
                               'extra' => {
-                                'entry_node' => {},
+                                'element_node' => {},
                                 'index_entry' => {
                                   'entry_element' => {},
                                   'entry_number' => 2,
@@ -944,11 +944,11 @@ $result_trees{'multitable_anchor_and_index_entry'} = {
   ],
   'type' => 'document_root'
 };
-$result_trees{'multitable_anchor_and_index_entry'}{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'extra'}{'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'}{'element_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_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'}[2]{'extra'}{'node_content'}[0]
 = 
$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];
 
$result_trees{'multitable_anchor_and_index_entry'}{'contents'}[1]{'contents'}[1]{'extra'}{'columnfractions'}
 = 
$result_trees{'multitable_anchor_and_index_entry'}{'contents'}[1]{'contents'}[1]{'args'}[0]{'contents'}[0];
-$result_trees{'multitable_anchor_and_index_entry'}{'contents'}[1]{'contents'}[3]{'contents'}[0]{'contents'}[1]{'contents'}[0]{'contents'}[1]{'contents'}[2]{'extra'}{'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'}{'element_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_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'}[2]{'contents'}[1]{'contents'}[1]{'contents'}[2]{'extra'}{'node_content'}[0]
 = 
$result_trees{'multitable_anchor_and_index_entry'}{'contents'}[1]{'contents'}[3]{'contents'}[0]{'contents'}[2]{'contents'}[1]{'contents'}[1]{'contents'}[2]{'args'}[0]{'contents'}[0];
 
$result_trees{'multitable_anchor_and_index_entry'}{'contents'}[1]{'contents'}[3]{'extra'}{'prototypes'}[0]{'contents'}[0]
 = 
$result_trees{'multitable_anchor_and_index_entry'}{'contents'}[1]{'contents'}[3]{'args'}[0]{'contents'}[0]{'contents'}[0];
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 6a1358e573..15f833ff20 100644
--- a/tp/t/results/info_tests/nested_multitable_anchor_index.pl
+++ b/tp/t/results/info_tests/nested_multitable_anchor_index.pl
@@ -205,7 +205,7 @@ $result_trees{'nested_multitable_anchor_index'} = {
                                               ],
                                               'cmdname' => 'cindex',
                                               'extra' => {
-                                                'entry_node' => {},
+                                                'element_node' => {},
                                                 'index_entry' => {
                                                   'entry_element' => {},
                                                   'entry_number' => 1,
@@ -441,7 +441,7 @@ $result_trees{'nested_multitable_anchor_index'} = {
                               ],
                               'cmdname' => 'cindex',
                               'extra' => {
-                                'entry_node' => {},
+                                'element_node' => {},
                                 'index_entry' => {
                                   'entry_element' => {},
                                   'entry_number' => 2,
@@ -686,12 +686,12 @@ $result_trees{'nested_multitable_anchor_index'} = {
   'type' => 'document_root'
 };
 
$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'}[1]{'extra'}{'node_content'}[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'}[1]{'args'}[0]{'contents'}[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]{'extra'}{'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'}{'element_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_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]{'extra'}{'prototypes'}[0]{'contents'}[0]
 = 
$result_trees{'nested_multitable_anchor_index'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[1]{'args'}[0]{'contents'}[0]{'contents'}[0];
 
$result_trees{'nested_multitable_anchor_index'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[1]{'extra'}{'prototypes'}[1]{'contents'}[0]
 = 
$result_trees{'nested_multitable_anchor_index'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[1]{'args'}[0]{'contents'}[2]{'contents'}[0];
 
$result_trees{'nested_multitable_anchor_index'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'extra'}{'node_content'}[0]
 = 
$result_trees{'nested_multitable_anchor_index'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'args'}[0]{'contents'}[0];
-$result_trees{'nested_multitable_anchor_index'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[3]{'extra'}{'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'}{'element_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_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]{'extra'}{'prototypes'}[0]{'contents'}[0]
 = 
$result_trees{'nested_multitable_anchor_index'}{'contents'}[1]{'contents'}[1]{'args'}[0]{'contents'}[0]{'contents'}[0];
 
$result_trees{'nested_multitable_anchor_index'}{'contents'}[1]{'contents'}[1]{'extra'}{'prototypes'}[1]{'contents'}[0]
 = 
$result_trees{'nested_multitable_anchor_index'}{'contents'}[1]{'contents'}[1]{'args'}[0]{'contents'}[2]{'contents'}[0];
diff --git a/tp/t/results/info_tests/one_node_counted_elements.pl 
b/tp/t/results/info_tests/one_node_counted_elements.pl
index 83f00d1e69..cdaddc3643 100644
--- a/tp/t/results/info_tests/one_node_counted_elements.pl
+++ b/tp/t/results/info_tests/one_node_counted_elements.pl
@@ -128,7 +128,7 @@ $result_trees{'one_node_counted_elements'} = {
               ],
               'cmdname' => 'cindex',
               'extra' => {
-                'entry_node' => {},
+                'element_node' => {},
                 'index_entry' => {
                   'entry_element' => {},
                   'entry_number' => 2,
@@ -443,7 +443,7 @@ $result_trees{'one_node_counted_elements'} = {
   'type' => 'document_root'
 };
 
$result_trees{'one_node_counted_elements'}{'contents'}[0]{'contents'}[0]{'contents'}[1]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'one_node_counted_elements'}{'contents'}[0]{'contents'}[0]{'contents'}[1];
-$result_trees{'one_node_counted_elements'}{'contents'}[1]{'contents'}[0]{'contents'}[1]{'extra'}{'entry_node'}
 = $result_trees{'one_node_counted_elements'}{'contents'}[1];
+$result_trees{'one_node_counted_elements'}{'contents'}[1]{'contents'}[0]{'contents'}[1]{'extra'}{'element_node'}
 = $result_trees{'one_node_counted_elements'}{'contents'}[1];
 
$result_trees{'one_node_counted_elements'}{'contents'}[1]{'contents'}[0]{'contents'}[1]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'one_node_counted_elements'}{'contents'}[1]{'contents'}[0]{'contents'}[1];
 
$result_trees{'one_node_counted_elements'}{'contents'}[1]{'contents'}[2]{'contents'}[1]{'extra'}{'node_content'}[0]
 = 
$result_trees{'one_node_counted_elements'}{'contents'}[1]{'contents'}[2]{'contents'}[1]{'args'}[0]{'contents'}[0];
 
$result_trees{'one_node_counted_elements'}{'contents'}[1]{'contents'}[4]{'contents'}[0]{'extra'}{'menu_entry_node_label'}{'manual_content'}[0]
 = 
$result_trees{'one_node_counted_elements'}{'contents'}[1]{'contents'}[4]{'contents'}[0]{'contents'}[1]{'contents'}[1];
diff --git a/tp/t/results/info_tests/test_index.pl 
b/tp/t/results/info_tests/test_index.pl
index 885ebf14ef..0a90d33e80 100644
--- a/tp/t/results/info_tests/test_index.pl
+++ b/tp/t/results/info_tests/test_index.pl
@@ -166,7 +166,7 @@ $result_trees{'test_index'} = {
               ],
               'cmdname' => 'cindex',
               'extra' => {
-                'entry_node' => {},
+                'element_node' => {},
                 'index_entry' => {
                   'entry_element' => {},
                   'entry_number' => 1,
@@ -205,7 +205,7 @@ $result_trees{'test_index'} = {
               ],
               'cmdname' => 'cindex',
               'extra' => {
-                'entry_node' => {},
+                'element_node' => {},
                 'index_entry' => {
                   'entry_element' => {},
                   'entry_number' => 2,
@@ -254,7 +254,7 @@ $result_trees{'test_index'} = {
               ],
               'cmdname' => 'cindex',
               'extra' => {
-                'entry_node' => {},
+                'element_node' => {},
                 'index_entry' => {
                   'entry_element' => {},
                   'entry_number' => 3,
@@ -293,7 +293,7 @@ $result_trees{'test_index'} = {
               ],
               'cmdname' => 'cindex',
               'extra' => {
-                'entry_node' => {},
+                'element_node' => {},
                 'index_entry' => {
                   'entry_element' => {},
                   'entry_number' => 4,
@@ -405,7 +405,7 @@ $result_trees{'test_index'} = {
                   'category' => {},
                   'name' => {}
                 },
-                'entry_node' => {},
+                'element_node' => {},
                 'index_entry' => {
                   'entry_element' => {},
                   'entry_number' => 1,
@@ -488,7 +488,7 @@ $result_trees{'test_index'} = {
                   'category' => {},
                   'name' => {}
                 },
-                'entry_node' => {},
+                'element_node' => {},
                 'index_entry' => {
                   'entry_element' => {},
                   'entry_number' => 2,
@@ -616,7 +616,7 @@ $result_trees{'test_index'} = {
                       ],
                       'cmdname' => 'item',
                       'extra' => {
-                        'entry_node' => {},
+                        'element_node' => {},
                         'index_entry' => {
                           'entry_element' => {},
                           'entry_number' => 3,
@@ -683,7 +683,7 @@ $result_trees{'test_index'} = {
                       ],
                       'cmdname' => 'item',
                       'extra' => {
-                        'entry_node' => {},
+                        'element_node' => {},
                         'index_entry' => {
                           'entry_element' => {},
                           'entry_number' => 4,
@@ -721,7 +721,7 @@ $result_trees{'test_index'} = {
                       ],
                       'cmdname' => 'itemx',
                       'extra' => {
-                        'entry_node' => {},
+                        'element_node' => {},
                         'index_entry' => {
                           'entry_element' => {},
                           'entry_number' => 5,
@@ -1061,7 +1061,7 @@ $result_trees{'test_index'} = {
           ],
           'cmdname' => 'cindex',
           'extra' => {
-            'entry_node' => {},
+            'element_node' => {},
             'index_entry' => {
               'entry_element' => {},
               'entry_number' => 5,
@@ -1100,7 +1100,7 @@ $result_trees{'test_index'} = {
           ],
           'cmdname' => 'findex',
           'extra' => {
-            'entry_node' => {},
+            'element_node' => {},
             'index_entry' => {
               'entry_element' => {},
               'entry_number' => 6,
@@ -1150,7 +1150,7 @@ $result_trees{'test_index'} = {
               ],
               'cmdname' => 'findex',
               'extra' => {
-                'entry_node' => {},
+                'element_node' => {},
                 'index_entry' => {
                   'entry_element' => {},
                   'entry_number' => 7,
@@ -1271,7 +1271,7 @@ $result_trees{'test_index'} = {
           ],
           'cmdname' => 'findex',
           'extra' => {
-            'entry_node' => {},
+            'element_node' => {},
             'index_entry' => {
               'entry_element' => {},
               'entry_number' => 8,
@@ -2365,7 +2365,7 @@ $result_trees{'test_index'} = {
           ],
           'cmdname' => 'findex',
           'extra' => {
-            'entry_node' => {},
+            'element_node' => {},
             'index_entry' => {
               'entry_element' => {},
               'entry_number' => 9,
@@ -2490,7 +2490,7 @@ $result_trees{'test_index'} = {
           ],
           'cmdname' => 'cindex',
           'extra' => {
-            'entry_node' => {},
+            'element_node' => {},
             'index_entry' => {
               'entry_element' => {},
               'entry_number' => 6,
@@ -2591,7 +2591,7 @@ $result_trees{'test_index'} = {
           ],
           'cmdname' => 'findex',
           'extra' => {
-            'entry_node' => {},
+            'element_node' => {},
             'index_entry' => {
               'entry_element' => {},
               'entry_number' => 10,
@@ -2898,7 +2898,7 @@ $result_trees{'test_index'} = {
           ],
           'cmdname' => 'cindex',
           'extra' => {
-            'entry_node' => {},
+            'element_node' => {},
             'index_entry' => {
               'entry_element' => {},
               'entry_number' => 7,
@@ -2963,52 +2963,52 @@ 
$result_trees{'test_index'}{'contents'}[1]{'extra'}{'node_content'}[0] = $result
 
$result_trees{'test_index'}{'contents'}[1]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = $result_trees{'test_index'}{'contents'}[1]{'args'}[0]{'contents'}[0];
 
$result_trees{'test_index'}{'contents'}[2]{'contents'}[1]{'contents'}[0]{'extra'}{'label'}{'extra'}{'node_content'}[0]
 = 
$result_trees{'test_index'}{'contents'}[2]{'contents'}[1]{'contents'}[0]{'extra'}{'label'}{'args'}[0]{'contents'}[0];
 
$result_trees{'test_index'}{'contents'}[2]{'contents'}[1]{'contents'}[0]{'extra'}{'node_argument'}{'node_content'}[0]
 = 
$result_trees{'test_index'}{'contents'}[2]{'contents'}[1]{'contents'}[0]{'args'}[0]{'contents'}[0];
-$result_trees{'test_index'}{'contents'}[2]{'contents'}[3]{'contents'}[1]{'extra'}{'entry_node'}
 = $result_trees{'test_index'}{'contents'}[1];
+$result_trees{'test_index'}{'contents'}[2]{'contents'}[3]{'contents'}[1]{'extra'}{'element_node'}
 = $result_trees{'test_index'}{'contents'}[1];
 
$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'}[2]{'extra'}{'entry_node'}
 = $result_trees{'test_index'}{'contents'}[1];
+$result_trees{'test_index'}{'contents'}[2]{'contents'}[3]{'contents'}[2]{'extra'}{'element_node'}
 = $result_trees{'test_index'}{'contents'}[1];
 
$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'}[3]{'extra'}{'entry_node'}
 = $result_trees{'test_index'}{'contents'}[1];
+$result_trees{'test_index'}{'contents'}[2]{'contents'}[3]{'contents'}[3]{'extra'}{'element_node'}
 = $result_trees{'test_index'}{'contents'}[1];
 
$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'}[4]{'extra'}{'entry_node'}
 = $result_trees{'test_index'}{'contents'}[1];
+$result_trees{'test_index'}{'contents'}[2]{'contents'}[3]{'contents'}[4]{'extra'}{'element_node'}
 = $result_trees{'test_index'}{'contents'}[1];
 
$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'}[5]{'contents'}[0]{'extra'}{'def_index_element'}
 = 
$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'}{'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'}{'entry_node'}
 = $result_trees{'test_index'}{'contents'}[1];
+$result_trees{'test_index'}{'contents'}[2]{'contents'}[5]{'contents'}[0]{'extra'}{'element_node'}
 = $result_trees{'test_index'}{'contents'}[1];
 
$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'}[1]{'extra'}{'def_index_element'}
 = 
$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'}{'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'}{'entry_node'}
 = $result_trees{'test_index'}{'contents'}[1];
+$result_trees{'test_index'}{'contents'}[2]{'contents'}[5]{'contents'}[1]{'extra'}{'element_node'}
 = $result_trees{'test_index'}{'contents'}[1];
 
$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'}[7]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'extra'}{'entry_node'}
 = $result_trees{'test_index'}{'contents'}[1];
+$result_trees{'test_index'}{'contents'}[2]{'contents'}[7]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'extra'}{'element_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_element'}
 = 
$result_trees{'test_index'}{'contents'}[2]{'contents'}[7]{'contents'}[0]{'contents'}[0]{'contents'}[0];
-$result_trees{'test_index'}{'contents'}[2]{'contents'}[7]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'extra'}{'entry_node'}
 = $result_trees{'test_index'}{'contents'}[1];
+$result_trees{'test_index'}{'contents'}[2]{'contents'}[7]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'extra'}{'element_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_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'}[1]{'extra'}{'entry_node'}
 = $result_trees{'test_index'}{'contents'}[1];
+$result_trees{'test_index'}{'contents'}[2]{'contents'}[7]{'contents'}[1]{'contents'}[0]{'contents'}[1]{'extra'}{'element_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_element'}
 = 
$result_trees{'test_index'}{'contents'}[2]{'contents'}[7]{'contents'}[1]{'contents'}[0]{'contents'}[1];
 
$result_trees{'test_index'}{'contents'}[2]{'contents'}[7]{'extra'}{'command_as_argument'}
 = 
$result_trees{'test_index'}{'contents'}[2]{'contents'}[7]{'args'}[0]{'contents'}[0];
 
$result_trees{'test_index'}{'contents'}[2]{'contents'}[9]{'contents'}[0]{'extra'}{'menu_entry_node_label'}{'node_content'}[0]
 = 
$result_trees{'test_index'}{'contents'}[2]{'contents'}[9]{'contents'}[0]{'contents'}[1]{'contents'}[0];
 
$result_trees{'test_index'}{'contents'}[2]{'contents'}[9]{'contents'}[1]{'extra'}{'menu_entry_node_label'}{'node_content'}[0]
 = 
$result_trees{'test_index'}{'contents'}[2]{'contents'}[9]{'contents'}[1]{'contents'}[1]{'contents'}[0];
 $result_trees{'test_index'}{'contents'}[3]{'extra'}{'node_content'}[0] = 
$result_trees{'test_index'}{'contents'}[3]{'args'}[0]{'contents'}[0];
 
$result_trees{'test_index'}{'contents'}[3]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = $result_trees{'test_index'}{'contents'}[3]{'args'}[0]{'contents'}[0];
-$result_trees{'test_index'}{'contents'}[4]{'contents'}[1]{'extra'}{'entry_node'}
 = $result_trees{'test_index'}{'contents'}[3];
+$result_trees{'test_index'}{'contents'}[4]{'contents'}[1]{'extra'}{'element_node'}
 = $result_trees{'test_index'}{'contents'}[3];
 
$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'}[2]{'extra'}{'entry_node'}
 = $result_trees{'test_index'}{'contents'}[3];
+$result_trees{'test_index'}{'contents'}[4]{'contents'}[2]{'extra'}{'element_node'}
 = $result_trees{'test_index'}{'contents'}[3];
 
$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'}[4]{'contents'}[1]{'extra'}{'entry_node'}
 = $result_trees{'test_index'}{'contents'}[3];
+$result_trees{'test_index'}{'contents'}[4]{'contents'}[4]{'contents'}[1]{'extra'}{'element_node'}
 = $result_trees{'test_index'}{'contents'}[3];
 
$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'}[16]{'extra'}{'entry_node'}
 = $result_trees{'test_index'}{'contents'}[3];
+$result_trees{'test_index'}{'contents'}[4]{'contents'}[16]{'extra'}{'element_node'}
 = $result_trees{'test_index'}{'contents'}[3];
 
$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'}[168]{'extra'}{'entry_node'}
 = $result_trees{'test_index'}{'contents'}[3];
+$result_trees{'test_index'}{'contents'}[4]{'contents'}[168]{'extra'}{'element_node'}
 = $result_trees{'test_index'}{'contents'}[3];
 
$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'}[5]{'extra'}{'node_content'}[0] = 
$result_trees{'test_index'}{'contents'}[5]{'args'}[0]{'contents'}[0];
 
$result_trees{'test_index'}{'contents'}[5]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = $result_trees{'test_index'}{'contents'}[5]{'args'}[0]{'contents'}[0];
-$result_trees{'test_index'}{'contents'}[6]{'contents'}[1]{'extra'}{'entry_node'}
 = $result_trees{'test_index'}{'contents'}[5];
+$result_trees{'test_index'}{'contents'}[6]{'contents'}[1]{'extra'}{'element_node'}
 = $result_trees{'test_index'}{'contents'}[5];
 
$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'}[7]{'extra'}{'entry_node'}
 = $result_trees{'test_index'}{'contents'}[5];
+$result_trees{'test_index'}{'contents'}[6]{'contents'}[7]{'extra'}{'element_node'}
 = $result_trees{'test_index'}{'contents'}[5];
 
$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'}[11]{'contents'}[1]{'extra'}{'entry_node'}
 = $result_trees{'test_index'}{'contents'}[5];
+$result_trees{'test_index'}{'contents'}[11]{'contents'}[1]{'extra'}{'element_node'}
 = $result_trees{'test_index'}{'contents'}[5];
 
$result_trees{'test_index'}{'contents'}[11]{'contents'}[1]{'extra'}{'index_entry'}{'entry_element'}
 = $result_trees{'test_index'}{'contents'}[11]{'contents'}[1];
 $result_trees{'test_index'}{'contents'}[11]{'contents'}[3] = 
$result_trees{'test_index'}{'contents'}[2]{'contents'}[1]{'contents'}[0]{'extra'}{'label'};
 
diff --git a/tp/t/results/invalid_nestings/in_table.pl 
b/tp/t/results/invalid_nestings/in_table.pl
index fa281fa6b9..d100133b71 100644
--- a/tp/t/results/invalid_nestings/in_table.pl
+++ b/tp/t/results/invalid_nestings/in_table.pl
@@ -533,7 +533,7 @@ $result_trees{'in_table'} = {
                               ],
                               'cmdname' => 'cindex',
                               'extra' => {
-                                'entry_node' => {},
+                                'element_node' => {},
                                 'index_entry' => {
                                   'entry_element' => {},
                                   'entry_number' => 1,
@@ -679,7 +679,7 @@ $result_trees{'in_table'} = {
                               ],
                               'cmdname' => 'cindex',
                               'extra' => {
-                                'entry_node' => {},
+                                'element_node' => {},
                                 'index_entry' => {
                                   'entry_element' => {},
                                   'entry_number' => 2,
@@ -705,7 +705,7 @@ $result_trees{'in_table'} = {
                       ],
                       'cmdname' => 'item',
                       'extra' => {
-                        'entry_node' => {},
+                        'element_node' => {},
                         'index_entry' => {
                           'entry_element' => {},
                           'entry_number' => 1,
@@ -793,7 +793,7 @@ $result_trees{'in_table'} = {
                               ],
                               'cmdname' => 'cindex',
                               'extra' => {
-                                'entry_node' => {},
+                                'element_node' => {},
                                 'index_entry' => {
                                   'entry_element' => {},
                                   'entry_number' => 3,
@@ -819,7 +819,7 @@ $result_trees{'in_table'} = {
                       ],
                       'cmdname' => 'item',
                       'extra' => {
-                        'entry_node' => {},
+                        'element_node' => {},
                         'index_entry' => {
                           'entry_element' => {},
                           'entry_number' => 2,
@@ -1039,16 +1039,16 @@ 
$result_trees{'in_table'}{'contents'}[1]{'extra'}{'node_content'}[0] = $result_t
 
$result_trees{'in_table'}{'contents'}[1]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = $result_trees{'in_table'}{'contents'}[1]{'args'}[0]{'contents'}[0];
 
$result_trees{'in_table'}{'contents'}[2]{'contents'}[1]{'extra'}{'command_as_argument'}
 = 
$result_trees{'in_table'}{'contents'}[2]{'contents'}[1]{'args'}[0]{'contents'}[0];
 
$result_trees{'in_table'}{'contents'}[2]{'contents'}[3]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[4]{'extra'}{'node_content'}[0]
 = 
$result_trees{'in_table'}{'contents'}[2]{'contents'}[3]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[4]{'args'}[0]{'contents'}[0];
-$result_trees{'in_table'}{'contents'}[2]{'contents'}[3]{'contents'}[3]{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0]{'extra'}{'entry_node'}
 = $result_trees{'in_table'}{'contents'}[2];
+$result_trees{'in_table'}{'contents'}[2]{'contents'}[3]{'contents'}[3]{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0]{'extra'}{'element_node'}
 = $result_trees{'in_table'}{'contents'}[2];
 
$result_trees{'in_table'}{'contents'}[2]{'contents'}[3]{'contents'}[3]{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'in_table'}{'contents'}[2]{'contents'}[3]{'contents'}[3]{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0];
 
$result_trees{'in_table'}{'contents'}[2]{'contents'}[3]{'extra'}{'command_as_argument'}
 = 
$result_trees{'in_table'}{'contents'}[2]{'contents'}[3]{'args'}[0]{'contents'}[0];
-$result_trees{'in_table'}{'contents'}[2]{'contents'}[5]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0]{'extra'}{'entry_node'}
 = $result_trees{'in_table'}{'contents'}[2];
+$result_trees{'in_table'}{'contents'}[2]{'contents'}[5]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0]{'extra'}{'element_node'}
 = $result_trees{'in_table'}{'contents'}[2];
 
$result_trees{'in_table'}{'contents'}[2]{'contents'}[5]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'in_table'}{'contents'}[2]{'contents'}[5]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0];
-$result_trees{'in_table'}{'contents'}[2]{'contents'}[5]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'extra'}{'entry_node'}
 = $result_trees{'in_table'}{'contents'}[2];
+$result_trees{'in_table'}{'contents'}[2]{'contents'}[5]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'extra'}{'element_node'}
 = $result_trees{'in_table'}{'contents'}[2];
 
$result_trees{'in_table'}{'contents'}[2]{'contents'}[5]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'in_table'}{'contents'}[2]{'contents'}[5]{'contents'}[0]{'contents'}[0]{'contents'}[0];
-$result_trees{'in_table'}{'contents'}[2]{'contents'}[5]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0]{'extra'}{'entry_node'}
 = $result_trees{'in_table'}{'contents'}[2];
+$result_trees{'in_table'}{'contents'}[2]{'contents'}[5]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0]{'extra'}{'element_node'}
 = $result_trees{'in_table'}{'contents'}[2];
 
$result_trees{'in_table'}{'contents'}[2]{'contents'}[5]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'in_table'}{'contents'}[2]{'contents'}[5]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0];
-$result_trees{'in_table'}{'contents'}[2]{'contents'}[5]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'extra'}{'entry_node'}
 = $result_trees{'in_table'}{'contents'}[2];
+$result_trees{'in_table'}{'contents'}[2]{'contents'}[5]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'extra'}{'element_node'}
 = $result_trees{'in_table'}{'contents'}[2];
 
$result_trees{'in_table'}{'contents'}[2]{'contents'}[5]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'in_table'}{'contents'}[2]{'contents'}[5]{'contents'}[1]{'contents'}[0]{'contents'}[0];
 
$result_trees{'in_table'}{'contents'}[2]{'contents'}[5]{'extra'}{'command_as_argument'}
 = 
$result_trees{'in_table'}{'contents'}[2]{'contents'}[5]{'args'}[0]{'contents'}[0];
 $result_trees{'in_table'}{'contents'}[2]{'extra'}{'node_content'}[0] = 
$result_trees{'in_table'}{'contents'}[2]{'args'}[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 57781b42b6..3f18befc74 100644
--- a/tp/t/results/itemize/inter_item_commands_in_enumerate.pl
+++ b/tp/t/results/itemize/inter_item_commands_in_enumerate.pl
@@ -316,7 +316,7 @@ $result_trees{'inter_item_commands_in_enumerate'} = {
                   ],
                   'cmdname' => 'cindex',
                   'extra' => {
-                    'entry_node' => {},
+                    'element_node' => {},
                     'index_entry' => {
                       'entry_element' => {},
                       'entry_number' => 1,
@@ -457,7 +457,7 @@ $result_trees{'inter_item_commands_in_enumerate'} = {
                   ],
                   'cmdname' => 'cindex',
                   'extra' => {
-                    'entry_node' => {},
+                    'element_node' => {},
                     'index_entry' => {
                       'entry_element' => {},
                       'entry_number' => 2,
@@ -588,7 +588,7 @@ $result_trees{'inter_item_commands_in_enumerate'} = {
                   ],
                   'cmdname' => 'cindex',
                   'extra' => {
-                    'entry_node' => {},
+                    'element_node' => {},
                     'index_entry' => {
                       'entry_element' => {},
                       'entry_number' => 3,
@@ -730,7 +730,7 @@ $result_trees{'inter_item_commands_in_enumerate'} = {
                       ],
                       'cmdname' => 'cindex',
                       'extra' => {
-                        'entry_node' => {},
+                        'element_node' => {},
                         'index_entry' => {
                           'entry_element' => {},
                           'entry_number' => 4,
@@ -864,7 +864,7 @@ $result_trees{'inter_item_commands_in_enumerate'} = {
                   ],
                   'cmdname' => 'cindex',
                   'extra' => {
-                    'entry_node' => {},
+                    'element_node' => {},
                     'index_entry' => {
                       'entry_element' => {},
                       'entry_number' => 5,
@@ -919,7 +919,7 @@ $result_trees{'inter_item_commands_in_enumerate'} = {
                   ],
                   'cmdname' => 'cindex',
                   'extra' => {
-                    'entry_node' => {},
+                    'element_node' => {},
                     'index_entry' => {
                       'entry_element' => {},
                       'entry_number' => 6,
@@ -958,7 +958,7 @@ $result_trees{'inter_item_commands_in_enumerate'} = {
                   ],
                   'cmdname' => 'cindex',
                   'extra' => {
-                    'entry_node' => {},
+                    'element_node' => {},
                     'index_entry' => {
                       'entry_element' => {},
                       'entry_number' => 7,
@@ -1074,19 +1074,19 @@ 
$result_trees{'inter_item_commands_in_enumerate'}{'contents'}[1]{'extra'}{'node_
 
$result_trees{'inter_item_commands_in_enumerate'}{'contents'}[1]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = 
$result_trees{'inter_item_commands_in_enumerate'}{'contents'}[1]{'args'}[0]{'contents'}[0];
 
$result_trees{'inter_item_commands_in_enumerate'}{'contents'}[3]{'extra'}{'node_content'}[0]
 = 
$result_trees{'inter_item_commands_in_enumerate'}{'contents'}[3]{'args'}[0]{'contents'}[0];
 
$result_trees{'inter_item_commands_in_enumerate'}{'contents'}[3]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = 
$result_trees{'inter_item_commands_in_enumerate'}{'contents'}[3]{'args'}[0]{'contents'}[0];
-$result_trees{'inter_item_commands_in_enumerate'}{'contents'}[4]{'contents'}[3]{'contents'}[0]{'contents'}[1]{'extra'}{'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'}{'element_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_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'}[5]{'contents'}[0]{'contents'}[1]{'extra'}{'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'}{'element_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_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'}[7]{'contents'}[0]{'contents'}[0]{'extra'}{'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'}{'element_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_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'}[9]{'contents'}[0]{'contents'}[0]{'contents'}[1]{'extra'}{'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'}{'element_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_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'}[11]{'contents'}[0]{'contents'}[0]{'extra'}{'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'}{'element_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_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'}[2]{'extra'}{'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'}{'element_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_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'}[3]{'extra'}{'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'}{'element_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_element'}
 = 
$result_trees{'inter_item_commands_in_enumerate'}{'contents'}[4]{'contents'}[11]{'contents'}[0]{'contents'}[3];
 
 $result_texis{'inter_item_commands_in_enumerate'} = '@node Top
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 73647b6213..bb6dcd069c 100644
--- a/tp/t/results/itemize/inter_item_commands_in_itemize.pl
+++ b/tp/t/results/itemize/inter_item_commands_in_itemize.pl
@@ -225,7 +225,7 @@ $result_trees{'inter_item_commands_in_itemize'} = {
                   ],
                   'cmdname' => 'cindex',
                   'extra' => {
-                    'entry_node' => {},
+                    'element_node' => {},
                     'index_entry' => {
                       'entry_element' => {},
                       'entry_number' => 1,
@@ -372,7 +372,7 @@ $result_trees{'inter_item_commands_in_itemize'} = {
                   ],
                   'cmdname' => 'cindex',
                   'extra' => {
-                    'entry_node' => {},
+                    'element_node' => {},
                     'index_entry' => {
                       'entry_element' => {},
                       'entry_number' => 2,
@@ -453,7 +453,7 @@ $result_trees{'inter_item_commands_in_itemize'} = {
                   ],
                   'cmdname' => 'cindex',
                   'extra' => {
-                    'entry_node' => {},
+                    'element_node' => {},
                     'index_entry' => {
                       'entry_element' => {},
                       'entry_number' => 3,
@@ -607,7 +607,7 @@ $result_trees{'inter_item_commands_in_itemize'} = {
                       ],
                       'cmdname' => 'cindex',
                       'extra' => {
-                        'entry_node' => {},
+                        'element_node' => {},
                         'index_entry' => {
                           'entry_element' => {},
                           'entry_number' => 4,
@@ -721,15 +721,15 @@ 
$result_trees{'inter_item_commands_in_itemize'}{'contents'}[1]{'extra'}{'node_co
 
$result_trees{'inter_item_commands_in_itemize'}{'contents'}[1]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = 
$result_trees{'inter_item_commands_in_itemize'}{'contents'}[1]{'args'}[0]{'contents'}[0];
 
$result_trees{'inter_item_commands_in_itemize'}{'contents'}[3]{'extra'}{'node_content'}[0]
 = 
$result_trees{'inter_item_commands_in_itemize'}{'contents'}[3]{'args'}[0]{'contents'}[0];
 
$result_trees{'inter_item_commands_in_itemize'}{'contents'}[3]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = 
$result_trees{'inter_item_commands_in_itemize'}{'contents'}[3]{'args'}[0]{'contents'}[0];
-$result_trees{'inter_item_commands_in_itemize'}{'contents'}[4]{'contents'}[1]{'contents'}[0]{'contents'}[1]{'extra'}{'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'}{'element_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_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]{'extra'}{'command_as_argument'}
 = 
$result_trees{'inter_item_commands_in_itemize'}{'contents'}[4]{'contents'}[1]{'args'}[0]{'contents'}[0];
-$result_trees{'inter_item_commands_in_itemize'}{'contents'}[4]{'contents'}[3]{'contents'}[0]{'contents'}[0]{'extra'}{'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'}{'element_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_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'}[2]{'contents'}[1]{'extra'}{'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'}{'element_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_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]{'extra'}{'command_as_argument'}
 = 
$result_trees{'inter_item_commands_in_itemize'}{'contents'}[4]{'contents'}[3]{'args'}[0]{'contents'}[0];
-$result_trees{'inter_item_commands_in_itemize'}{'contents'}[4]{'contents'}[5]{'contents'}[0]{'contents'}[1]{'contents'}[1]{'extra'}{'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'}{'element_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_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]{'extra'}{'command_as_argument'}
 = 
$result_trees{'inter_item_commands_in_itemize'}{'contents'}[4]{'contents'}[5]{'args'}[0]{'contents'}[0];
 
diff --git a/tp/t/results/languages/documentlanguage.pl 
b/tp/t/results/languages/documentlanguage.pl
index 7df68d697f..ba700eea04 100644
--- a/tp/t/results/languages/documentlanguage.pl
+++ b/tp/t/results/languages/documentlanguage.pl
@@ -663,7 +663,7 @@ $result_trees{'documentlanguage'} = {
                   'type' => {}
                 },
                 'documentlanguage' => 'pt',
-                'entry_node' => {},
+                'element_node' => {},
                 'index_entry' => {
                   'entry_element' => {},
                   'entry_number' => 1,
@@ -821,7 +821,7 @@ 
$result_trees{'documentlanguage'}{'contents'}[4]{'contents'}[3]{'contents'}[0]{'
 
$result_trees{'documentlanguage'}{'contents'}[4]{'contents'}[3]{'contents'}[0]{'extra'}{'def_parsed_hash'}{'class'}
 = 
$result_trees{'documentlanguage'}{'contents'}[4]{'contents'}[3]{'contents'}[0]{'args'}[0]{'contents'}[2];
 
$result_trees{'documentlanguage'}{'contents'}[4]{'contents'}[3]{'contents'}[0]{'extra'}{'def_parsed_hash'}{'name'}
 = 
$result_trees{'documentlanguage'}{'contents'}[4]{'contents'}[3]{'contents'}[0]{'args'}[0]{'contents'}[6];
 
$result_trees{'documentlanguage'}{'contents'}[4]{'contents'}[3]{'contents'}[0]{'extra'}{'def_parsed_hash'}{'type'}
 = 
$result_trees{'documentlanguage'}{'contents'}[4]{'contents'}[3]{'contents'}[0]{'args'}[0]{'contents'}[4];
-$result_trees{'documentlanguage'}{'contents'}[4]{'contents'}[3]{'contents'}[0]{'extra'}{'entry_node'}
 = $result_trees{'documentlanguage'}{'contents'}[3];
+$result_trees{'documentlanguage'}{'contents'}[4]{'contents'}[3]{'contents'}[0]{'extra'}{'element_node'}
 = $result_trees{'documentlanguage'}{'contents'}[3];
 
$result_trees{'documentlanguage'}{'contents'}[4]{'contents'}[3]{'contents'}[0]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'documentlanguage'}{'contents'}[4]{'contents'}[3]{'contents'}[0];
 
 $result_texis{'documentlanguage'} = '\\input texinfo @c -*-texinfo-*-
diff --git a/tp/t/results/languages/documentlanguage_option.pl 
b/tp/t/results/languages/documentlanguage_option.pl
index a9951ce07c..12bfe242c1 100644
--- a/tp/t/results/languages/documentlanguage_option.pl
+++ b/tp/t/results/languages/documentlanguage_option.pl
@@ -663,7 +663,7 @@ $result_trees{'documentlanguage_option'} = {
                   'type' => {}
                 },
                 'documentlanguage' => 'fr',
-                'entry_node' => {},
+                'element_node' => {},
                 'index_entry' => {
                   'entry_element' => {},
                   'entry_number' => 1,
@@ -821,7 +821,7 @@ 
$result_trees{'documentlanguage_option'}{'contents'}[4]{'contents'}[3]{'contents
 
$result_trees{'documentlanguage_option'}{'contents'}[4]{'contents'}[3]{'contents'}[0]{'extra'}{'def_parsed_hash'}{'class'}
 = 
$result_trees{'documentlanguage_option'}{'contents'}[4]{'contents'}[3]{'contents'}[0]{'args'}[0]{'contents'}[2];
 
$result_trees{'documentlanguage_option'}{'contents'}[4]{'contents'}[3]{'contents'}[0]{'extra'}{'def_parsed_hash'}{'name'}
 = 
$result_trees{'documentlanguage_option'}{'contents'}[4]{'contents'}[3]{'contents'}[0]{'args'}[0]{'contents'}[6];
 
$result_trees{'documentlanguage_option'}{'contents'}[4]{'contents'}[3]{'contents'}[0]{'extra'}{'def_parsed_hash'}{'type'}
 = 
$result_trees{'documentlanguage_option'}{'contents'}[4]{'contents'}[3]{'contents'}[0]{'args'}[0]{'contents'}[4];
-$result_trees{'documentlanguage_option'}{'contents'}[4]{'contents'}[3]{'contents'}[0]{'extra'}{'entry_node'}
 = $result_trees{'documentlanguage_option'}{'contents'}[3];
+$result_trees{'documentlanguage_option'}{'contents'}[4]{'contents'}[3]{'contents'}[0]{'extra'}{'element_node'}
 = $result_trees{'documentlanguage_option'}{'contents'}[3];
 
$result_trees{'documentlanguage_option'}{'contents'}[4]{'contents'}[3]{'contents'}[0]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'documentlanguage_option'}{'contents'}[4]{'contents'}[3]{'contents'}[0];
 
 $result_texis{'documentlanguage_option'} = '\\input texinfo @c -*-texinfo-*-
diff --git a/tp/t/results/languages/documentlanguage_unknown.pl 
b/tp/t/results/languages/documentlanguage_unknown.pl
index f78a4829fe..6867bbe76c 100644
--- a/tp/t/results/languages/documentlanguage_unknown.pl
+++ b/tp/t/results/languages/documentlanguage_unknown.pl
@@ -663,7 +663,7 @@ $result_trees{'documentlanguage_unknown'} = {
                   'type' => {}
                 },
                 'documentlanguage' => 'unknown',
-                'entry_node' => {},
+                'element_node' => {},
                 'index_entry' => {
                   'entry_element' => {},
                   'entry_number' => 1,
@@ -821,7 +821,7 @@ 
$result_trees{'documentlanguage_unknown'}{'contents'}[4]{'contents'}[3]{'content
 
$result_trees{'documentlanguage_unknown'}{'contents'}[4]{'contents'}[3]{'contents'}[0]{'extra'}{'def_parsed_hash'}{'class'}
 = 
$result_trees{'documentlanguage_unknown'}{'contents'}[4]{'contents'}[3]{'contents'}[0]{'args'}[0]{'contents'}[2];
 
$result_trees{'documentlanguage_unknown'}{'contents'}[4]{'contents'}[3]{'contents'}[0]{'extra'}{'def_parsed_hash'}{'name'}
 = 
$result_trees{'documentlanguage_unknown'}{'contents'}[4]{'contents'}[3]{'contents'}[0]{'args'}[0]{'contents'}[6];
 
$result_trees{'documentlanguage_unknown'}{'contents'}[4]{'contents'}[3]{'contents'}[0]{'extra'}{'def_parsed_hash'}{'type'}
 = 
$result_trees{'documentlanguage_unknown'}{'contents'}[4]{'contents'}[3]{'contents'}[0]{'args'}[0]{'contents'}[4];
-$result_trees{'documentlanguage_unknown'}{'contents'}[4]{'contents'}[3]{'contents'}[0]{'extra'}{'entry_node'}
 = $result_trees{'documentlanguage_unknown'}{'contents'}[3];
+$result_trees{'documentlanguage_unknown'}{'contents'}[4]{'contents'}[3]{'contents'}[0]{'extra'}{'element_node'}
 = $result_trees{'documentlanguage_unknown'}{'contents'}[3];
 
$result_trees{'documentlanguage_unknown'}{'contents'}[4]{'contents'}[3]{'contents'}[0]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'documentlanguage_unknown'}{'contents'}[4]{'contents'}[3]{'contents'}[0];
 
 $result_texis{'documentlanguage_unknown'} = '\\input texinfo @c -*-texinfo-*-
diff --git a/tp/t/results/languages/multiple_documentlanguage.pl 
b/tp/t/results/languages/multiple_documentlanguage.pl
index e21f1c8883..474144d331 100644
--- a/tp/t/results/languages/multiple_documentlanguage.pl
+++ b/tp/t/results/languages/multiple_documentlanguage.pl
@@ -160,7 +160,7 @@ $result_trees{'multiple_documentlanguage'} = {
                           'name' => {}
                         },
                         'documentlanguage' => 'fr',
-                        'entry_region' => 'copying',
+                        'element_region' => 'copying',
                         'index_entry' => {
                           'entry_element' => {},
                           'entry_number' => 1,
@@ -543,7 +543,7 @@ $result_trees{'multiple_documentlanguage'} = {
                   'name' => {}
                 },
                 'documentlanguage' => 'fr',
-                'entry_node' => {},
+                'element_node' => {},
                 'index_entry' => {
                   'entry_element' => {},
                   'entry_number' => 2,
@@ -827,7 +827,7 @@ $result_trees{'multiple_documentlanguage'} = {
                   'name' => {}
                 },
                 'documentlanguage' => 'hr',
-                'entry_node' => {},
+                'element_node' => {},
                 'index_entry' => {
                   'entry_element' => {},
                   'entry_number' => 3,
@@ -1008,7 +1008,7 @@ 
$result_trees{'multiple_documentlanguage'}{'contents'}[4]{'contents'}[1]{'conten
 
$result_trees{'multiple_documentlanguage'}{'contents'}[4]{'contents'}[1]{'contents'}[0]{'extra'}{'def_parsed_hash'}{'category'}
 = 
$result_trees{'multiple_documentlanguage'}{'contents'}[4]{'contents'}[1]{'contents'}[0]{'args'}[0]{'contents'}[0];
 
$result_trees{'multiple_documentlanguage'}{'contents'}[4]{'contents'}[1]{'contents'}[0]{'extra'}{'def_parsed_hash'}{'class'}
 = 
$result_trees{'multiple_documentlanguage'}{'contents'}[4]{'contents'}[1]{'contents'}[0]{'args'}[0]{'contents'}[2];
 
$result_trees{'multiple_documentlanguage'}{'contents'}[4]{'contents'}[1]{'contents'}[0]{'extra'}{'def_parsed_hash'}{'name'}
 = 
$result_trees{'multiple_documentlanguage'}{'contents'}[4]{'contents'}[1]{'contents'}[0]{'args'}[0]{'contents'}[4];
-$result_trees{'multiple_documentlanguage'}{'contents'}[4]{'contents'}[1]{'contents'}[0]{'extra'}{'entry_node'}
 = $result_trees{'multiple_documentlanguage'}{'contents'}[3];
+$result_trees{'multiple_documentlanguage'}{'contents'}[4]{'contents'}[1]{'contents'}[0]{'extra'}{'element_node'}
 = $result_trees{'multiple_documentlanguage'}{'contents'}[3];
 
$result_trees{'multiple_documentlanguage'}{'contents'}[4]{'contents'}[1]{'contents'}[0]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'multiple_documentlanguage'}{'contents'}[4]{'contents'}[1]{'contents'}[0];
 
$result_trees{'multiple_documentlanguage'}{'contents'}[4]{'contents'}[9]{'contents'}[0]{'extra'}{'def_index_element'}{'contents'}[0]
 = 
$result_trees{'multiple_documentlanguage'}{'contents'}[4]{'contents'}[9]{'contents'}[0]{'args'}[0]{'contents'}[4];
 
$result_trees{'multiple_documentlanguage'}{'contents'}[4]{'contents'}[9]{'contents'}[0]{'extra'}{'def_index_element'}{'contents'}[2]
 = 
$result_trees{'multiple_documentlanguage'}{'contents'}[4]{'contents'}[9]{'contents'}[0]{'args'}[0]{'contents'}[2];
@@ -1017,7 +1017,7 @@ 
$result_trees{'multiple_documentlanguage'}{'contents'}[4]{'contents'}[9]{'conten
 
$result_trees{'multiple_documentlanguage'}{'contents'}[4]{'contents'}[9]{'contents'}[0]{'extra'}{'def_parsed_hash'}{'category'}
 = 
$result_trees{'multiple_documentlanguage'}{'contents'}[4]{'contents'}[9]{'contents'}[0]{'args'}[0]{'contents'}[0];
 
$result_trees{'multiple_documentlanguage'}{'contents'}[4]{'contents'}[9]{'contents'}[0]{'extra'}{'def_parsed_hash'}{'class'}
 = 
$result_trees{'multiple_documentlanguage'}{'contents'}[4]{'contents'}[9]{'contents'}[0]{'args'}[0]{'contents'}[2];
 
$result_trees{'multiple_documentlanguage'}{'contents'}[4]{'contents'}[9]{'contents'}[0]{'extra'}{'def_parsed_hash'}{'name'}
 = 
$result_trees{'multiple_documentlanguage'}{'contents'}[4]{'contents'}[9]{'contents'}[0]{'args'}[0]{'contents'}[4];
-$result_trees{'multiple_documentlanguage'}{'contents'}[4]{'contents'}[9]{'contents'}[0]{'extra'}{'entry_node'}
 = $result_trees{'multiple_documentlanguage'}{'contents'}[3];
+$result_trees{'multiple_documentlanguage'}{'contents'}[4]{'contents'}[9]{'contents'}[0]{'extra'}{'element_node'}
 = $result_trees{'multiple_documentlanguage'}{'contents'}[3];
 
$result_trees{'multiple_documentlanguage'}{'contents'}[4]{'contents'}[9]{'contents'}[0]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'multiple_documentlanguage'}{'contents'}[4]{'contents'}[9]{'contents'}[0];
 
 $result_texis{'multiple_documentlanguage'} = '@documentlanguage fr
diff --git a/tp/t/results/languages/multiple_in_preamble.pl 
b/tp/t/results/languages/multiple_in_preamble.pl
index 9fc3430cf6..b08cc8863d 100644
--- a/tp/t/results/languages/multiple_in_preamble.pl
+++ b/tp/t/results/languages/multiple_in_preamble.pl
@@ -160,7 +160,7 @@ $result_trees{'multiple_in_preamble'} = {
                           'name' => {}
                         },
                         'documentlanguage' => 'fr',
-                        'entry_region' => 'copying',
+                        'element_region' => 'copying',
                         'index_entry' => {
                           'entry_element' => {},
                           'entry_number' => 1,
@@ -579,7 +579,7 @@ $result_trees{'multiple_in_preamble'} = {
                   'name' => {}
                 },
                 'documentlanguage' => 'hr',
-                'entry_node' => {},
+                'element_node' => {},
                 'index_entry' => {
                   'entry_element' => {},
                   'entry_number' => 2,
@@ -806,7 +806,7 @@ $result_trees{'multiple_in_preamble'} = {
                   'name' => {}
                 },
                 'documentlanguage' => 'de',
-                'entry_node' => {},
+                'element_node' => {},
                 'index_entry' => {
                   'entry_element' => {},
                   'entry_number' => 3,
@@ -901,7 +901,7 @@ 
$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'}{'entry_node'}
 = $result_trees{'multiple_in_preamble'}{'contents'}[3];
+$result_trees{'multiple_in_preamble'}{'contents'}[4]{'contents'}[1]{'contents'}[0]{'extra'}{'element_node'}
 = $result_trees{'multiple_in_preamble'}{'contents'}[3];
 
$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'}[5]{'contents'}[0]{'extra'}{'def_index_element'}{'contents'}[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'}{'def_index_element'}{'contents'}[2]
 = 
$result_trees{'multiple_in_preamble'}{'contents'}[4]{'contents'}[5]{'contents'}[0]{'args'}[0]{'contents'}[2];
@@ -910,7 +910,7 @@ 
$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'}{'entry_node'}
 = $result_trees{'multiple_in_preamble'}{'contents'}[3];
+$result_trees{'multiple_in_preamble'}{'contents'}[4]{'contents'}[5]{'contents'}[0]{'extra'}{'element_node'}
 = $result_trees{'multiple_in_preamble'}{'contents'}[3];
 
$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_texis{'multiple_in_preamble'} = '@documentlanguage fr
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 157f26e003..c90a39fca8 100644
--- a/tp/t/results/languages/multiple_in_preamble_before_node.pl
+++ b/tp/t/results/languages/multiple_in_preamble_before_node.pl
@@ -160,7 +160,7 @@ $result_trees{'multiple_in_preamble_before_node'} = {
                           'name' => {}
                         },
                         'documentlanguage' => 'fr',
-                        'entry_region' => 'copying',
+                        'element_region' => 'copying',
                         'index_entry' => {
                           'entry_element' => {},
                           'entry_number' => 1,
@@ -630,7 +630,7 @@ $result_trees{'multiple_in_preamble_before_node'} = {
                   'name' => {}
                 },
                 'documentlanguage' => 'de',
-                'entry_node' => {},
+                'element_node' => {},
                 'index_entry' => {
                   'entry_element' => {},
                   'entry_number' => 2,
@@ -752,7 +752,7 @@ 
$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'}{'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'}{'element_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_element'}
 = 
$result_trees{'multiple_in_preamble_before_node'}{'contents'}[4]{'contents'}[1]{'contents'}[0];
 
 $result_texis{'multiple_in_preamble_before_node'} = '@documentlanguage fr
diff --git a/tp/t/results/languages/multiple_lang_chapters.pl 
b/tp/t/results/languages/multiple_lang_chapters.pl
index a6742fe8b6..a4246339ca 100644
--- a/tp/t/results/languages/multiple_lang_chapters.pl
+++ b/tp/t/results/languages/multiple_lang_chapters.pl
@@ -860,7 +860,7 @@ $result_trees{'multiple_lang_chapters'} = {
                   'name' => {}
                 },
                 'documentlanguage' => 'ja',
-                'entry_node' => {},
+                'element_node' => {},
                 'index_entry' => {
                   'entry_element' => {},
                   'entry_number' => 1,
@@ -1174,7 +1174,7 @@ $result_trees{'multiple_lang_chapters'} = {
                   'name' => {}
                 },
                 'documentlanguage' => 'en',
-                'entry_node' => {},
+                'element_node' => {},
                 'index_entry' => {
                   'entry_element' => {},
                   'entry_number' => 2,
@@ -1449,7 +1449,7 @@ $result_trees{'multiple_lang_chapters'} = {
                   'name' => {}
                 },
                 'documentlanguage' => 'fr_FR',
-                'entry_node' => {},
+                'element_node' => {},
                 'index_entry' => {
                   'entry_element' => {},
                   'entry_number' => 3,
@@ -1811,7 +1811,7 @@ 
$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'}{'entry_node'}
 = $result_trees{'multiple_lang_chapters'}{'contents'}[3];
+$result_trees{'multiple_lang_chapters'}{'contents'}[4]{'contents'}[2]{'contents'}[0]{'extra'}{'element_node'}
 = $result_trees{'multiple_lang_chapters'}{'contents'}[3];
 
$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'}[5]{'extra'}{'node_content'}[0]
 = 
$result_trees{'multiple_lang_chapters'}{'contents'}[5]{'args'}[0]{'contents'}[0];
 
$result_trees{'multiple_lang_chapters'}{'contents'}[5]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = 
$result_trees{'multiple_lang_chapters'}{'contents'}[5]{'args'}[0]{'contents'}[0];
@@ -1824,7 +1824,7 @@ 
$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'}{'entry_node'}
 = $result_trees{'multiple_lang_chapters'}{'contents'}[5];
+$result_trees{'multiple_lang_chapters'}{'contents'}[6]{'contents'}[2]{'contents'}[0]{'extra'}{'element_node'}
 = $result_trees{'multiple_lang_chapters'}{'contents'}[5];
 
$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'}[7]{'extra'}{'node_content'}[0]
 = 
$result_trees{'multiple_lang_chapters'}{'contents'}[7]{'args'}[0]{'contents'}[0];
 
$result_trees{'multiple_lang_chapters'}{'contents'}[7]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = 
$result_trees{'multiple_lang_chapters'}{'contents'}[7]{'args'}[0]{'contents'}[0];
@@ -1835,7 +1835,7 @@ 
$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'}{'entry_node'}
 = $result_trees{'multiple_lang_chapters'}{'contents'}[7];
+$result_trees{'multiple_lang_chapters'}{'contents'}[8]{'contents'}[1]{'contents'}[0]{'extra'}{'element_node'}
 = $result_trees{'multiple_lang_chapters'}{'contents'}[7];
 
$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'}[9]{'extra'}{'node_content'}[0]
 = 
$result_trees{'multiple_lang_chapters'}{'contents'}[9]{'args'}[0]{'contents'}[0];
 
$result_trees{'multiple_lang_chapters'}{'contents'}[9]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = 
$result_trees{'multiple_lang_chapters'}{'contents'}[9]{'args'}[0]{'contents'}[0];
diff --git a/tp/t/results/languages/multiple_lang_chapters_latex.pl 
b/tp/t/results/languages/multiple_lang_chapters_latex.pl
index 8b3350564a..5c77515a5d 100644
--- a/tp/t/results/languages/multiple_lang_chapters_latex.pl
+++ b/tp/t/results/languages/multiple_lang_chapters_latex.pl
@@ -860,7 +860,7 @@ $result_trees{'multiple_lang_chapters_latex'} = {
                   'name' => {}
                 },
                 'documentlanguage' => 'ja',
-                'entry_node' => {},
+                'element_node' => {},
                 'index_entry' => {
                   'entry_element' => {},
                   'entry_number' => 1,
@@ -1174,7 +1174,7 @@ $result_trees{'multiple_lang_chapters_latex'} = {
                   'name' => {}
                 },
                 'documentlanguage' => 'en',
-                'entry_node' => {},
+                'element_node' => {},
                 'index_entry' => {
                   'entry_element' => {},
                   'entry_number' => 2,
@@ -1449,7 +1449,7 @@ $result_trees{'multiple_lang_chapters_latex'} = {
                   'name' => {}
                 },
                 'documentlanguage' => 'fr_FR',
-                'entry_node' => {},
+                'element_node' => {},
                 'index_entry' => {
                   'entry_element' => {},
                   'entry_number' => 3,
@@ -1811,7 +1811,7 @@ 
$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'}{'entry_node'}
 = $result_trees{'multiple_lang_chapters_latex'}{'contents'}[3];
+$result_trees{'multiple_lang_chapters_latex'}{'contents'}[4]{'contents'}[2]{'contents'}[0]{'extra'}{'element_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_element'}
 = 
$result_trees{'multiple_lang_chapters_latex'}{'contents'}[4]{'contents'}[2]{'contents'}[0];
 
$result_trees{'multiple_lang_chapters_latex'}{'contents'}[5]{'extra'}{'node_content'}[0]
 = 
$result_trees{'multiple_lang_chapters_latex'}{'contents'}[5]{'args'}[0]{'contents'}[0];
 
$result_trees{'multiple_lang_chapters_latex'}{'contents'}[5]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = 
$result_trees{'multiple_lang_chapters_latex'}{'contents'}[5]{'args'}[0]{'contents'}[0];
@@ -1824,7 +1824,7 @@ 
$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'}{'entry_node'}
 = $result_trees{'multiple_lang_chapters_latex'}{'contents'}[5];
+$result_trees{'multiple_lang_chapters_latex'}{'contents'}[6]{'contents'}[2]{'contents'}[0]{'extra'}{'element_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_element'}
 = 
$result_trees{'multiple_lang_chapters_latex'}{'contents'}[6]{'contents'}[2]{'contents'}[0];
 
$result_trees{'multiple_lang_chapters_latex'}{'contents'}[7]{'extra'}{'node_content'}[0]
 = 
$result_trees{'multiple_lang_chapters_latex'}{'contents'}[7]{'args'}[0]{'contents'}[0];
 
$result_trees{'multiple_lang_chapters_latex'}{'contents'}[7]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = 
$result_trees{'multiple_lang_chapters_latex'}{'contents'}[7]{'args'}[0]{'contents'}[0];
@@ -1835,7 +1835,7 @@ 
$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'}{'entry_node'}
 = $result_trees{'multiple_lang_chapters_latex'}{'contents'}[7];
+$result_trees{'multiple_lang_chapters_latex'}{'contents'}[8]{'contents'}[1]{'contents'}[0]{'extra'}{'element_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_element'}
 = 
$result_trees{'multiple_lang_chapters_latex'}{'contents'}[8]{'contents'}[1]{'contents'}[0];
 
$result_trees{'multiple_lang_chapters_latex'}{'contents'}[9]{'extra'}{'node_content'}[0]
 = 
$result_trees{'multiple_lang_chapters_latex'}{'contents'}[9]{'args'}[0]{'contents'}[0];
 
$result_trees{'multiple_lang_chapters_latex'}{'contents'}[9]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = 
$result_trees{'multiple_lang_chapters_latex'}{'contents'}[9]{'args'}[0]{'contents'}[0];
diff --git a/tp/t/results/languages/multiple_lang_chapters_texi2html.pl 
b/tp/t/results/languages/multiple_lang_chapters_texi2html.pl
index ded81599de..da0e505614 100644
--- a/tp/t/results/languages/multiple_lang_chapters_texi2html.pl
+++ b/tp/t/results/languages/multiple_lang_chapters_texi2html.pl
@@ -827,7 +827,7 @@ $result_trees{'multiple_lang_chapters_texi2html'} = {
                   'name' => {}
                 },
                 'documentlanguage' => 'ja',
-                'entry_node' => {},
+                'element_node' => {},
                 'index_entry' => {
                   'entry_element' => {},
                   'entry_number' => 1,
@@ -1141,7 +1141,7 @@ $result_trees{'multiple_lang_chapters_texi2html'} = {
                   'name' => {}
                 },
                 'documentlanguage' => 'en',
-                'entry_node' => {},
+                'element_node' => {},
                 'index_entry' => {
                   'entry_element' => {},
                   'entry_number' => 2,
@@ -1416,7 +1416,7 @@ $result_trees{'multiple_lang_chapters_texi2html'} = {
                   'name' => {}
                 },
                 'documentlanguage' => 'fr_FR',
-                'entry_node' => {},
+                'element_node' => {},
                 'index_entry' => {
                   'entry_element' => {},
                   'entry_number' => 3,
@@ -1778,7 +1778,7 @@ 
$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'}{'entry_node'}
 = $result_trees{'multiple_lang_chapters_texi2html'}{'contents'}[3];
+$result_trees{'multiple_lang_chapters_texi2html'}{'contents'}[4]{'contents'}[2]{'contents'}[0]{'extra'}{'element_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_element'}
 = 
$result_trees{'multiple_lang_chapters_texi2html'}{'contents'}[4]{'contents'}[2]{'contents'}[0];
 
$result_trees{'multiple_lang_chapters_texi2html'}{'contents'}[5]{'extra'}{'node_content'}[0]
 = 
$result_trees{'multiple_lang_chapters_texi2html'}{'contents'}[5]{'args'}[0]{'contents'}[0];
 
$result_trees{'multiple_lang_chapters_texi2html'}{'contents'}[5]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = 
$result_trees{'multiple_lang_chapters_texi2html'}{'contents'}[5]{'args'}[0]{'contents'}[0];
@@ -1791,7 +1791,7 @@ 
$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'}{'entry_node'}
 = $result_trees{'multiple_lang_chapters_texi2html'}{'contents'}[5];
+$result_trees{'multiple_lang_chapters_texi2html'}{'contents'}[6]{'contents'}[2]{'contents'}[0]{'extra'}{'element_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_element'}
 = 
$result_trees{'multiple_lang_chapters_texi2html'}{'contents'}[6]{'contents'}[2]{'contents'}[0];
 
$result_trees{'multiple_lang_chapters_texi2html'}{'contents'}[7]{'extra'}{'node_content'}[0]
 = 
$result_trees{'multiple_lang_chapters_texi2html'}{'contents'}[7]{'args'}[0]{'contents'}[0];
 
$result_trees{'multiple_lang_chapters_texi2html'}{'contents'}[7]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = 
$result_trees{'multiple_lang_chapters_texi2html'}{'contents'}[7]{'args'}[0]{'contents'}[0];
@@ -1802,7 +1802,7 @@ 
$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'}{'entry_node'}
 = $result_trees{'multiple_lang_chapters_texi2html'}{'contents'}[7];
+$result_trees{'multiple_lang_chapters_texi2html'}{'contents'}[8]{'contents'}[1]{'contents'}[0]{'extra'}{'element_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_element'}
 = 
$result_trees{'multiple_lang_chapters_texi2html'}{'contents'}[8]{'contents'}[1]{'contents'}[0];
 
$result_trees{'multiple_lang_chapters_texi2html'}{'contents'}[9]{'extra'}{'node_content'}[0]
 = 
$result_trees{'multiple_lang_chapters_texi2html'}{'contents'}[9]{'args'}[0]{'contents'}[0];
 
$result_trees{'multiple_lang_chapters_texi2html'}{'contents'}[9]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = 
$result_trees{'multiple_lang_chapters_texi2html'}{'contents'}[9]{'args'}[0]{'contents'}[0];
diff --git a/tp/t/results/languages/simple_documentlanguage.pl 
b/tp/t/results/languages/simple_documentlanguage.pl
index 5b5ecccc6a..b5d985d799 100644
--- a/tp/t/results/languages/simple_documentlanguage.pl
+++ b/tp/t/results/languages/simple_documentlanguage.pl
@@ -219,7 +219,7 @@ $result_trees{'simple_documentlanguage'} = {
                   'name' => {}
                 },
                 'documentlanguage' => 'fr',
-                'entry_node' => {},
+                'element_node' => {},
                 'index_entry' => {
                   'entry_element' => {},
                   'entry_number' => 1,
@@ -317,7 +317,7 @@ 
$result_trees{'simple_documentlanguage'}{'contents'}[2]{'contents'}[1]{'contents
 
$result_trees{'simple_documentlanguage'}{'contents'}[2]{'contents'}[1]{'contents'}[0]{'extra'}{'def_parsed_hash'}{'category'}
 = 
$result_trees{'simple_documentlanguage'}{'contents'}[2]{'contents'}[1]{'contents'}[0]{'args'}[0]{'contents'}[0];
 
$result_trees{'simple_documentlanguage'}{'contents'}[2]{'contents'}[1]{'contents'}[0]{'extra'}{'def_parsed_hash'}{'class'}
 = 
$result_trees{'simple_documentlanguage'}{'contents'}[2]{'contents'}[1]{'contents'}[0]{'args'}[0]{'contents'}[2];
 
$result_trees{'simple_documentlanguage'}{'contents'}[2]{'contents'}[1]{'contents'}[0]{'extra'}{'def_parsed_hash'}{'name'}
 = 
$result_trees{'simple_documentlanguage'}{'contents'}[2]{'contents'}[1]{'contents'}[0]{'args'}[0]{'contents'}[4];
-$result_trees{'simple_documentlanguage'}{'contents'}[2]{'contents'}[1]{'contents'}[0]{'extra'}{'entry_node'}
 = $result_trees{'simple_documentlanguage'}{'contents'}[2];
+$result_trees{'simple_documentlanguage'}{'contents'}[2]{'contents'}[1]{'contents'}[0]{'extra'}{'element_node'}
 = $result_trees{'simple_documentlanguage'}{'contents'}[2];
 
$result_trees{'simple_documentlanguage'}{'contents'}[2]{'contents'}[1]{'contents'}[0]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'simple_documentlanguage'}{'contents'}[2]{'contents'}[1]{'contents'}[0];
 
$result_trees{'simple_documentlanguage'}{'contents'}[2]{'extra'}{'node_content'}[0]
 = 
$result_trees{'simple_documentlanguage'}{'contents'}[2]{'args'}[0]{'contents'}[0];
 
$result_trees{'simple_documentlanguage'}{'contents'}[2]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = 
$result_trees{'simple_documentlanguage'}{'contents'}[2]{'args'}[0]{'contents'}[0];
diff --git a/tp/t/results/languages/unknown_region.pl 
b/tp/t/results/languages/unknown_region.pl
index a19bf00b8f..189b648c01 100644
--- a/tp/t/results/languages/unknown_region.pl
+++ b/tp/t/results/languages/unknown_region.pl
@@ -219,7 +219,7 @@ $result_trees{'unknown_region'} = {
                   'name' => {}
                 },
                 'documentlanguage' => 'fr_NOWHERE',
-                'entry_node' => {},
+                'element_node' => {},
                 'index_entry' => {
                   'entry_element' => {},
                   'entry_number' => 1,
@@ -317,7 +317,7 @@ 
$result_trees{'unknown_region'}{'contents'}[2]{'contents'}[1]{'contents'}[0]{'ex
 
$result_trees{'unknown_region'}{'contents'}[2]{'contents'}[1]{'contents'}[0]{'extra'}{'def_parsed_hash'}{'category'}
 = 
$result_trees{'unknown_region'}{'contents'}[2]{'contents'}[1]{'contents'}[0]{'args'}[0]{'contents'}[0];
 
$result_trees{'unknown_region'}{'contents'}[2]{'contents'}[1]{'contents'}[0]{'extra'}{'def_parsed_hash'}{'class'}
 = 
$result_trees{'unknown_region'}{'contents'}[2]{'contents'}[1]{'contents'}[0]{'args'}[0]{'contents'}[2];
 
$result_trees{'unknown_region'}{'contents'}[2]{'contents'}[1]{'contents'}[0]{'extra'}{'def_parsed_hash'}{'name'}
 = 
$result_trees{'unknown_region'}{'contents'}[2]{'contents'}[1]{'contents'}[0]{'args'}[0]{'contents'}[4];
-$result_trees{'unknown_region'}{'contents'}[2]{'contents'}[1]{'contents'}[0]{'extra'}{'entry_node'}
 = $result_trees{'unknown_region'}{'contents'}[2];
+$result_trees{'unknown_region'}{'contents'}[2]{'contents'}[1]{'contents'}[0]{'extra'}{'element_node'}
 = $result_trees{'unknown_region'}{'contents'}[2];
 
$result_trees{'unknown_region'}{'contents'}[2]{'contents'}[1]{'contents'}[0]{'extra'}{'index_entry'}{'entry_element'}
 = $result_trees{'unknown_region'}{'contents'}[2]{'contents'}[1]{'contents'}[0];
 $result_trees{'unknown_region'}{'contents'}[2]{'extra'}{'node_content'}[0] = 
$result_trees{'unknown_region'}{'contents'}[2]{'args'}[0]{'contents'}[0];
 
$result_trees{'unknown_region'}{'contents'}[2]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = $result_trees{'unknown_region'}{'contents'}[2]{'args'}[0]{'contents'}[0];
diff --git a/tp/t/results/latex_tests/indices.pl 
b/tp/t/results/latex_tests/indices.pl
index 9d644e5dc8..998260e90e 100644
--- a/tp/t/results/latex_tests/indices.pl
+++ b/tp/t/results/latex_tests/indices.pl
@@ -258,7 +258,7 @@ $result_trees{'indices'} = {
           ],
           'cmdname' => 'cindex',
           'extra' => {
-            'entry_node' => {},
+            'element_node' => {},
             'index_entry' => {
               'entry_element' => {},
               'entry_number' => 1,
@@ -298,7 +298,7 @@ $result_trees{'indices'} = {
           ],
           'cmdname' => 'cindex',
           'extra' => {
-            'entry_node' => {},
+            'element_node' => {},
             'index_entry' => {
               'entry_element' => {},
               'entry_number' => 2,
@@ -338,7 +338,7 @@ $result_trees{'indices'} = {
           ],
           'cmdname' => 'cindex',
           'extra' => {
-            'entry_node' => {},
+            'element_node' => {},
             'index_entry' => {
               'entry_element' => {},
               'entry_number' => 3,
@@ -378,7 +378,7 @@ $result_trees{'indices'} = {
           ],
           'cmdname' => 'cindex',
           'extra' => {
-            'entry_node' => {},
+            'element_node' => {},
             'index_entry' => {
               'entry_element' => {},
               'entry_number' => 4,
@@ -418,7 +418,7 @@ $result_trees{'indices'} = {
           ],
           'cmdname' => 'cindex',
           'extra' => {
-            'entry_node' => {},
+            'element_node' => {},
             'index_entry' => {
               'entry_element' => {},
               'entry_number' => 5,
@@ -473,7 +473,7 @@ $result_trees{'indices'} = {
           ],
           'cmdname' => 'cindex',
           'extra' => {
-            'entry_node' => {},
+            'element_node' => {},
             'index_entry' => {
               'entry_element' => {},
               'entry_number' => 6,
@@ -586,7 +586,7 @@ $result_trees{'indices'} = {
           ],
           'cmdname' => 'cindex',
           'extra' => {
-            'entry_node' => {},
+            'element_node' => {},
             'index_entry' => {
               'entry_element' => {},
               'entry_number' => 7,
@@ -852,7 +852,7 @@ $result_trees{'indices'} = {
           ],
           'cmdname' => 'cindex',
           'extra' => {
-            'entry_node' => {},
+            'element_node' => {},
             'index_entry' => {
               'entry_element' => {},
               'entry_number' => 8,
@@ -914,7 +914,7 @@ $result_trees{'indices'} = {
           ],
           'cmdname' => 'cindex',
           'extra' => {
-            'entry_node' => {},
+            'element_node' => {},
             'index_entry' => {
               'entry_element' => {},
               'entry_number' => 9,
@@ -1016,7 +1016,7 @@ $result_trees{'indices'} = {
           ],
           'cmdname' => 'cindex',
           'extra' => {
-            'entry_node' => {},
+            'element_node' => {},
             'index_entry' => {
               'entry_element' => {},
               'entry_number' => 10,
@@ -1099,7 +1099,7 @@ $result_trees{'indices'} = {
           ],
           'cmdname' => 'findex',
           'extra' => {
-            'entry_node' => {},
+            'element_node' => {},
             'index_entry' => {
               'entry_element' => {},
               'entry_number' => 1,
@@ -1217,29 +1217,29 @@ 
$result_trees{'indices'}{'contents'}[1]{'extra'}{'node_content'}[0] = $result_tr
 
$result_trees{'indices'}{'contents'}[1]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = $result_trees{'indices'}{'contents'}[1]{'args'}[0]{'contents'}[0];
 $result_trees{'indices'}{'contents'}[3]{'extra'}{'node_content'}[0] = 
$result_trees{'indices'}{'contents'}[3]{'args'}[0]{'contents'}[0];
 
$result_trees{'indices'}{'contents'}[3]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = $result_trees{'indices'}{'contents'}[3]{'args'}[0]{'contents'}[0];
-$result_trees{'indices'}{'contents'}[4]{'contents'}[1]{'extra'}{'entry_node'} 
= $result_trees{'indices'}{'contents'}[3];
+$result_trees{'indices'}{'contents'}[4]{'contents'}[1]{'extra'}{'element_node'}
 = $result_trees{'indices'}{'contents'}[3];
 
$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'}[2]{'extra'}{'entry_node'} 
= $result_trees{'indices'}{'contents'}[3];
+$result_trees{'indices'}{'contents'}[4]{'contents'}[2]{'extra'}{'element_node'}
 = $result_trees{'indices'}{'contents'}[3];
 
$result_trees{'indices'}{'contents'}[4]{'contents'}[2]{'extra'}{'index_entry'}{'entry_element'}
 = $result_trees{'indices'}{'contents'}[4]{'contents'}[2];
-$result_trees{'indices'}{'contents'}[4]{'contents'}[3]{'extra'}{'entry_node'} 
= $result_trees{'indices'}{'contents'}[3];
+$result_trees{'indices'}{'contents'}[4]{'contents'}[3]{'extra'}{'element_node'}
 = $result_trees{'indices'}{'contents'}[3];
 
$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'}[4]{'extra'}{'entry_node'} 
= $result_trees{'indices'}{'contents'}[3];
+$result_trees{'indices'}{'contents'}[4]{'contents'}[4]{'extra'}{'element_node'}
 = $result_trees{'indices'}{'contents'}[3];
 
$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'}[5]{'extra'}{'entry_node'} 
= $result_trees{'indices'}{'contents'}[3];
+$result_trees{'indices'}{'contents'}[4]{'contents'}[5]{'extra'}{'element_node'}
 = $result_trees{'indices'}{'contents'}[3];
 
$result_trees{'indices'}{'contents'}[4]{'contents'}[5]{'extra'}{'index_entry'}{'entry_element'}
 = $result_trees{'indices'}{'contents'}[4]{'contents'}[5];
-$result_trees{'indices'}{'contents'}[4]{'contents'}[6]{'extra'}{'entry_node'} 
= $result_trees{'indices'}{'contents'}[3];
+$result_trees{'indices'}{'contents'}[4]{'contents'}[6]{'extra'}{'element_node'}
 = $result_trees{'indices'}{'contents'}[3];
 
$result_trees{'indices'}{'contents'}[4]{'contents'}[6]{'extra'}{'index_entry'}{'entry_element'}
 = $result_trees{'indices'}{'contents'}[4]{'contents'}[6];
-$result_trees{'indices'}{'contents'}[4]{'contents'}[8]{'extra'}{'entry_node'} 
= $result_trees{'indices'}{'contents'}[3];
+$result_trees{'indices'}{'contents'}[4]{'contents'}[8]{'extra'}{'element_node'}
 = $result_trees{'indices'}{'contents'}[3];
 
$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'}{'subentry'}{'extra'}{'seealso'}
 = 
$result_trees{'indices'}{'contents'}[4]{'contents'}[8]{'extra'}{'subentry'}{'args'}[0]{'contents'}[11];
 $result_trees{'indices'}{'contents'}[4]{'contents'}[9] = 
$result_trees{'indices'}{'contents'}[4]{'contents'}[8]{'extra'}{'subentry'};
-$result_trees{'indices'}{'contents'}[4]{'contents'}[10]{'extra'}{'entry_node'} 
= $result_trees{'indices'}{'contents'}[3];
+$result_trees{'indices'}{'contents'}[4]{'contents'}[10]{'extra'}{'element_node'}
 = $result_trees{'indices'}{'contents'}[3];
 
$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'}[11]{'extra'}{'entry_node'} 
= $result_trees{'indices'}{'contents'}[3];
+$result_trees{'indices'}{'contents'}[4]{'contents'}[11]{'extra'}{'element_node'}
 = $result_trees{'indices'}{'contents'}[3];
 
$result_trees{'indices'}{'contents'}[4]{'contents'}[11]{'extra'}{'index_entry'}{'entry_element'}
 = $result_trees{'indices'}{'contents'}[4]{'contents'}[11];
-$result_trees{'indices'}{'contents'}[4]{'contents'}[15]{'extra'}{'entry_node'} 
= $result_trees{'indices'}{'contents'}[3];
+$result_trees{'indices'}{'contents'}[4]{'contents'}[15]{'extra'}{'element_node'}
 = $result_trees{'indices'}{'contents'}[3];
 
$result_trees{'indices'}{'contents'}[4]{'contents'}[15]{'extra'}{'index_entry'}{'entry_element'}
 = $result_trees{'indices'}{'contents'}[4]{'contents'}[15];
-$result_trees{'indices'}{'contents'}[4]{'contents'}[17]{'extra'}{'entry_node'} 
= $result_trees{'indices'}{'contents'}[3];
+$result_trees{'indices'}{'contents'}[4]{'contents'}[17]{'extra'}{'element_node'}
 = $result_trees{'indices'}{'contents'}[3];
 
$result_trees{'indices'}{'contents'}[4]{'contents'}[17]{'extra'}{'index_entry'}{'entry_element'}
 = $result_trees{'indices'}{'contents'}[4]{'contents'}[17];
 
 $result_texis{'indices'} = '
diff --git a/tp/t/results/latex_tests/indices_disable_encoding.pl 
b/tp/t/results/latex_tests/indices_disable_encoding.pl
index 1eda671fc0..72b3f53613 100644
--- a/tp/t/results/latex_tests/indices_disable_encoding.pl
+++ b/tp/t/results/latex_tests/indices_disable_encoding.pl
@@ -258,7 +258,7 @@ $result_trees{'indices_disable_encoding'} = {
           ],
           'cmdname' => 'cindex',
           'extra' => {
-            'entry_node' => {},
+            'element_node' => {},
             'index_entry' => {
               'entry_element' => {},
               'entry_number' => 1,
@@ -298,7 +298,7 @@ $result_trees{'indices_disable_encoding'} = {
           ],
           'cmdname' => 'cindex',
           'extra' => {
-            'entry_node' => {},
+            'element_node' => {},
             'index_entry' => {
               'entry_element' => {},
               'entry_number' => 2,
@@ -338,7 +338,7 @@ $result_trees{'indices_disable_encoding'} = {
           ],
           'cmdname' => 'cindex',
           'extra' => {
-            'entry_node' => {},
+            'element_node' => {},
             'index_entry' => {
               'entry_element' => {},
               'entry_number' => 3,
@@ -378,7 +378,7 @@ $result_trees{'indices_disable_encoding'} = {
           ],
           'cmdname' => 'cindex',
           'extra' => {
-            'entry_node' => {},
+            'element_node' => {},
             'index_entry' => {
               'entry_element' => {},
               'entry_number' => 4,
@@ -418,7 +418,7 @@ $result_trees{'indices_disable_encoding'} = {
           ],
           'cmdname' => 'cindex',
           'extra' => {
-            'entry_node' => {},
+            'element_node' => {},
             'index_entry' => {
               'entry_element' => {},
               'entry_number' => 5,
@@ -473,7 +473,7 @@ $result_trees{'indices_disable_encoding'} = {
           ],
           'cmdname' => 'cindex',
           'extra' => {
-            'entry_node' => {},
+            'element_node' => {},
             'index_entry' => {
               'entry_element' => {},
               'entry_number' => 6,
@@ -586,7 +586,7 @@ $result_trees{'indices_disable_encoding'} = {
           ],
           'cmdname' => 'cindex',
           'extra' => {
-            'entry_node' => {},
+            'element_node' => {},
             'index_entry' => {
               'entry_element' => {},
               'entry_number' => 7,
@@ -852,7 +852,7 @@ $result_trees{'indices_disable_encoding'} = {
           ],
           'cmdname' => 'cindex',
           'extra' => {
-            'entry_node' => {},
+            'element_node' => {},
             'index_entry' => {
               'entry_element' => {},
               'entry_number' => 8,
@@ -914,7 +914,7 @@ $result_trees{'indices_disable_encoding'} = {
           ],
           'cmdname' => 'cindex',
           'extra' => {
-            'entry_node' => {},
+            'element_node' => {},
             'index_entry' => {
               'entry_element' => {},
               'entry_number' => 9,
@@ -1016,7 +1016,7 @@ $result_trees{'indices_disable_encoding'} = {
           ],
           'cmdname' => 'cindex',
           'extra' => {
-            'entry_node' => {},
+            'element_node' => {},
             'index_entry' => {
               'entry_element' => {},
               'entry_number' => 10,
@@ -1099,7 +1099,7 @@ $result_trees{'indices_disable_encoding'} = {
           ],
           'cmdname' => 'findex',
           'extra' => {
-            'entry_node' => {},
+            'element_node' => {},
             'index_entry' => {
               'entry_element' => {},
               'entry_number' => 1,
@@ -1217,29 +1217,29 @@ 
$result_trees{'indices_disable_encoding'}{'contents'}[1]{'extra'}{'node_content'
 
$result_trees{'indices_disable_encoding'}{'contents'}[1]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = 
$result_trees{'indices_disable_encoding'}{'contents'}[1]{'args'}[0]{'contents'}[0];
 
$result_trees{'indices_disable_encoding'}{'contents'}[3]{'extra'}{'node_content'}[0]
 = 
$result_trees{'indices_disable_encoding'}{'contents'}[3]{'args'}[0]{'contents'}[0];
 
$result_trees{'indices_disable_encoding'}{'contents'}[3]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = 
$result_trees{'indices_disable_encoding'}{'contents'}[3]{'args'}[0]{'contents'}[0];
-$result_trees{'indices_disable_encoding'}{'contents'}[4]{'contents'}[1]{'extra'}{'entry_node'}
 = $result_trees{'indices_disable_encoding'}{'contents'}[3];
+$result_trees{'indices_disable_encoding'}{'contents'}[4]{'contents'}[1]{'extra'}{'element_node'}
 = $result_trees{'indices_disable_encoding'}{'contents'}[3];
 
$result_trees{'indices_disable_encoding'}{'contents'}[4]{'contents'}[1]{'extra'}{'index_entry'}{'entry_element'}
 = $result_trees{'indices_disable_encoding'}{'contents'}[4]{'contents'}[1];
-$result_trees{'indices_disable_encoding'}{'contents'}[4]{'contents'}[2]{'extra'}{'entry_node'}
 = $result_trees{'indices_disable_encoding'}{'contents'}[3];
+$result_trees{'indices_disable_encoding'}{'contents'}[4]{'contents'}[2]{'extra'}{'element_node'}
 = $result_trees{'indices_disable_encoding'}{'contents'}[3];
 
$result_trees{'indices_disable_encoding'}{'contents'}[4]{'contents'}[2]{'extra'}{'index_entry'}{'entry_element'}
 = $result_trees{'indices_disable_encoding'}{'contents'}[4]{'contents'}[2];
-$result_trees{'indices_disable_encoding'}{'contents'}[4]{'contents'}[3]{'extra'}{'entry_node'}
 = $result_trees{'indices_disable_encoding'}{'contents'}[3];
+$result_trees{'indices_disable_encoding'}{'contents'}[4]{'contents'}[3]{'extra'}{'element_node'}
 = $result_trees{'indices_disable_encoding'}{'contents'}[3];
 
$result_trees{'indices_disable_encoding'}{'contents'}[4]{'contents'}[3]{'extra'}{'index_entry'}{'entry_element'}
 = $result_trees{'indices_disable_encoding'}{'contents'}[4]{'contents'}[3];
-$result_trees{'indices_disable_encoding'}{'contents'}[4]{'contents'}[4]{'extra'}{'entry_node'}
 = $result_trees{'indices_disable_encoding'}{'contents'}[3];
+$result_trees{'indices_disable_encoding'}{'contents'}[4]{'contents'}[4]{'extra'}{'element_node'}
 = $result_trees{'indices_disable_encoding'}{'contents'}[3];
 
$result_trees{'indices_disable_encoding'}{'contents'}[4]{'contents'}[4]{'extra'}{'index_entry'}{'entry_element'}
 = $result_trees{'indices_disable_encoding'}{'contents'}[4]{'contents'}[4];
-$result_trees{'indices_disable_encoding'}{'contents'}[4]{'contents'}[5]{'extra'}{'entry_node'}
 = $result_trees{'indices_disable_encoding'}{'contents'}[3];
+$result_trees{'indices_disable_encoding'}{'contents'}[4]{'contents'}[5]{'extra'}{'element_node'}
 = $result_trees{'indices_disable_encoding'}{'contents'}[3];
 
$result_trees{'indices_disable_encoding'}{'contents'}[4]{'contents'}[5]{'extra'}{'index_entry'}{'entry_element'}
 = $result_trees{'indices_disable_encoding'}{'contents'}[4]{'contents'}[5];
-$result_trees{'indices_disable_encoding'}{'contents'}[4]{'contents'}[6]{'extra'}{'entry_node'}
 = $result_trees{'indices_disable_encoding'}{'contents'}[3];
+$result_trees{'indices_disable_encoding'}{'contents'}[4]{'contents'}[6]{'extra'}{'element_node'}
 = $result_trees{'indices_disable_encoding'}{'contents'}[3];
 
$result_trees{'indices_disable_encoding'}{'contents'}[4]{'contents'}[6]{'extra'}{'index_entry'}{'entry_element'}
 = $result_trees{'indices_disable_encoding'}{'contents'}[4]{'contents'}[6];
-$result_trees{'indices_disable_encoding'}{'contents'}[4]{'contents'}[8]{'extra'}{'entry_node'}
 = $result_trees{'indices_disable_encoding'}{'contents'}[3];
+$result_trees{'indices_disable_encoding'}{'contents'}[4]{'contents'}[8]{'extra'}{'element_node'}
 = $result_trees{'indices_disable_encoding'}{'contents'}[3];
 
$result_trees{'indices_disable_encoding'}{'contents'}[4]{'contents'}[8]{'extra'}{'index_entry'}{'entry_element'}
 = $result_trees{'indices_disable_encoding'}{'contents'}[4]{'contents'}[8];
 
$result_trees{'indices_disable_encoding'}{'contents'}[4]{'contents'}[8]{'extra'}{'subentry'}{'extra'}{'seealso'}
 = 
$result_trees{'indices_disable_encoding'}{'contents'}[4]{'contents'}[8]{'extra'}{'subentry'}{'args'}[0]{'contents'}[11];
 $result_trees{'indices_disable_encoding'}{'contents'}[4]{'contents'}[9] = 
$result_trees{'indices_disable_encoding'}{'contents'}[4]{'contents'}[8]{'extra'}{'subentry'};
-$result_trees{'indices_disable_encoding'}{'contents'}[4]{'contents'}[10]{'extra'}{'entry_node'}
 = $result_trees{'indices_disable_encoding'}{'contents'}[3];
+$result_trees{'indices_disable_encoding'}{'contents'}[4]{'contents'}[10]{'extra'}{'element_node'}
 = $result_trees{'indices_disable_encoding'}{'contents'}[3];
 
$result_trees{'indices_disable_encoding'}{'contents'}[4]{'contents'}[10]{'extra'}{'index_entry'}{'entry_element'}
 = $result_trees{'indices_disable_encoding'}{'contents'}[4]{'contents'}[10];
-$result_trees{'indices_disable_encoding'}{'contents'}[4]{'contents'}[11]{'extra'}{'entry_node'}
 = $result_trees{'indices_disable_encoding'}{'contents'}[3];
+$result_trees{'indices_disable_encoding'}{'contents'}[4]{'contents'}[11]{'extra'}{'element_node'}
 = $result_trees{'indices_disable_encoding'}{'contents'}[3];
 
$result_trees{'indices_disable_encoding'}{'contents'}[4]{'contents'}[11]{'extra'}{'index_entry'}{'entry_element'}
 = $result_trees{'indices_disable_encoding'}{'contents'}[4]{'contents'}[11];
-$result_trees{'indices_disable_encoding'}{'contents'}[4]{'contents'}[15]{'extra'}{'entry_node'}
 = $result_trees{'indices_disable_encoding'}{'contents'}[3];
+$result_trees{'indices_disable_encoding'}{'contents'}[4]{'contents'}[15]{'extra'}{'element_node'}
 = $result_trees{'indices_disable_encoding'}{'contents'}[3];
 
$result_trees{'indices_disable_encoding'}{'contents'}[4]{'contents'}[15]{'extra'}{'index_entry'}{'entry_element'}
 = $result_trees{'indices_disable_encoding'}{'contents'}[4]{'contents'}[15];
-$result_trees{'indices_disable_encoding'}{'contents'}[4]{'contents'}[17]{'extra'}{'entry_node'}
 = $result_trees{'indices_disable_encoding'}{'contents'}[3];
+$result_trees{'indices_disable_encoding'}{'contents'}[4]{'contents'}[17]{'extra'}{'element_node'}
 = $result_trees{'indices_disable_encoding'}{'contents'}[3];
 
$result_trees{'indices_disable_encoding'}{'contents'}[4]{'contents'}[17]{'extra'}{'index_entry'}{'entry_element'}
 = $result_trees{'indices_disable_encoding'}{'contents'}[4]{'contents'}[17];
 
 $result_texis{'indices_disable_encoding'} = '
diff --git a/tp/t/results/layout/no_monolithic.pl 
b/tp/t/results/layout/no_monolithic.pl
index 596742271e..bac9ba4519 100644
--- a/tp/t/results/layout/no_monolithic.pl
+++ b/tp/t/results/layout/no_monolithic.pl
@@ -157,7 +157,7 @@ $result_trees{'no_monolithic'} = {
           ],
           'cmdname' => 'cindex',
           'extra' => {
-            'entry_node' => {},
+            'element_node' => {},
             'index_entry' => {
               'entry_element' => {},
               'entry_number' => 1,
@@ -480,7 +480,7 @@ $result_trees{'no_monolithic'} = {
 };
 $result_trees{'no_monolithic'}{'contents'}[1]{'extra'}{'node_content'}[0] = 
$result_trees{'no_monolithic'}{'contents'}[1]{'args'}[0]{'contents'}[0];
 
$result_trees{'no_monolithic'}{'contents'}[1]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = $result_trees{'no_monolithic'}{'contents'}[1]{'args'}[0]{'contents'}[0];
-$result_trees{'no_monolithic'}{'contents'}[2]{'contents'}[3]{'extra'}{'entry_node'}
 = $result_trees{'no_monolithic'}{'contents'}[1];
+$result_trees{'no_monolithic'}{'contents'}[2]{'contents'}[3]{'extra'}{'element_node'}
 = $result_trees{'no_monolithic'}{'contents'}[1];
 
$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'}[5]{'contents'}[0]{'extra'}{'menu_entry_node_label'}{'node_content'}[0]
 = 
$result_trees{'no_monolithic'}{'contents'}[2]{'contents'}[5]{'contents'}[0]{'contents'}[1]{'contents'}[0];
 $result_trees{'no_monolithic'}{'contents'}[3]{'extra'}{'node_content'}[0] = 
$result_trees{'no_monolithic'}{'contents'}[3]{'args'}[0]{'contents'}[0];
diff --git a/tp/t/results/layout/no_monolithic_only_toc_out.pl 
b/tp/t/results/layout/no_monolithic_only_toc_out.pl
index 6601f17ba9..e0290b05da 100644
--- a/tp/t/results/layout/no_monolithic_only_toc_out.pl
+++ b/tp/t/results/layout/no_monolithic_only_toc_out.pl
@@ -157,7 +157,7 @@ $result_trees{'no_monolithic_only_toc_out'} = {
           ],
           'cmdname' => 'cindex',
           'extra' => {
-            'entry_node' => {},
+            'element_node' => {},
             'index_entry' => {
               'entry_element' => {},
               'entry_number' => 1,
@@ -480,7 +480,7 @@ $result_trees{'no_monolithic_only_toc_out'} = {
 };
 
$result_trees{'no_monolithic_only_toc_out'}{'contents'}[1]{'extra'}{'node_content'}[0]
 = 
$result_trees{'no_monolithic_only_toc_out'}{'contents'}[1]{'args'}[0]{'contents'}[0];
 
$result_trees{'no_monolithic_only_toc_out'}{'contents'}[1]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = 
$result_trees{'no_monolithic_only_toc_out'}{'contents'}[1]{'args'}[0]{'contents'}[0];
-$result_trees{'no_monolithic_only_toc_out'}{'contents'}[2]{'contents'}[3]{'extra'}{'entry_node'}
 = $result_trees{'no_monolithic_only_toc_out'}{'contents'}[1];
+$result_trees{'no_monolithic_only_toc_out'}{'contents'}[2]{'contents'}[3]{'extra'}{'element_node'}
 = $result_trees{'no_monolithic_only_toc_out'}{'contents'}[1];
 
$result_trees{'no_monolithic_only_toc_out'}{'contents'}[2]{'contents'}[3]{'extra'}{'index_entry'}{'entry_element'}
 = $result_trees{'no_monolithic_only_toc_out'}{'contents'}[2]{'contents'}[3];
 
$result_trees{'no_monolithic_only_toc_out'}{'contents'}[2]{'contents'}[5]{'contents'}[0]{'extra'}{'menu_entry_node_label'}{'node_content'}[0]
 = 
$result_trees{'no_monolithic_only_toc_out'}{'contents'}[2]{'contents'}[5]{'contents'}[0]{'contents'}[1]{'contents'}[0];
 
$result_trees{'no_monolithic_only_toc_out'}{'contents'}[3]{'extra'}{'node_content'}[0]
 = 
$result_trees{'no_monolithic_only_toc_out'}{'contents'}[3]{'args'}[0]{'contents'}[0];
diff --git a/tp/t/results/macro/backslash_in_arg.pl 
b/tp/t/results/macro/backslash_in_arg.pl
index 4418ee6fd4..6d96fd20fa 100644
--- a/tp/t/results/macro/backslash_in_arg.pl
+++ b/tp/t/results/macro/backslash_in_arg.pl
@@ -199,7 +199,7 @@ $result_trees{'backslash_in_arg'} = {
           ],
           'cmdname' => 'findex',
           'extra' => {
-            'entry_node' => {},
+            'element_node' => {},
             'index_entry' => {
               'entry_element' => {},
               'entry_number' => 1,
@@ -269,7 +269,7 @@ $result_trees{'backslash_in_arg'} = {
           ],
           'cmdname' => 'findex',
           'extra' => {
-            'entry_node' => {},
+            'element_node' => {},
             'index_entry' => {
               'entry_element' => {},
               'entry_number' => 2,
@@ -344,7 +344,7 @@ $result_trees{'backslash_in_arg'} = {
           ],
           'cmdname' => 'findex',
           'extra' => {
-            'entry_node' => {},
+            'element_node' => {},
             'index_entry' => {
               'entry_element' => {},
               'entry_number' => 3,
@@ -414,7 +414,7 @@ $result_trees{'backslash_in_arg'} = {
           ],
           'cmdname' => 'findex',
           'extra' => {
-            'entry_node' => {},
+            'element_node' => {},
             'index_entry' => {
               'entry_element' => {},
               'entry_number' => 4,
@@ -500,13 +500,13 @@ $result_trees{'backslash_in_arg'} = {
 };
 $result_trees{'backslash_in_arg'}{'contents'}[1]{'extra'}{'node_content'}[0] = 
$result_trees{'backslash_in_arg'}{'contents'}[1]{'args'}[0]{'contents'}[0];
 
$result_trees{'backslash_in_arg'}{'contents'}[1]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = $result_trees{'backslash_in_arg'}{'contents'}[1]{'args'}[0]{'contents'}[0];
-$result_trees{'backslash_in_arg'}{'contents'}[2]{'contents'}[3]{'extra'}{'entry_node'}
 = $result_trees{'backslash_in_arg'}{'contents'}[2];
+$result_trees{'backslash_in_arg'}{'contents'}[2]{'contents'}[3]{'extra'}{'element_node'}
 = $result_trees{'backslash_in_arg'}{'contents'}[2];
 
$result_trees{'backslash_in_arg'}{'contents'}[2]{'contents'}[3]{'extra'}{'index_entry'}{'entry_element'}
 = $result_trees{'backslash_in_arg'}{'contents'}[2]{'contents'}[3];
-$result_trees{'backslash_in_arg'}{'contents'}[2]{'contents'}[4]{'extra'}{'entry_node'}
 = $result_trees{'backslash_in_arg'}{'contents'}[2];
+$result_trees{'backslash_in_arg'}{'contents'}[2]{'contents'}[4]{'extra'}{'element_node'}
 = $result_trees{'backslash_in_arg'}{'contents'}[2];
 
$result_trees{'backslash_in_arg'}{'contents'}[2]{'contents'}[4]{'extra'}{'index_entry'}{'entry_element'}
 = $result_trees{'backslash_in_arg'}{'contents'}[2]{'contents'}[4];
-$result_trees{'backslash_in_arg'}{'contents'}[2]{'contents'}[5]{'extra'}{'entry_node'}
 = $result_trees{'backslash_in_arg'}{'contents'}[2];
+$result_trees{'backslash_in_arg'}{'contents'}[2]{'contents'}[5]{'extra'}{'element_node'}
 = $result_trees{'backslash_in_arg'}{'contents'}[2];
 
$result_trees{'backslash_in_arg'}{'contents'}[2]{'contents'}[5]{'extra'}{'index_entry'}{'entry_element'}
 = $result_trees{'backslash_in_arg'}{'contents'}[2]{'contents'}[5];
-$result_trees{'backslash_in_arg'}{'contents'}[2]{'contents'}[6]{'extra'}{'entry_node'}
 = $result_trees{'backslash_in_arg'}{'contents'}[2];
+$result_trees{'backslash_in_arg'}{'contents'}[2]{'contents'}[6]{'extra'}{'element_node'}
 = $result_trees{'backslash_in_arg'}{'contents'}[2];
 
$result_trees{'backslash_in_arg'}{'contents'}[2]{'contents'}[6]{'extra'}{'index_entry'}{'entry_element'}
 = $result_trees{'backslash_in_arg'}{'contents'}[2]{'contents'}[6];
 $result_trees{'backslash_in_arg'}{'contents'}[2]{'extra'}{'node_content'}[0] = 
$result_trees{'backslash_in_arg'}{'contents'}[2]{'args'}[0]{'contents'}[0];
 
$result_trees{'backslash_in_arg'}{'contents'}[2]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = $result_trees{'backslash_in_arg'}{'contents'}[2]{'args'}[0]{'contents'}[0];
diff --git a/tp/t/results/macro/macro_in_index_commands.pl 
b/tp/t/results/macro/macro_in_index_commands.pl
index 2c648e1dde..5169e447a6 100644
--- a/tp/t/results/macro/macro_in_index_commands.pl
+++ b/tp/t/results/macro/macro_in_index_commands.pl
@@ -836,7 +836,7 @@ $result_trees{'macro_in_index_commands'} = {
           ],
           'cmdname' => 'trucindex',
           'extra' => {
-            'entry_node' => {},
+            'element_node' => {},
             'index_entry' => {
               'entry_element' => {},
               'entry_number' => 1,
@@ -969,7 +969,7 @@ $result_trees{'macro_in_index_commands'} = {
           ],
           'cmdname' => 'codeidxindex',
           'extra' => {
-            'entry_node' => {},
+            'element_node' => {},
             'index_entry' => {
               'entry_element' => {},
               'entry_number' => 1,
@@ -1040,7 +1040,7 @@ $result_trees{'macro_in_index_commands'} = {
           ],
           'cmdname' => 'kindex',
           'extra' => {
-            'entry_node' => {},
+            'element_node' => {},
             'index_entry' => {
               'entry_element' => {},
               'entry_number' => 1,
@@ -1123,7 +1123,7 @@ $result_trees{'macro_in_index_commands'} = {
           ],
           'cmdname' => 'pindex',
           'extra' => {
-            'entry_node' => {},
+            'element_node' => {},
             'index_entry' => {
               'entry_element' => {},
               'entry_number' => 1,
@@ -1330,13 +1330,13 @@ $result_trees{'macro_in_index_commands'} = {
 };
 
$result_trees{'macro_in_index_commands'}{'contents'}[1]{'extra'}{'node_content'}[0]
 = 
$result_trees{'macro_in_index_commands'}{'contents'}[1]{'args'}[0]{'contents'}[0];
 
$result_trees{'macro_in_index_commands'}{'contents'}[1]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = 
$result_trees{'macro_in_index_commands'}{'contents'}[1]{'args'}[0]{'contents'}[0];
-$result_trees{'macro_in_index_commands'}{'contents'}[2]{'contents'}[1]{'extra'}{'entry_node'}
 = $result_trees{'macro_in_index_commands'}{'contents'}[2];
+$result_trees{'macro_in_index_commands'}{'contents'}[2]{'contents'}[1]{'extra'}{'element_node'}
 = $result_trees{'macro_in_index_commands'}{'contents'}[2];
 
$result_trees{'macro_in_index_commands'}{'contents'}[2]{'contents'}[1]{'extra'}{'index_entry'}{'entry_element'}
 = $result_trees{'macro_in_index_commands'}{'contents'}[2]{'contents'}[1];
-$result_trees{'macro_in_index_commands'}{'contents'}[2]{'contents'}[3]{'extra'}{'entry_node'}
 = $result_trees{'macro_in_index_commands'}{'contents'}[2];
+$result_trees{'macro_in_index_commands'}{'contents'}[2]{'contents'}[3]{'extra'}{'element_node'}
 = $result_trees{'macro_in_index_commands'}{'contents'}[2];
 
$result_trees{'macro_in_index_commands'}{'contents'}[2]{'contents'}[3]{'extra'}{'index_entry'}{'entry_element'}
 = $result_trees{'macro_in_index_commands'}{'contents'}[2]{'contents'}[3];
-$result_trees{'macro_in_index_commands'}{'contents'}[2]{'contents'}[5]{'extra'}{'entry_node'}
 = $result_trees{'macro_in_index_commands'}{'contents'}[2];
+$result_trees{'macro_in_index_commands'}{'contents'}[2]{'contents'}[5]{'extra'}{'element_node'}
 = $result_trees{'macro_in_index_commands'}{'contents'}[2];
 
$result_trees{'macro_in_index_commands'}{'contents'}[2]{'contents'}[5]{'extra'}{'index_entry'}{'entry_element'}
 = $result_trees{'macro_in_index_commands'}{'contents'}[2]{'contents'}[5];
-$result_trees{'macro_in_index_commands'}{'contents'}[2]{'contents'}[6]{'extra'}{'entry_node'}
 = $result_trees{'macro_in_index_commands'}{'contents'}[2];
+$result_trees{'macro_in_index_commands'}{'contents'}[2]{'contents'}[6]{'extra'}{'element_node'}
 = $result_trees{'macro_in_index_commands'}{'contents'}[2];
 
$result_trees{'macro_in_index_commands'}{'contents'}[2]{'contents'}[6]{'extra'}{'index_entry'}{'entry_element'}
 = $result_trees{'macro_in_index_commands'}{'contents'}[2]{'contents'}[6];
 
$result_trees{'macro_in_index_commands'}{'contents'}[2]{'extra'}{'node_content'}[0]
 = 
$result_trees{'macro_in_index_commands'}{'contents'}[2]{'args'}[0]{'contents'}[0];
 
$result_trees{'macro_in_index_commands'}{'contents'}[2]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = 
$result_trees{'macro_in_index_commands'}{'contents'}[2]{'args'}[0]{'contents'}[0];
diff --git a/tp/t/results/menu/menu_in_deffn.pl 
b/tp/t/results/menu/menu_in_deffn.pl
index c48da1e296..ea06df0637 100644
--- a/tp/t/results/menu/menu_in_deffn.pl
+++ b/tp/t/results/menu/menu_in_deffn.pl
@@ -90,7 +90,7 @@ $result_trees{'menu_in_deffn'} = {
                   'category' => {},
                   'name' => {}
                 },
-                'entry_node' => {},
+                'element_node' => {},
                 'index_entry' => {
                   'entry_element' => {},
                   'entry_number' => 1,
@@ -293,7 +293,7 @@ $result_trees{'menu_in_deffn'} = {
 
$result_trees{'menu_in_deffn'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'extra'}{'def_index_element'}
 = 
$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'}{'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'}{'entry_node'}
 = $result_trees{'menu_in_deffn'}{'contents'}[1];
+$result_trees{'menu_in_deffn'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'extra'}{'element_node'}
 = $result_trees{'menu_in_deffn'}{'contents'}[1];
 
$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'}[1]{'contents'}[0]{'contents'}[0]{'extra'}{'menu_entry_node_label'}{'manual_content'}[0]
 = 
$result_trees{'menu_in_deffn'}{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'contents'}[1]{'contents'}[1];
 $result_trees{'menu_in_deffn'}{'contents'}[1]{'extra'}{'node_content'}[0] = 
$result_trees{'menu_in_deffn'}{'contents'}[1]{'args'}[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 329bdc2ef0..d874d82bee 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
@@ -418,7 +418,7 @@ $result_trees{'comment_space_command_on_line'} = {
           ],
           'cmdname' => 'cindex',
           'extra' => {
-            'entry_node' => {},
+            'element_node' => {},
             'index_entry' => {
               'entry_element' => {},
               'entry_number' => 1,
@@ -753,7 +753,7 @@ 
$result_trees{'comment_space_command_on_line'}{'contents'}[1]{'extra'}{'node_con
 
$result_trees{'comment_space_command_on_line'}{'contents'}[1]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = 
$result_trees{'comment_space_command_on_line'}{'contents'}[1]{'args'}[0]{'contents'}[0];
 
$result_trees{'comment_space_command_on_line'}{'contents'}[3]{'extra'}{'node_content'}[0]
 = 
$result_trees{'comment_space_command_on_line'}{'contents'}[3]{'args'}[0]{'contents'}[0];
 
$result_trees{'comment_space_command_on_line'}{'contents'}[3]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = 
$result_trees{'comment_space_command_on_line'}{'contents'}[3]{'args'}[0]{'contents'}[0];
-$result_trees{'comment_space_command_on_line'}{'contents'}[4]{'contents'}[5]{'extra'}{'entry_node'}
 = $result_trees{'comment_space_command_on_line'}{'contents'}[3];
+$result_trees{'comment_space_command_on_line'}{'contents'}[4]{'contents'}[5]{'extra'}{'element_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_element'}
 = $result_trees{'comment_space_command_on_line'}{'contents'}[4]{'contents'}[5];
 
$result_trees{'comment_space_command_on_line'}{'contents'}[4]{'contents'}[11]{'extra'}{'float_section'}
 = $result_trees{'comment_space_command_on_line'}{'contents'}[4];
 
$result_trees{'comment_space_command_on_line'}{'contents'}[4]{'contents'}[11]{'extra'}{'node_content'}[0]
 = 
$result_trees{'comment_space_command_on_line'}{'contents'}[4]{'contents'}[11]{'args'}[1]{'contents'}[0];
diff --git 
a/tp/t/results/transformations/index_entries_relate_to_item_no_transformation.pl
 
b/tp/t/results/transformations/index_entries_relate_to_item_no_transformation.pl
index 9b496d3589..ccd2e994e4 100644
--- 
a/tp/t/results/transformations/index_entries_relate_to_item_no_transformation.pl
+++ 
b/tp/t/results/transformations/index_entries_relate_to_item_no_transformation.pl
@@ -237,7 +237,7 @@ 
$result_trees{'index_entries_relate_to_item_no_transformation'} = {
                       ],
                       'cmdname' => 'cindex',
                       'extra' => {
-                        'entry_node' => {},
+                        'element_node' => {},
                         'index_entry' => {
                           'entry_element' => {},
                           'entry_number' => 1,
@@ -276,7 +276,7 @@ 
$result_trees{'index_entries_relate_to_item_no_transformation'} = {
                       ],
                       'cmdname' => 'cindex',
                       'extra' => {
-                        'entry_node' => {},
+                        'element_node' => {},
                         'index_entry' => {
                           'entry_element' => {},
                           'entry_number' => 2,
@@ -315,7 +315,7 @@ 
$result_trees{'index_entries_relate_to_item_no_transformation'} = {
                       ],
                       'cmdname' => 'cindex',
                       'extra' => {
-                        'entry_node' => {},
+                        'element_node' => {},
                         'index_entry' => {
                           'entry_element' => {},
                           'entry_number' => 3,
@@ -636,11 +636,11 @@ 
$result_trees{'index_entries_relate_to_item_no_transformation'}{'contents'}[1]{'
 
$result_trees{'index_entries_relate_to_item_no_transformation'}{'contents'}[1]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = 
$result_trees{'index_entries_relate_to_item_no_transformation'}{'contents'}[1]{'args'}[0]{'contents'}[0];
 
$result_trees{'index_entries_relate_to_item_no_transformation'}{'contents'}[3]{'extra'}{'node_content'}[0]
 = 
$result_trees{'index_entries_relate_to_item_no_transformation'}{'contents'}[3]{'args'}[0]{'contents'}[0];
 
$result_trees{'index_entries_relate_to_item_no_transformation'}{'contents'}[3]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = 
$result_trees{'index_entries_relate_to_item_no_transformation'}{'contents'}[3]{'args'}[0]{'contents'}[0];
-$result_trees{'index_entries_relate_to_item_no_transformation'}{'contents'}[4]{'contents'}[1]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'extra'}{'entry_node'}
 = 
$result_trees{'index_entries_relate_to_item_no_transformation'}{'contents'}[3];
+$result_trees{'index_entries_relate_to_item_no_transformation'}{'contents'}[4]{'contents'}[1]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'extra'}{'element_node'}
 = 
$result_trees{'index_entries_relate_to_item_no_transformation'}{'contents'}[3];
 
$result_trees{'index_entries_relate_to_item_no_transformation'}{'contents'}[4]{'contents'}[1]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'index_entries_relate_to_item_no_transformation'}{'contents'}[4]{'contents'}[1]{'contents'}[1]{'contents'}[0]{'contents'}[0];
-$result_trees{'index_entries_relate_to_item_no_transformation'}{'contents'}[4]{'contents'}[1]{'contents'}[1]{'contents'}[0]{'contents'}[1]{'extra'}{'entry_node'}
 = 
$result_trees{'index_entries_relate_to_item_no_transformation'}{'contents'}[3];
+$result_trees{'index_entries_relate_to_item_no_transformation'}{'contents'}[4]{'contents'}[1]{'contents'}[1]{'contents'}[0]{'contents'}[1]{'extra'}{'element_node'}
 = 
$result_trees{'index_entries_relate_to_item_no_transformation'}{'contents'}[3];
 
$result_trees{'index_entries_relate_to_item_no_transformation'}{'contents'}[4]{'contents'}[1]{'contents'}[1]{'contents'}[0]{'contents'}[1]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'index_entries_relate_to_item_no_transformation'}{'contents'}[4]{'contents'}[1]{'contents'}[1]{'contents'}[0]{'contents'}[1];
-$result_trees{'index_entries_relate_to_item_no_transformation'}{'contents'}[4]{'contents'}[1]{'contents'}[1]{'contents'}[0]{'contents'}[2]{'extra'}{'entry_node'}
 = 
$result_trees{'index_entries_relate_to_item_no_transformation'}{'contents'}[3];
+$result_trees{'index_entries_relate_to_item_no_transformation'}{'contents'}[4]{'contents'}[1]{'contents'}[1]{'contents'}[0]{'contents'}[2]{'extra'}{'element_node'}
 = 
$result_trees{'index_entries_relate_to_item_no_transformation'}{'contents'}[3];
 
$result_trees{'index_entries_relate_to_item_no_transformation'}{'contents'}[4]{'contents'}[1]{'contents'}[1]{'contents'}[0]{'contents'}[2]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'index_entries_relate_to_item_no_transformation'}{'contents'}[4]{'contents'}[1]{'contents'}[1]{'contents'}[0]{'contents'}[2];
 
$result_trees{'index_entries_relate_to_item_no_transformation'}{'contents'}[4]{'contents'}[1]{'extra'}{'command_as_argument'}
 = 
$result_trees{'index_entries_relate_to_item_no_transformation'}{'contents'}[4]{'contents'}[1]{'args'}[0]{'contents'}[0];
 
diff --git 
a/tp/t/results/transformations/index_entries_relate_to_item_transformation.pl 
b/tp/t/results/transformations/index_entries_relate_to_item_transformation.pl
index ece750bfaa..77764749b3 100644
--- 
a/tp/t/results/transformations/index_entries_relate_to_item_transformation.pl
+++ 
b/tp/t/results/transformations/index_entries_relate_to_item_transformation.pl
@@ -237,7 +237,7 @@ 
$result_trees{'index_entries_relate_to_item_transformation'} = {
                       ],
                       'cmdname' => 'cindex',
                       'extra' => {
-                        'entry_node' => {},
+                        'element_node' => {},
                         'index_entry' => {
                           'entry_associated_element' => {
                             'args' => [
@@ -305,7 +305,7 @@ 
$result_trees{'index_entries_relate_to_item_transformation'} = {
                       ],
                       'cmdname' => 'cindex',
                       'extra' => {
-                        'entry_node' => {},
+                        'element_node' => {},
                         'index_entry' => {
                           'entry_element' => {},
                           'entry_number' => 2,
@@ -344,7 +344,7 @@ 
$result_trees{'index_entries_relate_to_item_transformation'} = {
                       ],
                       'cmdname' => 'cindex',
                       'extra' => {
-                        'entry_node' => {},
+                        'element_node' => {},
                         'index_entry' => {
                           'entry_element' => {},
                           'entry_number' => 3,
@@ -637,11 +637,11 @@ 
$result_trees{'index_entries_relate_to_item_transformation'}{'contents'}[1]{'ext
 
$result_trees{'index_entries_relate_to_item_transformation'}{'contents'}[1]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = 
$result_trees{'index_entries_relate_to_item_transformation'}{'contents'}[1]{'args'}[0]{'contents'}[0];
 
$result_trees{'index_entries_relate_to_item_transformation'}{'contents'}[3]{'extra'}{'node_content'}[0]
 = 
$result_trees{'index_entries_relate_to_item_transformation'}{'contents'}[3]{'args'}[0]{'contents'}[0];
 
$result_trees{'index_entries_relate_to_item_transformation'}{'contents'}[3]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = 
$result_trees{'index_entries_relate_to_item_transformation'}{'contents'}[3]{'args'}[0]{'contents'}[0];
-$result_trees{'index_entries_relate_to_item_transformation'}{'contents'}[4]{'contents'}[1]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'extra'}{'entry_node'}
 = $result_trees{'index_entries_relate_to_item_transformation'}{'contents'}[3];
+$result_trees{'index_entries_relate_to_item_transformation'}{'contents'}[4]{'contents'}[1]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'extra'}{'element_node'}
 = $result_trees{'index_entries_relate_to_item_transformation'}{'contents'}[3];
 
$result_trees{'index_entries_relate_to_item_transformation'}{'contents'}[4]{'contents'}[1]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'index_entries_relate_to_item_transformation'}{'contents'}[4]{'contents'}[1]{'contents'}[1]{'contents'}[0]{'contents'}[0];
-$result_trees{'index_entries_relate_to_item_transformation'}{'contents'}[4]{'contents'}[1]{'contents'}[1]{'contents'}[0]{'contents'}[1]{'extra'}{'entry_node'}
 = $result_trees{'index_entries_relate_to_item_transformation'}{'contents'}[3];
+$result_trees{'index_entries_relate_to_item_transformation'}{'contents'}[4]{'contents'}[1]{'contents'}[1]{'contents'}[0]{'contents'}[1]{'extra'}{'element_node'}
 = $result_trees{'index_entries_relate_to_item_transformation'}{'contents'}[3];
 
$result_trees{'index_entries_relate_to_item_transformation'}{'contents'}[4]{'contents'}[1]{'contents'}[1]{'contents'}[0]{'contents'}[1]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'index_entries_relate_to_item_transformation'}{'contents'}[4]{'contents'}[1]{'contents'}[1]{'contents'}[0]{'contents'}[1];
-$result_trees{'index_entries_relate_to_item_transformation'}{'contents'}[4]{'contents'}[1]{'contents'}[1]{'contents'}[0]{'contents'}[2]{'extra'}{'entry_node'}
 = $result_trees{'index_entries_relate_to_item_transformation'}{'contents'}[3];
+$result_trees{'index_entries_relate_to_item_transformation'}{'contents'}[4]{'contents'}[1]{'contents'}[1]{'contents'}[0]{'contents'}[2]{'extra'}{'element_node'}
 = $result_trees{'index_entries_relate_to_item_transformation'}{'contents'}[3];
 
$result_trees{'index_entries_relate_to_item_transformation'}{'contents'}[4]{'contents'}[1]{'contents'}[1]{'contents'}[0]{'contents'}[2]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'index_entries_relate_to_item_transformation'}{'contents'}[4]{'contents'}[1]{'contents'}[1]{'contents'}[0]{'contents'}[2];
 
$result_trees{'index_entries_relate_to_item_transformation'}{'contents'}[4]{'contents'}[1]{'contents'}[1]{'contents'}[0]{'contents'}[3]
 = 
$result_trees{'index_entries_relate_to_item_transformation'}{'contents'}[4]{'contents'}[1]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'extra'}{'index_entry'}{'entry_associated_element'};
 
$result_trees{'index_entries_relate_to_item_transformation'}{'contents'}[4]{'contents'}[1]{'extra'}{'command_as_argument'}
 = 
$result_trees{'index_entries_relate_to_item_transformation'}{'contents'}[4]{'contents'}[1]{'args'}[0]{'contents'}[0];
diff --git a/tp/t/results/value/value_in_index_commands.pl 
b/tp/t/results/value/value_in_index_commands.pl
index 441ec93268..cca89a523f 100644
--- a/tp/t/results/value/value_in_index_commands.pl
+++ b/tp/t/results/value/value_in_index_commands.pl
@@ -586,7 +586,7 @@ $result_trees{'value_in_index_commands'} = {
           ],
           'cmdname' => 'trucindex',
           'extra' => {
-            'entry_node' => {},
+            'element_node' => {},
             'index_entry' => {
               'entry_element' => {},
               'entry_number' => 1,
@@ -719,7 +719,7 @@ $result_trees{'value_in_index_commands'} = {
           ],
           'cmdname' => 'codeidxindex',
           'extra' => {
-            'entry_node' => {},
+            'element_node' => {},
             'index_entry' => {
               'entry_element' => {},
               'entry_number' => 1,
@@ -788,7 +788,7 @@ $result_trees{'value_in_index_commands'} = {
           ],
           'cmdname' => 'kindex',
           'extra' => {
-            'entry_node' => {},
+            'element_node' => {},
             'index_entry' => {
               'entry_element' => {},
               'entry_number' => 1,
@@ -867,7 +867,7 @@ $result_trees{'value_in_index_commands'} = {
           ],
           'cmdname' => 'pindex',
           'extra' => {
-            'entry_node' => {},
+            'element_node' => {},
             'index_entry' => {
               'entry_element' => {},
               'entry_number' => 1,
@@ -1065,13 +1065,13 @@ $result_trees{'value_in_index_commands'} = {
 };
 
$result_trees{'value_in_index_commands'}{'contents'}[1]{'extra'}{'node_content'}[0]
 = 
$result_trees{'value_in_index_commands'}{'contents'}[1]{'args'}[0]{'contents'}[0];
 
$result_trees{'value_in_index_commands'}{'contents'}[1]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = 
$result_trees{'value_in_index_commands'}{'contents'}[1]{'args'}[0]{'contents'}[0];
-$result_trees{'value_in_index_commands'}{'contents'}[2]{'contents'}[1]{'extra'}{'entry_node'}
 = $result_trees{'value_in_index_commands'}{'contents'}[2];
+$result_trees{'value_in_index_commands'}{'contents'}[2]{'contents'}[1]{'extra'}{'element_node'}
 = $result_trees{'value_in_index_commands'}{'contents'}[2];
 
$result_trees{'value_in_index_commands'}{'contents'}[2]{'contents'}[1]{'extra'}{'index_entry'}{'entry_element'}
 = $result_trees{'value_in_index_commands'}{'contents'}[2]{'contents'}[1];
-$result_trees{'value_in_index_commands'}{'contents'}[2]{'contents'}[3]{'extra'}{'entry_node'}
 = $result_trees{'value_in_index_commands'}{'contents'}[2];
+$result_trees{'value_in_index_commands'}{'contents'}[2]{'contents'}[3]{'extra'}{'element_node'}
 = $result_trees{'value_in_index_commands'}{'contents'}[2];
 
$result_trees{'value_in_index_commands'}{'contents'}[2]{'contents'}[3]{'extra'}{'index_entry'}{'entry_element'}
 = $result_trees{'value_in_index_commands'}{'contents'}[2]{'contents'}[3];
-$result_trees{'value_in_index_commands'}{'contents'}[2]{'contents'}[5]{'extra'}{'entry_node'}
 = $result_trees{'value_in_index_commands'}{'contents'}[2];
+$result_trees{'value_in_index_commands'}{'contents'}[2]{'contents'}[5]{'extra'}{'element_node'}
 = $result_trees{'value_in_index_commands'}{'contents'}[2];
 
$result_trees{'value_in_index_commands'}{'contents'}[2]{'contents'}[5]{'extra'}{'index_entry'}{'entry_element'}
 = $result_trees{'value_in_index_commands'}{'contents'}[2]{'contents'}[5];
-$result_trees{'value_in_index_commands'}{'contents'}[2]{'contents'}[6]{'extra'}{'entry_node'}
 = $result_trees{'value_in_index_commands'}{'contents'}[2];
+$result_trees{'value_in_index_commands'}{'contents'}[2]{'contents'}[6]{'extra'}{'element_node'}
 = $result_trees{'value_in_index_commands'}{'contents'}[2];
 
$result_trees{'value_in_index_commands'}{'contents'}[2]{'contents'}[6]{'extra'}{'index_entry'}{'entry_element'}
 = $result_trees{'value_in_index_commands'}{'contents'}[2]{'contents'}[6];
 
$result_trees{'value_in_index_commands'}{'contents'}[2]{'extra'}{'node_content'}[0]
 = 
$result_trees{'value_in_index_commands'}{'contents'}[2]{'args'}[0]{'contents'}[0];
 
$result_trees{'value_in_index_commands'}{'contents'}[2]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = 
$result_trees{'value_in_index_commands'}{'contents'}[2]{'args'}[0]{'contents'}[0];
diff --git a/tp/t/results/xml_tests/commands_and_spaces.pl 
b/tp/t/results/xml_tests/commands_and_spaces.pl
index 298248d94b..9e338aa1c4 100644
--- a/tp/t/results/xml_tests/commands_and_spaces.pl
+++ b/tp/t/results/xml_tests/commands_and_spaces.pl
@@ -1627,7 +1627,7 @@ $result_trees{'commands_and_spaces'} = {
                   'category' => {},
                   'name' => {}
                 },
-                'entry_node' => {},
+                'element_node' => {},
                 'index_entry' => {
                   'entry_element' => {},
                   'entry_number' => 1,
@@ -1763,7 +1763,7 @@ 
$result_trees{'commands_and_spaces'}{'contents'}[1]{'contents'}[35]{'extra'}{'co
 
$result_trees{'commands_and_spaces'}{'contents'}[1]{'contents'}[43]{'contents'}[0]{'extra'}{'def_index_element'}
 = 
$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'}{'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'}{'entry_node'}
 = $result_trees{'commands_and_spaces'}{'contents'}[1];
+$result_trees{'commands_and_spaces'}{'contents'}[1]{'contents'}[43]{'contents'}[0]{'extra'}{'element_node'}
 = $result_trees{'commands_and_spaces'}{'contents'}[1];
 
$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]{'extra'}{'node_content'}[0] 
= $result_trees{'commands_and_spaces'}{'contents'}[1]{'args'}[0]{'contents'}[0];
 
$result_trees{'commands_and_spaces'}{'contents'}[1]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = 
$result_trees{'commands_and_spaces'}{'contents'}[1]{'args'}[0]{'contents'}[0];
diff --git a/tp/t/results/xtable/block_commands_in_table.pl 
b/tp/t/results/xtable/block_commands_in_table.pl
index 76e05f1ae7..958ba28274 100644
--- a/tp/t/results/xtable/block_commands_in_table.pl
+++ b/tp/t/results/xtable/block_commands_in_table.pl
@@ -769,7 +769,7 @@ $result_trees{'block_commands_in_table'} = {
                       ],
                       'cmdname' => 'item',
                       'extra' => {
-                        'entry_node' => {},
+                        'element_node' => {},
                         'index_entry' => {
                           'entry_element' => {},
                           'entry_number' => 1,
@@ -828,7 +828,7 @@ $result_trees{'block_commands_in_table'} = {
                       ],
                       'cmdname' => 'vindex',
                       'extra' => {
-                        'entry_node' => {},
+                        'element_node' => {},
                         'index_entry' => {
                           'entry_element' => {},
                           'entry_number' => 2,
@@ -867,7 +867,7 @@ $result_trees{'block_commands_in_table'} = {
                       ],
                       'cmdname' => 'itemx',
                       'extra' => {
-                        'entry_node' => {},
+                        'element_node' => {},
                         'index_entry' => {
                           'entry_element' => {},
                           'entry_number' => 3,
@@ -1006,7 +1006,7 @@ $result_trees{'block_commands_in_table'} = {
                       ],
                       'cmdname' => 'item',
                       'extra' => {
-                        'entry_node' => {},
+                        'element_node' => {},
                         'index_entry' => {
                           'entry_element' => {},
                           'entry_number' => 4,
@@ -1054,7 +1054,7 @@ $result_trees{'block_commands_in_table'} = {
                       ],
                       'cmdname' => 'itemx',
                       'extra' => {
-                        'entry_node' => {},
+                        'element_node' => {},
                         'index_entry' => {
                           'entry_element' => {},
                           'entry_number' => 5,
@@ -1372,16 +1372,16 @@ 
$result_trees{'block_commands_in_table'}{'contents'}[1]{'extra'}{'nodes_manuals'
 
$result_trees{'block_commands_in_table'}{'contents'}[3]{'extra'}{'node_content'}[0]
 = 
$result_trees{'block_commands_in_table'}{'contents'}[3]{'args'}[0]{'contents'}[0];
 
$result_trees{'block_commands_in_table'}{'contents'}[3]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = 
$result_trees{'block_commands_in_table'}{'contents'}[3]{'args'}[0]{'contents'}[0];
 
$result_trees{'block_commands_in_table'}{'contents'}[4]{'contents'}[1]{'extra'}{'command_as_argument'}
 = 
$result_trees{'block_commands_in_table'}{'contents'}[4]{'contents'}[1]{'args'}[0]{'contents'}[0];
-$result_trees{'block_commands_in_table'}{'contents'}[4]{'contents'}[3]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'extra'}{'entry_node'}
 = $result_trees{'block_commands_in_table'}{'contents'}[3];
+$result_trees{'block_commands_in_table'}{'contents'}[4]{'contents'}[3]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'extra'}{'element_node'}
 = $result_trees{'block_commands_in_table'}{'contents'}[3];
 
$result_trees{'block_commands_in_table'}{'contents'}[4]{'contents'}[3]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'block_commands_in_table'}{'contents'}[4]{'contents'}[3]{'contents'}[0]{'contents'}[0]{'contents'}[0];
-$result_trees{'block_commands_in_table'}{'contents'}[4]{'contents'}[3]{'contents'}[0]{'contents'}[0]{'contents'}[2]{'extra'}{'entry_node'}
 = $result_trees{'block_commands_in_table'}{'contents'}[3];
+$result_trees{'block_commands_in_table'}{'contents'}[4]{'contents'}[3]{'contents'}[0]{'contents'}[0]{'contents'}[2]{'extra'}{'element_node'}
 = $result_trees{'block_commands_in_table'}{'contents'}[3];
 
$result_trees{'block_commands_in_table'}{'contents'}[4]{'contents'}[3]{'contents'}[0]{'contents'}[0]{'contents'}[2]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'block_commands_in_table'}{'contents'}[4]{'contents'}[3]{'contents'}[0]{'contents'}[0]{'contents'}[2];
-$result_trees{'block_commands_in_table'}{'contents'}[4]{'contents'}[3]{'contents'}[0]{'contents'}[0]{'contents'}[3]{'extra'}{'entry_node'}
 = $result_trees{'block_commands_in_table'}{'contents'}[3];
+$result_trees{'block_commands_in_table'}{'contents'}[4]{'contents'}[3]{'contents'}[0]{'contents'}[0]{'contents'}[3]{'extra'}{'element_node'}
 = $result_trees{'block_commands_in_table'}{'contents'}[3];
 
$result_trees{'block_commands_in_table'}{'contents'}[4]{'contents'}[3]{'contents'}[0]{'contents'}[0]{'contents'}[3]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'block_commands_in_table'}{'contents'}[4]{'contents'}[3]{'contents'}[0]{'contents'}[0]{'contents'}[3];
 
$result_trees{'block_commands_in_table'}{'contents'}[4]{'contents'}[3]{'extra'}{'command_as_argument'}
 = 
$result_trees{'block_commands_in_table'}{'contents'}[4]{'contents'}[3]{'args'}[0]{'contents'}[0];
-$result_trees{'block_commands_in_table'}{'contents'}[4]{'contents'}[4]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'extra'}{'entry_node'}
 = $result_trees{'block_commands_in_table'}{'contents'}[3];
+$result_trees{'block_commands_in_table'}{'contents'}[4]{'contents'}[4]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'extra'}{'element_node'}
 = $result_trees{'block_commands_in_table'}{'contents'}[3];
 
$result_trees{'block_commands_in_table'}{'contents'}[4]{'contents'}[4]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'block_commands_in_table'}{'contents'}[4]{'contents'}[4]{'contents'}[0]{'contents'}[0]{'contents'}[0];
-$result_trees{'block_commands_in_table'}{'contents'}[4]{'contents'}[4]{'contents'}[0]{'contents'}[0]{'contents'}[2]{'extra'}{'entry_node'}
 = $result_trees{'block_commands_in_table'}{'contents'}[3];
+$result_trees{'block_commands_in_table'}{'contents'}[4]{'contents'}[4]{'contents'}[0]{'contents'}[0]{'contents'}[2]{'extra'}{'element_node'}
 = $result_trees{'block_commands_in_table'}{'contents'}[3];
 
$result_trees{'block_commands_in_table'}{'contents'}[4]{'contents'}[4]{'contents'}[0]{'contents'}[0]{'contents'}[2]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'block_commands_in_table'}{'contents'}[4]{'contents'}[4]{'contents'}[0]{'contents'}[0]{'contents'}[2];
 
$result_trees{'block_commands_in_table'}{'contents'}[4]{'contents'}[4]{'extra'}{'command_as_argument'}
 = 
$result_trees{'block_commands_in_table'}{'contents'}[4]{'contents'}[4]{'args'}[0]{'contents'}[0];
 
$result_trees{'block_commands_in_table'}{'contents'}[4]{'contents'}[7]{'extra'}{'command_as_argument'}
 = 
$result_trees{'block_commands_in_table'}{'contents'}[4]{'contents'}[7]{'args'}[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 43062d0fb2..45329e3e4b 100644
--- a/tp/t/results/xtable/inter_item_commands_in_table.pl
+++ b/tp/t/results/xtable/inter_item_commands_in_table.pl
@@ -227,7 +227,7 @@ $result_trees{'inter_item_commands_in_table'} = {
                       ],
                       'cmdname' => 'item',
                       'extra' => {
-                        'entry_node' => {},
+                        'element_node' => {},
                         'index_entry' => {
                           'entry_element' => {},
                           'entry_number' => 1,
@@ -366,7 +366,7 @@ $result_trees{'inter_item_commands_in_table'} = {
                       ],
                       'cmdname' => 'item',
                       'extra' => {
-                        'entry_node' => {},
+                        'element_node' => {},
                         'index_entry' => {
                           'entry_element' => {},
                           'entry_number' => 2,
@@ -425,7 +425,7 @@ $result_trees{'inter_item_commands_in_table'} = {
                       ],
                       'cmdname' => 'itemx',
                       'extra' => {
-                        'entry_node' => {},
+                        'element_node' => {},
                         'index_entry' => {
                           'entry_element' => {},
                           'entry_number' => 3,
@@ -564,7 +564,7 @@ $result_trees{'inter_item_commands_in_table'} = {
                       ],
                       'cmdname' => 'item',
                       'extra' => {
-                        'entry_node' => {},
+                        'element_node' => {},
                         'index_entry' => {
                           'entry_element' => {},
                           'entry_number' => 1,
@@ -604,7 +604,7 @@ $result_trees{'inter_item_commands_in_table'} = {
                           ],
                           'cmdname' => 'cindex',
                           'extra' => {
-                            'entry_node' => {},
+                            'element_node' => {},
                             'index_entry' => {
                               'entry_element' => {},
                               'entry_number' => 1,
@@ -678,7 +678,7 @@ $result_trees{'inter_item_commands_in_table'} = {
                       ],
                       'cmdname' => 'itemx',
                       'extra' => {
-                        'entry_node' => {},
+                        'element_node' => {},
                         'index_entry' => {
                           'entry_element' => {},
                           'entry_number' => 2,
@@ -740,7 +740,7 @@ $result_trees{'inter_item_commands_in_table'} = {
                       ],
                       'cmdname' => 'item',
                       'extra' => {
-                        'entry_node' => {},
+                        'element_node' => {},
                         'index_entry' => {
                           'entry_element' => {},
                           'entry_number' => 3,
@@ -809,7 +809,7 @@ $result_trees{'inter_item_commands_in_table'} = {
                       ],
                       'cmdname' => 'itemx',
                       'extra' => {
-                        'entry_node' => {},
+                        'element_node' => {},
                         'index_entry' => {
                           'entry_element' => {},
                           'entry_number' => 4,
@@ -960,7 +960,7 @@ $result_trees{'inter_item_commands_in_table'} = {
                       ],
                       'cmdname' => 'item',
                       'extra' => {
-                        'entry_node' => {},
+                        'element_node' => {},
                         'index_entry' => {
                           'entry_element' => {},
                           'entry_number' => 5,
@@ -1000,7 +1000,7 @@ $result_trees{'inter_item_commands_in_table'} = {
                           ],
                           'cmdname' => 'cindex',
                           'extra' => {
-                            'entry_node' => {},
+                            'element_node' => {},
                             'index_entry' => {
                               'entry_element' => {},
                               'entry_number' => 2,
@@ -1042,7 +1042,7 @@ $result_trees{'inter_item_commands_in_table'} = {
                       ],
                       'cmdname' => 'itemx',
                       'extra' => {
-                        'entry_node' => {},
+                        'element_node' => {},
                         'index_entry' => {
                           'entry_element' => {},
                           'entry_number' => 6,
@@ -1181,7 +1181,7 @@ $result_trees{'inter_item_commands_in_table'} = {
                       ],
                       'cmdname' => 'cindex',
                       'extra' => {
-                        'entry_node' => {},
+                        'element_node' => {},
                         'index_entry' => {
                           'entry_element' => {},
                           'entry_number' => 3,
@@ -1364,7 +1364,7 @@ $result_trees{'inter_item_commands_in_table'} = {
                   ],
                   'cmdname' => 'cindex',
                   'extra' => {
-                    'entry_node' => {},
+                    'element_node' => {},
                     'index_entry' => {
                       'entry_element' => {},
                       'entry_number' => 4,
@@ -1535,7 +1535,7 @@ $result_trees{'inter_item_commands_in_table'} = {
                       ],
                       'cmdname' => 'cindex',
                       'extra' => {
-                        'entry_node' => {},
+                        'element_node' => {},
                         'index_entry' => {
                           'entry_element' => {},
                           'entry_number' => 5,
@@ -1718,7 +1718,7 @@ $result_trees{'inter_item_commands_in_table'} = {
                   ],
                   'cmdname' => 'cindex',
                   'extra' => {
-                    'entry_node' => {},
+                    'element_node' => {},
                     'index_entry' => {
                       'entry_element' => {},
                       'entry_number' => 6,
@@ -1892,7 +1892,7 @@ $result_trees{'inter_item_commands_in_table'} = {
                   ],
                   'cmdname' => 'cindex',
                   'extra' => {
-                    'entry_node' => {},
+                    'element_node' => {},
                     'index_entry' => {
                       'entry_element' => {},
                       'entry_number' => 7,
@@ -2057,7 +2057,7 @@ $result_trees{'inter_item_commands_in_table'} = {
                   ],
                   'cmdname' => 'cindex',
                   'extra' => {
-                    'entry_node' => {},
+                    'element_node' => {},
                     'index_entry' => {
                       'entry_element' => {},
                       'entry_number' => 8,
@@ -2234,7 +2234,7 @@ $result_trees{'inter_item_commands_in_table'} = {
                       ],
                       'cmdname' => 'cindex',
                       'extra' => {
-                        'entry_node' => {},
+                        'element_node' => {},
                         'index_entry' => {
                           'entry_element' => {},
                           'entry_number' => 9,
@@ -2389,7 +2389,7 @@ $result_trees{'inter_item_commands_in_table'} = {
                       ],
                       'cmdname' => 'cindex',
                       'extra' => {
-                        'entry_node' => {},
+                        'element_node' => {},
                         'index_entry' => {
                           'entry_element' => {},
                           'entry_number' => 10,
@@ -2444,7 +2444,7 @@ $result_trees{'inter_item_commands_in_table'} = {
                       ],
                       'cmdname' => 'cindex',
                       'extra' => {
-                        'entry_node' => {},
+                        'element_node' => {},
                         'index_entry' => {
                           'entry_element' => {},
                           'entry_number' => 11,
@@ -2483,7 +2483,7 @@ $result_trees{'inter_item_commands_in_table'} = {
                       ],
                       'cmdname' => 'cindex',
                       'extra' => {
-                        'entry_node' => {},
+                        'element_node' => {},
                         'index_entry' => {
                           'entry_element' => {},
                           'entry_number' => 12,
@@ -2615,58 +2615,58 @@ 
$result_trees{'inter_item_commands_in_table'}{'contents'}[1]{'extra'}{'node_cont
 
$result_trees{'inter_item_commands_in_table'}{'contents'}[1]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = 
$result_trees{'inter_item_commands_in_table'}{'contents'}[1]{'args'}[0]{'contents'}[0];
 
$result_trees{'inter_item_commands_in_table'}{'contents'}[3]{'extra'}{'node_content'}[0]
 = 
$result_trees{'inter_item_commands_in_table'}{'contents'}[3]{'args'}[0]{'contents'}[0];
 
$result_trees{'inter_item_commands_in_table'}{'contents'}[3]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = 
$result_trees{'inter_item_commands_in_table'}{'contents'}[3]{'args'}[0]{'contents'}[0];
-$result_trees{'inter_item_commands_in_table'}{'contents'}[4]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'contents'}[1]{'extra'}{'entry_node'}
 = $result_trees{'inter_item_commands_in_table'}{'contents'}[3];
+$result_trees{'inter_item_commands_in_table'}{'contents'}[4]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'contents'}[1]{'extra'}{'element_node'}
 = $result_trees{'inter_item_commands_in_table'}{'contents'}[3];
 
$result_trees{'inter_item_commands_in_table'}{'contents'}[4]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'contents'}[1]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'inter_item_commands_in_table'}{'contents'}[4]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'contents'}[1];
 
$result_trees{'inter_item_commands_in_table'}{'contents'}[4]{'contents'}[1]{'extra'}{'command_as_argument'}
 = 
$result_trees{'inter_item_commands_in_table'}{'contents'}[4]{'contents'}[1]{'args'}[0]{'contents'}[0];
-$result_trees{'inter_item_commands_in_table'}{'contents'}[4]{'contents'}[3]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'extra'}{'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'}{'element_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_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'}[2]{'extra'}{'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'}{'element_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_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]{'extra'}{'command_as_argument'}
 = 
$result_trees{'inter_item_commands_in_table'}{'contents'}[4]{'contents'}[3]{'args'}[0]{'contents'}[0];
-$result_trees{'inter_item_commands_in_table'}{'contents'}[4]{'contents'}[5]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'extra'}{'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'}{'element_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_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'}[1]{'contents'}[0]{'extra'}{'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'}{'element_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_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'}[2]{'extra'}{'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'}{'element_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_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'}[1]{'contents'}[0]{'contents'}[0]{'extra'}{'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'}{'element_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_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'}[2]{'extra'}{'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'}{'element_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_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]{'extra'}{'command_as_argument'}
 = 
$result_trees{'inter_item_commands_in_table'}{'contents'}[4]{'contents'}[5]{'args'}[0]{'contents'}[0];
-$result_trees{'inter_item_commands_in_table'}{'contents'}[4]{'contents'}[7]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'extra'}{'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]{'contents'}[0]{'extra'}{'element_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]{'contents'}[0]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'inter_item_commands_in_table'}{'contents'}[4]{'contents'}[7]{'contents'}[0]{'contents'}[0]{'contents'}[0];
-$result_trees{'inter_item_commands_in_table'}{'contents'}[4]{'contents'}[7]{'contents'}[0]{'contents'}[0]{'contents'}[1]{'contents'}[0]{'extra'}{'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]{'contents'}[1]{'contents'}[0]{'extra'}{'element_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]{'contents'}[1]{'contents'}[0]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'inter_item_commands_in_table'}{'contents'}[4]{'contents'}[7]{'contents'}[0]{'contents'}[0]{'contents'}[1]{'contents'}[0];
-$result_trees{'inter_item_commands_in_table'}{'contents'}[4]{'contents'}[7]{'contents'}[0]{'contents'}[0]{'contents'}[2]{'extra'}{'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]{'contents'}[2]{'extra'}{'element_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]{'contents'}[2]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'inter_item_commands_in_table'}{'contents'}[4]{'contents'}[7]{'contents'}[0]{'contents'}[0]{'contents'}[2];
 
$result_trees{'inter_item_commands_in_table'}{'contents'}[4]{'contents'}[7]{'extra'}{'command_as_argument'}
 = 
$result_trees{'inter_item_commands_in_table'}{'contents'}[4]{'contents'}[7]{'args'}[0]{'contents'}[0];
-$result_trees{'inter_item_commands_in_table'}{'contents'}[4]{'contents'}[9]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'extra'}{'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]{'contents'}[0]{'extra'}{'element_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]{'contents'}[0]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'inter_item_commands_in_table'}{'contents'}[4]{'contents'}[9]{'contents'}[0]{'contents'}[0]{'contents'}[0];
 
$result_trees{'inter_item_commands_in_table'}{'contents'}[4]{'contents'}[9]{'extra'}{'command_as_argument'}
 = 
$result_trees{'inter_item_commands_in_table'}{'contents'}[4]{'contents'}[9]{'args'}[0]{'contents'}[0];
-$result_trees{'inter_item_commands_in_table'}{'contents'}[4]{'contents'}[11]{'contents'}[0]{'contents'}[0]{'extra'}{'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'}{'element_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_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]{'extra'}{'command_as_argument'}
 = 
$result_trees{'inter_item_commands_in_table'}{'contents'}[4]{'contents'}[11]{'args'}[0]{'contents'}[0];
-$result_trees{'inter_item_commands_in_table'}{'contents'}[4]{'contents'}[13]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'extra'}{'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]{'contents'}[0]{'extra'}{'element_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]{'contents'}[0]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'inter_item_commands_in_table'}{'contents'}[4]{'contents'}[13]{'contents'}[0]{'contents'}[0]{'contents'}[0];
 
$result_trees{'inter_item_commands_in_table'}{'contents'}[4]{'contents'}[13]{'extra'}{'command_as_argument'}
 = 
$result_trees{'inter_item_commands_in_table'}{'contents'}[4]{'contents'}[13]{'args'}[0]{'contents'}[0];
-$result_trees{'inter_item_commands_in_table'}{'contents'}[4]{'contents'}[15]{'contents'}[0]{'contents'}[0]{'extra'}{'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'}[0]{'extra'}{'element_node'}
 = $result_trees{'inter_item_commands_in_table'}{'contents'}[3];
 
$result_trees{'inter_item_commands_in_table'}{'contents'}[4]{'contents'}[15]{'contents'}[0]{'contents'}[0]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'inter_item_commands_in_table'}{'contents'}[4]{'contents'}[15]{'contents'}[0]{'contents'}[0];
 
$result_trees{'inter_item_commands_in_table'}{'contents'}[4]{'contents'}[15]{'extra'}{'command_as_argument'}
 = 
$result_trees{'inter_item_commands_in_table'}{'contents'}[4]{'contents'}[15]{'args'}[0]{'contents'}[0];
-$result_trees{'inter_item_commands_in_table'}{'contents'}[4]{'contents'}[17]{'contents'}[0]{'contents'}[1]{'extra'}{'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'}[1]{'extra'}{'element_node'}
 = $result_trees{'inter_item_commands_in_table'}{'contents'}[3];
 
$result_trees{'inter_item_commands_in_table'}{'contents'}[4]{'contents'}[17]{'contents'}[0]{'contents'}[1]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'inter_item_commands_in_table'}{'contents'}[4]{'contents'}[17]{'contents'}[0]{'contents'}[1];
 
$result_trees{'inter_item_commands_in_table'}{'contents'}[4]{'contents'}[17]{'extra'}{'command_as_argument'}
 = 
$result_trees{'inter_item_commands_in_table'}{'contents'}[4]{'contents'}[17]{'args'}[0]{'contents'}[0];
-$result_trees{'inter_item_commands_in_table'}{'contents'}[4]{'contents'}[19]{'contents'}[0]{'contents'}[0]{'extra'}{'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'}[0]{'extra'}{'element_node'}
 = $result_trees{'inter_item_commands_in_table'}{'contents'}[3];
 
$result_trees{'inter_item_commands_in_table'}{'contents'}[4]{'contents'}[19]{'contents'}[0]{'contents'}[0]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'inter_item_commands_in_table'}{'contents'}[4]{'contents'}[19]{'contents'}[0]{'contents'}[0];
 
$result_trees{'inter_item_commands_in_table'}{'contents'}[4]{'contents'}[19]{'extra'}{'command_as_argument'}
 = 
$result_trees{'inter_item_commands_in_table'}{'contents'}[4]{'contents'}[19]{'args'}[0]{'contents'}[0];
-$result_trees{'inter_item_commands_in_table'}{'contents'}[4]{'contents'}[21]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'extra'}{'entry_node'}
 = $result_trees{'inter_item_commands_in_table'}{'contents'}[3];
+$result_trees{'inter_item_commands_in_table'}{'contents'}[4]{'contents'}[21]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'extra'}{'element_node'}
 = $result_trees{'inter_item_commands_in_table'}{'contents'}[3];
 
$result_trees{'inter_item_commands_in_table'}{'contents'}[4]{'contents'}[21]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'inter_item_commands_in_table'}{'contents'}[4]{'contents'}[21]{'contents'}[1]{'contents'}[0]{'contents'}[0];
 
$result_trees{'inter_item_commands_in_table'}{'contents'}[4]{'contents'}[21]{'extra'}{'command_as_argument'}
 = 
$result_trees{'inter_item_commands_in_table'}{'contents'}[4]{'contents'}[21]{'args'}[0]{'contents'}[0];
-$result_trees{'inter_item_commands_in_table'}{'contents'}[4]{'contents'}[23]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'extra'}{'entry_node'}
 = $result_trees{'inter_item_commands_in_table'}{'contents'}[3];
+$result_trees{'inter_item_commands_in_table'}{'contents'}[4]{'contents'}[23]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'extra'}{'element_node'}
 = $result_trees{'inter_item_commands_in_table'}{'contents'}[3];
 
$result_trees{'inter_item_commands_in_table'}{'contents'}[4]{'contents'}[23]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'inter_item_commands_in_table'}{'contents'}[4]{'contents'}[23]{'contents'}[0]{'contents'}[0]{'contents'}[0];
-$result_trees{'inter_item_commands_in_table'}{'contents'}[4]{'contents'}[23]{'contents'}[0]{'contents'}[0]{'contents'}[2]{'extra'}{'entry_node'}
 = $result_trees{'inter_item_commands_in_table'}{'contents'}[3];
+$result_trees{'inter_item_commands_in_table'}{'contents'}[4]{'contents'}[23]{'contents'}[0]{'contents'}[0]{'contents'}[2]{'extra'}{'element_node'}
 = $result_trees{'inter_item_commands_in_table'}{'contents'}[3];
 
$result_trees{'inter_item_commands_in_table'}{'contents'}[4]{'contents'}[23]{'contents'}[0]{'contents'}[0]{'contents'}[2]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'inter_item_commands_in_table'}{'contents'}[4]{'contents'}[23]{'contents'}[0]{'contents'}[0]{'contents'}[2];
-$result_trees{'inter_item_commands_in_table'}{'contents'}[4]{'contents'}[23]{'contents'}[0]{'contents'}[0]{'contents'}[3]{'extra'}{'entry_node'}
 = $result_trees{'inter_item_commands_in_table'}{'contents'}[3];
+$result_trees{'inter_item_commands_in_table'}{'contents'}[4]{'contents'}[23]{'contents'}[0]{'contents'}[0]{'contents'}[3]{'extra'}{'element_node'}
 = $result_trees{'inter_item_commands_in_table'}{'contents'}[3];
 
$result_trees{'inter_item_commands_in_table'}{'contents'}[4]{'contents'}[23]{'contents'}[0]{'contents'}[0]{'contents'}[3]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'inter_item_commands_in_table'}{'contents'}[4]{'contents'}[23]{'contents'}[0]{'contents'}[0]{'contents'}[3];
 
$result_trees{'inter_item_commands_in_table'}{'contents'}[4]{'contents'}[23]{'extra'}{'command_as_argument'}
 = 
$result_trees{'inter_item_commands_in_table'}{'contents'}[4]{'contents'}[23]{'args'}[0]{'contents'}[0];
reply via email to
[Prev in Thread] Current Thread [Next in Thread]