texinfo-commits
[Top][All Lists]
Advanced

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

branch master updated: * tp/Texinfo/Common.pm (lookup_index_entry), tp/T


From: Patrice Dumas
Subject: branch master updated: * tp/Texinfo/Common.pm (lookup_index_entry), tp/Texinfo/ParserNonXS.pm (_enter_index_entry), tp/Texinfo/XS/parsetexi/api.c (build_single_index_data), t/test_utils.pl (_duplicate_element_keys): store the index name and the index entry number in the index_entry extra value, do not refer directly to the index entry structure, Texinfo::Common::lookup_index_entry should be used to get the index entry structure.
Date: Mon, 06 Mar 2023 17:27:01 -0500

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

pertusus pushed a commit to branch master
in repository texinfo.

The following commit(s) were added to refs/heads/master by this push:
     new a22c1534ae * tp/Texinfo/Common.pm (lookup_index_entry), 
tp/Texinfo/ParserNonXS.pm (_enter_index_entry), tp/Texinfo/XS/parsetexi/api.c 
(build_single_index_data), t/test_utils.pl (_duplicate_element_keys): store the 
index name and the index entry number in the index_entry extra value, do not 
refer directly to the index entry structure, 
Texinfo::Common::lookup_index_entry should be used to get the index entry 
structure.
a22c1534ae is described below

commit a22c1534ae885f49446eb3920da21347859352bc
Author: Patrice Dumas <pertusus@free.fr>
AuthorDate: Mon Mar 6 23:26:48 2023 +0100

    * tp/Texinfo/Common.pm (lookup_index_entry), tp/Texinfo/ParserNonXS.pm
    (_enter_index_entry), tp/Texinfo/XS/parsetexi/api.c
    (build_single_index_data), t/test_utils.pl (_duplicate_element_keys):
    store the index name and the index entry number in the index_entry
    extra value, do not refer directly to the index entry structure,
    Texinfo::Common::lookup_index_entry should be used to get the index
    entry structure.
---
 ChangeLog                                          |   10 +
 tp/Texinfo/Common.pm                               |   15 +-
 tp/Texinfo/ParserNonXS.pm                          |   18 +-
 tp/Texinfo/XS/parsetexi/api.c                      |   10 +-
 tp/t/results/alias/alias_of_added_index.pl         |   11 +-
 .../alias_of_added_index_before_added_index.pl     |   11 +-
 .../results/converters_tests/at_commands_in_raw.pl |   11 +-
 tp/t/results/converters_tests/complex_nestings.pl  |   55 +-
 .../converters_tests/definition_commands.pl        |  858 ++++-------
 tp/t/results/converters_tests/form_feeds.pl        |   22 +-
 .../converters_tests/frenchspacing_and_code.pl     |   44 +-
 .../index_entry_in_preformatted.pl                 |   33 +-
 .../indices_in_begin_tables_lists.pl               |  319 ++---
 ...ces_in_begin_tables_lists_entries_after_item.pl |  319 ++---
 .../printindex_merged_indices_code_style.pl        |   55 +-
 .../references_to_top_no_top_output.pl             |   22 +-
 .../converters_tests/test_deftypefnnewline.pl      |  154 +-
 .../converters_tests/things_before_setfilename.pl  |   11 +-
 .../things_before_setfilename_no_element.pl        |   11 +-
 tp/t/results/coverage/commands.pl                  |   11 +-
 tp/t/results/coverage/def.pl                       |  165 +--
 tp/t/results/coverage/formats_titles.pl            |   11 +-
 tp/t/results/coverage/multitable.pl                |   11 +-
 tp/t/results/coverage/preformatted.pl              |   11 +-
 .../coverage/punctuation_in_line_commands.pl       |   11 +-
 tp/t/results/coverage/table.pl                     |   44 +-
 .../coverage_braces/contain_plain_text_nestings.pl |   22 +-
 .../results/coverage_braces/heading_in_footnote.pl |   11 +-
 tp/t/results/def/all_commands.pl                   |  297 ++--
 tp/t/results/def/all_commands_delimiters.pl        |  517 +++----
 .../def/all_commands_delimiters_printindex.pl      |  517 +++----
 tp/t/results/def/all_commands_printindex.pl        |  297 ++--
 tp/t/results/def/ampchar.pl                        |   11 +-
 tp/t/results/def/code_in_def.pl                    |   11 +-
 tp/t/results/def/def_defx_mismatch.pl              |   22 +-
 tp/t/results/def/def_groupings_args.pl             |   22 +-
 tp/t/results/def/defx_after_comment.pl             |   22 +-
 tp/t/results/def/defx_after_comment_in_example.pl  |   22 +-
 tp/t/results/def/defx_after_empty_line.pl          |   22 +-
 .../def/defx_after_empty_line_in_example.pl        |   22 +-
 tp/t/results/def/defx_after_paragraph_end.pl       |   22 +-
 .../def/defx_after_preformatted_with_text.pl       |   22 +-
 tp/t/results/def/defx_after_text.pl                |   22 +-
 tp/t/results/def/defx_in_example.pl                |   22 +-
 tp/t/results/def/double_command.pl                 |   44 +-
 tp/t/results/def/empty_def_arguments.pl            |   11 +-
 tp/t/results/def/empty_def_command.pl              |   33 +-
 tp/t/results/def/empty_deftype.pl                  |   44 +-
 tp/t/results/def/end_of_line_end_file.pl           |   11 +-
 tp/t/results/def/end_of_line_protect_at_end.pl     |   11 +-
 tp/t/results/def/end_of_lines_protected.pl         |   11 +-
 .../def/end_of_lines_protected_in_footnote.pl      |   11 +-
 .../def/end_of_lines_protected_non_ascii.pl        |   11 +-
 tp/t/results/def/inter_item_commands_in_def.pl     |   55 +-
 .../def/inter_item_commands_in_def_in_example.pl   |   55 +-
 tp/t/results/def/leading_space_in_def_arg.pl       |   11 +-
 tp/t/results/def/no_category_or_no_name.pl         |   11 +-
 tp/t/results/def/not_closed.pl                     |   33 +-
 tp/t/results/def/omit_def_space.pl                 |   22 +-
 tp/t/results/def/protected_brace.pl                |   11 +-
 tp/t/results/def/ref_in_def.pl                     |   22 +-
 tp/t/results/def/space_in_def_for_index.pl         |   22 +-
 tp/t/results/def/wrong_braces_simple.pl            |   99 +-
 tp/t/results/def/wrong_braces_with_end_of_lines.pl |   22 +-
 tp/t/results/float/cindex_in_caption.pl            |   11 +-
 tp/t/results/float/complex_float.pl                |   33 +-
 tp/t/results/float/float_copying.pl                |   44 +-
 .../char_latin1_latin1_in_refs.pl                  |   66 +-
 .../formats_encodings/char_latin1_utf8_in_refs.pl  |   66 +-
 .../char_latin2_latin2_in_refs.pl                  |   11 +-
 tp/t/results/formats_encodings/sample_utf8.pl      |   44 +-
 tp/t/results/heading/heading_in_copying.pl         |   11 +-
 .../deftypefnnewline_for_copying_after.pl          |   22 +-
 .../deftypefnnewline_for_copying_before.pl         |   22 +-
 tp/t/results/html_tests/float_copying.pl           |   66 +-
 .../results/html_tests/index_and_node_same_name.pl |   11 +-
 tp/t/results/html_tests/index_below.pl             |   11 +-
 tp/t/results/indices/complex_recursive_synindex.pl |   66 +-
 tp/t/results/indices/def_syn_indices.pl            |   77 +-
 ...default_cp_index_and_one_letter_syncodeindex.pl |  Bin 11165 -> 10507 bytes
 tp/t/results/indices/double_index_entry.pl         |   33 +-
 tp/t/results/indices/double_seeentry_seealso.pl    |   44 +-
 tp/t/results/indices/double_syncodeindex.pl        |   22 +-
 tp/t/results/indices/empty_string_index_entry.pl   |   44 +-
 tp/t/results/indices/encoding_index_ascii.pl       |  605 +++-----
 .../encoding_index_ascii_enable_encoding.pl        |  605 +++-----
 tp/t/results/indices/encoding_index_latin1.pl      |  605 +++-----
 .../encoding_index_latin1_enable_encoding.pl       |  605 +++-----
 tp/t/results/indices/encoding_index_utf8.pl        |  605 +++-----
 .../indices/encoding_index_utf8_enable_encoding.pl |  605 +++-----
 tp/t/results/indices/explicit_sort_key.pl          |   44 +-
 tp/t/results/indices/ftable_vtable.pl              |   77 +-
 .../indices/ignored_sort_char_empty_entries.pl     |   44 +-
 tp/t/results/indices/image_lines_count.pl          |  Bin 6273 -> 5998 bytes
 tp/t/results/indices/image_text_lines_count.pl     |  Bin 6728 -> 6443 bytes
 tp/t/results/indices/index_and_node_same_name.pl   |   11 +-
 tp/t/results/indices/index_entries_before_nodes.pl |  Bin 12563 -> 11684 bytes
 tp/t/results/indices/index_entries_locations.pl    |   44 +-
 .../indices/index_entry_before_first_node.pl       |  Bin 6539 -> 6240 bytes
 tp/t/results/indices/index_entry_before_node.pl    |   11 +-
 tp/t/results/indices/index_entry_in_footnote.pl    |  Bin 7588 -> 7195 bytes
 .../index_entry_in_footnote_different_node_end.pl  |   22 +-
 .../indices/index_entry_in_footnote_sections.pl    |   11 +-
 .../index_entry_in_footnote_sections_separate.pl   |   11 +-
 .../indices/index_entry_in_footnote_separate.pl    |   22 +-
 tp/t/results/indices/index_no_node.pl              |  154 +-
 tp/t/results/indices/index_no_node_no_top.pl       |  154 +-
 .../indices/index_no_node_no_top_no_node.pl        |  154 +-
 tp/t/results/indices/index_nodes.pl                |  121 +-
 .../indices/index_nodes_no_split_no_use_nodes.pl   |  121 +-
 tp/t/results/indices/index_special_region.pl       |   88 +-
 .../index_special_region_no_insertcopying.pl       |   88 +-
 ...egion_no_insertcopying_no_titlepage_no_nodes.pl |   88 +-
 ...l_region_no_insertcopying_titlepage_no_nodes.pl |   88 +-
 ...copying_titlepage_no_nodes_footnotes_default.pl |   88 +-
 .../index_special_region_no_titlepage_no_nodes.pl  |   88 +-
 .../index_special_region_titlepage_no_nodes.pl     |   88 +-
 ..._region_titlepage_no_nodes_footnotes_default.pl |   88 +-
 tp/t/results/indices/index_split.pl                |  209 +--
 .../indices/index_split_split_chapter_no_nodes.pl  |  209 +--
 tp/t/results/indices/index_table.pl                | 1485 +++++++-------------
 .../results/indices/index_table_chapter_no_node.pl | 1485 +++++++-------------
 .../multiple_index_text_sortas_seeentry_seealso.pl |   33 +-
 tp/t/results/indices/nodes_before_top.pl           |  143 +-
 .../nodes_before_top_and_sections_chapter.pl       |  165 +--
 ...odes_before_top_and_sections_chapter_no_node.pl |  165 +--
 ...des_before_top_and_sections_unsplit_no_nodes.pl |  165 +--
 .../indices/nodes_before_top_split_chapter.pl      |  143 +-
 .../nodes_before_top_split_chapter_no_nodes.pl     |  143 +-
 .../indices/printindex_between_node_section.pl     |   66 +-
 .../indices/printindex_between_part_chapter.pl     |   66 +-
 .../indices/printindex_index_entry_in_copying.pl   |   55 +-
 ...rintindex_index_entry_in_copying_in_footnote.pl |   11 +-
 ...ndex_index_entry_in_copying_no_insertcopying.pl |   55 +-
 .../indices/printindex_with_space_before.pl        |  Bin 7309 -> 7012 bytes
 .../indices/same_index_entry_merged_indices.pl     |   22 +-
 tp/t/results/indices/same_only_seealso_seeentry.pl |   66 +-
 tp/t/results/indices/same_seealso_seeentry.pl      |   77 +-
 tp/t/results/indices/seealso_duplicate.pl          |   22 +-
 tp/t/results/indices/seeentry.pl                   |   44 +-
 tp/t/results/indices/sorted_subentries.pl          |  198 +--
 tp/t/results/indices/split_chapter_index.pl        |  132 +-
 tp/t/results/indices/subentries.pl                 |   88 +-
 tp/t/results/indices/subentry_and_sortas.pl        |   22 +-
 tp/t/results/indices/subentry_and_sortas_spaces.pl |   44 +-
 tp/t/results/indices/syncode_index_print_both.pl   |   22 +-
 tp/t/results/indices/syncodeindex_to_plain.pl      |   33 +-
 tp/t/results/indices/transparent_sort_chars.pl     |   33 +-
 .../indices/unknown_then_known_index_entry.pl      |   11 +-
 tp/t/results/indices/w_lines_count.pl              |  Bin 10329 -> 10062 bytes
 tp/t/results/info_tests/before_node_and_section.pl |   11 +-
 tp/t/results/info_tests/colon_in_index_entry.pl    |   44 +-
 .../info_tests/colons_in_index_entries_and_node.pl |   66 +-
 .../colons_in_index_entries_and_node_no_quoting.pl |   66 +-
 tp/t/results/info_tests/def_in_copying.pl          |   44 +-
 .../end_of_line_command_in_node_lines.pl           |   11 +-
 tp/t/results/info_tests/index_entry_at_end_node.pl |   11 +-
 .../multitable_anchor_and_index_entry.pl           |   22 +-
 .../info_tests/nested_multitable_anchor_index.pl   |   22 +-
 .../info_tests/one_node_counted_elements.pl        |   22 +-
 tp/t/results/info_tests/test_index.pl              |  187 +--
 .../results/invalid_nestings/block_not_matching.pl |   11 +-
 tp/t/results/invalid_nestings/center.pl            |   11 +-
 .../invalid_nestings/def_in_style_command.pl       |   11 +-
 .../def_not_closed_in_menu_description.pl          |   11 +-
 tp/t/results/invalid_nestings/in_table.pl          |   55 +-
 .../invalid_nestings/multitable_item_in_index.pl   |   11 +-
 .../invalid_nestings/node_on_index_entry_line.pl   |   11 +-
 tp/t/results/invalid_nestings/on_def_line.pl       |   22 +-
 .../invalid_nestings/on_index_entry_line.pl        |   11 +-
 tp/t/results/invalid_nestings/raw_block_on_line.pl |   11 +-
 .../invalid_nestings/section_on_def_line.pl        |   11 +-
 .../invalid_nestings/section_on_defx_line.pl       |   22 +-
 .../section_on_index_entry_line.pl                 |   11 +-
 tp/t/results/invalid_nestings/tab_in_index.pl      |   11 +-
 .../itemize/inter_item_commands_in_enumerate.pl    |   77 +-
 .../itemize/inter_item_commands_in_itemize.pl      |   44 +-
 tp/t/results/languages/documentlanguage.pl         |   11 +-
 tp/t/results/languages/documentlanguage_option.pl  |   11 +-
 tp/t/results/languages/documentlanguage_unknown.pl |   11 +-
 .../results/languages/multiple_documentlanguage.pl |   33 +-
 tp/t/results/languages/multiple_in_preamble.pl     |   33 +-
 .../languages/multiple_in_preamble_before_node.pl  |   22 +-
 tp/t/results/languages/multiple_lang_chapters.pl   |   33 +-
 .../languages/multiple_lang_chapters_latex.pl      |   33 +-
 .../languages/multiple_lang_chapters_texi2html.pl  |   33 +-
 tp/t/results/languages/simple_documentlanguage.pl  |   11 +-
 tp/t/results/languages/unknown_region.pl           |   11 +-
 tp/t/results/latex_tests/brace_in_index.pl         |   44 +-
 tp/t/results/latex_tests/indices.pl                |  121 +-
 .../latex_tests/indices_disable_encoding.pl        |  121 +-
 tp/t/results/latex_tests/vbar_in_index.pl          |   22 +-
 tp/t/results/layout/no_monolithic.pl               |   11 +-
 tp/t/results/layout/no_monolithic_only_toc_out.pl  |   11 +-
 tp/t/results/macro/backslash_in_arg.pl             |   44 +-
 .../macro/macro_alias_definfoenclose_defindex.pl   |   33 +-
 tp/t/results/macro/macro_in_def_delimiters.pl      |   11 +-
 tp/t/results/macro/macro_in_index_commands.pl      |   44 +-
 tp/t/results/menu/menu_in_deffn.pl                 |   11 +-
 .../misc_commands/comment_space_command_on_line.pl |   11 +-
 tp/t/results/misc_commands/index_entries.pl        |   22 +-
 tp/t/results/moresectioning/no_element.pl          |   11 +-
 .../moresectioning/placed_things_before_element.pl |   11 +-
 .../moresectioning/placed_things_before_node.pl    |   11 +-
 .../inter_item_commands_in_multitable.pl           |   33 +-
 .../at_commands_glued_in_example.pl                |   11 +-
 .../at_commands_glued_in_paragraph.pl              |   11 +-
 tp/t/results/preformatted/def_in_example.pl        |   11 +-
 ...dex_entries_relate_to_item_no_transformation.pl |   33 +-
 .../index_entries_relate_to_item_transformation.pl |   93 +-
 tp/t/results/transformations/master_menu_fr.pl     |   10 +-
 tp/t/results/value/value_in_index_commands.pl      |   44 +-
 tp/t/results/xml_tests/commands_and_spaces.pl      |   11 +-
 tp/t/results/xtable/block_commands_in_table.pl     |   55 +-
 tp/t/results/xtable/empty_item_itemx.pl            |   33 +-
 .../xtable/index_command_before_end_table.pl       |   11 +-
 .../results/xtable/inter_item_commands_in_table.pl |  231 ++-
 .../inter_item_commands_in_table_in_example.pl     |   11 +-
 tp/t/results/xtable/table_nested.pl                |  132 +-
 tp/t/test_utils.pl                                 |    7 -
 220 files changed, 6765 insertions(+), 11757 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 263b3cd108..dd854f16a0 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,13 @@
+2023-03-06  Patrice Dumas  <pertusus@free.fr>
+
+       * tp/Texinfo/Common.pm (lookup_index_entry), tp/Texinfo/ParserNonXS.pm
+       (_enter_index_entry), tp/Texinfo/XS/parsetexi/api.c
+       (build_single_index_data), t/test_utils.pl (_duplicate_element_keys):
+       store the index name and the index entry number in the index_entry
+       extra value, do not refer directly to the index entry structure,
+       Texinfo::Common::lookup_index_entry should be used to get the index
+       entry structure.
+
 2023-03-06  Patrice Dumas  <pertusus@free.fr>
 
        * tp/Texinfo/Common.pm (lookup_index_entry)
diff --git a/tp/Texinfo/Common.pm b/tp/Texinfo/Common.pm
index 47fe6fc1d2..565ebe44cf 100644
--- a/tp/Texinfo/Common.pm
+++ b/tp/Texinfo/Common.pm
@@ -1424,14 +1424,12 @@ sub set_global_document_command($$$$)
   return $element;
 }
 
-# TODO document
 sub lookup_index_entry($$)
 {
   my $index_entry_info = shift;
   my $indices_information = shift;
 
-  my $entry_index_name = $index_entry_info->{'index_name'};
-  my $entry_number = $index_entry_info->{'entry_number'};
+  my ($entry_index_name, $entry_number) = @{$index_entry_info};
 
   if ($indices_information->{$entry_index_name}
       and $indices_information->{$entry_index_name}->{'index_entries'}
@@ -2831,6 +2829,17 @@ directories also used to find texinfo files included in 
Texinfo documents.
 I<$file_path> should be a binary string.  C<undef> is returned if the file was
 not found, otherwise the file found is returned as a binary string.
 
+=item $index_entry = lookup_index_entry($index_entry_info, 
$indices_information)
+
+Returns an I<$index_entry> hash based on the I<$index_entry_info> and
+I<$indices_information>.  I<$index_entry_info> should be an array reference
+with an index name as first element and the index entry number in that index
+(1-based) as second element.  In general, the I<$index_entry_info> is an
+L<C<extra> I<index_entry>|Texinfo::Parser/index_entry> associated to an 
element.
+
+The I<$index_entry> hash is described in L<Texinfo::Parser/index_entries>.
+
+
 =item move_index_entries_after_items_in_tree($tree)
 X<C<move_index_entries_after_items_in_tree>>
 
diff --git a/tp/Texinfo/ParserNonXS.pm b/tp/Texinfo/ParserNonXS.pm
index 76e2fc89f6..c73045b7c7 100644
--- a/tp/Texinfo/ParserNonXS.pm
+++ b/tp/Texinfo/ParserNonXS.pm
@@ -3204,7 +3204,7 @@ sub _enter_index_entry($$$$)
 
   push @{$index->{'index_entries'}}, $index_entry;
 
-  $element->{'extra'}->{'index_entry'} = $index_entry;
+  $element->{'extra'}->{'index_entry'} = [$index_name, $number];
 }
 
 sub _in_include($)
@@ -8487,9 +8487,19 @@ associated index entry and for @anchor.
 
 =item index_entry
 
-The index entry information (described in L</index_entries>
-in details) is associated to @-commands that have an associated
-index entry.
+The index entry information is associated to @-commands that have an associated
+index entry.  The associated information should not be directly accessed,
+instead L<C<Texinfo::Common::lookup_index_entry>|Texinfo::Common/$index_entry 
= lookup_index_entry($index_entry_info, $indices_information)>
+should be called on the C<extra> I<index_entry> value.  The
+I<$indices_information> is the information on a Texinfo manual indices obtained
+from
+L<C<Texinfo::Parser::indices_information>|Texinfo::Parser/indices_information>.
+The index entry information hash returned by
+C<Texinfo::Common::lookup_index_entry> is described in L</index_entries>.
+
+Currently, the I<index_entry> value is an array reference
+with an index name as first element and the index entry number in that index
+(1-based) as second element.
 
 =item index_ignore_chars
 
diff --git a/tp/Texinfo/XS/parsetexi/api.c b/tp/Texinfo/XS/parsetexi/api.c
index b817bad908..0fea9e47ae 100644
--- a/tp/Texinfo/XS/parsetexi/api.c
+++ b/tp/Texinfo/XS/parsetexi/api.c
@@ -804,12 +804,12 @@ build_single_index_data (INDEX *i)
       STORE2("entry_number", newSViv (entry_number));
 
       av_push (entries, newRV_inc ((SV *)entry));
-      entry_number++;
 
       /* We set this now because the index data structures don't
          exist at the time that the main tree is built. */
       {
       SV **extra_hash;
+      AV *av;
       extra_hash = hv_fetch (e->command->hv, "extra", strlen ("extra"), 0);
       if (!extra_hash)
         {
@@ -819,9 +819,15 @@ build_single_index_data (INDEX *i)
                                  newRV_inc ((SV *)newHV ()), 0);
         }
 
+      /* element index_entry extra value is an array reference containing the
+         index name and entry number */
+      av = newAV ();
+      av_push (av, newSVpv_utf8 (i->name, 0));
+      av_push (av, newSViv (entry_number));
       hv_store ((HV *)SvRV(*extra_hash), "index_entry", strlen ("index_entry"),
-                newRV_inc ((SV *)entry), 0);
+                newRV_inc ((SV *)av), 0);
       }
+      entry_number++;
 #undef STORE2
     }
 }
diff --git a/tp/t/results/alias/alias_of_added_index.pl 
b/tp/t/results/alias/alias_of_added_index.pl
index 19f2ada379..91cf7f9c84 100644
--- a/tp/t/results/alias/alias_of_added_index.pl
+++ b/tp/t/results/alias/alias_of_added_index.pl
@@ -167,12 +167,10 @@ $result_trees{'alias_of_added_index'} = {
           'cmdname' => 'sliindex',
           'extra' => {
             'element_node' => {},
-            'index_entry' => {
-              'entry_element' => {},
-              'entry_number' => 1,
-              'in_code' => 0,
-              'index_name' => 'sli'
-            }
+            'index_entry' => [
+              'sli',
+              1
+            ]
           },
           'info' => {
             'alias_of' => 'new',
@@ -313,7 +311,6 @@ $result_trees{'alias_of_added_index'} = {
   'type' => 'document_root'
 };
 
$result_trees{'alias_of_added_index'}{'contents'}[2]{'contents'}[1]{'extra'}{'element_node'}
 = $result_trees{'alias_of_added_index'}{'contents'}[1];
-$result_trees{'alias_of_added_index'}{'contents'}[2]{'contents'}[1]{'extra'}{'index_entry'}{'entry_element'}
 = $result_trees{'alias_of_added_index'}{'contents'}[2]{'contents'}[1];
 
 $result_texis{'alias_of_added_index'} = '@defindex sli
 
diff --git a/tp/t/results/alias/alias_of_added_index_before_added_index.pl 
b/tp/t/results/alias/alias_of_added_index_before_added_index.pl
index 853c1ff09c..6d2d1d7e36 100644
--- a/tp/t/results/alias/alias_of_added_index_before_added_index.pl
+++ b/tp/t/results/alias/alias_of_added_index_before_added_index.pl
@@ -167,12 +167,10 @@ $result_trees{'alias_of_added_index_before_added_index'} 
= {
           'cmdname' => 'sliindex',
           'extra' => {
             'element_node' => {},
-            'index_entry' => {
-              'entry_element' => {},
-              'entry_number' => 1,
-              'in_code' => 0,
-              'index_name' => 'sli'
-            }
+            'index_entry' => [
+              'sli',
+              1
+            ]
           },
           'info' => {
             'alias_of' => 'new',
@@ -313,7 +311,6 @@ $result_trees{'alias_of_added_index_before_added_index'} = {
   'type' => 'document_root'
 };
 
$result_trees{'alias_of_added_index_before_added_index'}{'contents'}[2]{'contents'}[1]{'extra'}{'element_node'}
 = $result_trees{'alias_of_added_index_before_added_index'}{'contents'}[1];
-$result_trees{'alias_of_added_index_before_added_index'}{'contents'}[2]{'contents'}[1]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'alias_of_added_index_before_added_index'}{'contents'}[2]{'contents'}[1];
 
 $result_texis{'alias_of_added_index_before_added_index'} = '@alias new = 
sliindex
 
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 f88d4d86e4..0df51b69c3 100644
--- a/tp/t/results/converters_tests/at_commands_in_raw.pl
+++ b/tp/t/results/converters_tests/at_commands_in_raw.pl
@@ -800,12 +800,10 @@ $result_trees{'at_commands_in_raw'} = {
           'cmdname' => 'findex',
           'extra' => {
             'element_node' => {},
-            'index_entry' => {
-              'entry_element' => {},
-              'entry_number' => 1,
-              'in_code' => 1,
-              'index_name' => 'fn'
-            }
+            'index_entry' => [
+              'fn',
+              1
+            ]
           },
           'info' => {
             'spaces_before_argument' => {
@@ -1084,7 +1082,6 @@ $result_trees{'at_commands_in_raw'} = {
 
$result_trees{'at_commands_in_raw'}{'contents'}[4]{'contents'}[13]{'contents'}[0]{'args'}[0]{'extra'}{'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]{'args'}[0]{'extra'}{'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'}[16]{'extra'}{'element_node'}
 = $result_trees{'at_commands_in_raw'}{'contents'}[3];
-$result_trees{'at_commands_in_raw'}{'contents'}[4]{'contents'}[16]{'extra'}{'index_entry'}{'entry_element'}
 = $result_trees{'at_commands_in_raw'}{'contents'}[4]{'contents'}[16];
 
 $result_texis{'at_commands_in_raw'} = '@node Top
 @top top
diff --git a/tp/t/results/converters_tests/complex_nestings.pl 
b/tp/t/results/converters_tests/complex_nestings.pl
index 57887794ae..2f0b1b2ecc 100644
--- a/tp/t/results/converters_tests/complex_nestings.pl
+++ b/tp/t/results/converters_tests/complex_nestings.pl
@@ -281,12 +281,10 @@ $result_trees{'complex_nestings'} = {
                       'name' => {}
                     },
                     'element_node' => {},
-                    'index_entry' => {
-                      'entry_element' => {},
-                      'entry_number' => 1,
-                      'in_code' => 1,
-                      'index_name' => 'fn'
-                    },
+                    'index_entry' => [
+                      'fn',
+                      1
+                    ],
                     'original_def_cmdname' => 'defun'
                   },
                   'source_info' => {
@@ -379,12 +377,10 @@ $result_trees{'complex_nestings'} = {
                       'name' => {}
                     },
                     'element_node' => {},
-                    'index_entry' => {
-                      'entry_element' => {},
-                      'entry_number' => 2,
-                      'in_code' => 1,
-                      'index_name' => 'fn'
-                    },
+                    'index_entry' => [
+                      'fn',
+                      2
+                    ],
                     'original_def_cmdname' => 'defunx'
                   },
                   'info' => {
@@ -517,12 +513,10 @@ $result_trees{'complex_nestings'} = {
                               'name' => {}
                             },
                             'element_node' => {},
-                            'index_entry' => {
-                              'entry_element' => {},
-                              'entry_number' => 3,
-                              'in_code' => 1,
-                              'index_name' => 'fn'
-                            },
+                            'index_entry' => [
+                              'fn',
+                              3
+                            ],
                             'original_def_cmdname' => 'deffn'
                           },
                           'source_info' => {
@@ -606,12 +600,10 @@ $result_trees{'complex_nestings'} = {
                                       'name' => {}
                                     },
                                     'element_node' => {},
-                                    'index_entry' => {
-                                      'entry_element' => {},
-                                      'entry_number' => 1,
-                                      'in_code' => 1,
-                                      'index_name' => 'vr'
-                                    },
+                                    'index_entry' => [
+                                      'vr',
+                                      1
+                                    ],
                                     'original_def_cmdname' => 'defvar'
                                   },
                                   'source_info' => {
@@ -706,12 +698,10 @@ $result_trees{'complex_nestings'} = {
                                       'name' => {}
                                     },
                                     'element_node' => {},
-                                    'index_entry' => {
-                                      'entry_element' => {},
-                                      'entry_number' => 2,
-                                      'in_code' => 1,
-                                      'index_name' => 'vr'
-                                    },
+                                    'index_entry' => [
+                                      'vr',
+                                      2
+                                    ],
                                     'original_def_cmdname' => 'defvarx'
                                   },
                                   'info' => {
@@ -1143,27 +1133,22 @@ 
$result_trees{'complex_nestings'}{'contents'}[4]{'contents'}[1]{'contents'}[1]{'
 
$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'}{'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'}{'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'}{'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'}{'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'}{'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];
 
 $result_texis{'complex_nestings'} = '@node Top
diff --git a/tp/t/results/converters_tests/definition_commands.pl 
b/tp/t/results/converters_tests/definition_commands.pl
index 7104a658bc..54e00a0c08 100644
--- a/tp/t/results/converters_tests/definition_commands.pl
+++ b/tp/t/results/converters_tests/definition_commands.pl
@@ -211,12 +211,10 @@ $result_trees{'definition_commands'} = {
                   'name' => {}
                 },
                 'element_node' => {},
-                'index_entry' => {
-                  'entry_element' => {},
-                  'entry_number' => 1,
-                  'in_code' => 1,
-                  'index_name' => 'fn'
-                },
+                'index_entry' => [
+                  'fn',
+                  1
+                ],
                 'original_def_cmdname' => 'deffn'
               },
               'source_info' => {
@@ -431,12 +429,10 @@ $result_trees{'definition_commands'} = {
                   'name' => {}
                 },
                 'element_node' => {},
-                'index_entry' => {
-                  'entry_element' => {},
-                  'entry_number' => 2,
-                  'in_code' => 1,
-                  'index_name' => 'fn'
-                },
+                'index_entry' => [
+                  'fn',
+                  2
+                ],
                 'original_def_cmdname' => 'deffn'
               },
               'source_info' => {
@@ -681,12 +677,10 @@ $result_trees{'definition_commands'} = {
                   'name' => {}
                 },
                 'element_node' => {},
-                'index_entry' => {
-                  'entry_element' => {},
-                  'entry_number' => 3,
-                  'in_code' => 1,
-                  'index_name' => 'fn'
-                },
+                'index_entry' => [
+                  'fn',
+                  3
+                ],
                 'original_def_cmdname' => 'deffn'
               },
               'source_info' => {
@@ -957,12 +951,10 @@ $result_trees{'definition_commands'} = {
                   'name' => {}
                 },
                 'element_node' => {},
-                'index_entry' => {
-                  'entry_element' => {},
-                  'entry_number' => 4,
-                  'in_code' => 1,
-                  'index_name' => 'fn'
-                },
+                'index_entry' => [
+                  'fn',
+                  4
+                ],
                 'original_def_cmdname' => 'defspec'
               },
               'source_info' => {
@@ -1161,12 +1153,10 @@ $result_trees{'definition_commands'} = {
                   'name' => {}
                 },
                 'element_node' => {},
-                'index_entry' => {
-                  'entry_element' => {},
-                  'entry_number' => 5,
-                  'in_code' => 1,
-                  'index_name' => 'fn'
-                },
+                'index_entry' => [
+                  'fn',
+                  5
+                ],
                 'original_def_cmdname' => 'defspecx'
               },
               'info' => {
@@ -1370,12 +1360,10 @@ $result_trees{'definition_commands'} = {
                   'name' => {}
                 },
                 'element_node' => {},
-                'index_entry' => {
-                  'entry_element' => {},
-                  'entry_number' => 6,
-                  'in_code' => 1,
-                  'index_name' => 'fn'
-                },
+                'index_entry' => [
+                  'fn',
+                  6
+                ],
                 'original_def_cmdname' => 'defspecx'
               },
               'info' => {
@@ -1579,12 +1567,10 @@ $result_trees{'definition_commands'} = {
                   'name' => {}
                 },
                 'element_node' => {},
-                'index_entry' => {
-                  'entry_element' => {},
-                  'entry_number' => 7,
-                  'in_code' => 1,
-                  'index_name' => 'fn'
-                },
+                'index_entry' => [
+                  'fn',
+                  7
+                ],
                 'original_def_cmdname' => 'defspecx'
               },
               'info' => {
@@ -1788,12 +1774,10 @@ $result_trees{'definition_commands'} = {
                   'name' => {}
                 },
                 'element_node' => {},
-                'index_entry' => {
-                  'entry_element' => {},
-                  'entry_number' => 8,
-                  'in_code' => 1,
-                  'index_name' => 'fn'
-                },
+                'index_entry' => [
+                  'fn',
+                  8
+                ],
                 'original_def_cmdname' => 'defspecx'
               },
               'info' => {
@@ -1997,12 +1981,10 @@ $result_trees{'definition_commands'} = {
                   'name' => {}
                 },
                 'element_node' => {},
-                'index_entry' => {
-                  'entry_element' => {},
-                  'entry_number' => 9,
-                  'in_code' => 1,
-                  'index_name' => 'fn'
-                },
+                'index_entry' => [
+                  'fn',
+                  9
+                ],
                 'original_def_cmdname' => 'defspecx'
               },
               'info' => {
@@ -2251,12 +2233,10 @@ $result_trees{'definition_commands'} = {
                   'name' => {}
                 },
                 'element_node' => {},
-                'index_entry' => {
-                  'entry_element' => {},
-                  'entry_number' => 10,
-                  'in_code' => 1,
-                  'index_name' => 'fn'
-                },
+                'index_entry' => [
+                  'fn',
+                  10
+                ],
                 'original_def_cmdname' => 'defspecx'
               },
               'info' => {
@@ -2505,12 +2485,10 @@ $result_trees{'definition_commands'} = {
                   'name' => {}
                 },
                 'element_node' => {},
-                'index_entry' => {
-                  'entry_element' => {},
-                  'entry_number' => 11,
-                  'in_code' => 1,
-                  'index_name' => 'fn'
-                },
+                'index_entry' => [
+                  'fn',
+                  11
+                ],
                 'original_def_cmdname' => 'defspecx'
               },
               'info' => {
@@ -2759,12 +2737,10 @@ $result_trees{'definition_commands'} = {
                   'name' => {}
                 },
                 'element_node' => {},
-                'index_entry' => {
-                  'entry_element' => {},
-                  'entry_number' => 12,
-                  'in_code' => 1,
-                  'index_name' => 'fn'
-                },
+                'index_entry' => [
+                  'fn',
+                  12
+                ],
                 'original_def_cmdname' => 'defspecx'
               },
               'info' => {
@@ -3013,12 +2989,10 @@ $result_trees{'definition_commands'} = {
                   'name' => {}
                 },
                 'element_node' => {},
-                'index_entry' => {
-                  'entry_element' => {},
-                  'entry_number' => 13,
-                  'in_code' => 1,
-                  'index_name' => 'fn'
-                },
+                'index_entry' => [
+                  'fn',
+                  13
+                ],
                 'original_def_cmdname' => 'defspecx'
               },
               'info' => {
@@ -3267,12 +3241,10 @@ $result_trees{'definition_commands'} = {
                   'name' => {}
                 },
                 'element_node' => {},
-                'index_entry' => {
-                  'entry_element' => {},
-                  'entry_number' => 14,
-                  'in_code' => 1,
-                  'index_name' => 'fn'
-                },
+                'index_entry' => [
+                  'fn',
+                  14
+                ],
                 'original_def_cmdname' => 'defspecx'
               },
               'info' => {
@@ -3521,12 +3493,10 @@ $result_trees{'definition_commands'} = {
                   'name' => {}
                 },
                 'element_node' => {},
-                'index_entry' => {
-                  'entry_element' => {},
-                  'entry_number' => 15,
-                  'in_code' => 1,
-                  'index_name' => 'fn'
-                },
+                'index_entry' => [
+                  'fn',
+                  15
+                ],
                 'original_def_cmdname' => 'defspecx'
               },
               'info' => {
@@ -3775,12 +3745,10 @@ $result_trees{'definition_commands'} = {
                   'name' => {}
                 },
                 'element_node' => {},
-                'index_entry' => {
-                  'entry_element' => {},
-                  'entry_number' => 16,
-                  'in_code' => 1,
-                  'index_name' => 'fn'
-                },
+                'index_entry' => [
+                  'fn',
+                  16
+                ],
                 'original_def_cmdname' => 'defspecx'
               },
               'info' => {
@@ -4029,12 +3997,10 @@ $result_trees{'definition_commands'} = {
                   'name' => {}
                 },
                 'element_node' => {},
-                'index_entry' => {
-                  'entry_element' => {},
-                  'entry_number' => 17,
-                  'in_code' => 1,
-                  'index_name' => 'fn'
-                },
+                'index_entry' => [
+                  'fn',
+                  17
+                ],
                 'original_def_cmdname' => 'defspecx'
               },
               'info' => {
@@ -4283,12 +4249,10 @@ $result_trees{'definition_commands'} = {
                   'name' => {}
                 },
                 'element_node' => {},
-                'index_entry' => {
-                  'entry_element' => {},
-                  'entry_number' => 18,
-                  'in_code' => 1,
-                  'index_name' => 'fn'
-                },
+                'index_entry' => [
+                  'fn',
+                  18
+                ],
                 'original_def_cmdname' => 'defspecx'
               },
               'info' => {
@@ -4441,12 +4405,10 @@ $result_trees{'definition_commands'} = {
                   'name' => {}
                 },
                 'element_node' => {},
-                'index_entry' => {
-                  'entry_element' => {},
-                  'entry_number' => 19,
-                  'in_code' => 1,
-                  'index_name' => 'fn'
-                },
+                'index_entry' => [
+                  'fn',
+                  19
+                ],
                 'original_def_cmdname' => 'defspec'
               },
               'source_info' => {
@@ -4544,12 +4506,10 @@ $result_trees{'definition_commands'} = {
                   'name' => {}
                 },
                 'element_node' => {},
-                'index_entry' => {
-                  'entry_element' => {},
-                  'entry_number' => 20,
-                  'in_code' => 1,
-                  'index_name' => 'fn'
-                },
+                'index_entry' => [
+                  'fn',
+                  20
+                ],
                 'original_def_cmdname' => 'defspecx'
               },
               'info' => {
@@ -4652,12 +4612,10 @@ $result_trees{'definition_commands'} = {
                   'name' => {}
                 },
                 'element_node' => {},
-                'index_entry' => {
-                  'entry_element' => {},
-                  'entry_number' => 21,
-                  'in_code' => 1,
-                  'index_name' => 'fn'
-                },
+                'index_entry' => [
+                  'fn',
+                  21
+                ],
                 'original_def_cmdname' => 'defspecx'
               },
               'info' => {
@@ -4760,12 +4718,10 @@ $result_trees{'definition_commands'} = {
                   'name' => {}
                 },
                 'element_node' => {},
-                'index_entry' => {
-                  'entry_element' => {},
-                  'entry_number' => 22,
-                  'in_code' => 1,
-                  'index_name' => 'fn'
-                },
+                'index_entry' => [
+                  'fn',
+                  22
+                ],
                 'original_def_cmdname' => 'defspecx'
               },
               'info' => {
@@ -4868,12 +4824,10 @@ $result_trees{'definition_commands'} = {
                   'name' => {}
                 },
                 'element_node' => {},
-                'index_entry' => {
-                  'entry_element' => {},
-                  'entry_number' => 23,
-                  'in_code' => 1,
-                  'index_name' => 'fn'
-                },
+                'index_entry' => [
+                  'fn',
+                  23
+                ],
                 'original_def_cmdname' => 'defspecx'
               },
               'info' => {
@@ -4976,12 +4930,10 @@ $result_trees{'definition_commands'} = {
                   'name' => {}
                 },
                 'element_node' => {},
-                'index_entry' => {
-                  'entry_element' => {},
-                  'entry_number' => 24,
-                  'in_code' => 1,
-                  'index_name' => 'fn'
-                },
+                'index_entry' => [
+                  'fn',
+                  24
+                ],
                 'original_def_cmdname' => 'defspecx'
               },
               'info' => {
@@ -5099,12 +5051,10 @@ $result_trees{'definition_commands'} = {
                   'name' => {}
                 },
                 'element_node' => {},
-                'index_entry' => {
-                  'entry_element' => {},
-                  'entry_number' => 25,
-                  'in_code' => 1,
-                  'index_name' => 'fn'
-                },
+                'index_entry' => [
+                  'fn',
+                  25
+                ],
                 'original_def_cmdname' => 'defspecx'
               },
               'info' => {
@@ -5222,12 +5172,10 @@ $result_trees{'definition_commands'} = {
                   'name' => {}
                 },
                 'element_node' => {},
-                'index_entry' => {
-                  'entry_element' => {},
-                  'entry_number' => 26,
-                  'in_code' => 1,
-                  'index_name' => 'fn'
-                },
+                'index_entry' => [
+                  'fn',
+                  26
+                ],
                 'original_def_cmdname' => 'defspecx'
               },
               'info' => {
@@ -5345,12 +5293,10 @@ $result_trees{'definition_commands'} = {
                   'name' => {}
                 },
                 'element_node' => {},
-                'index_entry' => {
-                  'entry_element' => {},
-                  'entry_number' => 27,
-                  'in_code' => 1,
-                  'index_name' => 'fn'
-                },
+                'index_entry' => [
+                  'fn',
+                  27
+                ],
                 'original_def_cmdname' => 'defspecx'
               },
               'info' => {
@@ -5468,12 +5414,10 @@ $result_trees{'definition_commands'} = {
                   'name' => {}
                 },
                 'element_node' => {},
-                'index_entry' => {
-                  'entry_element' => {},
-                  'entry_number' => 28,
-                  'in_code' => 1,
-                  'index_name' => 'fn'
-                },
+                'index_entry' => [
+                  'fn',
+                  28
+                ],
                 'original_def_cmdname' => 'defspecx'
               },
               'info' => {
@@ -5591,12 +5535,10 @@ $result_trees{'definition_commands'} = {
                   'name' => {}
                 },
                 'element_node' => {},
-                'index_entry' => {
-                  'entry_element' => {},
-                  'entry_number' => 29,
-                  'in_code' => 1,
-                  'index_name' => 'fn'
-                },
+                'index_entry' => [
+                  'fn',
+                  29
+                ],
                 'original_def_cmdname' => 'defspecx'
               },
               'info' => {
@@ -5714,12 +5656,10 @@ $result_trees{'definition_commands'} = {
                   'name' => {}
                 },
                 'element_node' => {},
-                'index_entry' => {
-                  'entry_element' => {},
-                  'entry_number' => 30,
-                  'in_code' => 1,
-                  'index_name' => 'fn'
-                },
+                'index_entry' => [
+                  'fn',
+                  30
+                ],
                 'original_def_cmdname' => 'defspecx'
               },
               'info' => {
@@ -5837,12 +5777,10 @@ $result_trees{'definition_commands'} = {
                   'name' => {}
                 },
                 'element_node' => {},
-                'index_entry' => {
-                  'entry_element' => {},
-                  'entry_number' => 31,
-                  'in_code' => 1,
-                  'index_name' => 'fn'
-                },
+                'index_entry' => [
+                  'fn',
+                  31
+                ],
                 'original_def_cmdname' => 'defspecx'
               },
               'info' => {
@@ -5960,12 +5898,10 @@ $result_trees{'definition_commands'} = {
                   'name' => {}
                 },
                 'element_node' => {},
-                'index_entry' => {
-                  'entry_element' => {},
-                  'entry_number' => 32,
-                  'in_code' => 1,
-                  'index_name' => 'fn'
-                },
+                'index_entry' => [
+                  'fn',
+                  32
+                ],
                 'original_def_cmdname' => 'defspecx'
               },
               'info' => {
@@ -6083,12 +6019,10 @@ $result_trees{'definition_commands'} = {
                   'name' => {}
                 },
                 'element_node' => {},
-                'index_entry' => {
-                  'entry_element' => {},
-                  'entry_number' => 33,
-                  'in_code' => 1,
-                  'index_name' => 'fn'
-                },
+                'index_entry' => [
+                  'fn',
+                  33
+                ],
                 'original_def_cmdname' => 'defspecx'
               },
               'info' => {
@@ -6282,12 +6216,10 @@ $result_trees{'definition_commands'} = {
                   'name' => {}
                 },
                 'element_node' => {},
-                'index_entry' => {
-                  'entry_element' => {},
-                  'entry_number' => 34,
-                  'in_code' => 1,
-                  'index_name' => 'fn'
-                },
+                'index_entry' => [
+                  'fn',
+                  34
+                ],
                 'original_def_cmdname' => 'deffn'
               },
               'source_info' => {
@@ -6426,12 +6358,10 @@ $result_trees{'definition_commands'} = {
                   'name' => {}
                 },
                 'element_node' => {},
-                'index_entry' => {
-                  'entry_element' => {},
-                  'entry_number' => 35,
-                  'in_code' => 1,
-                  'index_name' => 'fn'
-                },
+                'index_entry' => [
+                  'fn',
+                  35
+                ],
                 'original_def_cmdname' => 'deffnx'
               },
               'info' => {
@@ -6575,12 +6505,10 @@ $result_trees{'definition_commands'} = {
                   'name' => {}
                 },
                 'element_node' => {},
-                'index_entry' => {
-                  'entry_element' => {},
-                  'entry_number' => 36,
-                  'in_code' => 1,
-                  'index_name' => 'fn'
-                },
+                'index_entry' => [
+                  'fn',
+                  36
+                ],
                 'original_def_cmdname' => 'deffnx'
               },
               'info' => {
@@ -6814,12 +6742,10 @@ $result_trees{'definition_commands'} = {
                   'name' => {}
                 },
                 'element_node' => {},
-                'index_entry' => {
-                  'entry_element' => {},
-                  'entry_number' => 37,
-                  'in_code' => 1,
-                  'index_name' => 'fn'
-                },
+                'index_entry' => [
+                  'fn',
+                  37
+                ],
                 'original_def_cmdname' => 'deffnx'
               },
               'info' => {
@@ -6891,12 +6817,10 @@ $result_trees{'definition_commands'} = {
                   'name' => {}
                 },
                 'element_node' => {},
-                'index_entry' => {
-                  'entry_element' => {},
-                  'entry_number' => 38,
-                  'in_code' => 1,
-                  'index_name' => 'fn'
-                },
+                'index_entry' => [
+                  'fn',
+                  38
+                ],
                 'original_def_cmdname' => 'deffnx'
               },
               'info' => {
@@ -8085,12 +8009,10 @@ $result_trees{'definition_commands'} = {
                   'name' => {}
                 },
                 'element_node' => {},
-                'index_entry' => {
-                  'entry_element' => {},
-                  'entry_number' => 39,
-                  'in_code' => 1,
-                  'index_name' => 'fn'
-                },
+                'index_entry' => [
+                  'fn',
+                  39
+                ],
                 'original_def_cmdname' => 'defspec'
               },
               'source_info' => {
@@ -8424,12 +8346,10 @@ $result_trees{'definition_commands'} = {
                   'name' => {}
                 },
                 'element_node' => {},
-                'index_entry' => {
-                  'entry_element' => {},
-                  'entry_number' => 40,
-                  'in_code' => 1,
-                  'index_name' => 'fn'
-                },
+                'index_entry' => [
+                  'fn',
+                  40
+                ],
                 'original_def_cmdname' => 'defspecx'
               },
               'info' => {
@@ -8678,12 +8598,10 @@ $result_trees{'definition_commands'} = {
                   'type' => {}
                 },
                 'element_node' => {},
-                'index_entry' => {
-                  'entry_element' => {},
-                  'entry_number' => 41,
-                  'in_code' => 1,
-                  'index_name' => 'fn'
-                },
+                'index_entry' => [
+                  'fn',
+                  41
+                ],
                 'original_def_cmdname' => 'deftypefn'
               },
               'source_info' => {
@@ -9012,12 +8930,10 @@ $result_trees{'definition_commands'} = {
                   'type' => {}
                 },
                 'element_node' => {},
-                'index_entry' => {
-                  'entry_element' => {},
-                  'entry_number' => 42,
-                  'in_code' => 1,
-                  'index_name' => 'fn'
-                },
+                'index_entry' => [
+                  'fn',
+                  42
+                ],
                 'original_def_cmdname' => 'deftypefn'
               },
               'source_info' => {
@@ -9237,12 +9153,10 @@ $result_trees{'definition_commands'} = {
                   'name' => {}
                 },
                 'element_node' => {},
-                'index_entry' => {
-                  'entry_element' => {},
-                  'entry_number' => 1,
-                  'in_code' => 1,
-                  'index_name' => 'vr'
-                },
+                'index_entry' => [
+                  'vr',
+                  1
+                ],
                 'original_def_cmdname' => 'defcv'
               },
               'source_info' => {
@@ -9443,12 +9357,10 @@ $result_trees{'definition_commands'} = {
                   'type' => {}
                 },
                 'element_node' => {},
-                'index_entry' => {
-                  'entry_element' => {},
-                  'entry_number' => 2,
-                  'in_code' => 1,
-                  'index_name' => 'vr'
-                },
+                'index_entry' => [
+                  'vr',
+                  2
+                ],
                 'original_def_cmdname' => 'deftypecv'
               },
               'source_info' => {
@@ -9719,12 +9631,10 @@ $result_trees{'definition_commands'} = {
                       'type' => {}
                     },
                     'element_node' => {},
-                    'index_entry' => {
-                      'entry_element' => {},
-                      'entry_number' => 43,
-                      'in_code' => 1,
-                      'index_name' => 'fn'
-                    },
+                    'index_entry' => [
+                      'fn',
+                      43
+                    ],
                     'original_def_cmdname' => 'deftypefn'
                   },
                   'source_info' => {
@@ -9979,12 +9889,10 @@ $result_trees{'definition_commands'} = {
                   'name' => {}
                 },
                 'element_node' => {},
-                'index_entry' => {
-                  'entry_element' => {},
-                  'entry_number' => 44,
-                  'in_code' => 1,
-                  'index_name' => 'fn'
-                },
+                'index_entry' => [
+                  'fn',
+                  44
+                ],
                 'original_def_cmdname' => 'defun'
               },
               'source_info' => {
@@ -10235,12 +10143,10 @@ $result_trees{'definition_commands'} = {
                   'name' => {}
                 },
                 'element_node' => {},
-                'index_entry' => {
-                  'entry_element' => {},
-                  'entry_number' => 45,
-                  'in_code' => 1,
-                  'index_name' => 'fn'
-                },
+                'index_entry' => [
+                  'fn',
+                  45
+                ],
                 'original_def_cmdname' => 'defun'
               },
               'source_info' => {
@@ -10712,12 +10618,10 @@ $result_trees{'definition_commands'} = {
                   'name' => {}
                 },
                 'element_node' => {},
-                'index_entry' => {
-                  'entry_element' => {},
-                  'entry_number' => 46,
-                  'in_code' => 1,
-                  'index_name' => 'fn'
-                },
+                'index_entry' => [
+                  'fn',
+                  46
+                ],
                 'original_def_cmdname' => 'deffn'
               },
               'source_info' => {
@@ -10988,12 +10892,10 @@ $result_trees{'definition_commands'} = {
                   'type' => {}
                 },
                 'element_node' => {},
-                'index_entry' => {
-                  'entry_element' => {},
-                  'entry_number' => 47,
-                  'in_code' => 1,
-                  'index_name' => 'fn'
-                },
+                'index_entry' => [
+                  'fn',
+                  47
+                ],
                 'original_def_cmdname' => 'deftypefn'
               },
               'source_info' => {
@@ -11227,12 +11129,10 @@ $result_trees{'definition_commands'} = {
                   'type' => {}
                 },
                 'element_node' => {},
-                'index_entry' => {
-                  'entry_element' => {},
-                  'entry_number' => 48,
-                  'in_code' => 1,
-                  'index_name' => 'fn'
-                },
+                'index_entry' => [
+                  'fn',
+                  48
+                ],
                 'original_def_cmdname' => 'deftypefnx'
               },
               'info' => {
@@ -11471,12 +11371,10 @@ $result_trees{'definition_commands'} = {
                   'type' => {}
                 },
                 'element_node' => {},
-                'index_entry' => {
-                  'entry_element' => {},
-                  'entry_number' => 49,
-                  'in_code' => 1,
-                  'index_name' => 'fn'
-                },
+                'index_entry' => [
+                  'fn',
+                  49
+                ],
                 'original_def_cmdname' => 'deftypefnx'
               },
               'info' => {
@@ -11715,12 +11613,10 @@ $result_trees{'definition_commands'} = {
                   'type' => {}
                 },
                 'element_node' => {},
-                'index_entry' => {
-                  'entry_element' => {},
-                  'entry_number' => 50,
-                  'in_code' => 1,
-                  'index_name' => 'fn'
-                },
+                'index_entry' => [
+                  'fn',
+                  50
+                ],
                 'original_def_cmdname' => 'deftypefnx'
               },
               'info' => {
@@ -11959,12 +11855,10 @@ $result_trees{'definition_commands'} = {
                   'type' => {}
                 },
                 'element_node' => {},
-                'index_entry' => {
-                  'entry_element' => {},
-                  'entry_number' => 51,
-                  'in_code' => 1,
-                  'index_name' => 'fn'
-                },
+                'index_entry' => [
+                  'fn',
+                  51
+                ],
                 'original_def_cmdname' => 'deftypefnx'
               },
               'info' => {
@@ -12203,12 +12097,10 @@ $result_trees{'definition_commands'} = {
                   'type' => {}
                 },
                 'element_node' => {},
-                'index_entry' => {
-                  'entry_element' => {},
-                  'entry_number' => 52,
-                  'in_code' => 1,
-                  'index_name' => 'fn'
-                },
+                'index_entry' => [
+                  'fn',
+                  52
+                ],
                 'original_def_cmdname' => 'deftypefnx'
               },
               'info' => {
@@ -12477,12 +12369,10 @@ $result_trees{'definition_commands'} = {
                   'type' => {}
                 },
                 'element_node' => {},
-                'index_entry' => {
-                  'entry_element' => {},
-                  'entry_number' => 53,
-                  'in_code' => 1,
-                  'index_name' => 'fn'
-                },
+                'index_entry' => [
+                  'fn',
+                  53
+                ],
                 'original_def_cmdname' => 'deftypefnx'
               },
               'info' => {
@@ -12751,12 +12641,10 @@ $result_trees{'definition_commands'} = {
                   'type' => {}
                 },
                 'element_node' => {},
-                'index_entry' => {
-                  'entry_element' => {},
-                  'entry_number' => 54,
-                  'in_code' => 1,
-                  'index_name' => 'fn'
-                },
+                'index_entry' => [
+                  'fn',
+                  54
+                ],
                 'original_def_cmdname' => 'deftypefnx'
               },
               'info' => {
@@ -13025,12 +12913,10 @@ $result_trees{'definition_commands'} = {
                   'type' => {}
                 },
                 'element_node' => {},
-                'index_entry' => {
-                  'entry_element' => {},
-                  'entry_number' => 55,
-                  'in_code' => 1,
-                  'index_name' => 'fn'
-                },
+                'index_entry' => [
+                  'fn',
+                  55
+                ],
                 'original_def_cmdname' => 'deftypefnx'
               },
               'info' => {
@@ -13299,12 +13185,10 @@ $result_trees{'definition_commands'} = {
                   'type' => {}
                 },
                 'element_node' => {},
-                'index_entry' => {
-                  'entry_element' => {},
-                  'entry_number' => 56,
-                  'in_code' => 1,
-                  'index_name' => 'fn'
-                },
+                'index_entry' => [
+                  'fn',
+                  56
+                ],
                 'original_def_cmdname' => 'deftypefnx'
               },
               'info' => {
@@ -13573,12 +13457,10 @@ $result_trees{'definition_commands'} = {
                   'type' => {}
                 },
                 'element_node' => {},
-                'index_entry' => {
-                  'entry_element' => {},
-                  'entry_number' => 57,
-                  'in_code' => 1,
-                  'index_name' => 'fn'
-                },
+                'index_entry' => [
+                  'fn',
+                  57
+                ],
                 'original_def_cmdname' => 'deftypefnx'
               },
               'info' => {
@@ -13847,12 +13729,10 @@ $result_trees{'definition_commands'} = {
                   'type' => {}
                 },
                 'element_node' => {},
-                'index_entry' => {
-                  'entry_element' => {},
-                  'entry_number' => 58,
-                  'in_code' => 1,
-                  'index_name' => 'fn'
-                },
+                'index_entry' => [
+                  'fn',
+                  58
+                ],
                 'original_def_cmdname' => 'deftypefnx'
               },
               'info' => {
@@ -14121,12 +14001,10 @@ $result_trees{'definition_commands'} = {
                   'type' => {}
                 },
                 'element_node' => {},
-                'index_entry' => {
-                  'entry_element' => {},
-                  'entry_number' => 59,
-                  'in_code' => 1,
-                  'index_name' => 'fn'
-                },
+                'index_entry' => [
+                  'fn',
+                  59
+                ],
                 'original_def_cmdname' => 'deftypefnx'
               },
               'info' => {
@@ -14395,12 +14273,10 @@ $result_trees{'definition_commands'} = {
                   'type' => {}
                 },
                 'element_node' => {},
-                'index_entry' => {
-                  'entry_element' => {},
-                  'entry_number' => 60,
-                  'in_code' => 1,
-                  'index_name' => 'fn'
-                },
+                'index_entry' => [
+                  'fn',
+                  60
+                ],
                 'original_def_cmdname' => 'deftypefnx'
               },
               'info' => {
@@ -14669,12 +14545,10 @@ $result_trees{'definition_commands'} = {
                   'type' => {}
                 },
                 'element_node' => {},
-                'index_entry' => {
-                  'entry_element' => {},
-                  'entry_number' => 61,
-                  'in_code' => 1,
-                  'index_name' => 'fn'
-                },
+                'index_entry' => [
+                  'fn',
+                  61
+                ],
                 'original_def_cmdname' => 'deftypefnx'
               },
               'info' => {
@@ -14950,12 +14824,10 @@ $result_trees{'definition_commands'} = {
                   'type' => {}
                 },
                 'element_node' => {},
-                'index_entry' => {
-                  'entry_element' => {},
-                  'entry_number' => 62,
-                  'in_code' => 1,
-                  'index_name' => 'fn'
-                },
+                'index_entry' => [
+                  'fn',
+                  62
+                ],
                 'original_def_cmdname' => 'deftypefn'
               },
               'source_info' => {
@@ -15176,12 +15048,10 @@ $result_trees{'definition_commands'} = {
                   'type' => {}
                 },
                 'element_node' => {},
-                'index_entry' => {
-                  'entry_element' => {},
-                  'entry_number' => 63,
-                  'in_code' => 1,
-                  'index_name' => 'fn'
-                },
+                'index_entry' => [
+                  'fn',
+                  63
+                ],
                 'original_def_cmdname' => 'deftypefnx'
               },
               'info' => {
@@ -15407,12 +15277,10 @@ $result_trees{'definition_commands'} = {
                   'type' => {}
                 },
                 'element_node' => {},
-                'index_entry' => {
-                  'entry_element' => {},
-                  'entry_number' => 64,
-                  'in_code' => 1,
-                  'index_name' => 'fn'
-                },
+                'index_entry' => [
+                  'fn',
+                  64
+                ],
                 'original_def_cmdname' => 'deftypefnx'
               },
               'info' => {
@@ -15638,12 +15506,10 @@ $result_trees{'definition_commands'} = {
                   'type' => {}
                 },
                 'element_node' => {},
-                'index_entry' => {
-                  'entry_element' => {},
-                  'entry_number' => 65,
-                  'in_code' => 1,
-                  'index_name' => 'fn'
-                },
+                'index_entry' => [
+                  'fn',
+                  65
+                ],
                 'original_def_cmdname' => 'deftypefnx'
               },
               'info' => {
@@ -15869,12 +15735,10 @@ $result_trees{'definition_commands'} = {
                   'type' => {}
                 },
                 'element_node' => {},
-                'index_entry' => {
-                  'entry_element' => {},
-                  'entry_number' => 66,
-                  'in_code' => 1,
-                  'index_name' => 'fn'
-                },
+                'index_entry' => [
+                  'fn',
+                  66
+                ],
                 'original_def_cmdname' => 'deftypefnx'
               },
               'info' => {
@@ -16100,12 +15964,10 @@ $result_trees{'definition_commands'} = {
                   'type' => {}
                 },
                 'element_node' => {},
-                'index_entry' => {
-                  'entry_element' => {},
-                  'entry_number' => 67,
-                  'in_code' => 1,
-                  'index_name' => 'fn'
-                },
+                'index_entry' => [
+                  'fn',
+                  67
+                ],
                 'original_def_cmdname' => 'deftypefnx'
               },
               'info' => {
@@ -16346,12 +16208,10 @@ $result_trees{'definition_commands'} = {
                   'type' => {}
                 },
                 'element_node' => {},
-                'index_entry' => {
-                  'entry_element' => {},
-                  'entry_number' => 68,
-                  'in_code' => 1,
-                  'index_name' => 'fn'
-                },
+                'index_entry' => [
+                  'fn',
+                  68
+                ],
                 'original_def_cmdname' => 'deftypefnx'
               },
               'info' => {
@@ -16592,12 +16452,10 @@ $result_trees{'definition_commands'} = {
                   'type' => {}
                 },
                 'element_node' => {},
-                'index_entry' => {
-                  'entry_element' => {},
-                  'entry_number' => 69,
-                  'in_code' => 1,
-                  'index_name' => 'fn'
-                },
+                'index_entry' => [
+                  'fn',
+                  69
+                ],
                 'original_def_cmdname' => 'deftypefnx'
               },
               'info' => {
@@ -16838,12 +16696,10 @@ $result_trees{'definition_commands'} = {
                   'type' => {}
                 },
                 'element_node' => {},
-                'index_entry' => {
-                  'entry_element' => {},
-                  'entry_number' => 70,
-                  'in_code' => 1,
-                  'index_name' => 'fn'
-                },
+                'index_entry' => [
+                  'fn',
+                  70
+                ],
                 'original_def_cmdname' => 'deftypefnx'
               },
               'info' => {
@@ -17084,12 +16940,10 @@ $result_trees{'definition_commands'} = {
                   'type' => {}
                 },
                 'element_node' => {},
-                'index_entry' => {
-                  'entry_element' => {},
-                  'entry_number' => 71,
-                  'in_code' => 1,
-                  'index_name' => 'fn'
-                },
+                'index_entry' => [
+                  'fn',
+                  71
+                ],
                 'original_def_cmdname' => 'deftypefnx'
               },
               'info' => {
@@ -17330,12 +17184,10 @@ $result_trees{'definition_commands'} = {
                   'type' => {}
                 },
                 'element_node' => {},
-                'index_entry' => {
-                  'entry_element' => {},
-                  'entry_number' => 72,
-                  'in_code' => 1,
-                  'index_name' => 'fn'
-                },
+                'index_entry' => [
+                  'fn',
+                  72
+                ],
                 'original_def_cmdname' => 'deftypefnx'
               },
               'info' => {
@@ -17576,12 +17428,10 @@ $result_trees{'definition_commands'} = {
                   'type' => {}
                 },
                 'element_node' => {},
-                'index_entry' => {
-                  'entry_element' => {},
-                  'entry_number' => 73,
-                  'in_code' => 1,
-                  'index_name' => 'fn'
-                },
+                'index_entry' => [
+                  'fn',
+                  73
+                ],
                 'original_def_cmdname' => 'deftypefnx'
               },
               'info' => {
@@ -17822,12 +17672,10 @@ $result_trees{'definition_commands'} = {
                   'type' => {}
                 },
                 'element_node' => {},
-                'index_entry' => {
-                  'entry_element' => {},
-                  'entry_number' => 74,
-                  'in_code' => 1,
-                  'index_name' => 'fn'
-                },
+                'index_entry' => [
+                  'fn',
+                  74
+                ],
                 'original_def_cmdname' => 'deftypefnx'
               },
               'info' => {
@@ -18068,12 +17916,10 @@ $result_trees{'definition_commands'} = {
                   'type' => {}
                 },
                 'element_node' => {},
-                'index_entry' => {
-                  'entry_element' => {},
-                  'entry_number' => 75,
-                  'in_code' => 1,
-                  'index_name' => 'fn'
-                },
+                'index_entry' => [
+                  'fn',
+                  75
+                ],
                 'original_def_cmdname' => 'deftypefnx'
               },
               'info' => {
@@ -18314,12 +18160,10 @@ $result_trees{'definition_commands'} = {
                   'type' => {}
                 },
                 'element_node' => {},
-                'index_entry' => {
-                  'entry_element' => {},
-                  'entry_number' => 76,
-                  'in_code' => 1,
-                  'index_name' => 'fn'
-                },
+                'index_entry' => [
+                  'fn',
+                  76
+                ],
                 'original_def_cmdname' => 'deftypefnx'
               },
               'info' => {
@@ -18417,220 +18261,177 @@ 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[1]{'contents'}[0
 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[1]{'contents'}[0]{'extra'}{'def_parsed_hash'}{'category'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[1]{'contents'}[0]{'args'}[0]{'contents'}[0];
 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[1]{'contents'}[0]{'extra'}{'def_parsed_hash'}{'name'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[1]{'contents'}[0]{'args'}[0]{'contents'}[2];
 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[1]{'contents'}[0]{'extra'}{'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'}{'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'}{'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'}{'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'}{'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'}{'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'}{'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'}{'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'}{'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'}{'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'}{'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'}{'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'}{'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'}{'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'}{'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'}{'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'}{'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'}{'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'}{'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'}{'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'}{'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'}{'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'}{'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'}{'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'}{'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'}{'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'}{'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'}{'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'}{'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'}{'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'}{'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'}{'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'}{'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'}{'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'}{'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'}{'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'}{'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'}{'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'}{'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'}{'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'}{'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'}{'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'}{'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];
 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[24]{'contents'}[0]{'extra'}{'def_index_ref_element'}{'contents'}[0]
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[24]{'contents'}[0]{'args'}[0]{'contents'}[6];
@@ -18640,208 +18441,173 @@ 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[24]{'contents'}[
 
$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'}{'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'}{'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'}{'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'}{'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'}{'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'}{'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'}{'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'}{'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'}{'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'}{'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'}{'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'}{'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'}{'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'}{'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'}{'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'}{'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'}{'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'}{'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'}{'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'}{'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'}{'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'}{'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'}{'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'}{'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'}{'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'}{'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'}{'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'}{'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'}{'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'}{'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'}{'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'}{'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'}{'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'}{'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'}{'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
 @top top section
diff --git a/tp/t/results/converters_tests/form_feeds.pl 
b/tp/t/results/converters_tests/form_feeds.pl
index 0601f71238..de07394476 100644
--- a/tp/t/results/converters_tests/form_feeds.pl
+++ b/tp/t/results/converters_tests/form_feeds.pl
@@ -608,12 +608,10 @@ $result_trees{'form_feeds'} = {
                   'name' => {}
                 },
                 'element_node' => {},
-                'index_entry' => {
-                  'entry_element' => {},
-                  'entry_number' => 1,
-                  'in_code' => 1,
-                  'index_name' => 'fn'
-                },
+                'index_entry' => [
+                  'fn',
+                  1
+                ],
                 'original_def_cmdname' => 'deffn'
               },
               'source_info' => {
@@ -794,12 +792,10 @@ $result_trees{'form_feeds'} = {
                   'name' => {}
                 },
                 'element_node' => {},
-                'index_entry' => {
-                  'entry_element' => {},
-                  'entry_number' => 2,
-                  'in_code' => 1,
-                  'index_name' => 'fn'
-                },
+                'index_entry' => [
+                  'fn',
+                  2
+                ],
                 'original_def_cmdname' => 'deffnx'
               },
               'info' => {
@@ -1234,12 +1230,10 @@ 
$result_trees{'form_feeds'}{'contents'}[2]{'contents'}[27]{'contents'}[0]{'extra
 
$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'}{'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'}{'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];
 $result_trees{'form_feeds'}{'contents'}[2]{'contents'}[29]{'extra'}{'caption'} 
= $result_trees{'form_feeds'}{'contents'}[2]{'contents'}[29]{'contents'}[1];
diff --git a/tp/t/results/converters_tests/frenchspacing_and_code.pl 
b/tp/t/results/converters_tests/frenchspacing_and_code.pl
index 0a1fcafdce..2e2f452943 100644
--- a/tp/t/results/converters_tests/frenchspacing_and_code.pl
+++ b/tp/t/results/converters_tests/frenchspacing_and_code.pl
@@ -519,12 +519,10 @@ $result_trees{'frenchspacing_and_code'} = {
                   'type' => {}
                 },
                 'element_node' => {},
-                'index_entry' => {
-                  'entry_element' => {},
-                  'entry_number' => 1,
-                  'in_code' => 1,
-                  'index_name' => 'fn'
-                },
+                'index_entry' => [
+                  'fn',
+                  1
+                ],
                 'original_def_cmdname' => 'deftypeop'
               },
               'source_info' => {
@@ -798,12 +796,10 @@ $result_trees{'frenchspacing_and_code'} = {
                   'name' => {}
                 },
                 'element_node' => {},
-                'index_entry' => {
-                  'entry_element' => {},
-                  'entry_number' => 2,
-                  'in_code' => 1,
-                  'index_name' => 'fn'
-                },
+                'index_entry' => [
+                  'fn',
+                  2
+                ],
                 'original_def_cmdname' => 'defop'
               },
               'source_info' => {
@@ -1317,12 +1313,10 @@ $result_trees{'frenchspacing_and_code'} = {
                   'type' => {}
                 },
                 'element_node' => {},
-                'index_entry' => {
-                  'entry_element' => {},
-                  'entry_number' => 3,
-                  'in_code' => 1,
-                  'index_name' => 'fn'
-                },
+                'index_entry' => [
+                  'fn',
+                  3
+                ],
                 'original_def_cmdname' => 'deftypeop'
               },
               'source_info' => {
@@ -1596,12 +1590,10 @@ $result_trees{'frenchspacing_and_code'} = {
                   'name' => {}
                 },
                 'element_node' => {},
-                'index_entry' => {
-                  'entry_element' => {},
-                  'entry_number' => 4,
-                  'in_code' => 1,
-                  'index_name' => 'fn'
-                },
+                'index_entry' => [
+                  'fn',
+                  4
+                ],
                 'original_def_cmdname' => 'defop'
               },
               'source_info' => {
@@ -1694,7 +1686,6 @@ 
$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'}{'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'}{'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];
 
$result_trees{'frenchspacing_and_code'}{'contents'}[4]{'contents'}[9]{'contents'}[0]{'extra'}{'def_index_ref_element'}{'contents'}[0]
 = 
$result_trees{'frenchspacing_and_code'}{'contents'}[4]{'contents'}[9]{'contents'}[0]{'args'}[0]{'contents'}[4];
@@ -1703,7 +1694,6 @@ 
$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'}{'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'}{'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'}[6]{'contents'}[7]{'contents'}[0]{'extra'}{'def_index_element'}{'contents'}[0]
 = 
$result_trees{'frenchspacing_and_code'}{'contents'}[6]{'contents'}[7]{'contents'}[0]{'args'}[0]{'contents'}[6];
 
$result_trees{'frenchspacing_and_code'}{'contents'}[6]{'contents'}[7]{'contents'}[0]{'extra'}{'def_index_element'}{'contents'}[2]
 = 
$result_trees{'frenchspacing_and_code'}{'contents'}[6]{'contents'}[7]{'contents'}[0]{'args'}[0]{'contents'}[2];
 
$result_trees{'frenchspacing_and_code'}{'contents'}[6]{'contents'}[7]{'contents'}[0]{'extra'}{'def_index_ref_element'}{'contents'}[0]
 = 
$result_trees{'frenchspacing_and_code'}{'contents'}[6]{'contents'}[7]{'contents'}[0]{'args'}[0]{'contents'}[6];
@@ -1713,7 +1703,6 @@ 
$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'}{'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'}{'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];
 
$result_trees{'frenchspacing_and_code'}{'contents'}[6]{'contents'}[9]{'contents'}[0]{'extra'}{'def_index_ref_element'}{'contents'}[0]
 = 
$result_trees{'frenchspacing_and_code'}{'contents'}[6]{'contents'}[9]{'contents'}[0]{'args'}[0]{'contents'}[4];
@@ -1722,7 +1711,6 @@ 
$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'}{'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'}{'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'} = '
 @frenchspacing on
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 a5964cd62e..493318c45c 100644
--- a/tp/t/results/converters_tests/index_entry_in_preformatted.pl
+++ b/tp/t/results/converters_tests/index_entry_in_preformatted.pl
@@ -171,12 +171,10 @@ $result_trees{'index_entry_in_preformatted'} = {
                   'cmdname' => 'cindex',
                   'extra' => {
                     'element_node' => {},
-                    'index_entry' => {
-                      'entry_element' => {},
-                      'entry_number' => 1,
-                      'in_code' => 0,
-                      'index_name' => 'cp'
-                    }
+                    'index_entry' => [
+                      'cp',
+                      1
+                    ]
                   },
                   'info' => {
                     'spaces_before_argument' => {
@@ -228,12 +226,10 @@ $result_trees{'index_entry_in_preformatted'} = {
                   'cmdname' => 'cindex',
                   'extra' => {
                     'element_node' => {},
-                    'index_entry' => {
-                      'entry_element' => {},
-                      'entry_number' => 2,
-                      'in_code' => 0,
-                      'index_name' => 'cp'
-                    }
+                    'index_entry' => [
+                      'cp',
+                      2
+                    ]
                   },
                   'info' => {
                     'spaces_before_argument' => {
@@ -271,12 +267,10 @@ $result_trees{'index_entry_in_preformatted'} = {
                   'cmdname' => 'cindex',
                   'extra' => {
                     'element_node' => {},
-                    'index_entry' => {
-                      'entry_element' => {},
-                      'entry_number' => 3,
-                      'in_code' => 0,
-                      'index_name' => 'cp'
-                    }
+                    'index_entry' => [
+                      'cp',
+                      3
+                    ]
                   },
                   'info' => {
                     'spaces_before_argument' => {
@@ -349,11 +343,8 @@ $result_trees{'index_entry_in_preformatted'} = {
   'type' => 'document_root'
 };
 
$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'}{'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'}{'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
 @top 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 08049dd39e..aad64de461 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
@@ -213,12 +213,10 @@ $result_trees{'indices_in_begin_tables_lists'} = {
                   'cmdname' => 'cindex',
                   'extra' => {
                     'element_node' => {},
-                    'index_entry' => {
-                      'entry_element' => {},
-                      'entry_number' => 1,
-                      'in_code' => 0,
-                      'index_name' => 'cp'
-                    }
+                    'index_entry' => [
+                      'cp',
+                      1
+                    ]
                   },
                   'info' => {
                     'spaces_before_argument' => {
@@ -360,12 +358,10 @@ $result_trees{'indices_in_begin_tables_lists'} = {
                   'cmdname' => 'cindex',
                   'extra' => {
                     'element_node' => {},
-                    'index_entry' => {
-                      'entry_element' => {},
-                      'entry_number' => 2,
-                      'in_code' => 0,
-                      'index_name' => 'cp'
-                    }
+                    'index_entry' => [
+                      'cp',
+                      2
+                    ]
                   },
                   'info' => {
                     'spaces_before_argument' => {
@@ -441,12 +437,10 @@ $result_trees{'indices_in_begin_tables_lists'} = {
                   'cmdname' => 'cindex',
                   'extra' => {
                     'element_node' => {},
-                    'index_entry' => {
-                      'entry_element' => {},
-                      'entry_number' => 3,
-                      'in_code' => 0,
-                      'index_name' => 'cp'
-                    }
+                    'index_entry' => [
+                      'cp',
+                      3
+                    ]
                   },
                   'info' => {
                     'spaces_before_argument' => {
@@ -592,12 +586,10 @@ $result_trees{'indices_in_begin_tables_lists'} = {
                   'cmdname' => 'cindex',
                   'extra' => {
                     'element_node' => {},
-                    'index_entry' => {
-                      'entry_element' => {},
-                      'entry_number' => 4,
-                      'in_code' => 0,
-                      'index_name' => 'cp'
-                    }
+                    'index_entry' => [
+                      'cp',
+                      4
+                    ]
                   },
                   'info' => {
                     'spaces_before_argument' => {
@@ -835,12 +827,10 @@ $result_trees{'indices_in_begin_tables_lists'} = {
                   'cmdname' => 'cindex',
                   'extra' => {
                     'element_node' => {},
-                    'index_entry' => {
-                      'entry_element' => {},
-                      'entry_number' => 5,
-                      'in_code' => 0,
-                      'index_name' => 'cp'
-                    }
+                    'index_entry' => [
+                      'cp',
+                      5
+                    ]
                   },
                   'info' => {
                     'spaces_before_argument' => {
@@ -976,12 +966,10 @@ $result_trees{'indices_in_begin_tables_lists'} = {
                   'cmdname' => 'cindex',
                   'extra' => {
                     'element_node' => {},
-                    'index_entry' => {
-                      'entry_element' => {},
-                      'entry_number' => 6,
-                      'in_code' => 0,
-                      'index_name' => 'cp'
-                    }
+                    'index_entry' => [
+                      'cp',
+                      6
+                    ]
                   },
                   'info' => {
                     'spaces_before_argument' => {
@@ -1107,12 +1095,10 @@ $result_trees{'indices_in_begin_tables_lists'} = {
                   'cmdname' => 'cindex',
                   'extra' => {
                     'element_node' => {},
-                    'index_entry' => {
-                      'entry_element' => {},
-                      'entry_number' => 7,
-                      'in_code' => 0,
-                      'index_name' => 'cp'
-                    }
+                    'index_entry' => [
+                      'cp',
+                      7
+                    ]
                   },
                   'info' => {
                     'spaces_before_argument' => {
@@ -1252,12 +1238,10 @@ $result_trees{'indices_in_begin_tables_lists'} = {
                   'cmdname' => 'cindex',
                   'extra' => {
                     'element_node' => {},
-                    'index_entry' => {
-                      'entry_element' => {},
-                      'entry_number' => 8,
-                      'in_code' => 0,
-                      'index_name' => 'cp'
-                    }
+                    'index_entry' => [
+                      'cp',
+                      8
+                    ]
                   },
                   'info' => {
                     'spaces_before_argument' => {
@@ -1383,12 +1367,10 @@ $result_trees{'indices_in_begin_tables_lists'} = {
                   'cmdname' => 'cindex',
                   'extra' => {
                     'element_node' => {},
-                    'index_entry' => {
-                      'entry_element' => {},
-                      'entry_number' => 9,
-                      'in_code' => 0,
-                      'index_name' => 'cp'
-                    }
+                    'index_entry' => [
+                      'cp',
+                      9
+                    ]
                   },
                   'info' => {
                     'spaces_before_argument' => {
@@ -1432,12 +1414,10 @@ $result_trees{'indices_in_begin_tables_lists'} = {
                   'cmdname' => 'cindex',
                   'extra' => {
                     'element_node' => {},
-                    'index_entry' => {
-                      'entry_element' => {},
-                      'entry_number' => 10,
-                      'in_code' => 0,
-                      'index_name' => 'cp'
-                    }
+                    'index_entry' => [
+                      'cp',
+                      10
+                    ]
                   },
                   'info' => {
                     'spaces_before_argument' => {
@@ -1471,12 +1451,10 @@ $result_trees{'indices_in_begin_tables_lists'} = {
                   'cmdname' => 'cindex',
                   'extra' => {
                     'element_node' => {},
-                    'index_entry' => {
-                      'entry_element' => {},
-                      'entry_number' => 11,
-                      'in_code' => 0,
-                      'index_name' => 'cp'
-                    }
+                    'index_entry' => [
+                      'cp',
+                      11
+                    ]
                   },
                   'info' => {
                     'spaces_before_argument' => {
@@ -1625,12 +1603,10 @@ $result_trees{'indices_in_begin_tables_lists'} = {
                       'cmdname' => 'item',
                       'extra' => {
                         'element_node' => {},
-                        'index_entry' => {
-                          'entry_element' => {},
-                          'entry_number' => 1,
-                          'in_code' => 1,
-                          'index_name' => 'vr'
-                        }
+                        'index_entry' => [
+                          'vr',
+                          1
+                        ]
                       },
                       'info' => {
                         'spaces_before_argument' => {
@@ -1764,12 +1740,10 @@ $result_trees{'indices_in_begin_tables_lists'} = {
                       'cmdname' => 'item',
                       'extra' => {
                         'element_node' => {},
-                        'index_entry' => {
-                          'entry_element' => {},
-                          'entry_number' => 2,
-                          'in_code' => 1,
-                          'index_name' => 'vr'
-                        }
+                        'index_entry' => [
+                          'vr',
+                          2
+                        ]
                       },
                       'info' => {
                         'spaces_before_argument' => {
@@ -1817,12 +1791,10 @@ $result_trees{'indices_in_begin_tables_lists'} = {
                       'cmdname' => 'itemx',
                       'extra' => {
                         'element_node' => {},
-                        'index_entry' => {
-                          'entry_element' => {},
-                          'entry_number' => 3,
-                          'in_code' => 1,
-                          'index_name' => 'vr'
-                        }
+                        'index_entry' => [
+                          'vr',
+                          3
+                        ]
                       },
                       'info' => {
                         'spaces_before_argument' => {
@@ -1956,12 +1928,10 @@ $result_trees{'indices_in_begin_tables_lists'} = {
                       'cmdname' => 'item',
                       'extra' => {
                         'element_node' => {},
-                        'index_entry' => {
-                          'entry_element' => {},
-                          'entry_number' => 1,
-                          'in_code' => 1,
-                          'index_name' => 'fn'
-                        }
+                        'index_entry' => [
+                          'fn',
+                          1
+                        ]
                       },
                       'info' => {
                         'spaces_before_argument' => {
@@ -1996,12 +1966,10 @@ $result_trees{'indices_in_begin_tables_lists'} = {
                           'cmdname' => 'cindex',
                           'extra' => {
                             'element_node' => {},
-                            'index_entry' => {
-                              'entry_element' => {},
-                              'entry_number' => 12,
-                              'in_code' => 0,
-                              'index_name' => 'cp'
-                            }
+                            'index_entry' => [
+                              'cp',
+                              12
+                            ]
                           },
                           'info' => {
                             'spaces_before_argument' => {
@@ -2058,12 +2026,10 @@ $result_trees{'indices_in_begin_tables_lists'} = {
                       'cmdname' => 'itemx',
                       'extra' => {
                         'element_node' => {},
-                        'index_entry' => {
-                          'entry_element' => {},
-                          'entry_number' => 2,
-                          'in_code' => 1,
-                          'index_name' => 'fn'
-                        }
+                        'index_entry' => [
+                          'fn',
+                          2
+                        ]
                       },
                       'info' => {
                         'spaces_before_argument' => {
@@ -2120,12 +2086,10 @@ $result_trees{'indices_in_begin_tables_lists'} = {
                       'cmdname' => 'item',
                       'extra' => {
                         'element_node' => {},
-                        'index_entry' => {
-                          'entry_element' => {},
-                          'entry_number' => 3,
-                          'in_code' => 1,
-                          'index_name' => 'fn'
-                        }
+                        'index_entry' => [
+                          'fn',
+                          3
+                        ]
                       },
                       'info' => {
                         'spaces_before_argument' => {
@@ -2183,12 +2147,10 @@ $result_trees{'indices_in_begin_tables_lists'} = {
                       'cmdname' => 'itemx',
                       'extra' => {
                         'element_node' => {},
-                        'index_entry' => {
-                          'entry_element' => {},
-                          'entry_number' => 4,
-                          'in_code' => 1,
-                          'index_name' => 'fn'
-                        }
+                        'index_entry' => [
+                          'fn',
+                          4
+                        ]
                       },
                       'info' => {
                         'spaces_before_argument' => {
@@ -2328,12 +2290,10 @@ $result_trees{'indices_in_begin_tables_lists'} = {
                       'cmdname' => 'cindex',
                       'extra' => {
                         'element_node' => {},
-                        'index_entry' => {
-                          'entry_element' => {},
-                          'entry_number' => 13,
-                          'in_code' => 0,
-                          'index_name' => 'cp'
-                        }
+                        'index_entry' => [
+                          'cp',
+                          13
+                        ]
                       },
                       'info' => {
                         'spaces_before_argument' => {
@@ -2505,12 +2465,10 @@ $result_trees{'indices_in_begin_tables_lists'} = {
                   'cmdname' => 'cindex',
                   'extra' => {
                     'element_node' => {},
-                    'index_entry' => {
-                      'entry_element' => {},
-                      'entry_number' => 14,
-                      'in_code' => 0,
-                      'index_name' => 'cp'
-                    }
+                    'index_entry' => [
+                      'cp',
+                      14
+                    ]
                   },
                   'info' => {
                     'spaces_before_argument' => {
@@ -2676,12 +2634,10 @@ $result_trees{'indices_in_begin_tables_lists'} = {
                       'cmdname' => 'cindex',
                       'extra' => {
                         'element_node' => {},
-                        'index_entry' => {
-                          'entry_element' => {},
-                          'entry_number' => 15,
-                          'in_code' => 0,
-                          'index_name' => 'cp'
-                        }
+                        'index_entry' => [
+                          'cp',
+                          15
+                        ]
                       },
                       'info' => {
                         'spaces_before_argument' => {
@@ -2853,12 +2809,10 @@ $result_trees{'indices_in_begin_tables_lists'} = {
                   'cmdname' => 'cindex',
                   'extra' => {
                     'element_node' => {},
-                    'index_entry' => {
-                      'entry_element' => {},
-                      'entry_number' => 16,
-                      'in_code' => 0,
-                      'index_name' => 'cp'
-                    }
+                    'index_entry' => [
+                      'cp',
+                      16
+                    ]
                   },
                   'info' => {
                     'spaces_before_argument' => {
@@ -3027,12 +2981,10 @@ $result_trees{'indices_in_begin_tables_lists'} = {
                   'cmdname' => 'cindex',
                   'extra' => {
                     'element_node' => {},
-                    'index_entry' => {
-                      'entry_element' => {},
-                      'entry_number' => 17,
-                      'in_code' => 0,
-                      'index_name' => 'cp'
-                    }
+                    'index_entry' => [
+                      'cp',
+                      17
+                    ]
                   },
                   'info' => {
                     'spaces_before_argument' => {
@@ -3192,12 +3144,10 @@ $result_trees{'indices_in_begin_tables_lists'} = {
                   'cmdname' => 'cindex',
                   'extra' => {
                     'element_node' => {},
-                    'index_entry' => {
-                      'entry_element' => {},
-                      'entry_number' => 18,
-                      'in_code' => 0,
-                      'index_name' => 'cp'
-                    }
+                    'index_entry' => [
+                      'cp',
+                      18
+                    ]
                   },
                   'info' => {
                     'spaces_before_argument' => {
@@ -3369,12 +3319,10 @@ $result_trees{'indices_in_begin_tables_lists'} = {
                       'cmdname' => 'cindex',
                       'extra' => {
                         'element_node' => {},
-                        'index_entry' => {
-                          'entry_element' => {},
-                          'entry_number' => 19,
-                          'in_code' => 0,
-                          'index_name' => 'cp'
-                        }
+                        'index_entry' => [
+                          'cp',
+                          19
+                        ]
                       },
                       'info' => {
                         'spaces_before_argument' => {
@@ -3524,12 +3472,10 @@ $result_trees{'indices_in_begin_tables_lists'} = {
                       'cmdname' => 'cindex',
                       'extra' => {
                         'element_node' => {},
-                        'index_entry' => {
-                          'entry_element' => {},
-                          'entry_number' => 20,
-                          'in_code' => 0,
-                          'index_name' => 'cp'
-                        }
+                        'index_entry' => [
+                          'cp',
+                          20
+                        ]
                       },
                       'info' => {
                         'spaces_before_argument' => {
@@ -3573,12 +3519,10 @@ $result_trees{'indices_in_begin_tables_lists'} = {
                       'cmdname' => 'cindex',
                       'extra' => {
                         'element_node' => {},
-                        'index_entry' => {
-                          'entry_element' => {},
-                          'entry_number' => 21,
-                          'in_code' => 0,
-                          'index_name' => 'cp'
-                        }
+                        'index_entry' => [
+                          'cp',
+                          21
+                        ]
                       },
                       'info' => {
                         'spaces_before_argument' => {
@@ -3612,12 +3556,10 @@ $result_trees{'indices_in_begin_tables_lists'} = {
                       'cmdname' => 'cindex',
                       'extra' => {
                         'element_node' => {},
-                        'index_entry' => {
-                          'entry_element' => {},
-                          'entry_number' => 22,
-                          'in_code' => 0,
-                          'index_name' => 'cp'
-                        }
+                        'index_entry' => [
+                          'cp',
+                          22
+                        ]
                       },
                       'info' => {
                         'spaces_before_argument' => {
@@ -3932,76 +3874,47 @@ $result_trees{'indices_in_begin_tables_lists'} = {
   'type' => 'document_root'
 };
 
$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'}{'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'}{'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'}[2]{'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'}[2]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'indices_in_begin_tables_lists'}{'contents'}[4]{'contents'}[5]{'contents'}[0]{'contents'}[2];
 
$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'}{'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'}{'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'}{'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'}[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'}[1]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'indices_in_begin_tables_lists'}{'contents'}[4]{'contents'}[15]{'contents'}[0]{'contents'}[1];
 
$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'}{'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'}{'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'}{'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'}{'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'}{'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'}{'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'}{'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'}{'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'}{'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'}{'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'}{'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'}{'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'}{'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'}{'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'}{'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'}{'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'}{'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'}{'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'}{'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'}{'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_texis{'indices_in_begin_tables_lists'} = '\\input texinfo.tex
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 53bc9a569c..d6b54d91e4 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
@@ -224,12 +224,10 @@ 
$result_trees{'indices_in_begin_tables_lists_entries_after_item'} = {
                   'cmdname' => 'cindex',
                   'extra' => {
                     'element_node' => {},
-                    'index_entry' => {
-                      'entry_element' => {},
-                      'entry_number' => 1,
-                      'in_code' => 0,
-                      'index_name' => 'cp'
-                    }
+                    'index_entry' => [
+                      'cp',
+                      1
+                    ]
                   },
                   'info' => {
                     'spaces_before_argument' => {
@@ -371,12 +369,10 @@ 
$result_trees{'indices_in_begin_tables_lists_entries_after_item'} = {
                   'cmdname' => 'cindex',
                   'extra' => {
                     'element_node' => {},
-                    'index_entry' => {
-                      'entry_element' => {},
-                      'entry_number' => 2,
-                      'in_code' => 0,
-                      'index_name' => 'cp'
-                    }
+                    'index_entry' => [
+                      'cp',
+                      2
+                    ]
                   },
                   'info' => {
                     'spaces_before_argument' => {
@@ -442,12 +438,10 @@ 
$result_trees{'indices_in_begin_tables_lists_entries_after_item'} = {
                   'cmdname' => 'cindex',
                   'extra' => {
                     'element_node' => {},
-                    'index_entry' => {
-                      'entry_element' => {},
-                      'entry_number' => 3,
-                      'in_code' => 0,
-                      'index_name' => 'cp'
-                    }
+                    'index_entry' => [
+                      'cp',
+                      3
+                    ]
                   },
                   'info' => {
                     'spaces_before_argument' => {
@@ -604,12 +598,10 @@ 
$result_trees{'indices_in_begin_tables_lists_entries_after_item'} = {
                   'cmdname' => 'cindex',
                   'extra' => {
                     'element_node' => {},
-                    'index_entry' => {
-                      'entry_element' => {},
-                      'entry_number' => 4,
-                      'in_code' => 0,
-                      'index_name' => 'cp'
-                    }
+                    'index_entry' => [
+                      'cp',
+                      4
+                    ]
                   },
                   'info' => {
                     'spaces_before_argument' => {
@@ -837,12 +829,10 @@ 
$result_trees{'indices_in_begin_tables_lists_entries_after_item'} = {
                   'cmdname' => 'cindex',
                   'extra' => {
                     'element_node' => {},
-                    'index_entry' => {
-                      'entry_element' => {},
-                      'entry_number' => 5,
-                      'in_code' => 0,
-                      'index_name' => 'cp'
-                    }
+                    'index_entry' => [
+                      'cp',
+                      5
+                    ]
                   },
                   'info' => {
                     'spaces_before_argument' => {
@@ -989,12 +979,10 @@ 
$result_trees{'indices_in_begin_tables_lists_entries_after_item'} = {
                   'cmdname' => 'cindex',
                   'extra' => {
                     'element_node' => {},
-                    'index_entry' => {
-                      'entry_element' => {},
-                      'entry_number' => 6,
-                      'in_code' => 0,
-                      'index_name' => 'cp'
-                    }
+                    'index_entry' => [
+                      'cp',
+                      6
+                    ]
                   },
                   'info' => {
                     'spaces_before_argument' => {
@@ -1110,12 +1098,10 @@ 
$result_trees{'indices_in_begin_tables_lists_entries_after_item'} = {
                   'cmdname' => 'cindex',
                   'extra' => {
                     'element_node' => {},
-                    'index_entry' => {
-                      'entry_element' => {},
-                      'entry_number' => 7,
-                      'in_code' => 0,
-                      'index_name' => 'cp'
-                    }
+                    'index_entry' => [
+                      'cp',
+                      7
+                    ]
                   },
                   'info' => {
                     'spaces_before_argument' => {
@@ -1266,12 +1252,10 @@ 
$result_trees{'indices_in_begin_tables_lists_entries_after_item'} = {
                   'cmdname' => 'cindex',
                   'extra' => {
                     'element_node' => {},
-                    'index_entry' => {
-                      'entry_element' => {},
-                      'entry_number' => 8,
-                      'in_code' => 0,
-                      'index_name' => 'cp'
-                    }
+                    'index_entry' => [
+                      'cp',
+                      8
+                    ]
                   },
                   'info' => {
                     'spaces_before_argument' => {
@@ -1397,12 +1381,10 @@ 
$result_trees{'indices_in_begin_tables_lists_entries_after_item'} = {
                   'cmdname' => 'cindex',
                   'extra' => {
                     'element_node' => {},
-                    'index_entry' => {
-                      'entry_element' => {},
-                      'entry_number' => 9,
-                      'in_code' => 0,
-                      'index_name' => 'cp'
-                    }
+                    'index_entry' => [
+                      'cp',
+                      9
+                    ]
                   },
                   'info' => {
                     'spaces_before_argument' => {
@@ -1446,12 +1428,10 @@ 
$result_trees{'indices_in_begin_tables_lists_entries_after_item'} = {
                   'cmdname' => 'cindex',
                   'extra' => {
                     'element_node' => {},
-                    'index_entry' => {
-                      'entry_element' => {},
-                      'entry_number' => 10,
-                      'in_code' => 0,
-                      'index_name' => 'cp'
-                    }
+                    'index_entry' => [
+                      'cp',
+                      10
+                    ]
                   },
                   'info' => {
                     'spaces_before_argument' => {
@@ -1485,12 +1465,10 @@ 
$result_trees{'indices_in_begin_tables_lists_entries_after_item'} = {
                   'cmdname' => 'cindex',
                   'extra' => {
                     'element_node' => {},
-                    'index_entry' => {
-                      'entry_element' => {},
-                      'entry_number' => 11,
-                      'in_code' => 0,
-                      'index_name' => 'cp'
-                    }
+                    'index_entry' => [
+                      'cp',
+                      11
+                    ]
                   },
                   'info' => {
                     'spaces_before_argument' => {
@@ -1629,12 +1607,10 @@ 
$result_trees{'indices_in_begin_tables_lists_entries_after_item'} = {
                       'cmdname' => 'item',
                       'extra' => {
                         'element_node' => {},
-                        'index_entry' => {
-                          'entry_element' => {},
-                          'entry_number' => 1,
-                          'in_code' => 1,
-                          'index_name' => 'vr'
-                        }
+                        'index_entry' => [
+                          'vr',
+                          1
+                        ]
                       },
                       'info' => {
                         'spaces_before_argument' => {
@@ -1768,12 +1744,10 @@ 
$result_trees{'indices_in_begin_tables_lists_entries_after_item'} = {
                       'cmdname' => 'item',
                       'extra' => {
                         'element_node' => {},
-                        'index_entry' => {
-                          'entry_element' => {},
-                          'entry_number' => 2,
-                          'in_code' => 1,
-                          'index_name' => 'vr'
-                        }
+                        'index_entry' => [
+                          'vr',
+                          2
+                        ]
                       },
                       'info' => {
                         'spaces_before_argument' => {
@@ -1821,12 +1795,10 @@ 
$result_trees{'indices_in_begin_tables_lists_entries_after_item'} = {
                       'cmdname' => 'itemx',
                       'extra' => {
                         'element_node' => {},
-                        'index_entry' => {
-                          'entry_element' => {},
-                          'entry_number' => 3,
-                          'in_code' => 1,
-                          'index_name' => 'vr'
-                        }
+                        'index_entry' => [
+                          'vr',
+                          3
+                        ]
                       },
                       'info' => {
                         'spaces_before_argument' => {
@@ -1960,12 +1932,10 @@ 
$result_trees{'indices_in_begin_tables_lists_entries_after_item'} = {
                       'cmdname' => 'item',
                       'extra' => {
                         'element_node' => {},
-                        'index_entry' => {
-                          'entry_element' => {},
-                          'entry_number' => 1,
-                          'in_code' => 1,
-                          'index_name' => 'fn'
-                        }
+                        'index_entry' => [
+                          'fn',
+                          1
+                        ]
                       },
                       'info' => {
                         'spaces_before_argument' => {
@@ -2000,12 +1970,10 @@ 
$result_trees{'indices_in_begin_tables_lists_entries_after_item'} = {
                           'cmdname' => 'cindex',
                           'extra' => {
                             'element_node' => {},
-                            'index_entry' => {
-                              'entry_element' => {},
-                              'entry_number' => 12,
-                              'in_code' => 0,
-                              'index_name' => 'cp'
-                            }
+                            'index_entry' => [
+                              'cp',
+                              12
+                            ]
                           },
                           'info' => {
                             'spaces_before_argument' => {
@@ -2062,12 +2030,10 @@ 
$result_trees{'indices_in_begin_tables_lists_entries_after_item'} = {
                       'cmdname' => 'itemx',
                       'extra' => {
                         'element_node' => {},
-                        'index_entry' => {
-                          'entry_element' => {},
-                          'entry_number' => 2,
-                          'in_code' => 1,
-                          'index_name' => 'fn'
-                        }
+                        'index_entry' => [
+                          'fn',
+                          2
+                        ]
                       },
                       'info' => {
                         'spaces_before_argument' => {
@@ -2124,12 +2090,10 @@ 
$result_trees{'indices_in_begin_tables_lists_entries_after_item'} = {
                       'cmdname' => 'item',
                       'extra' => {
                         'element_node' => {},
-                        'index_entry' => {
-                          'entry_element' => {},
-                          'entry_number' => 3,
-                          'in_code' => 1,
-                          'index_name' => 'fn'
-                        }
+                        'index_entry' => [
+                          'fn',
+                          3
+                        ]
                       },
                       'info' => {
                         'spaces_before_argument' => {
@@ -2187,12 +2151,10 @@ 
$result_trees{'indices_in_begin_tables_lists_entries_after_item'} = {
                       'cmdname' => 'itemx',
                       'extra' => {
                         'element_node' => {},
-                        'index_entry' => {
-                          'entry_element' => {},
-                          'entry_number' => 4,
-                          'in_code' => 1,
-                          'index_name' => 'fn'
-                        }
+                        'index_entry' => [
+                          'fn',
+                          4
+                        ]
                       },
                       'info' => {
                         'spaces_before_argument' => {
@@ -2332,12 +2294,10 @@ 
$result_trees{'indices_in_begin_tables_lists_entries_after_item'} = {
                       'cmdname' => 'cindex',
                       'extra' => {
                         'element_node' => {},
-                        'index_entry' => {
-                          'entry_element' => {},
-                          'entry_number' => 13,
-                          'in_code' => 0,
-                          'index_name' => 'cp'
-                        }
+                        'index_entry' => [
+                          'cp',
+                          13
+                        ]
                       },
                       'info' => {
                         'spaces_before_argument' => {
@@ -2509,12 +2469,10 @@ 
$result_trees{'indices_in_begin_tables_lists_entries_after_item'} = {
                   'cmdname' => 'cindex',
                   'extra' => {
                     'element_node' => {},
-                    'index_entry' => {
-                      'entry_element' => {},
-                      'entry_number' => 14,
-                      'in_code' => 0,
-                      'index_name' => 'cp'
-                    }
+                    'index_entry' => [
+                      'cp',
+                      14
+                    ]
                   },
                   'info' => {
                     'spaces_before_argument' => {
@@ -2680,12 +2638,10 @@ 
$result_trees{'indices_in_begin_tables_lists_entries_after_item'} = {
                       'cmdname' => 'cindex',
                       'extra' => {
                         'element_node' => {},
-                        'index_entry' => {
-                          'entry_element' => {},
-                          'entry_number' => 15,
-                          'in_code' => 0,
-                          'index_name' => 'cp'
-                        }
+                        'index_entry' => [
+                          'cp',
+                          15
+                        ]
                       },
                       'info' => {
                         'spaces_before_argument' => {
@@ -2857,12 +2813,10 @@ 
$result_trees{'indices_in_begin_tables_lists_entries_after_item'} = {
                   'cmdname' => 'cindex',
                   'extra' => {
                     'element_node' => {},
-                    'index_entry' => {
-                      'entry_element' => {},
-                      'entry_number' => 16,
-                      'in_code' => 0,
-                      'index_name' => 'cp'
-                    }
+                    'index_entry' => [
+                      'cp',
+                      16
+                    ]
                   },
                   'info' => {
                     'spaces_before_argument' => {
@@ -3031,12 +2985,10 @@ 
$result_trees{'indices_in_begin_tables_lists_entries_after_item'} = {
                   'cmdname' => 'cindex',
                   'extra' => {
                     'element_node' => {},
-                    'index_entry' => {
-                      'entry_element' => {},
-                      'entry_number' => 17,
-                      'in_code' => 0,
-                      'index_name' => 'cp'
-                    }
+                    'index_entry' => [
+                      'cp',
+                      17
+                    ]
                   },
                   'info' => {
                     'spaces_before_argument' => {
@@ -3196,12 +3148,10 @@ 
$result_trees{'indices_in_begin_tables_lists_entries_after_item'} = {
                   'cmdname' => 'cindex',
                   'extra' => {
                     'element_node' => {},
-                    'index_entry' => {
-                      'entry_element' => {},
-                      'entry_number' => 18,
-                      'in_code' => 0,
-                      'index_name' => 'cp'
-                    }
+                    'index_entry' => [
+                      'cp',
+                      18
+                    ]
                   },
                   'info' => {
                     'spaces_before_argument' => {
@@ -3373,12 +3323,10 @@ 
$result_trees{'indices_in_begin_tables_lists_entries_after_item'} = {
                       'cmdname' => 'cindex',
                       'extra' => {
                         'element_node' => {},
-                        'index_entry' => {
-                          'entry_element' => {},
-                          'entry_number' => 19,
-                          'in_code' => 0,
-                          'index_name' => 'cp'
-                        }
+                        'index_entry' => [
+                          'cp',
+                          19
+                        ]
                       },
                       'info' => {
                         'spaces_before_argument' => {
@@ -3528,12 +3476,10 @@ 
$result_trees{'indices_in_begin_tables_lists_entries_after_item'} = {
                       'cmdname' => 'cindex',
                       'extra' => {
                         'element_node' => {},
-                        'index_entry' => {
-                          'entry_element' => {},
-                          'entry_number' => 20,
-                          'in_code' => 0,
-                          'index_name' => 'cp'
-                        }
+                        'index_entry' => [
+                          'cp',
+                          20
+                        ]
                       },
                       'info' => {
                         'spaces_before_argument' => {
@@ -3577,12 +3523,10 @@ 
$result_trees{'indices_in_begin_tables_lists_entries_after_item'} = {
                       'cmdname' => 'cindex',
                       'extra' => {
                         'element_node' => {},
-                        'index_entry' => {
-                          'entry_element' => {},
-                          'entry_number' => 21,
-                          'in_code' => 0,
-                          'index_name' => 'cp'
-                        }
+                        'index_entry' => [
+                          'cp',
+                          21
+                        ]
                       },
                       'info' => {
                         'spaces_before_argument' => {
@@ -3616,12 +3560,10 @@ 
$result_trees{'indices_in_begin_tables_lists_entries_after_item'} = {
                       'cmdname' => 'cindex',
                       'extra' => {
                         'element_node' => {},
-                        'index_entry' => {
-                          'entry_element' => {},
-                          'entry_number' => 22,
-                          'in_code' => 0,
-                          'index_name' => 'cp'
-                        }
+                        'index_entry' => [
+                          'cp',
+                          22
+                        ]
                       },
                       'info' => {
                         'spaces_before_argument' => {
@@ -3936,76 +3878,47 @@ 
$result_trees{'indices_in_begin_tables_lists_entries_after_item'} = {
   'type' => 'document_root'
 };
 
$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'}{'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'}{'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'}{'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'}{'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'}{'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'}{'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'}{'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'}{'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'}{'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'}{'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'}{'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'}{'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'}{'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'}{'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'}{'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'}{'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'}{'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'}{'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'}{'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'}{'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'}{'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'}{'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'}{'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'}{'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'}{'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'}{'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'}{'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'}{'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_texis{'indices_in_begin_tables_lists_entries_after_item'} = '\\input 
texinfo.tex
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 b3dbac1b03..873f460a3b 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
@@ -242,12 +242,10 @@ $result_trees{'printindex_merged_indices_code_style'} = {
           'cmdname' => 'cindex',
           'extra' => {
             'element_node' => {},
-            'index_entry' => {
-              'entry_element' => {},
-              'entry_number' => 1,
-              'in_code' => 0,
-              'index_name' => 'cp'
-            }
+            'index_entry' => [
+              'cp',
+              1
+            ]
           },
           'info' => {
             'spaces_before_argument' => {
@@ -286,12 +284,10 @@ $result_trees{'printindex_merged_indices_code_style'} = {
           'cmdname' => 'vindex',
           'extra' => {
             'element_node' => {},
-            'index_entry' => {
-              'entry_element' => {},
-              'entry_number' => 1,
-              'in_code' => 0,
-              'index_name' => 'vr'
-            }
+            'index_entry' => [
+              'vr',
+              1
+            ]
           },
           'info' => {
             'spaces_before_argument' => {
@@ -330,12 +326,10 @@ $result_trees{'printindex_merged_indices_code_style'} = {
           'cmdname' => 'findex',
           'extra' => {
             'element_node' => {},
-            'index_entry' => {
-              'entry_element' => {},
-              'entry_number' => 1,
-              'in_code' => 1,
-              'index_name' => 'fn'
-            }
+            'index_entry' => [
+              'fn',
+              1
+            ]
           },
           'info' => {
             'spaces_before_argument' => {
@@ -453,12 +447,10 @@ $result_trees{'printindex_merged_indices_code_style'} = {
           'cmdname' => 'cdiindex',
           'extra' => {
             'element_node' => {},
-            'index_entry' => {
-              'entry_element' => {},
-              'entry_number' => 1,
-              'in_code' => 0,
-              'index_name' => 'cdi'
-            }
+            'index_entry' => [
+              'cdi',
+              1
+            ]
           },
           'info' => {
             'spaces_before_argument' => {
@@ -576,12 +568,10 @@ $result_trees{'printindex_merged_indices_code_style'} = {
           'cmdname' => 'ddiindex',
           'extra' => {
             'element_node' => {},
-            'index_entry' => {
-              'entry_element' => {},
-              'entry_number' => 1,
-              'in_code' => 1,
-              'index_name' => 'ddi'
-            }
+            'index_entry' => [
+              'ddi',
+              1
+            ]
           },
           'info' => {
             'spaces_before_argument' => {
@@ -651,15 +641,10 @@ $result_trees{'printindex_merged_indices_code_style'} = {
   'type' => 'document_root'
 };
 
$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'}{'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'}{'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'}{'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'}{'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
 @top 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 34ad6783e2..c6c8757ea8 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
@@ -573,12 +573,10 @@ $result_trees{'references_to_top_no_top_output'} = {
           'cmdname' => 'cindex',
           'extra' => {
             'element_node' => {},
-            'index_entry' => {
-              'entry_element' => {},
-              'entry_number' => 1,
-              'in_code' => 0,
-              'index_name' => 'cp'
-            }
+            'index_entry' => [
+              'cp',
+              1
+            ]
           },
           'info' => {
             'spaces_before_argument' => {
@@ -879,12 +877,10 @@ $result_trees{'references_to_top_no_top_output'} = {
           'cmdname' => 'cindex',
           'extra' => {
             'element_node' => {},
-            'index_entry' => {
-              'entry_element' => {},
-              'entry_number' => 2,
-              'in_code' => 0,
-              'index_name' => 'cp'
-            }
+            'index_entry' => [
+              'cp',
+              2
+            ]
           },
           'info' => {
             'spaces_before_argument' => {
@@ -1119,7 +1115,6 @@ 
$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'}{'caption'}
 = 
$result_trees{'references_to_top_no_top_output'}{'contents'}[2]{'contents'}[12]{'contents'}[1];
 
$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'}[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'}[4]{'contents'}[1]{'contents'}[0]{'args'}[0]{'extra'}{'node_content'}[0]
 = 
$result_trees{'references_to_top_no_top_output'}{'contents'}[4]{'contents'}[1]{'contents'}[0]{'args'}[0]{'contents'}[0];
 
$result_trees{'references_to_top_no_top_output'}{'contents'}[4]{'contents'}[1]{'contents'}[2]{'args'}[0]{'extra'}{'node_content'}[0]
 = 
$result_trees{'references_to_top_no_top_output'}{'contents'}[4]{'contents'}[1]{'contents'}[2]{'args'}[0]{'contents'}[0];
 
$result_trees{'references_to_top_no_top_output'}{'contents'}[4]{'contents'}[1]{'contents'}[4]{'args'}[0]{'extra'}{'node_content'}[0]
 = 
$result_trees{'references_to_top_no_top_output'}{'contents'}[4]{'contents'}[1]{'contents'}[4]{'args'}[0]{'contents'}[0];
@@ -1127,7 +1122,6 @@ 
$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]{'args'}[0]{'extra'}{'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]{'args'}[0]{'extra'}{'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'}{'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];
 
$result_trees{'references_to_top_no_top_output'}{'contents'}[4]{'contents'}[7]{'extra'}{'float_section'}
 = $result_trees{'references_to_top_no_top_output'}{'contents'}[4];
diff --git a/tp/t/results/converters_tests/test_deftypefnnewline.pl 
b/tp/t/results/converters_tests/test_deftypefnnewline.pl
index 48e1029676..9e8d5196d5 100644
--- a/tp/t/results/converters_tests/test_deftypefnnewline.pl
+++ b/tp/t/results/converters_tests/test_deftypefnnewline.pl
@@ -289,12 +289,10 @@ $result_trees{'test_deftypefnnewline'} = {
                   'type' => {}
                 },
                 'element_node' => {},
-                'index_entry' => {
-                  'entry_element' => {},
-                  'entry_number' => 1,
-                  'in_code' => 1,
-                  'index_name' => 'fn'
-                },
+                'index_entry' => [
+                  'fn',
+                  1
+                ],
                 'original_def_cmdname' => 'deftypefun'
               },
               'source_info' => {
@@ -425,12 +423,10 @@ $result_trees{'test_deftypefnnewline'} = {
                   'type' => {}
                 },
                 'element_node' => {},
-                'index_entry' => {
-                  'entry_element' => {},
-                  'entry_number' => 2,
-                  'in_code' => 1,
-                  'index_name' => 'fn'
-                },
+                'index_entry' => [
+                  'fn',
+                  2
+                ],
                 'original_def_cmdname' => 'deftypefn'
               },
               'source_info' => {
@@ -606,12 +602,10 @@ $result_trees{'test_deftypefnnewline'} = {
                   'type' => {}
                 },
                 'element_node' => {},
-                'index_entry' => {
-                  'entry_element' => {},
-                  'entry_number' => 3,
-                  'in_code' => 1,
-                  'index_name' => 'fn'
-                },
+                'index_entry' => [
+                  'fn',
+                  3
+                ],
                 'original_def_cmdname' => 'deftypeop'
               },
               'source_info' => {
@@ -774,12 +768,10 @@ $result_trees{'test_deftypefnnewline'} = {
                   'type' => {}
                 },
                 'element_node' => {},
-                'index_entry' => {
-                  'entry_element' => {},
-                  'entry_number' => 4,
-                  'in_code' => 1,
-                  'index_name' => 'fn'
-                },
+                'index_entry' => [
+                  'fn',
+                  4
+                ],
                 'original_def_cmdname' => 'deftypeop'
               },
               'source_info' => {
@@ -942,12 +934,10 @@ $result_trees{'test_deftypefnnewline'} = {
                   'type' => {}
                 },
                 'element_node' => {},
-                'index_entry' => {
-                  'entry_element' => {},
-                  'entry_number' => 1,
-                  'in_code' => 1,
-                  'index_name' => 'vr'
-                },
+                'index_entry' => [
+                  'vr',
+                  1
+                ],
                 'original_def_cmdname' => 'deftypecv'
               },
               'source_info' => {
@@ -1123,12 +1113,10 @@ $result_trees{'test_deftypefnnewline'} = {
                   'type' => {}
                 },
                 'element_node' => {},
-                'index_entry' => {
-                  'entry_element' => {},
-                  'entry_number' => 2,
-                  'in_code' => 1,
-                  'index_name' => 'vr'
-                },
+                'index_entry' => [
+                  'vr',
+                  2
+                ],
                 'original_def_cmdname' => 'deftypecv'
               },
               'source_info' => {
@@ -1245,12 +1233,10 @@ $result_trees{'test_deftypefnnewline'} = {
                   'name' => {}
                 },
                 'element_node' => {},
-                'index_entry' => {
-                  'entry_element' => {},
-                  'entry_number' => 5,
-                  'in_code' => 1,
-                  'index_name' => 'fn'
-                },
+                'index_entry' => [
+                  'fn',
+                  5
+                ],
                 'original_def_cmdname' => 'deffn'
               },
               'source_info' => {
@@ -1438,12 +1424,10 @@ $result_trees{'test_deftypefnnewline'} = {
                   'type' => {}
                 },
                 'element_node' => {},
-                'index_entry' => {
-                  'entry_element' => {},
-                  'entry_number' => 6,
-                  'in_code' => 1,
-                  'index_name' => 'fn'
-                },
+                'index_entry' => [
+                  'fn',
+                  6
+                ],
                 'original_def_cmdname' => 'deftypefun'
               },
               'source_info' => {
@@ -1574,12 +1558,10 @@ $result_trees{'test_deftypefnnewline'} = {
                   'type' => {}
                 },
                 'element_node' => {},
-                'index_entry' => {
-                  'entry_element' => {},
-                  'entry_number' => 7,
-                  'in_code' => 1,
-                  'index_name' => 'fn'
-                },
+                'index_entry' => [
+                  'fn',
+                  7
+                ],
                 'original_def_cmdname' => 'deftypefn'
               },
               'source_info' => {
@@ -1755,12 +1737,10 @@ $result_trees{'test_deftypefnnewline'} = {
                   'type' => {}
                 },
                 'element_node' => {},
-                'index_entry' => {
-                  'entry_element' => {},
-                  'entry_number' => 8,
-                  'in_code' => 1,
-                  'index_name' => 'fn'
-                },
+                'index_entry' => [
+                  'fn',
+                  8
+                ],
                 'original_def_cmdname' => 'deftypeop'
               },
               'source_info' => {
@@ -1923,12 +1903,10 @@ $result_trees{'test_deftypefnnewline'} = {
                   'type' => {}
                 },
                 'element_node' => {},
-                'index_entry' => {
-                  'entry_element' => {},
-                  'entry_number' => 9,
-                  'in_code' => 1,
-                  'index_name' => 'fn'
-                },
+                'index_entry' => [
+                  'fn',
+                  9
+                ],
                 'original_def_cmdname' => 'deftypeop'
               },
               'source_info' => {
@@ -2091,12 +2069,10 @@ $result_trees{'test_deftypefnnewline'} = {
                   'type' => {}
                 },
                 'element_node' => {},
-                'index_entry' => {
-                  'entry_element' => {},
-                  'entry_number' => 3,
-                  'in_code' => 1,
-                  'index_name' => 'vr'
-                },
+                'index_entry' => [
+                  'vr',
+                  3
+                ],
                 'original_def_cmdname' => 'deftypecv'
               },
               'source_info' => {
@@ -2272,12 +2248,10 @@ $result_trees{'test_deftypefnnewline'} = {
                   'type' => {}
                 },
                 'element_node' => {},
-                'index_entry' => {
-                  'entry_element' => {},
-                  'entry_number' => 4,
-                  'in_code' => 1,
-                  'index_name' => 'vr'
-                },
+                'index_entry' => [
+                  'vr',
+                  4
+                ],
                 'original_def_cmdname' => 'deftypecv'
               },
               'source_info' => {
@@ -2394,12 +2368,10 @@ $result_trees{'test_deftypefnnewline'} = {
                   'name' => {}
                 },
                 'element_node' => {},
-                'index_entry' => {
-                  'entry_element' => {},
-                  'entry_number' => 10,
-                  'in_code' => 1,
-                  'index_name' => 'fn'
-                },
+                'index_entry' => [
+                  'fn',
+                  10
+                ],
                 'original_def_cmdname' => 'deffn'
               },
               'source_info' => {
@@ -2488,13 +2460,11 @@ 
$result_trees{'test_deftypefnnewline'}{'contents'}[4]{'contents'}[1]{'contents'}
 
$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'}{'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'}{'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];
 
$result_trees{'test_deftypefnnewline'}{'contents'}[4]{'contents'}[5]{'contents'}[0]{'extra'}{'def_index_ref_element'}{'contents'}[0]
 = 
$result_trees{'test_deftypefnnewline'}{'contents'}[4]{'contents'}[5]{'contents'}[0]{'args'}[0]{'contents'}[6];
@@ -2504,7 +2474,6 @@ 
$result_trees{'test_deftypefnnewline'}{'contents'}[4]{'contents'}[5]{'contents'}
 
$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'}{'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];
 
$result_trees{'test_deftypefnnewline'}{'contents'}[4]{'contents'}[7]{'contents'}[0]{'extra'}{'def_index_ref_element'}{'contents'}[0]
 = 
$result_trees{'test_deftypefnnewline'}{'contents'}[4]{'contents'}[7]{'contents'}[0]{'args'}[0]{'contents'}[6];
@@ -2514,7 +2483,6 @@ 
$result_trees{'test_deftypefnnewline'}{'contents'}[4]{'contents'}[7]{'contents'}
 
$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'}{'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];
 
$result_trees{'test_deftypefnnewline'}{'contents'}[4]{'contents'}[9]{'contents'}[0]{'extra'}{'def_index_ref_element'}{'contents'}[0]
 = 
$result_trees{'test_deftypefnnewline'}{'contents'}[4]{'contents'}[9]{'contents'}[0]{'args'}[0]{'contents'}[6];
@@ -2524,7 +2492,6 @@ 
$result_trees{'test_deftypefnnewline'}{'contents'}[4]{'contents'}[9]{'contents'}
 
$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'}{'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];
 
$result_trees{'test_deftypefnnewline'}{'contents'}[4]{'contents'}[11]{'contents'}[0]{'extra'}{'def_index_ref_element'}{'contents'}[0]
 = 
$result_trees{'test_deftypefnnewline'}{'contents'}[4]{'contents'}[11]{'contents'}[0]{'args'}[0]{'contents'}[6];
@@ -2534,24 +2501,20 @@ 
$result_trees{'test_deftypefnnewline'}{'contents'}[4]{'contents'}[11]{'contents'
 
$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'}{'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'}{'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'}{'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'}{'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];
 
$result_trees{'test_deftypefnnewline'}{'contents'}[4]{'contents'}[21]{'contents'}[0]{'extra'}{'def_index_ref_element'}{'contents'}[0]
 = 
$result_trees{'test_deftypefnnewline'}{'contents'}[4]{'contents'}[21]{'contents'}[0]{'args'}[0]{'contents'}[6];
@@ -2561,7 +2524,6 @@ 
$result_trees{'test_deftypefnnewline'}{'contents'}[4]{'contents'}[21]{'contents'
 
$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'}{'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];
 
$result_trees{'test_deftypefnnewline'}{'contents'}[4]{'contents'}[23]{'contents'}[0]{'extra'}{'def_index_ref_element'}{'contents'}[0]
 = 
$result_trees{'test_deftypefnnewline'}{'contents'}[4]{'contents'}[23]{'contents'}[0]{'args'}[0]{'contents'}[6];
@@ -2571,7 +2533,6 @@ 
$result_trees{'test_deftypefnnewline'}{'contents'}[4]{'contents'}[23]{'contents'
 
$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'}{'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];
 
$result_trees{'test_deftypefnnewline'}{'contents'}[4]{'contents'}[25]{'contents'}[0]{'extra'}{'def_index_ref_element'}{'contents'}[0]
 = 
$result_trees{'test_deftypefnnewline'}{'contents'}[4]{'contents'}[25]{'contents'}[0]{'args'}[0]{'contents'}[6];
@@ -2581,7 +2542,6 @@ 
$result_trees{'test_deftypefnnewline'}{'contents'}[4]{'contents'}[25]{'contents'
 
$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'}{'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];
 
$result_trees{'test_deftypefnnewline'}{'contents'}[4]{'contents'}[27]{'contents'}[0]{'extra'}{'def_index_ref_element'}{'contents'}[0]
 = 
$result_trees{'test_deftypefnnewline'}{'contents'}[4]{'contents'}[27]{'contents'}[0]{'args'}[0]{'contents'}[6];
@@ -2591,12 +2551,10 @@ 
$result_trees{'test_deftypefnnewline'}{'contents'}[4]{'contents'}[27]{'contents'
 
$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'}{'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'}{'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/converters_tests/things_before_setfilename.pl 
b/tp/t/results/converters_tests/things_before_setfilename.pl
index 3f13341982..9b3da41a3b 100644
--- a/tp/t/results/converters_tests/things_before_setfilename.pl
+++ b/tp/t/results/converters_tests/things_before_setfilename.pl
@@ -653,12 +653,10 @@ $result_trees{'things_before_setfilename'} = {
               ],
               'cmdname' => 'cindex',
               'extra' => {
-                'index_entry' => {
-                  'entry_element' => {},
-                  'entry_number' => 1,
-                  'in_code' => 0,
-                  'index_name' => 'cp'
-                }
+                'index_entry' => [
+                  'cp',
+                  1
+                ]
               },
               'info' => {
                 'spaces_before_argument' => {
@@ -1033,7 +1031,6 @@ 
$result_trees{'things_before_setfilename'}{'contents'}[0]{'contents'}[0]{'conten
 
$result_trees{'things_before_setfilename'}{'contents'}[0]{'contents'}[0]{'contents'}[14]{'contents'}[2]{'extra'}{'float'}
 = 
$result_trees{'things_before_setfilename'}{'contents'}[0]{'contents'}[0]{'contents'}[14];
 
$result_trees{'things_before_setfilename'}{'contents'}[0]{'contents'}[0]{'contents'}[14]{'extra'}{'caption'}
 = 
$result_trees{'things_before_setfilename'}{'contents'}[0]{'contents'}[0]{'contents'}[14]{'contents'}[2];
 
$result_trees{'things_before_setfilename'}{'contents'}[0]{'contents'}[0]{'contents'}[18]{'contents'}[0]{'contents'}[1]{'extra'}{'node_content'}[0]
 = 
$result_trees{'things_before_setfilename'}{'contents'}[0]{'contents'}[0]{'contents'}[18]{'contents'}[0]{'contents'}[1]{'contents'}[0];
-$result_trees{'things_before_setfilename'}{'contents'}[0]{'contents'}[0]{'contents'}[20]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'things_before_setfilename'}{'contents'}[0]{'contents'}[0]{'contents'}[20];
 
$result_trees{'things_before_setfilename'}{'contents'}[4]{'contents'}[1]{'contents'}[1]{'args'}[0]{'extra'}{'node_content'}[0]
 = 
$result_trees{'things_before_setfilename'}{'contents'}[4]{'contents'}[1]{'contents'}[1]{'args'}[0]{'contents'}[0];
 
$result_trees{'things_before_setfilename'}{'contents'}[4]{'contents'}[3]{'contents'}[1]{'args'}[0]{'extra'}{'node_content'}[0]
 = 
$result_trees{'things_before_setfilename'}{'contents'}[4]{'contents'}[3]{'contents'}[1]{'args'}[0]{'contents'}[0];
 
diff --git 
a/tp/t/results/converters_tests/things_before_setfilename_no_element.pl 
b/tp/t/results/converters_tests/things_before_setfilename_no_element.pl
index ad84ce6672..266553698c 100644
--- a/tp/t/results/converters_tests/things_before_setfilename_no_element.pl
+++ b/tp/t/results/converters_tests/things_before_setfilename_no_element.pl
@@ -653,12 +653,10 @@ $result_trees{'things_before_setfilename_no_element'} = {
               ],
               'cmdname' => 'cindex',
               'extra' => {
-                'index_entry' => {
-                  'entry_element' => {},
-                  'entry_number' => 1,
-                  'in_code' => 0,
-                  'index_name' => 'cp'
-                }
+                'index_entry' => [
+                  'cp',
+                  1
+                ]
               },
               'info' => {
                 'spaces_before_argument' => {
@@ -895,7 +893,6 @@ 
$result_trees{'things_before_setfilename_no_element'}{'contents'}[0]{'contents'}
 
$result_trees{'things_before_setfilename_no_element'}{'contents'}[0]{'contents'}[0]{'contents'}[14]{'contents'}[2]{'extra'}{'float'}
 = 
$result_trees{'things_before_setfilename_no_element'}{'contents'}[0]{'contents'}[0]{'contents'}[14];
 
$result_trees{'things_before_setfilename_no_element'}{'contents'}[0]{'contents'}[0]{'contents'}[14]{'extra'}{'caption'}
 = 
$result_trees{'things_before_setfilename_no_element'}{'contents'}[0]{'contents'}[0]{'contents'}[14]{'contents'}[2];
 
$result_trees{'things_before_setfilename_no_element'}{'contents'}[0]{'contents'}[0]{'contents'}[18]{'contents'}[0]{'contents'}[1]{'extra'}{'node_content'}[0]
 = 
$result_trees{'things_before_setfilename_no_element'}{'contents'}[0]{'contents'}[0]{'contents'}[18]{'contents'}[0]{'contents'}[1]{'contents'}[0];
-$result_trees{'things_before_setfilename_no_element'}{'contents'}[0]{'contents'}[0]{'contents'}[20]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'things_before_setfilename_no_element'}{'contents'}[0]{'contents'}[0]{'contents'}[20];
 
$result_trees{'things_before_setfilename_no_element'}{'contents'}[0]{'contents'}[2]{'contents'}[1]{'args'}[0]{'extra'}{'node_content'}[0]
 = 
$result_trees{'things_before_setfilename_no_element'}{'contents'}[0]{'contents'}[2]{'contents'}[1]{'args'}[0]{'contents'}[0];
 
$result_trees{'things_before_setfilename_no_element'}{'contents'}[0]{'contents'}[4]{'contents'}[1]{'args'}[0]{'extra'}{'node_content'}[0]
 = 
$result_trees{'things_before_setfilename_no_element'}{'contents'}[0]{'contents'}[4]{'contents'}[1]{'args'}[0]{'contents'}[0];
 
diff --git a/tp/t/results/coverage/commands.pl 
b/tp/t/results/coverage/commands.pl
index f24e534387..5cc09e5300 100644
--- a/tp/t/results/coverage/commands.pl
+++ b/tp/t/results/coverage/commands.pl
@@ -317,12 +317,10 @@ $result_trees{'commands'} = {
           ],
           'cmdname' => 'cindex',
           'extra' => {
-            'index_entry' => {
-              'entry_element' => {},
-              'entry_number' => 1,
-              'in_code' => 0,
-              'index_name' => 'cp'
-            }
+            'index_entry' => [
+              'cp',
+              1
+            ]
           },
           'info' => {
             'spaces_before_argument' => {
@@ -394,7 +392,6 @@ $result_trees{'commands'} = {
   ],
   'type' => 'document_root'
 };
-$result_trees{'commands'}{'contents'}[0]{'contents'}[4]{'extra'}{'index_entry'}{'entry_element'}
 = $result_trees{'commands'}{'contents'}[0]{'contents'}[4];
 
 $result_texis{'commands'} = '@@ @TeX{} @
 @"e @^{@dotless{i}} @~{a} @ringaccent a
diff --git a/tp/t/results/coverage/def.pl b/tp/t/results/coverage/def.pl
index 9df5725023..8ff713573d 100644
--- a/tp/t/results/coverage/def.pl
+++ b/tp/t/results/coverage/def.pl
@@ -80,12 +80,10 @@ $result_trees{'def'} = {
                   'category' => {},
                   'name' => {}
                 },
-                'index_entry' => {
-                  'entry_element' => {},
-                  'entry_number' => 1,
-                  'in_code' => 1,
-                  'index_name' => 'fn'
-                },
+                'index_entry' => [
+                  'fn',
+                  1
+                ],
                 'original_def_cmdname' => 'deffn'
               },
               'source_info' => {
@@ -299,12 +297,10 @@ $result_trees{'def'} = {
                   'category' => {},
                   'name' => {}
                 },
-                'index_entry' => {
-                  'entry_element' => {},
-                  'entry_number' => 2,
-                  'in_code' => 1,
-                  'index_name' => 'fn'
-                },
+                'index_entry' => [
+                  'fn',
+                  2
+                ],
                 'original_def_cmdname' => 'deffn'
               },
               'source_info' => {
@@ -461,12 +457,10 @@ $result_trees{'def'} = {
                   'category' => {},
                   'name' => {}
                 },
-                'index_entry' => {
-                  'entry_element' => {},
-                  'entry_number' => 3,
-                  'in_code' => 1,
-                  'index_name' => 'fn'
-                },
+                'index_entry' => [
+                  'fn',
+                  3
+                ],
                 'original_def_cmdname' => 'deffn'
               },
               'source_info' => {
@@ -545,12 +539,10 @@ $result_trees{'def'} = {
                   'category' => {},
                   'name' => {}
                 },
-                'index_entry' => {
-                  'entry_element' => {},
-                  'entry_number' => 4,
-                  'in_code' => 1,
-                  'index_name' => 'fn'
-                },
+                'index_entry' => [
+                  'fn',
+                  4
+                ],
                 'original_def_cmdname' => 'deffnx'
               },
               'info' => {
@@ -634,12 +626,10 @@ $result_trees{'def'} = {
                   'category' => {},
                   'name' => {}
                 },
-                'index_entry' => {
-                  'entry_element' => {},
-                  'entry_number' => 5,
-                  'in_code' => 1,
-                  'index_name' => 'fn'
-                },
+                'index_entry' => [
+                  'fn',
+                  5
+                ],
                 'original_def_cmdname' => 'deffnx'
               },
               'info' => {
@@ -728,12 +718,10 @@ $result_trees{'def'} = {
                   'category' => {},
                   'name' => {}
                 },
-                'index_entry' => {
-                  'entry_element' => {},
-                  'entry_number' => 6,
-                  'in_code' => 1,
-                  'index_name' => 'fn'
-                },
+                'index_entry' => [
+                  'fn',
+                  6
+                ],
                 'original_def_cmdname' => 'deffnx'
               },
               'info' => {
@@ -822,12 +810,10 @@ $result_trees{'def'} = {
                   'category' => {},
                   'name' => {}
                 },
-                'index_entry' => {
-                  'entry_element' => {},
-                  'entry_number' => 7,
-                  'in_code' => 1,
-                  'index_name' => 'fn'
-                },
+                'index_entry' => [
+                  'fn',
+                  7
+                ],
                 'original_def_cmdname' => 'deffnx'
               },
               'info' => {
@@ -911,12 +897,10 @@ $result_trees{'def'} = {
                   'category' => {},
                   'name' => {}
                 },
-                'index_entry' => {
-                  'entry_element' => {},
-                  'entry_number' => 8,
-                  'in_code' => 1,
-                  'index_name' => 'fn'
-                },
+                'index_entry' => [
+                  'fn',
+                  8
+                ],
                 'original_def_cmdname' => 'deffnx'
               },
               'info' => {
@@ -1021,12 +1005,10 @@ $result_trees{'def'} = {
                   'category' => {},
                   'name' => {}
                 },
-                'index_entry' => {
-                  'entry_element' => {},
-                  'entry_number' => 9,
-                  'in_code' => 1,
-                  'index_name' => 'fn'
-                },
+                'index_entry' => [
+                  'fn',
+                  9
+                ],
                 'original_def_cmdname' => 'deffnx'
               },
               'info' => {
@@ -1087,12 +1069,10 @@ $result_trees{'def'} = {
                   'category' => {},
                   'name' => {}
                 },
-                'index_entry' => {
-                  'entry_element' => {},
-                  'entry_number' => 10,
-                  'in_code' => 1,
-                  'index_name' => 'fn'
-                },
+                'index_entry' => [
+                  'fn',
+                  10
+                ],
                 'original_def_cmdname' => 'deffnx'
               },
               'source_info' => {
@@ -1158,12 +1138,10 @@ $result_trees{'def'} = {
                   'category' => {},
                   'name' => {}
                 },
-                'index_entry' => {
-                  'entry_element' => {},
-                  'entry_number' => 11,
-                  'in_code' => 1,
-                  'index_name' => 'fn'
-                },
+                'index_entry' => [
+                  'fn',
+                  11
+                ],
                 'original_def_cmdname' => 'deffnx'
               },
               'source_info' => {
@@ -1224,12 +1202,10 @@ $result_trees{'def'} = {
                   'category' => {},
                   'name' => {}
                 },
-                'index_entry' => {
-                  'entry_element' => {},
-                  'entry_number' => 12,
-                  'in_code' => 1,
-                  'index_name' => 'fn'
-                },
+                'index_entry' => [
+                  'fn',
+                  12
+                ],
                 'original_def_cmdname' => 'deffnx'
               },
               'source_info' => {
@@ -1329,12 +1305,10 @@ $result_trees{'def'} = {
                   'category' => {},
                   'name' => {}
                 },
-                'index_entry' => {
-                  'entry_element' => {},
-                  'entry_number' => 13,
-                  'in_code' => 1,
-                  'index_name' => 'fn'
-                },
+                'index_entry' => [
+                  'fn',
+                  13
+                ],
                 'original_def_cmdname' => 'deffnx'
               },
               'info' => {
@@ -1454,12 +1428,10 @@ $result_trees{'def'} = {
                   'category' => {},
                   'name' => {}
                 },
-                'index_entry' => {
-                  'entry_element' => {},
-                  'entry_number' => 14,
-                  'in_code' => 1,
-                  'index_name' => 'fn'
-                },
+                'index_entry' => [
+                  'fn',
+                  14
+                ],
                 'original_def_cmdname' => 'deffnx'
               },
               'info' => {
@@ -1579,12 +1551,10 @@ $result_trees{'def'} = {
                   'category' => {},
                   'name' => {}
                 },
-                'index_entry' => {
-                  'entry_element' => {},
-                  'entry_number' => 15,
-                  'in_code' => 1,
-                  'index_name' => 'fn'
-                },
+                'index_entry' => [
+                  'fn',
+                  15
+                ],
                 'original_def_cmdname' => 'deffnx'
               },
               'info' => {
@@ -1666,63 +1636,48 @@ $result_trees{'def'} = {
 
$result_trees{'def'}{'contents'}[0]{'contents'}[1]{'contents'}[0]{'extra'}{'def_index_element'}
 = 
$result_trees{'def'}{'contents'}[0]{'contents'}[1]{'contents'}[0]{'args'}[0]{'contents'}[2];
 
$result_trees{'def'}{'contents'}[0]{'contents'}[1]{'contents'}[0]{'extra'}{'def_parsed_hash'}{'category'}
 = 
$result_trees{'def'}{'contents'}[0]{'contents'}[1]{'contents'}[0]{'args'}[0]{'contents'}[0];
 
$result_trees{'def'}{'contents'}[0]{'contents'}[1]{'contents'}[0]{'extra'}{'def_parsed_hash'}{'name'}
 = 
$result_trees{'def'}{'contents'}[0]{'contents'}[1]{'contents'}[0]{'args'}[0]{'contents'}[2];
-$result_trees{'def'}{'contents'}[0]{'contents'}[1]{'contents'}[0]{'extra'}{'index_entry'}{'entry_element'}
 = $result_trees{'def'}{'contents'}[0]{'contents'}[1]{'contents'}[0];
 
$result_trees{'def'}{'contents'}[0]{'contents'}[3]{'contents'}[0]{'extra'}{'def_index_element'}
 = 
$result_trees{'def'}{'contents'}[0]{'contents'}[3]{'contents'}[0]{'args'}[0]{'contents'}[2];
 
$result_trees{'def'}{'contents'}[0]{'contents'}[3]{'contents'}[0]{'extra'}{'def_parsed_hash'}{'category'}
 = 
$result_trees{'def'}{'contents'}[0]{'contents'}[3]{'contents'}[0]{'args'}[0]{'contents'}[0];
 
$result_trees{'def'}{'contents'}[0]{'contents'}[3]{'contents'}[0]{'extra'}{'def_parsed_hash'}{'name'}
 = 
$result_trees{'def'}{'contents'}[0]{'contents'}[3]{'contents'}[0]{'args'}[0]{'contents'}[2];
-$result_trees{'def'}{'contents'}[0]{'contents'}[3]{'contents'}[0]{'extra'}{'index_entry'}{'entry_element'}
 = $result_trees{'def'}{'contents'}[0]{'contents'}[3]{'contents'}[0];
 
$result_trees{'def'}{'contents'}[0]{'contents'}[5]{'contents'}[0]{'extra'}{'def_index_element'}
 = 
$result_trees{'def'}{'contents'}[0]{'contents'}[5]{'contents'}[0]{'args'}[0]{'contents'}[2];
 
$result_trees{'def'}{'contents'}[0]{'contents'}[5]{'contents'}[0]{'extra'}{'def_parsed_hash'}{'category'}
 = 
$result_trees{'def'}{'contents'}[0]{'contents'}[5]{'contents'}[0]{'args'}[0]{'contents'}[0];
 
$result_trees{'def'}{'contents'}[0]{'contents'}[5]{'contents'}[0]{'extra'}{'def_parsed_hash'}{'name'}
 = 
$result_trees{'def'}{'contents'}[0]{'contents'}[5]{'contents'}[0]{'args'}[0]{'contents'}[2];
-$result_trees{'def'}{'contents'}[0]{'contents'}[5]{'contents'}[0]{'extra'}{'index_entry'}{'entry_element'}
 = $result_trees{'def'}{'contents'}[0]{'contents'}[5]{'contents'}[0];
 
$result_trees{'def'}{'contents'}[0]{'contents'}[5]{'contents'}[1]{'extra'}{'def_index_element'}
 = 
$result_trees{'def'}{'contents'}[0]{'contents'}[5]{'contents'}[1]{'args'}[0]{'contents'}[2];
 
$result_trees{'def'}{'contents'}[0]{'contents'}[5]{'contents'}[1]{'extra'}{'def_parsed_hash'}{'category'}
 = 
$result_trees{'def'}{'contents'}[0]{'contents'}[5]{'contents'}[1]{'args'}[0]{'contents'}[0];
 
$result_trees{'def'}{'contents'}[0]{'contents'}[5]{'contents'}[1]{'extra'}{'def_parsed_hash'}{'name'}
 = 
$result_trees{'def'}{'contents'}[0]{'contents'}[5]{'contents'}[1]{'args'}[0]{'contents'}[2];
-$result_trees{'def'}{'contents'}[0]{'contents'}[5]{'contents'}[1]{'extra'}{'index_entry'}{'entry_element'}
 = $result_trees{'def'}{'contents'}[0]{'contents'}[5]{'contents'}[1];
 
$result_trees{'def'}{'contents'}[0]{'contents'}[5]{'contents'}[2]{'extra'}{'def_index_element'}
 = 
$result_trees{'def'}{'contents'}[0]{'contents'}[5]{'contents'}[2]{'args'}[0]{'contents'}[2];
 
$result_trees{'def'}{'contents'}[0]{'contents'}[5]{'contents'}[2]{'extra'}{'def_parsed_hash'}{'category'}
 = 
$result_trees{'def'}{'contents'}[0]{'contents'}[5]{'contents'}[2]{'args'}[0]{'contents'}[0];
 
$result_trees{'def'}{'contents'}[0]{'contents'}[5]{'contents'}[2]{'extra'}{'def_parsed_hash'}{'name'}
 = 
$result_trees{'def'}{'contents'}[0]{'contents'}[5]{'contents'}[2]{'args'}[0]{'contents'}[2];
-$result_trees{'def'}{'contents'}[0]{'contents'}[5]{'contents'}[2]{'extra'}{'index_entry'}{'entry_element'}
 = $result_trees{'def'}{'contents'}[0]{'contents'}[5]{'contents'}[2];
 
$result_trees{'def'}{'contents'}[0]{'contents'}[5]{'contents'}[3]{'extra'}{'def_index_element'}
 = 
$result_trees{'def'}{'contents'}[0]{'contents'}[5]{'contents'}[3]{'args'}[0]{'contents'}[2];
 
$result_trees{'def'}{'contents'}[0]{'contents'}[5]{'contents'}[3]{'extra'}{'def_parsed_hash'}{'category'}
 = 
$result_trees{'def'}{'contents'}[0]{'contents'}[5]{'contents'}[3]{'args'}[0]{'contents'}[0];
 
$result_trees{'def'}{'contents'}[0]{'contents'}[5]{'contents'}[3]{'extra'}{'def_parsed_hash'}{'name'}
 = 
$result_trees{'def'}{'contents'}[0]{'contents'}[5]{'contents'}[3]{'args'}[0]{'contents'}[2];
-$result_trees{'def'}{'contents'}[0]{'contents'}[5]{'contents'}[3]{'extra'}{'index_entry'}{'entry_element'}
 = $result_trees{'def'}{'contents'}[0]{'contents'}[5]{'contents'}[3];
 
$result_trees{'def'}{'contents'}[0]{'contents'}[5]{'contents'}[4]{'extra'}{'def_index_element'}
 = 
$result_trees{'def'}{'contents'}[0]{'contents'}[5]{'contents'}[4]{'args'}[0]{'contents'}[2];
 
$result_trees{'def'}{'contents'}[0]{'contents'}[5]{'contents'}[4]{'extra'}{'def_parsed_hash'}{'category'}
 = 
$result_trees{'def'}{'contents'}[0]{'contents'}[5]{'contents'}[4]{'args'}[0]{'contents'}[0];
 
$result_trees{'def'}{'contents'}[0]{'contents'}[5]{'contents'}[4]{'extra'}{'def_parsed_hash'}{'name'}
 = 
$result_trees{'def'}{'contents'}[0]{'contents'}[5]{'contents'}[4]{'args'}[0]{'contents'}[2];
-$result_trees{'def'}{'contents'}[0]{'contents'}[5]{'contents'}[4]{'extra'}{'index_entry'}{'entry_element'}
 = $result_trees{'def'}{'contents'}[0]{'contents'}[5]{'contents'}[4];
 
$result_trees{'def'}{'contents'}[0]{'contents'}[5]{'contents'}[5]{'extra'}{'def_index_element'}
 = 
$result_trees{'def'}{'contents'}[0]{'contents'}[5]{'contents'}[5]{'args'}[0]{'contents'}[2];
 
$result_trees{'def'}{'contents'}[0]{'contents'}[5]{'contents'}[5]{'extra'}{'def_parsed_hash'}{'category'}
 = 
$result_trees{'def'}{'contents'}[0]{'contents'}[5]{'contents'}[5]{'args'}[0]{'contents'}[0];
 
$result_trees{'def'}{'contents'}[0]{'contents'}[5]{'contents'}[5]{'extra'}{'def_parsed_hash'}{'name'}
 = 
$result_trees{'def'}{'contents'}[0]{'contents'}[5]{'contents'}[5]{'args'}[0]{'contents'}[2];
-$result_trees{'def'}{'contents'}[0]{'contents'}[5]{'contents'}[5]{'extra'}{'index_entry'}{'entry_element'}
 = $result_trees{'def'}{'contents'}[0]{'contents'}[5]{'contents'}[5];
 
$result_trees{'def'}{'contents'}[0]{'contents'}[5]{'contents'}[6]{'extra'}{'def_index_element'}
 = 
$result_trees{'def'}{'contents'}[0]{'contents'}[5]{'contents'}[6]{'args'}[0]{'contents'}[2];
 
$result_trees{'def'}{'contents'}[0]{'contents'}[5]{'contents'}[6]{'extra'}{'def_parsed_hash'}{'category'}
 = 
$result_trees{'def'}{'contents'}[0]{'contents'}[5]{'contents'}[6]{'args'}[0]{'contents'}[0];
 
$result_trees{'def'}{'contents'}[0]{'contents'}[5]{'contents'}[6]{'extra'}{'def_parsed_hash'}{'name'}
 = 
$result_trees{'def'}{'contents'}[0]{'contents'}[5]{'contents'}[6]{'args'}[0]{'contents'}[2];
-$result_trees{'def'}{'contents'}[0]{'contents'}[5]{'contents'}[6]{'extra'}{'index_entry'}{'entry_element'}
 = $result_trees{'def'}{'contents'}[0]{'contents'}[5]{'contents'}[6];
 
$result_trees{'def'}{'contents'}[0]{'contents'}[5]{'contents'}[7]{'extra'}{'def_index_element'}
 = 
$result_trees{'def'}{'contents'}[0]{'contents'}[5]{'contents'}[7]{'args'}[0]{'contents'}[2];
 
$result_trees{'def'}{'contents'}[0]{'contents'}[5]{'contents'}[7]{'extra'}{'def_parsed_hash'}{'category'}
 = 
$result_trees{'def'}{'contents'}[0]{'contents'}[5]{'contents'}[7]{'args'}[0]{'contents'}[0];
 
$result_trees{'def'}{'contents'}[0]{'contents'}[5]{'contents'}[7]{'extra'}{'def_parsed_hash'}{'name'}
 = 
$result_trees{'def'}{'contents'}[0]{'contents'}[5]{'contents'}[7]{'args'}[0]{'contents'}[2];
-$result_trees{'def'}{'contents'}[0]{'contents'}[5]{'contents'}[7]{'extra'}{'index_entry'}{'entry_element'}
 = $result_trees{'def'}{'contents'}[0]{'contents'}[5]{'contents'}[7];
 
$result_trees{'def'}{'contents'}[0]{'contents'}[5]{'contents'}[8]{'extra'}{'def_index_element'}
 = 
$result_trees{'def'}{'contents'}[0]{'contents'}[5]{'contents'}[8]{'args'}[0]{'contents'}[2];
 
$result_trees{'def'}{'contents'}[0]{'contents'}[5]{'contents'}[8]{'extra'}{'def_parsed_hash'}{'category'}
 = 
$result_trees{'def'}{'contents'}[0]{'contents'}[5]{'contents'}[8]{'args'}[0]{'contents'}[0];
 
$result_trees{'def'}{'contents'}[0]{'contents'}[5]{'contents'}[8]{'extra'}{'def_parsed_hash'}{'name'}
 = 
$result_trees{'def'}{'contents'}[0]{'contents'}[5]{'contents'}[8]{'args'}[0]{'contents'}[2];
-$result_trees{'def'}{'contents'}[0]{'contents'}[5]{'contents'}[8]{'extra'}{'index_entry'}{'entry_element'}
 = $result_trees{'def'}{'contents'}[0]{'contents'}[5]{'contents'}[8];
 
$result_trees{'def'}{'contents'}[0]{'contents'}[5]{'contents'}[9]{'extra'}{'def_index_element'}
 = 
$result_trees{'def'}{'contents'}[0]{'contents'}[5]{'contents'}[9]{'args'}[0]{'contents'}[2];
 
$result_trees{'def'}{'contents'}[0]{'contents'}[5]{'contents'}[9]{'extra'}{'def_parsed_hash'}{'category'}
 = 
$result_trees{'def'}{'contents'}[0]{'contents'}[5]{'contents'}[9]{'args'}[0]{'contents'}[0];
 
$result_trees{'def'}{'contents'}[0]{'contents'}[5]{'contents'}[9]{'extra'}{'def_parsed_hash'}{'name'}
 = 
$result_trees{'def'}{'contents'}[0]{'contents'}[5]{'contents'}[9]{'args'}[0]{'contents'}[2];
-$result_trees{'def'}{'contents'}[0]{'contents'}[5]{'contents'}[9]{'extra'}{'index_entry'}{'entry_element'}
 = $result_trees{'def'}{'contents'}[0]{'contents'}[5]{'contents'}[9];
 
$result_trees{'def'}{'contents'}[0]{'contents'}[5]{'contents'}[10]{'extra'}{'def_index_element'}
 = 
$result_trees{'def'}{'contents'}[0]{'contents'}[5]{'contents'}[10]{'args'}[0]{'contents'}[2];
 
$result_trees{'def'}{'contents'}[0]{'contents'}[5]{'contents'}[10]{'extra'}{'def_parsed_hash'}{'category'}
 = 
$result_trees{'def'}{'contents'}[0]{'contents'}[5]{'contents'}[10]{'args'}[0]{'contents'}[0];
 
$result_trees{'def'}{'contents'}[0]{'contents'}[5]{'contents'}[10]{'extra'}{'def_parsed_hash'}{'name'}
 = 
$result_trees{'def'}{'contents'}[0]{'contents'}[5]{'contents'}[10]{'args'}[0]{'contents'}[2];
-$result_trees{'def'}{'contents'}[0]{'contents'}[5]{'contents'}[10]{'extra'}{'index_entry'}{'entry_element'}
 = $result_trees{'def'}{'contents'}[0]{'contents'}[5]{'contents'}[10];
 
$result_trees{'def'}{'contents'}[0]{'contents'}[5]{'contents'}[12]{'extra'}{'def_index_element'}
 = 
$result_trees{'def'}{'contents'}[0]{'contents'}[5]{'contents'}[12]{'args'}[0]{'contents'}[2];
 
$result_trees{'def'}{'contents'}[0]{'contents'}[5]{'contents'}[12]{'extra'}{'def_parsed_hash'}{'category'}
 = 
$result_trees{'def'}{'contents'}[0]{'contents'}[5]{'contents'}[12]{'args'}[0]{'contents'}[0];
 
$result_trees{'def'}{'contents'}[0]{'contents'}[5]{'contents'}[12]{'extra'}{'def_parsed_hash'}{'name'}
 = 
$result_trees{'def'}{'contents'}[0]{'contents'}[5]{'contents'}[12]{'args'}[0]{'contents'}[2];
-$result_trees{'def'}{'contents'}[0]{'contents'}[5]{'contents'}[12]{'extra'}{'index_entry'}{'entry_element'}
 = $result_trees{'def'}{'contents'}[0]{'contents'}[5]{'contents'}[12];
 
$result_trees{'def'}{'contents'}[0]{'contents'}[5]{'contents'}[14]{'extra'}{'def_index_element'}
 = 
$result_trees{'def'}{'contents'}[0]{'contents'}[5]{'contents'}[14]{'args'}[0]{'contents'}[2];
 
$result_trees{'def'}{'contents'}[0]{'contents'}[5]{'contents'}[14]{'extra'}{'def_parsed_hash'}{'category'}
 = 
$result_trees{'def'}{'contents'}[0]{'contents'}[5]{'contents'}[14]{'args'}[0]{'contents'}[0];
 
$result_trees{'def'}{'contents'}[0]{'contents'}[5]{'contents'}[14]{'extra'}{'def_parsed_hash'}{'name'}
 = 
$result_trees{'def'}{'contents'}[0]{'contents'}[5]{'contents'}[14]{'args'}[0]{'contents'}[2];
-$result_trees{'def'}{'contents'}[0]{'contents'}[5]{'contents'}[14]{'extra'}{'index_entry'}{'entry_element'}
 = $result_trees{'def'}{'contents'}[0]{'contents'}[5]{'contents'}[14];
 
 $result_texis{'def'} = '
 @deffn {c--ategory} d--effn_name a--rguments...
diff --git a/tp/t/results/coverage/formats_titles.pl 
b/tp/t/results/coverage/formats_titles.pl
index 1174f97578..2ebcd78fc1 100644
--- a/tp/t/results/coverage/formats_titles.pl
+++ b/tp/t/results/coverage/formats_titles.pl
@@ -409,12 +409,10 @@ $result_trees{'formats_titles'} = {
                       ],
                       'cmdname' => 'item',
                       'extra' => {
-                        'index_entry' => {
-                          'entry_element' => {},
-                          'entry_number' => 1,
-                          'in_code' => 1,
-                          'index_name' => 'vr'
-                        }
+                        'index_entry' => [
+                          'vr',
+                          1
+                        ]
                       },
                       'info' => {
                         'spaces_before_argument' => {
@@ -664,7 +662,6 @@ $result_trees{'formats_titles'} = {
 };
 
$result_trees{'formats_titles'}{'contents'}[0]{'contents'}[0]{'extra'}{'command_as_argument'}
 = 
$result_trees{'formats_titles'}{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0];
 
$result_trees{'formats_titles'}{'contents'}[0]{'contents'}[4]{'extra'}{'command_as_argument'}
 = 
$result_trees{'formats_titles'}{'contents'}[0]{'contents'}[4]{'args'}[0]{'contents'}[0];
-$result_trees{'formats_titles'}{'contents'}[0]{'contents'}[6]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'formats_titles'}{'contents'}[0]{'contents'}[6]{'contents'}[1]{'contents'}[0]{'contents'}[0];
 
$result_trees{'formats_titles'}{'contents'}[0]{'contents'}[6]{'extra'}{'command_as_argument'}
 = 
$result_trees{'formats_titles'}{'contents'}[0]{'contents'}[6]{'args'}[0]{'contents'}[0];
 
$result_trees{'formats_titles'}{'contents'}[0]{'contents'}[8]{'extra'}{'columnfractions'}
 = 
$result_trees{'formats_titles'}{'contents'}[0]{'contents'}[8]{'args'}[0]{'contents'}[0];
 
diff --git a/tp/t/results/coverage/multitable.pl 
b/tp/t/results/coverage/multitable.pl
index 120e94f2cd..99e876b07d 100644
--- a/tp/t/results/coverage/multitable.pl
+++ b/tp/t/results/coverage/multitable.pl
@@ -256,12 +256,10 @@ $result_trees{'multitable'} = {
                           ],
                           'cmdname' => 'cindex',
                           'extra' => {
-                            'index_entry' => {
-                              'entry_element' => {},
-                              'entry_number' => 1,
-                              'in_code' => 0,
-                              'index_name' => 'cp'
-                            }
+                            'index_entry' => [
+                              'cp',
+                              1
+                            ]
                           },
                           'info' => {
                             'spaces_before_argument' => {
@@ -547,7 +545,6 @@ $result_trees{'multitable'} = {
   ],
   'type' => 'document_root'
 };
-$result_trees{'multitable'}{'contents'}[0]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[2]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'multitable'}{'contents'}[0]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[2];
 
$result_trees{'multitable'}{'contents'}[0]{'contents'}[1]{'extra'}{'columnfractions'}
 = 
$result_trees{'multitable'}{'contents'}[0]{'contents'}[1]{'args'}[0]{'contents'}[0];
 
$result_trees{'multitable'}{'contents'}[0]{'contents'}[3]{'extra'}{'prototypes'}[0]{'contents'}[0]
 = 
$result_trees{'multitable'}{'contents'}[0]{'contents'}[3]{'args'}[0]{'contents'}[0]{'contents'}[0];
 
$result_trees{'multitable'}{'contents'}[0]{'contents'}[3]{'extra'}{'prototypes'}[1]{'contents'}[0]
 = 
$result_trees{'multitable'}{'contents'}[0]{'contents'}[3]{'args'}[0]{'contents'}[2]{'contents'}[0];
diff --git a/tp/t/results/coverage/preformatted.pl 
b/tp/t/results/coverage/preformatted.pl
index 90485df3d5..3ce5935653 100644
--- a/tp/t/results/coverage/preformatted.pl
+++ b/tp/t/results/coverage/preformatted.pl
@@ -152,12 +152,10 @@ $result_trees{'preformatted'} = {
                           ],
                           'cmdname' => 'item',
                           'extra' => {
-                            'index_entry' => {
-                              'entry_element' => {},
-                              'entry_number' => 1,
-                              'in_code' => 1,
-                              'index_name' => 'vr'
-                            }
+                            'index_entry' => [
+                              'vr',
+                              1
+                            ]
                           },
                           'info' => {
                             'spaces_before_argument' => {
@@ -287,7 +285,6 @@ $result_trees{'preformatted'} = {
   ],
   'type' => 'document_root'
 };
-$result_trees{'preformatted'}{'contents'}[0]{'contents'}[3]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'preformatted'}{'contents'}[0]{'contents'}[3]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[0];
 
$result_trees{'preformatted'}{'contents'}[0]{'contents'}[3]{'contents'}[0]{'extra'}{'command_as_argument'}
 = 
$result_trees{'preformatted'}{'contents'}[0]{'contents'}[3]{'contents'}[0]{'args'}[0]{'contents'}[0];
 
 $result_texis{'preformatted'} = '
diff --git a/tp/t/results/coverage/punctuation_in_line_commands.pl 
b/tp/t/results/coverage/punctuation_in_line_commands.pl
index 9632bc0170..48cf81b7a2 100644
--- a/tp/t/results/coverage/punctuation_in_line_commands.pl
+++ b/tp/t/results/coverage/punctuation_in_line_commands.pl
@@ -603,12 +603,10 @@ $result_trees{'punctuation_in_line_commands'} = {
           'cmdname' => 'cindex',
           'extra' => {
             'element_node' => {},
-            'index_entry' => {
-              'entry_element' => {},
-              'entry_number' => 1,
-              'in_code' => 0,
-              'index_name' => 'cp'
-            }
+            'index_entry' => [
+              'cp',
+              1
+            ]
           },
           'info' => {
             'spaces_before_argument' => {
@@ -805,7 +803,6 @@ 
$result_trees{'punctuation_in_line_commands'}{'contents'}[2]{'contents'}[7]{'con
 
$result_trees{'punctuation_in_line_commands'}{'contents'}[2]{'contents'}[7]{'extra'}{'caption'}
 = 
$result_trees{'punctuation_in_line_commands'}{'contents'}[2]{'contents'}[7]{'contents'}[1];
 
$result_trees{'punctuation_in_line_commands'}{'contents'}[2]{'contents'}[7]{'extra'}{'float_section'}
 = $result_trees{'punctuation_in_line_commands'}{'contents'}[2];
 
$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'} = '
 @node node! After punc
diff --git a/tp/t/results/coverage/table.pl b/tp/t/results/coverage/table.pl
index 5516b934ee..6de24c6043 100644
--- a/tp/t/results/coverage/table.pl
+++ b/tp/t/results/coverage/table.pl
@@ -240,12 +240,10 @@ $result_trees{'table'} = {
                   ],
                   'cmdname' => 'cindex',
                   'extra' => {
-                    'index_entry' => {
-                      'entry_element' => {},
-                      'entry_number' => 1,
-                      'in_code' => 0,
-                      'index_name' => 'cp'
-                    }
+                    'index_entry' => [
+                      'cp',
+                      1
+                    ]
                   },
                   'info' => {
                     'spaces_before_argument' => {
@@ -290,12 +288,10 @@ $result_trees{'table'} = {
                       ],
                       'cmdname' => 'item',
                       'extra' => {
-                        'index_entry' => {
-                          'entry_element' => {},
-                          'entry_number' => 1,
-                          'in_code' => 1,
-                          'index_name' => 'vr'
-                        }
+                        'index_entry' => [
+                          'vr',
+                          1
+                        ]
                       },
                       'info' => {
                         'spaces_before_argument' => {
@@ -342,12 +338,10 @@ $result_trees{'table'} = {
                       ],
                       'cmdname' => 'kindex',
                       'extra' => {
-                        'index_entry' => {
-                          'entry_element' => {},
-                          'entry_number' => 1,
-                          'in_code' => 1,
-                          'index_name' => 'ky'
-                        }
+                        'index_entry' => [
+                          'ky',
+                          1
+                        ]
                       },
                       'info' => {
                         'spaces_before_argument' => {
@@ -389,12 +383,10 @@ $result_trees{'table'} = {
                       ],
                       'cmdname' => 'itemx',
                       'extra' => {
-                        'index_entry' => {
-                          'entry_element' => {},
-                          'entry_number' => 2,
-                          'in_code' => 1,
-                          'index_name' => 'vr'
-                        }
+                        'index_entry' => [
+                          'vr',
+                          2
+                        ]
                       },
                       'info' => {
                         'spaces_before_argument' => {
@@ -593,10 +585,6 @@ $result_trees{'table'} = {
   'type' => 'document_root'
 };
 
$result_trees{'table'}{'contents'}[0]{'contents'}[1]{'extra'}{'command_as_argument'}
 = 
$result_trees{'table'}{'contents'}[0]{'contents'}[1]{'args'}[0]{'contents'}[0];
-$result_trees{'table'}{'contents'}[0]{'contents'}[3]{'contents'}[0]{'contents'}[1]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'table'}{'contents'}[0]{'contents'}[3]{'contents'}[0]{'contents'}[1];
-$result_trees{'table'}{'contents'}[0]{'contents'}[3]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'table'}{'contents'}[0]{'contents'}[3]{'contents'}[1]{'contents'}[0]{'contents'}[0];
-$result_trees{'table'}{'contents'}[0]{'contents'}[3]{'contents'}[1]{'contents'}[0]{'contents'}[2]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'table'}{'contents'}[0]{'contents'}[3]{'contents'}[1]{'contents'}[0]{'contents'}[2];
-$result_trees{'table'}{'contents'}[0]{'contents'}[3]{'contents'}[1]{'contents'}[0]{'contents'}[3]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'table'}{'contents'}[0]{'contents'}[3]{'contents'}[1]{'contents'}[0]{'contents'}[3];
 
$result_trees{'table'}{'contents'}[0]{'contents'}[3]{'extra'}{'command_as_argument'}
 = 
$result_trees{'table'}{'contents'}[0]{'contents'}[3]{'args'}[0]{'contents'}[0];
 
$result_trees{'table'}{'contents'}[0]{'contents'}[5]{'extra'}{'command_as_argument'}
 = 
$result_trees{'table'}{'contents'}[0]{'contents'}[5]{'args'}[0]{'contents'}[0];
 
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 93612f0ac1..99d9721ba3 100644
--- a/tp/t/results/coverage_braces/contain_plain_text_nestings.pl
+++ b/tp/t/results/coverage_braces/contain_plain_text_nestings.pl
@@ -325,12 +325,10 @@ $result_trees{'contain_plain_text_nestings'} = {
           'cmdname' => 'cindex',
           'extra' => {
             'element_node' => {},
-            'index_entry' => {
-              'entry_element' => {},
-              'entry_number' => 1,
-              'in_code' => 0,
-              'index_name' => 'cp'
-            },
+            'index_entry' => [
+              'cp',
+              1
+            ],
             'sortas' => ' text'
           },
           'info' => {
@@ -625,12 +623,10 @@ $result_trees{'contain_plain_text_nestings'} = {
           'cmdname' => 'cindex',
           'extra' => {
             'element_node' => {},
-            'index_entry' => {
-              'entry_element' => {},
-              'entry_number' => 2,
-              'in_code' => 0,
-              'index_name' => 'cp'
-            },
+            'index_entry' => [
+              'cp',
+              2
+            ],
             'sortas' => ' text'
           },
           'info' => {
@@ -701,13 +697,11 @@ $result_trees{'contain_plain_text_nestings'} = {
   'type' => 'document_root'
 };
 
$result_trees{'contain_plain_text_nestings'}{'contents'}[4]{'contents'}[2]{'extra'}{'element_node'}
 = $result_trees{'contain_plain_text_nestings'}{'contents'}[3];
-$result_trees{'contain_plain_text_nestings'}{'contents'}[4]{'contents'}[2]{'extra'}{'index_entry'}{'entry_element'}
 = $result_trees{'contain_plain_text_nestings'}{'contents'}[4]{'contents'}[2];
 
$result_trees{'contain_plain_text_nestings'}{'contents'}[4]{'contents'}[5]{'contents'}[1]{'args'}[0]{'contents'}[0]{'args'}[0]{'extra'}{'node_content'}[0]
 = 
$result_trees{'contain_plain_text_nestings'}{'contents'}[4]{'contents'}[5]{'contents'}[1]{'args'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0];
 
$result_trees{'contain_plain_text_nestings'}{'contents'}[4]{'contents'}[5]{'contents'}[3]{'args'}[0]{'contents'}[0]{'args'}[0]{'extra'}{'node_content'}[0]
 = 
$result_trees{'contain_plain_text_nestings'}{'contents'}[4]{'contents'}[5]{'contents'}[3]{'args'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0];
 
$result_trees{'contain_plain_text_nestings'}{'contents'}[4]{'contents'}[5]{'contents'}[5]{'args'}[0]{'contents'}[0]{'args'}[0]{'extra'}{'node_content'}[0]
 = 
$result_trees{'contain_plain_text_nestings'}{'contents'}[4]{'contents'}[5]{'contents'}[5]{'args'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0];
 
$result_trees{'contain_plain_text_nestings'}{'contents'}[4]{'contents'}[6]{'args'}[0]{'contents'}[2]{'args'}[0]{'contents'}[0]{'args'}[0]{'extra'}{'node_content'}[0]
 = 
$result_trees{'contain_plain_text_nestings'}{'contents'}[4]{'contents'}[6]{'args'}[0]{'contents'}[2]{'args'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0];
 
$result_trees{'contain_plain_text_nestings'}{'contents'}[4]{'contents'}[6]{'extra'}{'element_node'}
 = $result_trees{'contain_plain_text_nestings'}{'contents'}[3];
-$result_trees{'contain_plain_text_nestings'}{'contents'}[4]{'contents'}[6]{'extra'}{'index_entry'}{'entry_element'}
 = $result_trees{'contain_plain_text_nestings'}{'contents'}[4]{'contents'}[6];
 
 $result_texis{'contain_plain_text_nestings'} = '@node Top
 @top top
diff --git a/tp/t/results/coverage_braces/heading_in_footnote.pl 
b/tp/t/results/coverage_braces/heading_in_footnote.pl
index 7dfe5023e1..28a2bc8caa 100644
--- a/tp/t/results/coverage_braces/heading_in_footnote.pl
+++ b/tp/t/results/coverage_braces/heading_in_footnote.pl
@@ -75,12 +75,10 @@ $result_trees{'heading_in_footnote'} = {
                       ],
                       'cmdname' => 'cindex',
                       'extra' => {
-                        'index_entry' => {
-                          'entry_element' => {},
-                          'entry_number' => 1,
-                          'in_code' => 0,
-                          'index_name' => 'cp'
-                        }
+                        'index_entry' => [
+                          'cp',
+                          1
+                        ]
                       },
                       'info' => {
                         'spaces_before_argument' => {
@@ -133,7 +131,6 @@ $result_trees{'heading_in_footnote'} = {
   ],
   'type' => 'document_root'
 };
-$result_trees{'heading_in_footnote'}{'contents'}[0]{'contents'}[0]{'contents'}[1]{'args'}[0]{'contents'}[2]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'heading_in_footnote'}{'contents'}[0]{'contents'}[0]{'contents'}[1]{'args'}[0]{'contents'}[2];
 
 $result_texis{'heading_in_footnote'} = 'T@footnote{
 AAA
diff --git a/tp/t/results/def/all_commands.pl b/tp/t/results/def/all_commands.pl
index 90beb02f0c..48dab0c515 100644
--- a/tp/t/results/def/all_commands.pl
+++ b/tp/t/results/def/all_commands.pl
@@ -52,12 +52,10 @@ $result_trees{'all_commands'} = {
                   'category' => {},
                   'name' => {}
                 },
-                'index_entry' => {
-                  'entry_element' => {},
-                  'entry_number' => 1,
-                  'in_code' => 1,
-                  'index_name' => 'vr'
-                },
+                'index_entry' => [
+                  'vr',
+                  1
+                ],
                 'original_def_cmdname' => 'defvr'
               },
               'source_info' => {
@@ -186,12 +184,10 @@ $result_trees{'all_commands'} = {
                   'category' => {},
                   'name' => {}
                 },
-                'index_entry' => {
-                  'entry_element' => {},
-                  'entry_number' => 1,
-                  'in_code' => 1,
-                  'index_name' => 'fn'
-                },
+                'index_entry' => [
+                  'fn',
+                  1
+                ],
                 'original_def_cmdname' => 'deffn'
               },
               'source_info' => {
@@ -307,12 +303,10 @@ $result_trees{'all_commands'} = {
                   'category' => {},
                   'name' => {}
                 },
-                'index_entry' => {
-                  'entry_element' => {},
-                  'entry_number' => 2,
-                  'in_code' => 1,
-                  'index_name' => 'fn'
-                },
+                'index_entry' => [
+                  'fn',
+                  2
+                ],
                 'original_def_cmdname' => 'deffn'
               },
               'source_info' => {
@@ -455,12 +449,10 @@ $result_trees{'all_commands'} = {
                   'name' => {},
                   'type' => {}
                 },
-                'index_entry' => {
-                  'entry_element' => {},
-                  'entry_number' => 3,
-                  'in_code' => 1,
-                  'index_name' => 'fn'
-                },
+                'index_entry' => [
+                  'fn',
+                  3
+                ],
                 'original_def_cmdname' => 'deftypefn'
               },
               'source_info' => {
@@ -590,12 +582,10 @@ $result_trees{'all_commands'} = {
                   'name' => {},
                   'type' => {}
                 },
-                'index_entry' => {
-                  'entry_element' => {},
-                  'entry_number' => 4,
-                  'in_code' => 1,
-                  'index_name' => 'fn'
-                },
+                'index_entry' => [
+                  'fn',
+                  4
+                ],
                 'original_def_cmdname' => 'deftypefn'
               },
               'source_info' => {
@@ -770,12 +760,10 @@ $result_trees{'all_commands'} = {
                   'name' => {},
                   'type' => {}
                 },
-                'index_entry' => {
-                  'entry_element' => {},
-                  'entry_number' => 5,
-                  'in_code' => 1,
-                  'index_name' => 'fn'
-                },
+                'index_entry' => [
+                  'fn',
+                  5
+                ],
                 'original_def_cmdname' => 'deftypeop'
               },
               'source_info' => {
@@ -937,12 +925,10 @@ $result_trees{'all_commands'} = {
                   'name' => {},
                   'type' => {}
                 },
-                'index_entry' => {
-                  'entry_element' => {},
-                  'entry_number' => 6,
-                  'in_code' => 1,
-                  'index_name' => 'fn'
-                },
+                'index_entry' => [
+                  'fn',
+                  6
+                ],
                 'original_def_cmdname' => 'deftypeop'
               },
               'source_info' => {
@@ -1072,12 +1058,10 @@ $result_trees{'all_commands'} = {
                   'name' => {},
                   'type' => {}
                 },
-                'index_entry' => {
-                  'entry_element' => {},
-                  'entry_number' => 2,
-                  'in_code' => 1,
-                  'index_name' => 'vr'
-                },
+                'index_entry' => [
+                  'vr',
+                  2
+                ],
                 'original_def_cmdname' => 'deftypevr'
               },
               'source_info' => {
@@ -1207,12 +1191,10 @@ $result_trees{'all_commands'} = {
                   'class' => {},
                   'name' => {}
                 },
-                'index_entry' => {
-                  'entry_element' => {},
-                  'entry_number' => 3,
-                  'in_code' => 1,
-                  'index_name' => 'vr'
-                },
+                'index_entry' => [
+                  'vr',
+                  3
+                ],
                 'original_def_cmdname' => 'defcv'
               },
               'source_info' => {
@@ -1355,12 +1337,10 @@ $result_trees{'all_commands'} = {
                   'class' => {},
                   'name' => {}
                 },
-                'index_entry' => {
-                  'entry_element' => {},
-                  'entry_number' => 4,
-                  'in_code' => 1,
-                  'index_name' => 'vr'
-                },
+                'index_entry' => [
+                  'vr',
+                  4
+                ],
                 'original_def_cmdname' => 'defcv'
               },
               'source_info' => {
@@ -1522,12 +1502,10 @@ $result_trees{'all_commands'} = {
                   'name' => {},
                   'type' => {}
                 },
-                'index_entry' => {
-                  'entry_element' => {},
-                  'entry_number' => 5,
-                  'in_code' => 1,
-                  'index_name' => 'vr'
-                },
+                'index_entry' => [
+                  'vr',
+                  5
+                ],
                 'original_def_cmdname' => 'deftypecv'
               },
               'source_info' => {
@@ -1702,12 +1680,10 @@ $result_trees{'all_commands'} = {
                   'name' => {},
                   'type' => {}
                 },
-                'index_entry' => {
-                  'entry_element' => {},
-                  'entry_number' => 6,
-                  'in_code' => 1,
-                  'index_name' => 'vr'
-                },
+                'index_entry' => [
+                  'vr',
+                  6
+                ],
                 'original_def_cmdname' => 'deftypecv'
               },
               'source_info' => {
@@ -1868,12 +1844,10 @@ $result_trees{'all_commands'} = {
                   'class' => {},
                   'name' => {}
                 },
-                'index_entry' => {
-                  'entry_element' => {},
-                  'entry_number' => 7,
-                  'in_code' => 1,
-                  'index_name' => 'fn'
-                },
+                'index_entry' => [
+                  'fn',
+                  7
+                ],
                 'original_def_cmdname' => 'defop'
               },
               'source_info' => {
@@ -2021,12 +1995,10 @@ $result_trees{'all_commands'} = {
                   'class' => {},
                   'name' => {}
                 },
-                'index_entry' => {
-                  'entry_element' => {},
-                  'entry_number' => 8,
-                  'in_code' => 1,
-                  'index_name' => 'fn'
-                },
+                'index_entry' => [
+                  'fn',
+                  8
+                ],
                 'original_def_cmdname' => 'defop'
               },
               'source_info' => {
@@ -2155,12 +2127,10 @@ $result_trees{'all_commands'} = {
                   'category' => {},
                   'name' => {}
                 },
-                'index_entry' => {
-                  'entry_element' => {},
-                  'entry_number' => 1,
-                  'in_code' => 1,
-                  'index_name' => 'tp'
-                },
+                'index_entry' => [
+                  'tp',
+                  1
+                ],
                 'original_def_cmdname' => 'deftp'
               },
               'source_info' => {
@@ -2294,12 +2264,10 @@ $result_trees{'all_commands'} = {
                   'category' => {},
                   'name' => {}
                 },
-                'index_entry' => {
-                  'entry_element' => {},
-                  'entry_number' => 9,
-                  'in_code' => 1,
-                  'index_name' => 'fn'
-                },
+                'index_entry' => [
+                  'fn',
+                  9
+                ],
                 'original_def_cmdname' => 'defun'
               },
               'source_info' => {
@@ -2433,12 +2401,10 @@ $result_trees{'all_commands'} = {
                   'category' => {},
                   'name' => {}
                 },
-                'index_entry' => {
-                  'entry_element' => {},
-                  'entry_number' => 10,
-                  'in_code' => 1,
-                  'index_name' => 'fn'
-                },
+                'index_entry' => [
+                  'fn',
+                  10
+                ],
                 'original_def_cmdname' => 'defmac'
               },
               'source_info' => {
@@ -2572,12 +2538,10 @@ $result_trees{'all_commands'} = {
                   'category' => {},
                   'name' => {}
                 },
-                'index_entry' => {
-                  'entry_element' => {},
-                  'entry_number' => 11,
-                  'in_code' => 1,
-                  'index_name' => 'fn'
-                },
+                'index_entry' => [
+                  'fn',
+                  11
+                ],
                 'original_def_cmdname' => 'defspec'
               },
               'source_info' => {
@@ -2698,12 +2662,10 @@ $result_trees{'all_commands'} = {
                   'category' => {},
                   'name' => {}
                 },
-                'index_entry' => {
-                  'entry_element' => {},
-                  'entry_number' => 7,
-                  'in_code' => 1,
-                  'index_name' => 'vr'
-                },
+                'index_entry' => [
+                  'vr',
+                  7
+                ],
                 'original_def_cmdname' => 'defvar'
               },
               'source_info' => {
@@ -2850,12 +2812,10 @@ $result_trees{'all_commands'} = {
                   'category' => {},
                   'name' => {}
                 },
-                'index_entry' => {
-                  'entry_element' => {},
-                  'entry_number' => 8,
-                  'in_code' => 1,
-                  'index_name' => 'vr'
-                },
+                'index_entry' => [
+                  'vr',
+                  8
+                ],
                 'original_def_cmdname' => 'defvar'
               },
               'source_info' => {
@@ -2976,12 +2936,10 @@ $result_trees{'all_commands'} = {
                   'category' => {},
                   'name' => {}
                 },
-                'index_entry' => {
-                  'entry_element' => {},
-                  'entry_number' => 9,
-                  'in_code' => 1,
-                  'index_name' => 'vr'
-                },
+                'index_entry' => [
+                  'vr',
+                  9
+                ],
                 'original_def_cmdname' => 'defopt'
               },
               'source_info' => {
@@ -3129,12 +3087,10 @@ $result_trees{'all_commands'} = {
                   'name' => {},
                   'type' => {}
                 },
-                'index_entry' => {
-                  'entry_element' => {},
-                  'entry_number' => 12,
-                  'in_code' => 1,
-                  'index_name' => 'fn'
-                },
+                'index_entry' => [
+                  'fn',
+                  12
+                ],
                 'original_def_cmdname' => 'deftypefun'
               },
               'source_info' => {
@@ -3269,12 +3225,10 @@ $result_trees{'all_commands'} = {
                   'name' => {},
                   'type' => {}
                 },
-                'index_entry' => {
-                  'entry_element' => {},
-                  'entry_number' => 10,
-                  'in_code' => 1,
-                  'index_name' => 'vr'
-                },
+                'index_entry' => [
+                  'vr',
+                  10
+                ],
                 'original_def_cmdname' => 'deftypevar'
               },
               'source_info' => {
@@ -3427,12 +3381,10 @@ $result_trees{'all_commands'} = {
                   'class' => {},
                   'name' => {}
                 },
-                'index_entry' => {
-                  'entry_element' => {},
-                  'entry_number' => 11,
-                  'in_code' => 1,
-                  'index_name' => 'vr'
-                },
+                'index_entry' => [
+                  'vr',
+                  11
+                ],
                 'original_def_cmdname' => 'defivar'
               },
               'source_info' => {
@@ -3599,12 +3551,10 @@ $result_trees{'all_commands'} = {
                   'name' => {},
                   'type' => {}
                 },
-                'index_entry' => {
-                  'entry_element' => {},
-                  'entry_number' => 12,
-                  'in_code' => 1,
-                  'index_name' => 'vr'
-                },
+                'index_entry' => [
+                  'vr',
+                  12
+                ],
                 'original_def_cmdname' => 'deftypeivar'
               },
               'source_info' => {
@@ -3770,12 +3720,10 @@ $result_trees{'all_commands'} = {
                   'class' => {},
                   'name' => {}
                 },
-                'index_entry' => {
-                  'entry_element' => {},
-                  'entry_number' => 13,
-                  'in_code' => 1,
-                  'index_name' => 'fn'
-                },
+                'index_entry' => [
+                  'fn',
+                  13
+                ],
                 'original_def_cmdname' => 'defmethod'
               },
               'source_info' => {
@@ -3955,12 +3903,10 @@ $result_trees{'all_commands'} = {
                   'name' => {},
                   'type' => {}
                 },
-                'index_entry' => {
-                  'entry_element' => {},
-                  'entry_number' => 14,
-                  'in_code' => 1,
-                  'index_name' => 'fn'
-                },
+                'index_entry' => [
+                  'fn',
+                  14
+                ],
                 'original_def_cmdname' => 'deftypemethod'
               },
               'source_info' => {
@@ -4037,25 +3983,20 @@ $result_trees{'all_commands'} = {
 
$result_trees{'all_commands'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'extra'}{'def_index_element'}
 = 
$result_trees{'all_commands'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[2];
 
$result_trees{'all_commands'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'extra'}{'def_parsed_hash'}{'category'}
 = 
$result_trees{'all_commands'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0];
 
$result_trees{'all_commands'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'extra'}{'def_parsed_hash'}{'name'}
 = 
$result_trees{'all_commands'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[2];
-$result_trees{'all_commands'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'extra'}{'index_entry'}{'entry_element'}
 = $result_trees{'all_commands'}{'contents'}[0]{'contents'}[0]{'contents'}[0];
 
$result_trees{'all_commands'}{'contents'}[0]{'contents'}[2]{'contents'}[0]{'extra'}{'def_index_element'}
 = 
$result_trees{'all_commands'}{'contents'}[0]{'contents'}[2]{'contents'}[0]{'args'}[0]{'contents'}[2];
 
$result_trees{'all_commands'}{'contents'}[0]{'contents'}[2]{'contents'}[0]{'extra'}{'def_parsed_hash'}{'category'}
 = 
$result_trees{'all_commands'}{'contents'}[0]{'contents'}[2]{'contents'}[0]{'args'}[0]{'contents'}[0];
 
$result_trees{'all_commands'}{'contents'}[0]{'contents'}[2]{'contents'}[0]{'extra'}{'def_parsed_hash'}{'name'}
 = 
$result_trees{'all_commands'}{'contents'}[0]{'contents'}[2]{'contents'}[0]{'args'}[0]{'contents'}[2];
-$result_trees{'all_commands'}{'contents'}[0]{'contents'}[2]{'contents'}[0]{'extra'}{'index_entry'}{'entry_element'}
 = $result_trees{'all_commands'}{'contents'}[0]{'contents'}[2]{'contents'}[0];
 
$result_trees{'all_commands'}{'contents'}[0]{'contents'}[4]{'contents'}[0]{'extra'}{'def_index_element'}
 = 
$result_trees{'all_commands'}{'contents'}[0]{'contents'}[4]{'contents'}[0]{'args'}[0]{'contents'}[2];
 
$result_trees{'all_commands'}{'contents'}[0]{'contents'}[4]{'contents'}[0]{'extra'}{'def_parsed_hash'}{'category'}
 = 
$result_trees{'all_commands'}{'contents'}[0]{'contents'}[4]{'contents'}[0]{'args'}[0]{'contents'}[0];
 
$result_trees{'all_commands'}{'contents'}[0]{'contents'}[4]{'contents'}[0]{'extra'}{'def_parsed_hash'}{'name'}
 = 
$result_trees{'all_commands'}{'contents'}[0]{'contents'}[4]{'contents'}[0]{'args'}[0]{'contents'}[2];
-$result_trees{'all_commands'}{'contents'}[0]{'contents'}[4]{'contents'}[0]{'extra'}{'index_entry'}{'entry_element'}
 = $result_trees{'all_commands'}{'contents'}[0]{'contents'}[4]{'contents'}[0];
 
$result_trees{'all_commands'}{'contents'}[0]{'contents'}[6]{'contents'}[0]{'extra'}{'def_index_element'}
 = 
$result_trees{'all_commands'}{'contents'}[0]{'contents'}[6]{'contents'}[0]{'args'}[0]{'contents'}[4];
 
$result_trees{'all_commands'}{'contents'}[0]{'contents'}[6]{'contents'}[0]{'extra'}{'def_parsed_hash'}{'category'}
 = 
$result_trees{'all_commands'}{'contents'}[0]{'contents'}[6]{'contents'}[0]{'args'}[0]{'contents'}[0];
 
$result_trees{'all_commands'}{'contents'}[0]{'contents'}[6]{'contents'}[0]{'extra'}{'def_parsed_hash'}{'name'}
 = 
$result_trees{'all_commands'}{'contents'}[0]{'contents'}[6]{'contents'}[0]{'args'}[0]{'contents'}[4];
 
$result_trees{'all_commands'}{'contents'}[0]{'contents'}[6]{'contents'}[0]{'extra'}{'def_parsed_hash'}{'type'}
 = 
$result_trees{'all_commands'}{'contents'}[0]{'contents'}[6]{'contents'}[0]{'args'}[0]{'contents'}[2];
-$result_trees{'all_commands'}{'contents'}[0]{'contents'}[6]{'contents'}[0]{'extra'}{'index_entry'}{'entry_element'}
 = $result_trees{'all_commands'}{'contents'}[0]{'contents'}[6]{'contents'}[0];
 
$result_trees{'all_commands'}{'contents'}[0]{'contents'}[8]{'contents'}[0]{'extra'}{'def_index_element'}
 = 
$result_trees{'all_commands'}{'contents'}[0]{'contents'}[8]{'contents'}[0]{'args'}[0]{'contents'}[4];
 
$result_trees{'all_commands'}{'contents'}[0]{'contents'}[8]{'contents'}[0]{'extra'}{'def_parsed_hash'}{'category'}
 = 
$result_trees{'all_commands'}{'contents'}[0]{'contents'}[8]{'contents'}[0]{'args'}[0]{'contents'}[0];
 
$result_trees{'all_commands'}{'contents'}[0]{'contents'}[8]{'contents'}[0]{'extra'}{'def_parsed_hash'}{'name'}
 = 
$result_trees{'all_commands'}{'contents'}[0]{'contents'}[8]{'contents'}[0]{'args'}[0]{'contents'}[4];
 
$result_trees{'all_commands'}{'contents'}[0]{'contents'}[8]{'contents'}[0]{'extra'}{'def_parsed_hash'}{'type'}
 = 
$result_trees{'all_commands'}{'contents'}[0]{'contents'}[8]{'contents'}[0]{'args'}[0]{'contents'}[2];
-$result_trees{'all_commands'}{'contents'}[0]{'contents'}[8]{'contents'}[0]{'extra'}{'index_entry'}{'entry_element'}
 = $result_trees{'all_commands'}{'contents'}[0]{'contents'}[8]{'contents'}[0];
 
$result_trees{'all_commands'}{'contents'}[0]{'contents'}[10]{'contents'}[0]{'extra'}{'def_index_element'}{'contents'}[0]
 = 
$result_trees{'all_commands'}{'contents'}[0]{'contents'}[10]{'contents'}[0]{'args'}[0]{'contents'}[6];
 
$result_trees{'all_commands'}{'contents'}[0]{'contents'}[10]{'contents'}[0]{'extra'}{'def_index_element'}{'contents'}[2]
 = 
$result_trees{'all_commands'}{'contents'}[0]{'contents'}[10]{'contents'}[0]{'args'}[0]{'contents'}[2];
 
$result_trees{'all_commands'}{'contents'}[0]{'contents'}[10]{'contents'}[0]{'extra'}{'def_index_ref_element'}{'contents'}[0]
 = 
$result_trees{'all_commands'}{'contents'}[0]{'contents'}[10]{'contents'}[0]{'args'}[0]{'contents'}[6];
@@ -4064,7 +4005,6 @@ 
$result_trees{'all_commands'}{'contents'}[0]{'contents'}[10]{'contents'}[0]{'ext
 
$result_trees{'all_commands'}{'contents'}[0]{'contents'}[10]{'contents'}[0]{'extra'}{'def_parsed_hash'}{'class'}
 = 
$result_trees{'all_commands'}{'contents'}[0]{'contents'}[10]{'contents'}[0]{'args'}[0]{'contents'}[2];
 
$result_trees{'all_commands'}{'contents'}[0]{'contents'}[10]{'contents'}[0]{'extra'}{'def_parsed_hash'}{'name'}
 = 
$result_trees{'all_commands'}{'contents'}[0]{'contents'}[10]{'contents'}[0]{'args'}[0]{'contents'}[6];
 
$result_trees{'all_commands'}{'contents'}[0]{'contents'}[10]{'contents'}[0]{'extra'}{'def_parsed_hash'}{'type'}
 = 
$result_trees{'all_commands'}{'contents'}[0]{'contents'}[10]{'contents'}[0]{'args'}[0]{'contents'}[4];
-$result_trees{'all_commands'}{'contents'}[0]{'contents'}[10]{'contents'}[0]{'extra'}{'index_entry'}{'entry_element'}
 = $result_trees{'all_commands'}{'contents'}[0]{'contents'}[10]{'contents'}[0];
 
$result_trees{'all_commands'}{'contents'}[0]{'contents'}[12]{'contents'}[0]{'extra'}{'def_index_element'}{'contents'}[0]
 = 
$result_trees{'all_commands'}{'contents'}[0]{'contents'}[12]{'contents'}[0]{'args'}[0]{'contents'}[6];
 
$result_trees{'all_commands'}{'contents'}[0]{'contents'}[12]{'contents'}[0]{'extra'}{'def_index_element'}{'contents'}[2]
 = 
$result_trees{'all_commands'}{'contents'}[0]{'contents'}[12]{'contents'}[0]{'args'}[0]{'contents'}[2];
 
$result_trees{'all_commands'}{'contents'}[0]{'contents'}[12]{'contents'}[0]{'extra'}{'def_index_ref_element'}{'contents'}[0]
 = 
$result_trees{'all_commands'}{'contents'}[0]{'contents'}[12]{'contents'}[0]{'args'}[0]{'contents'}[6];
@@ -4073,22 +4013,18 @@ 
$result_trees{'all_commands'}{'contents'}[0]{'contents'}[12]{'contents'}[0]{'ext
 
$result_trees{'all_commands'}{'contents'}[0]{'contents'}[12]{'contents'}[0]{'extra'}{'def_parsed_hash'}{'class'}
 = 
$result_trees{'all_commands'}{'contents'}[0]{'contents'}[12]{'contents'}[0]{'args'}[0]{'contents'}[2];
 
$result_trees{'all_commands'}{'contents'}[0]{'contents'}[12]{'contents'}[0]{'extra'}{'def_parsed_hash'}{'name'}
 = 
$result_trees{'all_commands'}{'contents'}[0]{'contents'}[12]{'contents'}[0]{'args'}[0]{'contents'}[6];
 
$result_trees{'all_commands'}{'contents'}[0]{'contents'}[12]{'contents'}[0]{'extra'}{'def_parsed_hash'}{'type'}
 = 
$result_trees{'all_commands'}{'contents'}[0]{'contents'}[12]{'contents'}[0]{'args'}[0]{'contents'}[4];
-$result_trees{'all_commands'}{'contents'}[0]{'contents'}[12]{'contents'}[0]{'extra'}{'index_entry'}{'entry_element'}
 = $result_trees{'all_commands'}{'contents'}[0]{'contents'}[12]{'contents'}[0];
 
$result_trees{'all_commands'}{'contents'}[0]{'contents'}[14]{'contents'}[0]{'extra'}{'def_index_element'}
 = 
$result_trees{'all_commands'}{'contents'}[0]{'contents'}[14]{'contents'}[0]{'args'}[0]{'contents'}[4];
 
$result_trees{'all_commands'}{'contents'}[0]{'contents'}[14]{'contents'}[0]{'extra'}{'def_parsed_hash'}{'category'}
 = 
$result_trees{'all_commands'}{'contents'}[0]{'contents'}[14]{'contents'}[0]{'args'}[0]{'contents'}[0];
 
$result_trees{'all_commands'}{'contents'}[0]{'contents'}[14]{'contents'}[0]{'extra'}{'def_parsed_hash'}{'name'}
 = 
$result_trees{'all_commands'}{'contents'}[0]{'contents'}[14]{'contents'}[0]{'args'}[0]{'contents'}[4];
 
$result_trees{'all_commands'}{'contents'}[0]{'contents'}[14]{'contents'}[0]{'extra'}{'def_parsed_hash'}{'type'}
 = 
$result_trees{'all_commands'}{'contents'}[0]{'contents'}[14]{'contents'}[0]{'args'}[0]{'contents'}[2];
-$result_trees{'all_commands'}{'contents'}[0]{'contents'}[14]{'contents'}[0]{'extra'}{'index_entry'}{'entry_element'}
 = $result_trees{'all_commands'}{'contents'}[0]{'contents'}[14]{'contents'}[0];
 
$result_trees{'all_commands'}{'contents'}[0]{'contents'}[16]{'contents'}[0]{'extra'}{'def_index_element'}
 = 
$result_trees{'all_commands'}{'contents'}[0]{'contents'}[16]{'contents'}[0]{'args'}[0]{'contents'}[4];
 
$result_trees{'all_commands'}{'contents'}[0]{'contents'}[16]{'contents'}[0]{'extra'}{'def_parsed_hash'}{'category'}
 = 
$result_trees{'all_commands'}{'contents'}[0]{'contents'}[16]{'contents'}[0]{'args'}[0]{'contents'}[0];
 
$result_trees{'all_commands'}{'contents'}[0]{'contents'}[16]{'contents'}[0]{'extra'}{'def_parsed_hash'}{'class'}
 = 
$result_trees{'all_commands'}{'contents'}[0]{'contents'}[16]{'contents'}[0]{'args'}[0]{'contents'}[2];
 
$result_trees{'all_commands'}{'contents'}[0]{'contents'}[16]{'contents'}[0]{'extra'}{'def_parsed_hash'}{'name'}
 = 
$result_trees{'all_commands'}{'contents'}[0]{'contents'}[16]{'contents'}[0]{'args'}[0]{'contents'}[4];
-$result_trees{'all_commands'}{'contents'}[0]{'contents'}[16]{'contents'}[0]{'extra'}{'index_entry'}{'entry_element'}
 = $result_trees{'all_commands'}{'contents'}[0]{'contents'}[16]{'contents'}[0];
 
$result_trees{'all_commands'}{'contents'}[0]{'contents'}[18]{'contents'}[0]{'extra'}{'def_index_element'}
 = 
$result_trees{'all_commands'}{'contents'}[0]{'contents'}[18]{'contents'}[0]{'args'}[0]{'contents'}[4];
 
$result_trees{'all_commands'}{'contents'}[0]{'contents'}[18]{'contents'}[0]{'extra'}{'def_parsed_hash'}{'category'}
 = 
$result_trees{'all_commands'}{'contents'}[0]{'contents'}[18]{'contents'}[0]{'args'}[0]{'contents'}[0];
 
$result_trees{'all_commands'}{'contents'}[0]{'contents'}[18]{'contents'}[0]{'extra'}{'def_parsed_hash'}{'class'}
 = 
$result_trees{'all_commands'}{'contents'}[0]{'contents'}[18]{'contents'}[0]{'args'}[0]{'contents'}[2];
 
$result_trees{'all_commands'}{'contents'}[0]{'contents'}[18]{'contents'}[0]{'extra'}{'def_parsed_hash'}{'name'}
 = 
$result_trees{'all_commands'}{'contents'}[0]{'contents'}[18]{'contents'}[0]{'args'}[0]{'contents'}[4];
-$result_trees{'all_commands'}{'contents'}[0]{'contents'}[18]{'contents'}[0]{'extra'}{'index_entry'}{'entry_element'}
 = $result_trees{'all_commands'}{'contents'}[0]{'contents'}[18]{'contents'}[0];
 
$result_trees{'all_commands'}{'contents'}[0]{'contents'}[20]{'contents'}[0]{'extra'}{'def_index_element'}{'contents'}[0]
 = 
$result_trees{'all_commands'}{'contents'}[0]{'contents'}[20]{'contents'}[0]{'args'}[0]{'contents'}[6];
 
$result_trees{'all_commands'}{'contents'}[0]{'contents'}[20]{'contents'}[0]{'extra'}{'def_index_element'}{'contents'}[2]
 = 
$result_trees{'all_commands'}{'contents'}[0]{'contents'}[20]{'contents'}[0]{'args'}[0]{'contents'}[2];
 
$result_trees{'all_commands'}{'contents'}[0]{'contents'}[20]{'contents'}[0]{'extra'}{'def_index_ref_element'}{'contents'}[0]
 = 
$result_trees{'all_commands'}{'contents'}[0]{'contents'}[20]{'contents'}[0]{'args'}[0]{'contents'}[6];
@@ -4097,7 +4033,6 @@ 
$result_trees{'all_commands'}{'contents'}[0]{'contents'}[20]{'contents'}[0]{'ext
 
$result_trees{'all_commands'}{'contents'}[0]{'contents'}[20]{'contents'}[0]{'extra'}{'def_parsed_hash'}{'class'}
 = 
$result_trees{'all_commands'}{'contents'}[0]{'contents'}[20]{'contents'}[0]{'args'}[0]{'contents'}[2];
 
$result_trees{'all_commands'}{'contents'}[0]{'contents'}[20]{'contents'}[0]{'extra'}{'def_parsed_hash'}{'name'}
 = 
$result_trees{'all_commands'}{'contents'}[0]{'contents'}[20]{'contents'}[0]{'args'}[0]{'contents'}[6];
 
$result_trees{'all_commands'}{'contents'}[0]{'contents'}[20]{'contents'}[0]{'extra'}{'def_parsed_hash'}{'type'}
 = 
$result_trees{'all_commands'}{'contents'}[0]{'contents'}[20]{'contents'}[0]{'args'}[0]{'contents'}[4];
-$result_trees{'all_commands'}{'contents'}[0]{'contents'}[20]{'contents'}[0]{'extra'}{'index_entry'}{'entry_element'}
 = $result_trees{'all_commands'}{'contents'}[0]{'contents'}[20]{'contents'}[0];
 
$result_trees{'all_commands'}{'contents'}[0]{'contents'}[22]{'contents'}[0]{'extra'}{'def_index_element'}{'contents'}[0]
 = 
$result_trees{'all_commands'}{'contents'}[0]{'contents'}[22]{'contents'}[0]{'args'}[0]{'contents'}[6];
 
$result_trees{'all_commands'}{'contents'}[0]{'contents'}[22]{'contents'}[0]{'extra'}{'def_index_element'}{'contents'}[2]
 = 
$result_trees{'all_commands'}{'contents'}[0]{'contents'}[22]{'contents'}[0]{'args'}[0]{'contents'}[2];
 
$result_trees{'all_commands'}{'contents'}[0]{'contents'}[22]{'contents'}[0]{'extra'}{'def_index_ref_element'}{'contents'}[0]
 = 
$result_trees{'all_commands'}{'contents'}[0]{'contents'}[22]{'contents'}[0]{'args'}[0]{'contents'}[6];
@@ -4106,7 +4041,6 @@ 
$result_trees{'all_commands'}{'contents'}[0]{'contents'}[22]{'contents'}[0]{'ext
 
$result_trees{'all_commands'}{'contents'}[0]{'contents'}[22]{'contents'}[0]{'extra'}{'def_parsed_hash'}{'class'}
 = 
$result_trees{'all_commands'}{'contents'}[0]{'contents'}[22]{'contents'}[0]{'args'}[0]{'contents'}[2];
 
$result_trees{'all_commands'}{'contents'}[0]{'contents'}[22]{'contents'}[0]{'extra'}{'def_parsed_hash'}{'name'}
 = 
$result_trees{'all_commands'}{'contents'}[0]{'contents'}[22]{'contents'}[0]{'args'}[0]{'contents'}[6];
 
$result_trees{'all_commands'}{'contents'}[0]{'contents'}[22]{'contents'}[0]{'extra'}{'def_parsed_hash'}{'type'}
 = 
$result_trees{'all_commands'}{'contents'}[0]{'contents'}[22]{'contents'}[0]{'args'}[0]{'contents'}[4];
-$result_trees{'all_commands'}{'contents'}[0]{'contents'}[22]{'contents'}[0]{'extra'}{'index_entry'}{'entry_element'}
 = $result_trees{'all_commands'}{'contents'}[0]{'contents'}[22]{'contents'}[0];
 
$result_trees{'all_commands'}{'contents'}[0]{'contents'}[24]{'contents'}[0]{'extra'}{'def_index_element'}{'contents'}[0]
 = 
$result_trees{'all_commands'}{'contents'}[0]{'contents'}[24]{'contents'}[0]{'args'}[0]{'contents'}[4];
 
$result_trees{'all_commands'}{'contents'}[0]{'contents'}[24]{'contents'}[0]{'extra'}{'def_index_element'}{'contents'}[2]
 = 
$result_trees{'all_commands'}{'contents'}[0]{'contents'}[24]{'contents'}[0]{'args'}[0]{'contents'}[2];
 
$result_trees{'all_commands'}{'contents'}[0]{'contents'}[24]{'contents'}[0]{'extra'}{'def_index_ref_element'}{'contents'}[0]
 = 
$result_trees{'all_commands'}{'contents'}[0]{'contents'}[24]{'contents'}[0]{'args'}[0]{'contents'}[4];
@@ -4114,7 +4048,6 @@ 
$result_trees{'all_commands'}{'contents'}[0]{'contents'}[24]{'contents'}[0]{'ext
 
$result_trees{'all_commands'}{'contents'}[0]{'contents'}[24]{'contents'}[0]{'extra'}{'def_parsed_hash'}{'category'}
 = 
$result_trees{'all_commands'}{'contents'}[0]{'contents'}[24]{'contents'}[0]{'args'}[0]{'contents'}[0];
 
$result_trees{'all_commands'}{'contents'}[0]{'contents'}[24]{'contents'}[0]{'extra'}{'def_parsed_hash'}{'class'}
 = 
$result_trees{'all_commands'}{'contents'}[0]{'contents'}[24]{'contents'}[0]{'args'}[0]{'contents'}[2];
 
$result_trees{'all_commands'}{'contents'}[0]{'contents'}[24]{'contents'}[0]{'extra'}{'def_parsed_hash'}{'name'}
 = 
$result_trees{'all_commands'}{'contents'}[0]{'contents'}[24]{'contents'}[0]{'args'}[0]{'contents'}[4];
-$result_trees{'all_commands'}{'contents'}[0]{'contents'}[24]{'contents'}[0]{'extra'}{'index_entry'}{'entry_element'}
 = $result_trees{'all_commands'}{'contents'}[0]{'contents'}[24]{'contents'}[0];
 
$result_trees{'all_commands'}{'contents'}[0]{'contents'}[26]{'contents'}[0]{'extra'}{'def_index_element'}{'contents'}[0]
 = 
$result_trees{'all_commands'}{'contents'}[0]{'contents'}[26]{'contents'}[0]{'args'}[0]{'contents'}[4];
 
$result_trees{'all_commands'}{'contents'}[0]{'contents'}[26]{'contents'}[0]{'extra'}{'def_index_element'}{'contents'}[2]
 = 
$result_trees{'all_commands'}{'contents'}[0]{'contents'}[26]{'contents'}[0]{'args'}[0]{'contents'}[2];
 
$result_trees{'all_commands'}{'contents'}[0]{'contents'}[26]{'contents'}[0]{'extra'}{'def_index_ref_element'}{'contents'}[0]
 = 
$result_trees{'all_commands'}{'contents'}[0]{'contents'}[26]{'contents'}[0]{'args'}[0]{'contents'}[4];
@@ -4122,45 +4055,35 @@ 
$result_trees{'all_commands'}{'contents'}[0]{'contents'}[26]{'contents'}[0]{'ext
 
$result_trees{'all_commands'}{'contents'}[0]{'contents'}[26]{'contents'}[0]{'extra'}{'def_parsed_hash'}{'category'}
 = 
$result_trees{'all_commands'}{'contents'}[0]{'contents'}[26]{'contents'}[0]{'args'}[0]{'contents'}[0];
 
$result_trees{'all_commands'}{'contents'}[0]{'contents'}[26]{'contents'}[0]{'extra'}{'def_parsed_hash'}{'class'}
 = 
$result_trees{'all_commands'}{'contents'}[0]{'contents'}[26]{'contents'}[0]{'args'}[0]{'contents'}[2];
 
$result_trees{'all_commands'}{'contents'}[0]{'contents'}[26]{'contents'}[0]{'extra'}{'def_parsed_hash'}{'name'}
 = 
$result_trees{'all_commands'}{'contents'}[0]{'contents'}[26]{'contents'}[0]{'args'}[0]{'contents'}[4];
-$result_trees{'all_commands'}{'contents'}[0]{'contents'}[26]{'contents'}[0]{'extra'}{'index_entry'}{'entry_element'}
 = $result_trees{'all_commands'}{'contents'}[0]{'contents'}[26]{'contents'}[0];
 
$result_trees{'all_commands'}{'contents'}[0]{'contents'}[28]{'contents'}[0]{'extra'}{'def_index_element'}
 = 
$result_trees{'all_commands'}{'contents'}[0]{'contents'}[28]{'contents'}[0]{'args'}[0]{'contents'}[2];
 
$result_trees{'all_commands'}{'contents'}[0]{'contents'}[28]{'contents'}[0]{'extra'}{'def_parsed_hash'}{'category'}
 = 
$result_trees{'all_commands'}{'contents'}[0]{'contents'}[28]{'contents'}[0]{'args'}[0]{'contents'}[0];
 
$result_trees{'all_commands'}{'contents'}[0]{'contents'}[28]{'contents'}[0]{'extra'}{'def_parsed_hash'}{'name'}
 = 
$result_trees{'all_commands'}{'contents'}[0]{'contents'}[28]{'contents'}[0]{'args'}[0]{'contents'}[2];
-$result_trees{'all_commands'}{'contents'}[0]{'contents'}[28]{'contents'}[0]{'extra'}{'index_entry'}{'entry_element'}
 = $result_trees{'all_commands'}{'contents'}[0]{'contents'}[28]{'contents'}[0];
 
$result_trees{'all_commands'}{'contents'}[0]{'contents'}[30]{'contents'}[0]{'extra'}{'def_index_element'}
 = 
$result_trees{'all_commands'}{'contents'}[0]{'contents'}[30]{'contents'}[0]{'args'}[0]{'contents'}[2];
 
$result_trees{'all_commands'}{'contents'}[0]{'contents'}[30]{'contents'}[0]{'extra'}{'def_parsed_hash'}{'category'}
 = 
$result_trees{'all_commands'}{'contents'}[0]{'contents'}[30]{'contents'}[0]{'args'}[0]{'contents'}[0];
 
$result_trees{'all_commands'}{'contents'}[0]{'contents'}[30]{'contents'}[0]{'extra'}{'def_parsed_hash'}{'name'}
 = 
$result_trees{'all_commands'}{'contents'}[0]{'contents'}[30]{'contents'}[0]{'args'}[0]{'contents'}[2];
-$result_trees{'all_commands'}{'contents'}[0]{'contents'}[30]{'contents'}[0]{'extra'}{'index_entry'}{'entry_element'}
 = $result_trees{'all_commands'}{'contents'}[0]{'contents'}[30]{'contents'}[0];
 
$result_trees{'all_commands'}{'contents'}[0]{'contents'}[32]{'contents'}[0]{'extra'}{'def_index_element'}
 = 
$result_trees{'all_commands'}{'contents'}[0]{'contents'}[32]{'contents'}[0]{'args'}[0]{'contents'}[2];
 
$result_trees{'all_commands'}{'contents'}[0]{'contents'}[32]{'contents'}[0]{'extra'}{'def_parsed_hash'}{'category'}
 = 
$result_trees{'all_commands'}{'contents'}[0]{'contents'}[32]{'contents'}[0]{'args'}[0]{'contents'}[0];
 
$result_trees{'all_commands'}{'contents'}[0]{'contents'}[32]{'contents'}[0]{'extra'}{'def_parsed_hash'}{'name'}
 = 
$result_trees{'all_commands'}{'contents'}[0]{'contents'}[32]{'contents'}[0]{'args'}[0]{'contents'}[2];
-$result_trees{'all_commands'}{'contents'}[0]{'contents'}[32]{'contents'}[0]{'extra'}{'index_entry'}{'entry_element'}
 = $result_trees{'all_commands'}{'contents'}[0]{'contents'}[32]{'contents'}[0];
 
$result_trees{'all_commands'}{'contents'}[0]{'contents'}[34]{'contents'}[0]{'extra'}{'def_index_element'}
 = 
$result_trees{'all_commands'}{'contents'}[0]{'contents'}[34]{'contents'}[0]{'args'}[0]{'contents'}[2];
 
$result_trees{'all_commands'}{'contents'}[0]{'contents'}[34]{'contents'}[0]{'extra'}{'def_parsed_hash'}{'category'}
 = 
$result_trees{'all_commands'}{'contents'}[0]{'contents'}[34]{'contents'}[0]{'args'}[0]{'contents'}[0];
 
$result_trees{'all_commands'}{'contents'}[0]{'contents'}[34]{'contents'}[0]{'extra'}{'def_parsed_hash'}{'name'}
 = 
$result_trees{'all_commands'}{'contents'}[0]{'contents'}[34]{'contents'}[0]{'args'}[0]{'contents'}[2];
-$result_trees{'all_commands'}{'contents'}[0]{'contents'}[34]{'contents'}[0]{'extra'}{'index_entry'}{'entry_element'}
 = $result_trees{'all_commands'}{'contents'}[0]{'contents'}[34]{'contents'}[0];
 
$result_trees{'all_commands'}{'contents'}[0]{'contents'}[36]{'contents'}[0]{'extra'}{'def_index_element'}
 = 
$result_trees{'all_commands'}{'contents'}[0]{'contents'}[36]{'contents'}[0]{'args'}[0]{'contents'}[2];
 
$result_trees{'all_commands'}{'contents'}[0]{'contents'}[36]{'contents'}[0]{'extra'}{'def_parsed_hash'}{'category'}
 = 
$result_trees{'all_commands'}{'contents'}[0]{'contents'}[36]{'contents'}[0]{'args'}[0]{'contents'}[0];
 
$result_trees{'all_commands'}{'contents'}[0]{'contents'}[36]{'contents'}[0]{'extra'}{'def_parsed_hash'}{'name'}
 = 
$result_trees{'all_commands'}{'contents'}[0]{'contents'}[36]{'contents'}[0]{'args'}[0]{'contents'}[2];
-$result_trees{'all_commands'}{'contents'}[0]{'contents'}[36]{'contents'}[0]{'extra'}{'index_entry'}{'entry_element'}
 = $result_trees{'all_commands'}{'contents'}[0]{'contents'}[36]{'contents'}[0];
 
$result_trees{'all_commands'}{'contents'}[0]{'contents'}[38]{'contents'}[0]{'extra'}{'def_index_element'}
 = 
$result_trees{'all_commands'}{'contents'}[0]{'contents'}[38]{'contents'}[0]{'args'}[0]{'contents'}[2];
 
$result_trees{'all_commands'}{'contents'}[0]{'contents'}[38]{'contents'}[0]{'extra'}{'def_parsed_hash'}{'category'}
 = 
$result_trees{'all_commands'}{'contents'}[0]{'contents'}[38]{'contents'}[0]{'args'}[0]{'contents'}[0];
 
$result_trees{'all_commands'}{'contents'}[0]{'contents'}[38]{'contents'}[0]{'extra'}{'def_parsed_hash'}{'name'}
 = 
$result_trees{'all_commands'}{'contents'}[0]{'contents'}[38]{'contents'}[0]{'args'}[0]{'contents'}[2];
-$result_trees{'all_commands'}{'contents'}[0]{'contents'}[38]{'contents'}[0]{'extra'}{'index_entry'}{'entry_element'}
 = $result_trees{'all_commands'}{'contents'}[0]{'contents'}[38]{'contents'}[0];
 
$result_trees{'all_commands'}{'contents'}[0]{'contents'}[40]{'contents'}[0]{'extra'}{'def_index_element'}
 = 
$result_trees{'all_commands'}{'contents'}[0]{'contents'}[40]{'contents'}[0]{'args'}[0]{'contents'}[2];
 
$result_trees{'all_commands'}{'contents'}[0]{'contents'}[40]{'contents'}[0]{'extra'}{'def_parsed_hash'}{'category'}
 = 
$result_trees{'all_commands'}{'contents'}[0]{'contents'}[40]{'contents'}[0]{'args'}[0]{'contents'}[0];
 
$result_trees{'all_commands'}{'contents'}[0]{'contents'}[40]{'contents'}[0]{'extra'}{'def_parsed_hash'}{'name'}
 = 
$result_trees{'all_commands'}{'contents'}[0]{'contents'}[40]{'contents'}[0]{'args'}[0]{'contents'}[2];
-$result_trees{'all_commands'}{'contents'}[0]{'contents'}[40]{'contents'}[0]{'extra'}{'index_entry'}{'entry_element'}
 = $result_trees{'all_commands'}{'contents'}[0]{'contents'}[40]{'contents'}[0];
 
$result_trees{'all_commands'}{'contents'}[0]{'contents'}[42]{'contents'}[0]{'extra'}{'def_index_element'}
 = 
$result_trees{'all_commands'}{'contents'}[0]{'contents'}[42]{'contents'}[0]{'args'}[0]{'contents'}[4];
 
$result_trees{'all_commands'}{'contents'}[0]{'contents'}[42]{'contents'}[0]{'extra'}{'def_parsed_hash'}{'category'}
 = 
$result_trees{'all_commands'}{'contents'}[0]{'contents'}[42]{'contents'}[0]{'args'}[0]{'contents'}[0];
 
$result_trees{'all_commands'}{'contents'}[0]{'contents'}[42]{'contents'}[0]{'extra'}{'def_parsed_hash'}{'name'}
 = 
$result_trees{'all_commands'}{'contents'}[0]{'contents'}[42]{'contents'}[0]{'args'}[0]{'contents'}[4];
 
$result_trees{'all_commands'}{'contents'}[0]{'contents'}[42]{'contents'}[0]{'extra'}{'def_parsed_hash'}{'type'}
 = 
$result_trees{'all_commands'}{'contents'}[0]{'contents'}[42]{'contents'}[0]{'args'}[0]{'contents'}[2];
-$result_trees{'all_commands'}{'contents'}[0]{'contents'}[42]{'contents'}[0]{'extra'}{'index_entry'}{'entry_element'}
 = $result_trees{'all_commands'}{'contents'}[0]{'contents'}[42]{'contents'}[0];
 
$result_trees{'all_commands'}{'contents'}[0]{'contents'}[44]{'contents'}[0]{'extra'}{'def_index_element'}
 = 
$result_trees{'all_commands'}{'contents'}[0]{'contents'}[44]{'contents'}[0]{'args'}[0]{'contents'}[4];
 
$result_trees{'all_commands'}{'contents'}[0]{'contents'}[44]{'contents'}[0]{'extra'}{'def_parsed_hash'}{'category'}
 = 
$result_trees{'all_commands'}{'contents'}[0]{'contents'}[44]{'contents'}[0]{'args'}[0]{'contents'}[0];
 
$result_trees{'all_commands'}{'contents'}[0]{'contents'}[44]{'contents'}[0]{'extra'}{'def_parsed_hash'}{'name'}
 = 
$result_trees{'all_commands'}{'contents'}[0]{'contents'}[44]{'contents'}[0]{'args'}[0]{'contents'}[4];
 
$result_trees{'all_commands'}{'contents'}[0]{'contents'}[44]{'contents'}[0]{'extra'}{'def_parsed_hash'}{'type'}
 = 
$result_trees{'all_commands'}{'contents'}[0]{'contents'}[44]{'contents'}[0]{'args'}[0]{'contents'}[2];
-$result_trees{'all_commands'}{'contents'}[0]{'contents'}[44]{'contents'}[0]{'extra'}{'index_entry'}{'entry_element'}
 = $result_trees{'all_commands'}{'contents'}[0]{'contents'}[44]{'contents'}[0];
 
$result_trees{'all_commands'}{'contents'}[0]{'contents'}[46]{'contents'}[0]{'extra'}{'def_index_element'}{'contents'}[0]
 = 
$result_trees{'all_commands'}{'contents'}[0]{'contents'}[46]{'contents'}[0]{'args'}[0]{'contents'}[4];
 
$result_trees{'all_commands'}{'contents'}[0]{'contents'}[46]{'contents'}[0]{'extra'}{'def_index_element'}{'contents'}[2]
 = 
$result_trees{'all_commands'}{'contents'}[0]{'contents'}[46]{'contents'}[0]{'args'}[0]{'contents'}[2];
 
$result_trees{'all_commands'}{'contents'}[0]{'contents'}[46]{'contents'}[0]{'extra'}{'def_index_ref_element'}{'contents'}[0]
 = 
$result_trees{'all_commands'}{'contents'}[0]{'contents'}[46]{'contents'}[0]{'args'}[0]{'contents'}[4];
@@ -4168,7 +4091,6 @@ 
$result_trees{'all_commands'}{'contents'}[0]{'contents'}[46]{'contents'}[0]{'ext
 
$result_trees{'all_commands'}{'contents'}[0]{'contents'}[46]{'contents'}[0]{'extra'}{'def_parsed_hash'}{'category'}
 = 
$result_trees{'all_commands'}{'contents'}[0]{'contents'}[46]{'contents'}[0]{'args'}[0]{'contents'}[0];
 
$result_trees{'all_commands'}{'contents'}[0]{'contents'}[46]{'contents'}[0]{'extra'}{'def_parsed_hash'}{'class'}
 = 
$result_trees{'all_commands'}{'contents'}[0]{'contents'}[46]{'contents'}[0]{'args'}[0]{'contents'}[2];
 
$result_trees{'all_commands'}{'contents'}[0]{'contents'}[46]{'contents'}[0]{'extra'}{'def_parsed_hash'}{'name'}
 = 
$result_trees{'all_commands'}{'contents'}[0]{'contents'}[46]{'contents'}[0]{'args'}[0]{'contents'}[4];
-$result_trees{'all_commands'}{'contents'}[0]{'contents'}[46]{'contents'}[0]{'extra'}{'index_entry'}{'entry_element'}
 = $result_trees{'all_commands'}{'contents'}[0]{'contents'}[46]{'contents'}[0];
 
$result_trees{'all_commands'}{'contents'}[0]{'contents'}[48]{'contents'}[0]{'extra'}{'def_index_element'}{'contents'}[0]
 = 
$result_trees{'all_commands'}{'contents'}[0]{'contents'}[48]{'contents'}[0]{'args'}[0]{'contents'}[6];
 
$result_trees{'all_commands'}{'contents'}[0]{'contents'}[48]{'contents'}[0]{'extra'}{'def_index_element'}{'contents'}[2]
 = 
$result_trees{'all_commands'}{'contents'}[0]{'contents'}[48]{'contents'}[0]{'args'}[0]{'contents'}[2];
 
$result_trees{'all_commands'}{'contents'}[0]{'contents'}[48]{'contents'}[0]{'extra'}{'def_index_ref_element'}{'contents'}[0]
 = 
$result_trees{'all_commands'}{'contents'}[0]{'contents'}[48]{'contents'}[0]{'args'}[0]{'contents'}[6];
@@ -4177,7 +4099,6 @@ 
$result_trees{'all_commands'}{'contents'}[0]{'contents'}[48]{'contents'}[0]{'ext
 
$result_trees{'all_commands'}{'contents'}[0]{'contents'}[48]{'contents'}[0]{'extra'}{'def_parsed_hash'}{'class'}
 = 
$result_trees{'all_commands'}{'contents'}[0]{'contents'}[48]{'contents'}[0]{'args'}[0]{'contents'}[2];
 
$result_trees{'all_commands'}{'contents'}[0]{'contents'}[48]{'contents'}[0]{'extra'}{'def_parsed_hash'}{'name'}
 = 
$result_trees{'all_commands'}{'contents'}[0]{'contents'}[48]{'contents'}[0]{'args'}[0]{'contents'}[6];
 
$result_trees{'all_commands'}{'contents'}[0]{'contents'}[48]{'contents'}[0]{'extra'}{'def_parsed_hash'}{'type'}
 = 
$result_trees{'all_commands'}{'contents'}[0]{'contents'}[48]{'contents'}[0]{'args'}[0]{'contents'}[4];
-$result_trees{'all_commands'}{'contents'}[0]{'contents'}[48]{'contents'}[0]{'extra'}{'index_entry'}{'entry_element'}
 = $result_trees{'all_commands'}{'contents'}[0]{'contents'}[48]{'contents'}[0];
 
$result_trees{'all_commands'}{'contents'}[0]{'contents'}[50]{'contents'}[0]{'extra'}{'def_index_element'}{'contents'}[0]
 = 
$result_trees{'all_commands'}{'contents'}[0]{'contents'}[50]{'contents'}[0]{'args'}[0]{'contents'}[4];
 
$result_trees{'all_commands'}{'contents'}[0]{'contents'}[50]{'contents'}[0]{'extra'}{'def_index_element'}{'contents'}[2]
 = 
$result_trees{'all_commands'}{'contents'}[0]{'contents'}[50]{'contents'}[0]{'args'}[0]{'contents'}[2];
 
$result_trees{'all_commands'}{'contents'}[0]{'contents'}[50]{'contents'}[0]{'extra'}{'def_index_ref_element'}{'contents'}[0]
 = 
$result_trees{'all_commands'}{'contents'}[0]{'contents'}[50]{'contents'}[0]{'args'}[0]{'contents'}[4];
@@ -4185,7 +4106,6 @@ 
$result_trees{'all_commands'}{'contents'}[0]{'contents'}[50]{'contents'}[0]{'ext
 
$result_trees{'all_commands'}{'contents'}[0]{'contents'}[50]{'contents'}[0]{'extra'}{'def_parsed_hash'}{'category'}
 = 
$result_trees{'all_commands'}{'contents'}[0]{'contents'}[50]{'contents'}[0]{'args'}[0]{'contents'}[0];
 
$result_trees{'all_commands'}{'contents'}[0]{'contents'}[50]{'contents'}[0]{'extra'}{'def_parsed_hash'}{'class'}
 = 
$result_trees{'all_commands'}{'contents'}[0]{'contents'}[50]{'contents'}[0]{'args'}[0]{'contents'}[2];
 
$result_trees{'all_commands'}{'contents'}[0]{'contents'}[50]{'contents'}[0]{'extra'}{'def_parsed_hash'}{'name'}
 = 
$result_trees{'all_commands'}{'contents'}[0]{'contents'}[50]{'contents'}[0]{'args'}[0]{'contents'}[4];
-$result_trees{'all_commands'}{'contents'}[0]{'contents'}[50]{'contents'}[0]{'extra'}{'index_entry'}{'entry_element'}
 = $result_trees{'all_commands'}{'contents'}[0]{'contents'}[50]{'contents'}[0];
 
$result_trees{'all_commands'}{'contents'}[0]{'contents'}[52]{'contents'}[0]{'extra'}{'def_index_element'}{'contents'}[0]
 = 
$result_trees{'all_commands'}{'contents'}[0]{'contents'}[52]{'contents'}[0]{'args'}[0]{'contents'}[6];
 
$result_trees{'all_commands'}{'contents'}[0]{'contents'}[52]{'contents'}[0]{'extra'}{'def_index_element'}{'contents'}[2]
 = 
$result_trees{'all_commands'}{'contents'}[0]{'contents'}[52]{'contents'}[0]{'args'}[0]{'contents'}[2];
 
$result_trees{'all_commands'}{'contents'}[0]{'contents'}[52]{'contents'}[0]{'extra'}{'def_index_ref_element'}{'contents'}[0]
 = 
$result_trees{'all_commands'}{'contents'}[0]{'contents'}[52]{'contents'}[0]{'args'}[0]{'contents'}[6];
@@ -4194,7 +4114,6 @@ 
$result_trees{'all_commands'}{'contents'}[0]{'contents'}[52]{'contents'}[0]{'ext
 
$result_trees{'all_commands'}{'contents'}[0]{'contents'}[52]{'contents'}[0]{'extra'}{'def_parsed_hash'}{'class'}
 = 
$result_trees{'all_commands'}{'contents'}[0]{'contents'}[52]{'contents'}[0]{'args'}[0]{'contents'}[2];
 
$result_trees{'all_commands'}{'contents'}[0]{'contents'}[52]{'contents'}[0]{'extra'}{'def_parsed_hash'}{'name'}
 = 
$result_trees{'all_commands'}{'contents'}[0]{'contents'}[52]{'contents'}[0]{'args'}[0]{'contents'}[6];
 
$result_trees{'all_commands'}{'contents'}[0]{'contents'}[52]{'contents'}[0]{'extra'}{'def_parsed_hash'}{'type'}
 = 
$result_trees{'all_commands'}{'contents'}[0]{'contents'}[52]{'contents'}[0]{'args'}[0]{'contents'}[4];
-$result_trees{'all_commands'}{'contents'}[0]{'contents'}[52]{'contents'}[0]{'extra'}{'index_entry'}{'entry_element'}
 = $result_trees{'all_commands'}{'contents'}[0]{'contents'}[52]{'contents'}[0];
 
 $result_texis{'all_commands'} = '@defvr c--ategory d--efvr_name
 d--efvr
diff --git a/tp/t/results/def/all_commands_delimiters.pl 
b/tp/t/results/def/all_commands_delimiters.pl
index 31f51f5fa4..0dcdbcd640 100644
--- a/tp/t/results/def/all_commands_delimiters.pl
+++ b/tp/t/results/def/all_commands_delimiters.pl
@@ -381,12 +381,10 @@ $result_trees{'all_commands_delimiters'} = {
                   'category' => {},
                   'name' => {}
                 },
-                'index_entry' => {
-                  'entry_element' => {},
-                  'entry_number' => 1,
-                  'in_code' => 1,
-                  'index_name' => 'fn'
-                },
+                'index_entry' => [
+                  'fn',
+                  1
+                ],
                 'original_def_cmdname' => 'deffn'
               },
               'source_info' => {
@@ -774,12 +772,10 @@ $result_trees{'all_commands_delimiters'} = {
                   'category' => {},
                   'name' => {}
                 },
-                'index_entry' => {
-                  'entry_element' => {},
-                  'entry_number' => 1,
-                  'in_code' => 1,
-                  'index_name' => 'vr'
-                },
+                'index_entry' => [
+                  'vr',
+                  1
+                ],
                 'original_def_cmdname' => 'defvr'
               },
               'source_info' => {
@@ -1008,12 +1004,10 @@ $result_trees{'all_commands_delimiters'} = {
                   'name' => {},
                   'type' => {}
                 },
-                'index_entry' => {
-                  'entry_element' => {},
-                  'entry_number' => 2,
-                  'in_code' => 1,
-                  'index_name' => 'fn'
-                },
+                'index_entry' => [
+                  'fn',
+                  2
+                ],
                 'original_def_cmdname' => 'deftypefn'
               },
               'source_info' => {
@@ -1510,12 +1504,10 @@ $result_trees{'all_commands_delimiters'} = {
                   'name' => {},
                   'type' => {}
                 },
-                'index_entry' => {
-                  'entry_element' => {},
-                  'entry_number' => 3,
-                  'in_code' => 1,
-                  'index_name' => 'fn'
-                },
+                'index_entry' => [
+                  'fn',
+                  3
+                ],
                 'original_def_cmdname' => 'deftypefn'
               },
               'source_info' => {
@@ -1664,12 +1656,10 @@ $result_trees{'all_commands_delimiters'} = {
                   'name' => {},
                   'type' => {}
                 },
-                'index_entry' => {
-                  'entry_element' => {},
-                  'entry_number' => 4,
-                  'in_code' => 1,
-                  'index_name' => 'fn'
-                },
+                'index_entry' => [
+                  'fn',
+                  4
+                ],
                 'original_def_cmdname' => 'deftypefn'
               },
               'source_info' => {
@@ -1978,12 +1968,10 @@ $result_trees{'all_commands_delimiters'} = {
                   'name' => {},
                   'type' => {}
                 },
-                'index_entry' => {
-                  'entry_element' => {},
-                  'entry_number' => 5,
-                  'in_code' => 1,
-                  'index_name' => 'fn'
-                },
+                'index_entry' => [
+                  'fn',
+                  5
+                ],
                 'original_def_cmdname' => 'deftypefn'
               },
               'source_info' => {
@@ -2349,12 +2337,10 @@ $result_trees{'all_commands_delimiters'} = {
                   'name' => {},
                   'type' => {}
                 },
-                'index_entry' => {
-                  'entry_element' => {},
-                  'entry_number' => 2,
-                  'in_code' => 1,
-                  'index_name' => 'vr'
-                },
+                'index_entry' => [
+                  'vr',
+                  2
+                ],
                 'original_def_cmdname' => 'deftypevr'
               },
               'source_info' => {
@@ -2732,12 +2718,10 @@ $result_trees{'all_commands_delimiters'} = {
                   'category' => {},
                   'name' => {}
                 },
-                'index_entry' => {
-                  'entry_element' => {},
-                  'entry_number' => 1,
-                  'in_code' => 1,
-                  'index_name' => 'tp'
-                },
+                'index_entry' => [
+                  'tp',
+                  1
+                ],
                 'original_def_cmdname' => 'deftp'
               },
               'source_info' => {
@@ -3103,12 +3087,10 @@ $result_trees{'all_commands_delimiters'} = {
                   'class' => {},
                   'name' => {}
                 },
-                'index_entry' => {
-                  'entry_element' => {},
-                  'entry_number' => 3,
-                  'in_code' => 1,
-                  'index_name' => 'vr'
-                },
+                'index_entry' => [
+                  'vr',
+                  3
+                ],
                 'original_def_cmdname' => 'defcv'
               },
               'source_info' => {
@@ -3521,12 +3503,10 @@ $result_trees{'all_commands_delimiters'} = {
                   'name' => {},
                   'type' => {}
                 },
-                'index_entry' => {
-                  'entry_element' => {},
-                  'entry_number' => 4,
-                  'in_code' => 1,
-                  'index_name' => 'vr'
-                },
+                'index_entry' => [
+                  'vr',
+                  4
+                ],
                 'original_def_cmdname' => 'deftypecv'
               },
               'source_info' => {
@@ -3900,12 +3880,10 @@ $result_trees{'all_commands_delimiters'} = {
                   'class' => {},
                   'name' => {}
                 },
-                'index_entry' => {
-                  'entry_element' => {},
-                  'entry_number' => 6,
-                  'in_code' => 1,
-                  'index_name' => 'fn'
-                },
+                'index_entry' => [
+                  'fn',
+                  6
+                ],
                 'original_def_cmdname' => 'defop'
               },
               'source_info' => {
@@ -4308,12 +4286,10 @@ $result_trees{'all_commands_delimiters'} = {
                   'name' => {},
                   'type' => {}
                 },
-                'index_entry' => {
-                  'entry_element' => {},
-                  'entry_number' => 7,
-                  'in_code' => 1,
-                  'index_name' => 'fn'
-                },
+                'index_entry' => [
+                  'fn',
+                  7
+                ],
                 'original_def_cmdname' => 'deftypeop'
               },
               'source_info' => {
@@ -4502,12 +4478,10 @@ $result_trees{'all_commands_delimiters'} = {
                   'name' => {},
                   'type' => {}
                 },
-                'index_entry' => {
-                  'entry_element' => {},
-                  'entry_number' => 8,
-                  'in_code' => 1,
-                  'index_name' => 'fn'
-                },
+                'index_entry' => [
+                  'fn',
+                  8
+                ],
                 'original_def_cmdname' => 'deftypeop'
               },
               'source_info' => {
@@ -4716,12 +4690,10 @@ $result_trees{'all_commands_delimiters'} = {
                   'name' => {},
                   'type' => {}
                 },
-                'index_entry' => {
-                  'entry_element' => {},
-                  'entry_number' => 9,
-                  'in_code' => 1,
-                  'index_name' => 'fn'
-                },
+                'index_entry' => [
+                  'fn',
+                  9
+                ],
                 'original_def_cmdname' => 'deftypeop'
               },
               'source_info' => {
@@ -4930,12 +4902,10 @@ $result_trees{'all_commands_delimiters'} = {
                   'name' => {},
                   'type' => {}
                 },
-                'index_entry' => {
-                  'entry_element' => {},
-                  'entry_number' => 10,
-                  'in_code' => 1,
-                  'index_name' => 'fn'
-                },
+                'index_entry' => [
+                  'fn',
+                  10
+                ],
                 'original_def_cmdname' => 'deftypeop'
               },
               'source_info' => {
@@ -5124,12 +5094,10 @@ $result_trees{'all_commands_delimiters'} = {
                   'name' => {},
                   'type' => {}
                 },
-                'index_entry' => {
-                  'entry_element' => {},
-                  'entry_number' => 11,
-                  'in_code' => 1,
-                  'index_name' => 'fn'
-                },
+                'index_entry' => [
+                  'fn',
+                  11
+                ],
                 'original_def_cmdname' => 'deftypeop'
               },
               'source_info' => {
@@ -5318,12 +5286,10 @@ $result_trees{'all_commands_delimiters'} = {
                   'name' => {},
                   'type' => {}
                 },
-                'index_entry' => {
-                  'entry_element' => {},
-                  'entry_number' => 12,
-                  'in_code' => 1,
-                  'index_name' => 'fn'
-                },
+                'index_entry' => [
+                  'fn',
+                  12
+                ],
                 'original_def_cmdname' => 'deftypeop'
               },
               'source_info' => {
@@ -5532,12 +5498,10 @@ $result_trees{'all_commands_delimiters'} = {
                   'name' => {},
                   'type' => {}
                 },
-                'index_entry' => {
-                  'entry_element' => {},
-                  'entry_number' => 13,
-                  'in_code' => 1,
-                  'index_name' => 'fn'
-                },
+                'index_entry' => [
+                  'fn',
+                  13
+                ],
                 'original_def_cmdname' => 'deftypeop'
               },
               'source_info' => {
@@ -5746,12 +5710,10 @@ $result_trees{'all_commands_delimiters'} = {
                   'name' => {},
                   'type' => {}
                 },
-                'index_entry' => {
-                  'entry_element' => {},
-                  'entry_number' => 14,
-                  'in_code' => 1,
-                  'index_name' => 'fn'
-                },
+                'index_entry' => [
+                  'fn',
+                  14
+                ],
                 'original_def_cmdname' => 'deftypeop'
               },
               'source_info' => {
@@ -5940,12 +5902,10 @@ $result_trees{'all_commands_delimiters'} = {
                   'name' => {},
                   'type' => {}
                 },
-                'index_entry' => {
-                  'entry_element' => {},
-                  'entry_number' => 15,
-                  'in_code' => 1,
-                  'index_name' => 'fn'
-                },
+                'index_entry' => [
+                  'fn',
+                  15
+                ],
                 'original_def_cmdname' => 'deftypeop'
               },
               'source_info' => {
@@ -6134,12 +6094,10 @@ $result_trees{'all_commands_delimiters'} = {
                   'name' => {},
                   'type' => {}
                 },
-                'index_entry' => {
-                  'entry_element' => {},
-                  'entry_number' => 16,
-                  'in_code' => 1,
-                  'index_name' => 'fn'
-                },
+                'index_entry' => [
+                  'fn',
+                  16
+                ],
                 'original_def_cmdname' => 'deftypeop'
               },
               'source_info' => {
@@ -6348,12 +6306,10 @@ $result_trees{'all_commands_delimiters'} = {
                   'name' => {},
                   'type' => {}
                 },
-                'index_entry' => {
-                  'entry_element' => {},
-                  'entry_number' => 17,
-                  'in_code' => 1,
-                  'index_name' => 'fn'
-                },
+                'index_entry' => [
+                  'fn',
+                  17
+                ],
                 'original_def_cmdname' => 'deftypeop'
               },
               'source_info' => {
@@ -6562,12 +6518,10 @@ $result_trees{'all_commands_delimiters'} = {
                   'name' => {},
                   'type' => {}
                 },
-                'index_entry' => {
-                  'entry_element' => {},
-                  'entry_number' => 18,
-                  'in_code' => 1,
-                  'index_name' => 'fn'
-                },
+                'index_entry' => [
+                  'fn',
+                  18
+                ],
                 'original_def_cmdname' => 'deftypeop'
               },
               'source_info' => {
@@ -6756,12 +6710,10 @@ $result_trees{'all_commands_delimiters'} = {
                   'name' => {},
                   'type' => {}
                 },
-                'index_entry' => {
-                  'entry_element' => {},
-                  'entry_number' => 19,
-                  'in_code' => 1,
-                  'index_name' => 'fn'
-                },
+                'index_entry' => [
+                  'fn',
+                  19
+                ],
                 'original_def_cmdname' => 'deftypeop'
               },
               'source_info' => {
@@ -6950,12 +6902,10 @@ $result_trees{'all_commands_delimiters'} = {
                   'name' => {},
                   'type' => {}
                 },
-                'index_entry' => {
-                  'entry_element' => {},
-                  'entry_number' => 20,
-                  'in_code' => 1,
-                  'index_name' => 'fn'
-                },
+                'index_entry' => [
+                  'fn',
+                  20
+                ],
                 'original_def_cmdname' => 'deftypeop'
               },
               'source_info' => {
@@ -7177,12 +7127,10 @@ $result_trees{'all_commands_delimiters'} = {
                   'name' => {},
                   'type' => {}
                 },
-                'index_entry' => {
-                  'entry_element' => {},
-                  'entry_number' => 21,
-                  'in_code' => 1,
-                  'index_name' => 'fn'
-                },
+                'index_entry' => [
+                  'fn',
+                  21
+                ],
                 'original_def_cmdname' => 'deftypeop'
               },
               'source_info' => {
@@ -7328,12 +7276,10 @@ $result_trees{'all_commands_delimiters'} = {
                   'category' => {},
                   'name' => {}
                 },
-                'index_entry' => {
-                  'entry_element' => {},
-                  'entry_number' => 22,
-                  'in_code' => 1,
-                  'index_name' => 'fn'
-                },
+                'index_entry' => [
+                  'fn',
+                  22
+                ],
                 'original_def_cmdname' => 'defun'
               },
               'source_info' => {
@@ -7521,12 +7467,10 @@ $result_trees{'all_commands_delimiters'} = {
                   'category' => {},
                   'name' => {}
                 },
-                'index_entry' => {
-                  'entry_element' => {},
-                  'entry_number' => 23,
-                  'in_code' => 1,
-                  'index_name' => 'fn'
-                },
+                'index_entry' => [
+                  'fn',
+                  23
+                ],
                 'original_def_cmdname' => 'deffn'
               },
               'source_info' => {
@@ -7714,12 +7658,10 @@ $result_trees{'all_commands_delimiters'} = {
                   'category' => {},
                   'name' => {}
                 },
-                'index_entry' => {
-                  'entry_element' => {},
-                  'entry_number' => 24,
-                  'in_code' => 1,
-                  'index_name' => 'fn'
-                },
+                'index_entry' => [
+                  'fn',
+                  24
+                ],
                 'original_def_cmdname' => 'deffn'
               },
               'source_info' => {
@@ -7907,12 +7849,10 @@ $result_trees{'all_commands_delimiters'} = {
                   'category' => {},
                   'name' => {}
                 },
-                'index_entry' => {
-                  'entry_element' => {},
-                  'entry_number' => 5,
-                  'in_code' => 1,
-                  'index_name' => 'vr'
-                },
+                'index_entry' => [
+                  'vr',
+                  5
+                ],
                 'original_def_cmdname' => 'defvr'
               },
               'source_info' => {
@@ -8100,12 +8040,10 @@ $result_trees{'all_commands_delimiters'} = {
                   'category' => {},
                   'name' => {}
                 },
-                'index_entry' => {
-                  'entry_element' => {},
-                  'entry_number' => 6,
-                  'in_code' => 1,
-                  'index_name' => 'vr'
-                },
+                'index_entry' => [
+                  'vr',
+                  6
+                ],
                 'original_def_cmdname' => 'defvr'
               },
               'source_info' => {
@@ -8322,12 +8260,10 @@ $result_trees{'all_commands_delimiters'} = {
                   'name' => {},
                   'type' => {}
                 },
-                'index_entry' => {
-                  'entry_element' => {},
-                  'entry_number' => 25,
-                  'in_code' => 1,
-                  'index_name' => 'fn'
-                },
+                'index_entry' => [
+                  'fn',
+                  25
+                ],
                 'original_def_cmdname' => 'deftypefn'
               },
               'source_info' => {
@@ -8544,12 +8480,10 @@ $result_trees{'all_commands_delimiters'} = {
                   'name' => {},
                   'type' => {}
                 },
-                'index_entry' => {
-                  'entry_element' => {},
-                  'entry_number' => 26,
-                  'in_code' => 1,
-                  'index_name' => 'fn'
-                },
+                'index_entry' => [
+                  'fn',
+                  26
+                ],
                 'original_def_cmdname' => 'deftypefn'
               },
               'source_info' => {
@@ -8766,12 +8700,10 @@ $result_trees{'all_commands_delimiters'} = {
                   'name' => {},
                   'type' => {}
                 },
-                'index_entry' => {
-                  'entry_element' => {},
-                  'entry_number' => 7,
-                  'in_code' => 1,
-                  'index_name' => 'vr'
-                },
+                'index_entry' => [
+                  'vr',
+                  7
+                ],
                 'original_def_cmdname' => 'deftypevr'
               },
               'source_info' => {
@@ -8988,12 +8920,10 @@ $result_trees{'all_commands_delimiters'} = {
                   'name' => {},
                   'type' => {}
                 },
-                'index_entry' => {
-                  'entry_element' => {},
-                  'entry_number' => 8,
-                  'in_code' => 1,
-                  'index_name' => 'vr'
-                },
+                'index_entry' => [
+                  'vr',
+                  8
+                ],
                 'original_def_cmdname' => 'deftypevr'
               },
               'source_info' => {
@@ -9181,12 +9111,10 @@ $result_trees{'all_commands_delimiters'} = {
                   'category' => {},
                   'name' => {}
                 },
-                'index_entry' => {
-                  'entry_element' => {},
-                  'entry_number' => 2,
-                  'in_code' => 1,
-                  'index_name' => 'tp'
-                },
+                'index_entry' => [
+                  'tp',
+                  2
+                ],
                 'original_def_cmdname' => 'deftp'
               },
               'source_info' => {
@@ -9374,12 +9302,10 @@ $result_trees{'all_commands_delimiters'} = {
                   'category' => {},
                   'name' => {}
                 },
-                'index_entry' => {
-                  'entry_element' => {},
-                  'entry_number' => 3,
-                  'in_code' => 1,
-                  'index_name' => 'tp'
-                },
+                'index_entry' => [
+                  'tp',
+                  3
+                ],
                 'original_def_cmdname' => 'deftp'
               },
               'source_info' => {
@@ -9596,12 +9522,10 @@ $result_trees{'all_commands_delimiters'} = {
                   'class' => {},
                   'name' => {}
                 },
-                'index_entry' => {
-                  'entry_element' => {},
-                  'entry_number' => 9,
-                  'in_code' => 1,
-                  'index_name' => 'vr'
-                },
+                'index_entry' => [
+                  'vr',
+                  9
+                ],
                 'original_def_cmdname' => 'defcv'
               },
               'source_info' => {
@@ -9817,12 +9741,10 @@ $result_trees{'all_commands_delimiters'} = {
                   'category' => {},
                   'name' => {}
                 },
-                'index_entry' => {
-                  'entry_element' => {},
-                  'entry_number' => 4,
-                  'in_code' => 1,
-                  'index_name' => 'tp'
-                },
+                'index_entry' => [
+                  'tp',
+                  4
+                ],
                 'original_def_cmdname' => 'deftp'
               },
               'source_info' => {
@@ -10086,12 +10008,10 @@ $result_trees{'all_commands_delimiters'} = {
                   'name' => {},
                   'type' => {}
                 },
-                'index_entry' => {
-                  'entry_element' => {},
-                  'entry_number' => 10,
-                  'in_code' => 1,
-                  'index_name' => 'vr'
-                },
+                'index_entry' => [
+                  'vr',
+                  10
+                ],
                 'original_def_cmdname' => 'deftypecv'
               },
               'source_info' => {
@@ -10355,12 +10275,10 @@ $result_trees{'all_commands_delimiters'} = {
                   'name' => {},
                   'type' => {}
                 },
-                'index_entry' => {
-                  'entry_element' => {},
-                  'entry_number' => 11,
-                  'in_code' => 1,
-                  'index_name' => 'vr'
-                },
+                'index_entry' => [
+                  'vr',
+                  11
+                ],
                 'original_def_cmdname' => 'deftypecv'
               },
               'source_info' => {
@@ -10595,12 +10513,10 @@ $result_trees{'all_commands_delimiters'} = {
                   'class' => {},
                   'name' => {}
                 },
-                'index_entry' => {
-                  'entry_element' => {},
-                  'entry_number' => 27,
-                  'in_code' => 1,
-                  'index_name' => 'fn'
-                },
+                'index_entry' => [
+                  'fn',
+                  27
+                ],
                 'original_def_cmdname' => 'defop'
               },
               'source_info' => {
@@ -10835,12 +10751,10 @@ $result_trees{'all_commands_delimiters'} = {
                   'class' => {},
                   'name' => {}
                 },
-                'index_entry' => {
-                  'entry_element' => {},
-                  'entry_number' => 28,
-                  'in_code' => 1,
-                  'index_name' => 'fn'
-                },
+                'index_entry' => [
+                  'fn',
+                  28
+                ],
                 'original_def_cmdname' => 'defop'
               },
               'source_info' => {
@@ -11104,12 +11018,10 @@ $result_trees{'all_commands_delimiters'} = {
                   'name' => {},
                   'type' => {}
                 },
-                'index_entry' => {
-                  'entry_element' => {},
-                  'entry_number' => 29,
-                  'in_code' => 1,
-                  'index_name' => 'fn'
-                },
+                'index_entry' => [
+                  'fn',
+                  29
+                ],
                 'original_def_cmdname' => 'deftypeop'
               },
               'source_info' => {
@@ -11373,12 +11285,10 @@ $result_trees{'all_commands_delimiters'} = {
                   'name' => {},
                   'type' => {}
                 },
-                'index_entry' => {
-                  'entry_element' => {},
-                  'entry_number' => 30,
-                  'in_code' => 1,
-                  'index_name' => 'fn'
-                },
+                'index_entry' => [
+                  'fn',
+                  30
+                ],
                 'original_def_cmdname' => 'deftypeop'
               },
               'source_info' => {
@@ -11636,12 +11546,10 @@ $result_trees{'all_commands_delimiters'} = {
                   'name' => {},
                   'type' => {}
                 },
-                'index_entry' => {
-                  'entry_element' => {},
-                  'entry_number' => 31,
-                  'in_code' => 1,
-                  'index_name' => 'fn'
-                },
+                'index_entry' => [
+                  'fn',
+                  31
+                ],
                 'original_def_cmdname' => 'deftypefn'
               },
               'source_info' => {
@@ -11899,12 +11807,10 @@ $result_trees{'all_commands_delimiters'} = {
                   'name' => {},
                   'type' => {}
                 },
-                'index_entry' => {
-                  'entry_element' => {},
-                  'entry_number' => 32,
-                  'in_code' => 1,
-                  'index_name' => 'fn'
-                },
+                'index_entry' => [
+                  'fn',
+                  32
+                ],
                 'original_def_cmdname' => 'deftypefn'
               },
               'source_info' => {
@@ -11967,45 +11873,36 @@ $result_trees{'all_commands_delimiters'} = {
 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'extra'}{'def_index_element'}
 = 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[2];
 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'extra'}{'def_parsed_hash'}{'category'}
 = 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0];
 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'extra'}{'def_parsed_hash'}{'name'}
 = 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[2];
-$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[0]{'contents'}[0];
 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[2]{'contents'}[0]{'extra'}{'def_index_element'}
 = 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[2]{'contents'}[0]{'args'}[0]{'contents'}[2];
 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[2]{'contents'}[0]{'extra'}{'def_parsed_hash'}{'category'}
 = 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[2]{'contents'}[0]{'args'}[0]{'contents'}[0];
 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[2]{'contents'}[0]{'extra'}{'def_parsed_hash'}{'name'}
 = 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[2]{'contents'}[0]{'args'}[0]{'contents'}[2];
-$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[2]{'contents'}[0]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[2]{'contents'}[0];
 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[4]{'contents'}[0]{'extra'}{'def_index_element'}
 = 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[4]{'contents'}[0]{'args'}[0]{'contents'}[4];
 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[4]{'contents'}[0]{'extra'}{'def_parsed_hash'}{'category'}
 = 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[4]{'contents'}[0]{'args'}[0]{'contents'}[0];
 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[4]{'contents'}[0]{'extra'}{'def_parsed_hash'}{'name'}
 = 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[4]{'contents'}[0]{'args'}[0]{'contents'}[4];
 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[4]{'contents'}[0]{'extra'}{'def_parsed_hash'}{'type'}
 = 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[4]{'contents'}[0]{'args'}[0]{'contents'}[2];
-$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[4]{'contents'}[0]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[4]{'contents'}[0];
 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[6]{'contents'}[0]{'extra'}{'def_index_element'}
 = 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[6]{'contents'}[0]{'args'}[0]{'contents'}[4];
 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[6]{'contents'}[0]{'extra'}{'def_parsed_hash'}{'category'}
 = 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[6]{'contents'}[0]{'args'}[0]{'contents'}[0];
 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[6]{'contents'}[0]{'extra'}{'def_parsed_hash'}{'name'}
 = 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[6]{'contents'}[0]{'args'}[0]{'contents'}[4];
 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[6]{'contents'}[0]{'extra'}{'def_parsed_hash'}{'type'}
 = 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[6]{'contents'}[0]{'args'}[0]{'contents'}[2];
-$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[6]{'contents'}[0]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[6]{'contents'}[0];
 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[8]{'contents'}[0]{'extra'}{'def_index_element'}
 = 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[8]{'contents'}[0]{'args'}[0]{'contents'}[4];
 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[8]{'contents'}[0]{'extra'}{'def_parsed_hash'}{'category'}
 = 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[8]{'contents'}[0]{'args'}[0]{'contents'}[0];
 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[8]{'contents'}[0]{'extra'}{'def_parsed_hash'}{'name'}
 = 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[8]{'contents'}[0]{'args'}[0]{'contents'}[4];
 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[8]{'contents'}[0]{'extra'}{'def_parsed_hash'}{'type'}
 = 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[8]{'contents'}[0]{'args'}[0]{'contents'}[2];
-$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[8]{'contents'}[0]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[8]{'contents'}[0];
 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[10]{'contents'}[0]{'extra'}{'def_index_element'}
 = 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[10]{'contents'}[0]{'args'}[0]{'contents'}[4];
 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[10]{'contents'}[0]{'extra'}{'def_parsed_hash'}{'category'}
 = 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[10]{'contents'}[0]{'args'}[0]{'contents'}[0];
 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[10]{'contents'}[0]{'extra'}{'def_parsed_hash'}{'name'}
 = 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[10]{'contents'}[0]{'args'}[0]{'contents'}[4];
 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[10]{'contents'}[0]{'extra'}{'def_parsed_hash'}{'type'}
 = 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[10]{'contents'}[0]{'args'}[0]{'contents'}[2];
-$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[10]{'contents'}[0]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[10]{'contents'}[0];
 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[12]{'contents'}[0]{'extra'}{'def_index_element'}
 = 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[12]{'contents'}[0]{'args'}[0]{'contents'}[4];
 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[12]{'contents'}[0]{'extra'}{'def_parsed_hash'}{'category'}
 = 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[12]{'contents'}[0]{'args'}[0]{'contents'}[0];
 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[12]{'contents'}[0]{'extra'}{'def_parsed_hash'}{'name'}
 = 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[12]{'contents'}[0]{'args'}[0]{'contents'}[4];
 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[12]{'contents'}[0]{'extra'}{'def_parsed_hash'}{'type'}
 = 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[12]{'contents'}[0]{'args'}[0]{'contents'}[2];
-$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[12]{'contents'}[0]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[12]{'contents'}[0];
 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[14]{'contents'}[0]{'extra'}{'def_index_element'}
 = 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[14]{'contents'}[0]{'args'}[0]{'contents'}[2];
 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[14]{'contents'}[0]{'extra'}{'def_parsed_hash'}{'category'}
 = 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[14]{'contents'}[0]{'args'}[0]{'contents'}[0];
 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[14]{'contents'}[0]{'extra'}{'def_parsed_hash'}{'name'}
 = 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[14]{'contents'}[0]{'args'}[0]{'contents'}[2];
-$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[14]{'contents'}[0]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[14]{'contents'}[0];
 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[16]{'contents'}[0]{'extra'}{'def_index_element'}
 = 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[16]{'contents'}[0]{'args'}[0]{'contents'}[4];
 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[16]{'contents'}[0]{'extra'}{'def_parsed_hash'}{'category'}
 = 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[16]{'contents'}[0]{'args'}[0]{'contents'}[0];
 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[16]{'contents'}[0]{'extra'}{'def_parsed_hash'}{'class'}
 = 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[16]{'contents'}[0]{'args'}[0]{'contents'}[2];
 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[16]{'contents'}[0]{'extra'}{'def_parsed_hash'}{'name'}
 = 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[16]{'contents'}[0]{'args'}[0]{'contents'}[4];
-$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[16]{'contents'}[0]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[16]{'contents'}[0];
 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[18]{'contents'}[0]{'extra'}{'def_index_element'}{'contents'}[0]
 = 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[18]{'contents'}[0]{'args'}[0]{'contents'}[6];
 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[18]{'contents'}[0]{'extra'}{'def_index_element'}{'contents'}[2]
 = 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[18]{'contents'}[0]{'args'}[0]{'contents'}[2];
 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[18]{'contents'}[0]{'extra'}{'def_index_ref_element'}{'contents'}[0]
 = 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[18]{'contents'}[0]{'args'}[0]{'contents'}[6];
@@ -12014,7 +11911,6 @@ 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[18]{'content
 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[18]{'contents'}[0]{'extra'}{'def_parsed_hash'}{'class'}
 = 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[18]{'contents'}[0]{'args'}[0]{'contents'}[2];
 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[18]{'contents'}[0]{'extra'}{'def_parsed_hash'}{'name'}
 = 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[18]{'contents'}[0]{'args'}[0]{'contents'}[6];
 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[18]{'contents'}[0]{'extra'}{'def_parsed_hash'}{'type'}
 = 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[18]{'contents'}[0]{'args'}[0]{'contents'}[4];
-$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[18]{'contents'}[0]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[18]{'contents'}[0];
 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[20]{'contents'}[0]{'extra'}{'def_index_element'}{'contents'}[0]
 = 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[20]{'contents'}[0]{'args'}[0]{'contents'}[4];
 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[20]{'contents'}[0]{'extra'}{'def_index_element'}{'contents'}[2]
 = 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[20]{'contents'}[0]{'args'}[0]{'contents'}[2];
 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[20]{'contents'}[0]{'extra'}{'def_index_ref_element'}{'contents'}[0]
 = 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[20]{'contents'}[0]{'args'}[0]{'contents'}[4];
@@ -12022,7 +11918,6 @@ 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[20]{'content
 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[20]{'contents'}[0]{'extra'}{'def_parsed_hash'}{'category'}
 = 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[20]{'contents'}[0]{'args'}[0]{'contents'}[0];
 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[20]{'contents'}[0]{'extra'}{'def_parsed_hash'}{'class'}
 = 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[20]{'contents'}[0]{'args'}[0]{'contents'}[2];
 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[20]{'contents'}[0]{'extra'}{'def_parsed_hash'}{'name'}
 = 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[20]{'contents'}[0]{'args'}[0]{'contents'}[4];
-$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[20]{'contents'}[0]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[20]{'contents'}[0];
 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[22]{'contents'}[0]{'extra'}{'def_index_element'}{'contents'}[0]
 = 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[22]{'contents'}[0]{'args'}[0]{'contents'}[6];
 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[22]{'contents'}[0]{'extra'}{'def_index_element'}{'contents'}[2]
 = 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[22]{'contents'}[0]{'args'}[0]{'contents'}[2];
 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[22]{'contents'}[0]{'extra'}{'def_index_ref_element'}{'contents'}[0]
 = 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[22]{'contents'}[0]{'args'}[0]{'contents'}[6];
@@ -12031,7 +11926,6 @@ 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[22]{'content
 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[22]{'contents'}[0]{'extra'}{'def_parsed_hash'}{'class'}
 = 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[22]{'contents'}[0]{'args'}[0]{'contents'}[2];
 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[22]{'contents'}[0]{'extra'}{'def_parsed_hash'}{'name'}
 = 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[22]{'contents'}[0]{'args'}[0]{'contents'}[6];
 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[22]{'contents'}[0]{'extra'}{'def_parsed_hash'}{'type'}
 = 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[22]{'contents'}[0]{'args'}[0]{'contents'}[4];
-$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[22]{'contents'}[0]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[22]{'contents'}[0];
 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[24]{'contents'}[0]{'extra'}{'def_index_element'}{'contents'}[0]
 = 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[24]{'contents'}[0]{'args'}[0]{'contents'}[6];
 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[24]{'contents'}[0]{'extra'}{'def_index_element'}{'contents'}[2]
 = 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[24]{'contents'}[0]{'args'}[0]{'contents'}[2];
 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[24]{'contents'}[0]{'extra'}{'def_index_ref_element'}{'contents'}[0]
 = 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[24]{'contents'}[0]{'args'}[0]{'contents'}[6];
@@ -12040,7 +11934,6 @@ 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[24]{'content
 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[24]{'contents'}[0]{'extra'}{'def_parsed_hash'}{'class'}
 = 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[24]{'contents'}[0]{'args'}[0]{'contents'}[2];
 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[24]{'contents'}[0]{'extra'}{'def_parsed_hash'}{'name'}
 = 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[24]{'contents'}[0]{'args'}[0]{'contents'}[6];
 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[24]{'contents'}[0]{'extra'}{'def_parsed_hash'}{'type'}
 = 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[24]{'contents'}[0]{'args'}[0]{'contents'}[4];
-$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[24]{'contents'}[0]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[24]{'contents'}[0];
 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[26]{'contents'}[0]{'extra'}{'def_index_element'}{'contents'}[0]
 = 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[26]{'contents'}[0]{'args'}[0]{'contents'}[6];
 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[26]{'contents'}[0]{'extra'}{'def_index_element'}{'contents'}[2]
 = 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[26]{'contents'}[0]{'args'}[0]{'contents'}[2];
 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[26]{'contents'}[0]{'extra'}{'def_index_ref_element'}{'contents'}[0]
 = 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[26]{'contents'}[0]{'args'}[0]{'contents'}[6];
@@ -12049,7 +11942,6 @@ 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[26]{'content
 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[26]{'contents'}[0]{'extra'}{'def_parsed_hash'}{'class'}
 = 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[26]{'contents'}[0]{'args'}[0]{'contents'}[2];
 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[26]{'contents'}[0]{'extra'}{'def_parsed_hash'}{'name'}
 = 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[26]{'contents'}[0]{'args'}[0]{'contents'}[6];
 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[26]{'contents'}[0]{'extra'}{'def_parsed_hash'}{'type'}
 = 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[26]{'contents'}[0]{'args'}[0]{'contents'}[4];
-$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[26]{'contents'}[0]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[26]{'contents'}[0];
 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[28]{'contents'}[0]{'extra'}{'def_index_element'}{'contents'}[0]
 = 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[28]{'contents'}[0]{'args'}[0]{'contents'}[6];
 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[28]{'contents'}[0]{'extra'}{'def_index_element'}{'contents'}[2]
 = 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[28]{'contents'}[0]{'args'}[0]{'contents'}[2];
 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[28]{'contents'}[0]{'extra'}{'def_index_ref_element'}{'contents'}[0]
 = 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[28]{'contents'}[0]{'args'}[0]{'contents'}[6];
@@ -12058,7 +11950,6 @@ 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[28]{'content
 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[28]{'contents'}[0]{'extra'}{'def_parsed_hash'}{'class'}
 = 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[28]{'contents'}[0]{'args'}[0]{'contents'}[2];
 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[28]{'contents'}[0]{'extra'}{'def_parsed_hash'}{'name'}
 = 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[28]{'contents'}[0]{'args'}[0]{'contents'}[6];
 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[28]{'contents'}[0]{'extra'}{'def_parsed_hash'}{'type'}
 = 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[28]{'contents'}[0]{'args'}[0]{'contents'}[4];
-$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[28]{'contents'}[0]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[28]{'contents'}[0];
 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[30]{'contents'}[0]{'extra'}{'def_index_element'}{'contents'}[0]
 = 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[30]{'contents'}[0]{'args'}[0]{'contents'}[6];
 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[30]{'contents'}[0]{'extra'}{'def_index_element'}{'contents'}[2]
 = 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[30]{'contents'}[0]{'args'}[0]{'contents'}[2];
 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[30]{'contents'}[0]{'extra'}{'def_index_ref_element'}{'contents'}[0]
 = 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[30]{'contents'}[0]{'args'}[0]{'contents'}[6];
@@ -12067,7 +11958,6 @@ 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[30]{'content
 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[30]{'contents'}[0]{'extra'}{'def_parsed_hash'}{'class'}
 = 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[30]{'contents'}[0]{'args'}[0]{'contents'}[2];
 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[30]{'contents'}[0]{'extra'}{'def_parsed_hash'}{'name'}
 = 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[30]{'contents'}[0]{'args'}[0]{'contents'}[6];
 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[30]{'contents'}[0]{'extra'}{'def_parsed_hash'}{'type'}
 = 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[30]{'contents'}[0]{'args'}[0]{'contents'}[4];
-$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[30]{'contents'}[0]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[30]{'contents'}[0];
 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[32]{'contents'}[0]{'extra'}{'def_index_element'}{'contents'}[0]
 = 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[32]{'contents'}[0]{'args'}[0]{'contents'}[6];
 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[32]{'contents'}[0]{'extra'}{'def_index_element'}{'contents'}[2]
 = 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[32]{'contents'}[0]{'args'}[0]{'contents'}[2];
 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[32]{'contents'}[0]{'extra'}{'def_index_ref_element'}{'contents'}[0]
 = 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[32]{'contents'}[0]{'args'}[0]{'contents'}[6];
@@ -12076,7 +11966,6 @@ 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[32]{'content
 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[32]{'contents'}[0]{'extra'}{'def_parsed_hash'}{'class'}
 = 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[32]{'contents'}[0]{'args'}[0]{'contents'}[2];
 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[32]{'contents'}[0]{'extra'}{'def_parsed_hash'}{'name'}
 = 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[32]{'contents'}[0]{'args'}[0]{'contents'}[6];
 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[32]{'contents'}[0]{'extra'}{'def_parsed_hash'}{'type'}
 = 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[32]{'contents'}[0]{'args'}[0]{'contents'}[4];
-$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[32]{'contents'}[0]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[32]{'contents'}[0];
 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[34]{'contents'}[0]{'extra'}{'def_index_element'}{'contents'}[0]
 = 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[34]{'contents'}[0]{'args'}[0]{'contents'}[6];
 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[34]{'contents'}[0]{'extra'}{'def_index_element'}{'contents'}[2]
 = 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[34]{'contents'}[0]{'args'}[0]{'contents'}[2];
 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[34]{'contents'}[0]{'extra'}{'def_index_ref_element'}{'contents'}[0]
 = 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[34]{'contents'}[0]{'args'}[0]{'contents'}[6];
@@ -12085,7 +11974,6 @@ 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[34]{'content
 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[34]{'contents'}[0]{'extra'}{'def_parsed_hash'}{'class'}
 = 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[34]{'contents'}[0]{'args'}[0]{'contents'}[2];
 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[34]{'contents'}[0]{'extra'}{'def_parsed_hash'}{'name'}
 = 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[34]{'contents'}[0]{'args'}[0]{'contents'}[6];
 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[34]{'contents'}[0]{'extra'}{'def_parsed_hash'}{'type'}
 = 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[34]{'contents'}[0]{'args'}[0]{'contents'}[4];
-$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[34]{'contents'}[0]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[34]{'contents'}[0];
 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[36]{'contents'}[0]{'extra'}{'def_index_element'}{'contents'}[0]
 = 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[36]{'contents'}[0]{'args'}[0]{'contents'}[6];
 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[36]{'contents'}[0]{'extra'}{'def_index_element'}{'contents'}[2]
 = 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[36]{'contents'}[0]{'args'}[0]{'contents'}[2];
 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[36]{'contents'}[0]{'extra'}{'def_index_ref_element'}{'contents'}[0]
 = 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[36]{'contents'}[0]{'args'}[0]{'contents'}[6];
@@ -12094,7 +11982,6 @@ 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[36]{'content
 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[36]{'contents'}[0]{'extra'}{'def_parsed_hash'}{'class'}
 = 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[36]{'contents'}[0]{'args'}[0]{'contents'}[2];
 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[36]{'contents'}[0]{'extra'}{'def_parsed_hash'}{'name'}
 = 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[36]{'contents'}[0]{'args'}[0]{'contents'}[6];
 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[36]{'contents'}[0]{'extra'}{'def_parsed_hash'}{'type'}
 = 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[36]{'contents'}[0]{'args'}[0]{'contents'}[4];
-$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[36]{'contents'}[0]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[36]{'contents'}[0];
 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[38]{'contents'}[0]{'extra'}{'def_index_element'}{'contents'}[0]
 = 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[38]{'contents'}[0]{'args'}[0]{'contents'}[6];
 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[38]{'contents'}[0]{'extra'}{'def_index_element'}{'contents'}[2]
 = 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[38]{'contents'}[0]{'args'}[0]{'contents'}[2];
 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[38]{'contents'}[0]{'extra'}{'def_index_ref_element'}{'contents'}[0]
 = 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[38]{'contents'}[0]{'args'}[0]{'contents'}[6];
@@ -12103,7 +11990,6 @@ 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[38]{'content
 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[38]{'contents'}[0]{'extra'}{'def_parsed_hash'}{'class'}
 = 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[38]{'contents'}[0]{'args'}[0]{'contents'}[2];
 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[38]{'contents'}[0]{'extra'}{'def_parsed_hash'}{'name'}
 = 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[38]{'contents'}[0]{'args'}[0]{'contents'}[6];
 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[38]{'contents'}[0]{'extra'}{'def_parsed_hash'}{'type'}
 = 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[38]{'contents'}[0]{'args'}[0]{'contents'}[4];
-$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[38]{'contents'}[0]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[38]{'contents'}[0];
 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[40]{'contents'}[0]{'extra'}{'def_index_element'}{'contents'}[0]
 = 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[40]{'contents'}[0]{'args'}[0]{'contents'}[6];
 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[40]{'contents'}[0]{'extra'}{'def_index_element'}{'contents'}[2]
 = 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[40]{'contents'}[0]{'args'}[0]{'contents'}[2];
 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[40]{'contents'}[0]{'extra'}{'def_index_ref_element'}{'contents'}[0]
 = 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[40]{'contents'}[0]{'args'}[0]{'contents'}[6];
@@ -12112,7 +11998,6 @@ 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[40]{'content
 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[40]{'contents'}[0]{'extra'}{'def_parsed_hash'}{'class'}
 = 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[40]{'contents'}[0]{'args'}[0]{'contents'}[2];
 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[40]{'contents'}[0]{'extra'}{'def_parsed_hash'}{'name'}
 = 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[40]{'contents'}[0]{'args'}[0]{'contents'}[6];
 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[40]{'contents'}[0]{'extra'}{'def_parsed_hash'}{'type'}
 = 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[40]{'contents'}[0]{'args'}[0]{'contents'}[4];
-$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[40]{'contents'}[0]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[40]{'contents'}[0];
 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[42]{'contents'}[0]{'extra'}{'def_index_element'}{'contents'}[0]
 = 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[42]{'contents'}[0]{'args'}[0]{'contents'}[6];
 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[42]{'contents'}[0]{'extra'}{'def_index_element'}{'contents'}[2]
 = 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[42]{'contents'}[0]{'args'}[0]{'contents'}[2];
 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[42]{'contents'}[0]{'extra'}{'def_index_ref_element'}{'contents'}[0]
 = 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[42]{'contents'}[0]{'args'}[0]{'contents'}[6];
@@ -12121,7 +12006,6 @@ 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[42]{'content
 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[42]{'contents'}[0]{'extra'}{'def_parsed_hash'}{'class'}
 = 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[42]{'contents'}[0]{'args'}[0]{'contents'}[2];
 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[42]{'contents'}[0]{'extra'}{'def_parsed_hash'}{'name'}
 = 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[42]{'contents'}[0]{'args'}[0]{'contents'}[6];
 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[42]{'contents'}[0]{'extra'}{'def_parsed_hash'}{'type'}
 = 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[42]{'contents'}[0]{'args'}[0]{'contents'}[4];
-$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[42]{'contents'}[0]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[42]{'contents'}[0];
 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[44]{'contents'}[0]{'extra'}{'def_index_element'}{'contents'}[0]
 = 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[44]{'contents'}[0]{'args'}[0]{'contents'}[6];
 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[44]{'contents'}[0]{'extra'}{'def_index_element'}{'contents'}[2]
 = 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[44]{'contents'}[0]{'args'}[0]{'contents'}[2];
 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[44]{'contents'}[0]{'extra'}{'def_index_ref_element'}{'contents'}[0]
 = 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[44]{'contents'}[0]{'args'}[0]{'contents'}[6];
@@ -12130,7 +12014,6 @@ 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[44]{'content
 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[44]{'contents'}[0]{'extra'}{'def_parsed_hash'}{'class'}
 = 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[44]{'contents'}[0]{'args'}[0]{'contents'}[2];
 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[44]{'contents'}[0]{'extra'}{'def_parsed_hash'}{'name'}
 = 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[44]{'contents'}[0]{'args'}[0]{'contents'}[6];
 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[44]{'contents'}[0]{'extra'}{'def_parsed_hash'}{'type'}
 = 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[44]{'contents'}[0]{'args'}[0]{'contents'}[4];
-$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[44]{'contents'}[0]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[44]{'contents'}[0];
 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[46]{'contents'}[0]{'extra'}{'def_index_element'}{'contents'}[0]
 = 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[46]{'contents'}[0]{'args'}[0]{'contents'}[6];
 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[46]{'contents'}[0]{'extra'}{'def_index_element'}{'contents'}[2]
 = 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[46]{'contents'}[0]{'args'}[0]{'contents'}[2];
 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[46]{'contents'}[0]{'extra'}{'def_index_ref_element'}{'contents'}[0]
 = 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[46]{'contents'}[0]{'args'}[0]{'contents'}[6];
@@ -12139,7 +12022,6 @@ 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[46]{'content
 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[46]{'contents'}[0]{'extra'}{'def_parsed_hash'}{'class'}
 = 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[46]{'contents'}[0]{'args'}[0]{'contents'}[2];
 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[46]{'contents'}[0]{'extra'}{'def_parsed_hash'}{'name'}
 = 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[46]{'contents'}[0]{'args'}[0]{'contents'}[6];
 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[46]{'contents'}[0]{'extra'}{'def_parsed_hash'}{'type'}
 = 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[46]{'contents'}[0]{'args'}[0]{'contents'}[4];
-$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[46]{'contents'}[0]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[46]{'contents'}[0];
 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[48]{'contents'}[0]{'extra'}{'def_index_element'}{'contents'}[0]
 = 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[48]{'contents'}[0]{'args'}[0]{'contents'}[6];
 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[48]{'contents'}[0]{'extra'}{'def_index_element'}{'contents'}[2]
 = 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[48]{'contents'}[0]{'args'}[0]{'contents'}[2];
 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[48]{'contents'}[0]{'extra'}{'def_index_ref_element'}{'contents'}[0]
 = 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[48]{'contents'}[0]{'args'}[0]{'contents'}[6];
@@ -12148,7 +12030,6 @@ 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[48]{'content
 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[48]{'contents'}[0]{'extra'}{'def_parsed_hash'}{'class'}
 = 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[48]{'contents'}[0]{'args'}[0]{'contents'}[2];
 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[48]{'contents'}[0]{'extra'}{'def_parsed_hash'}{'name'}
 = 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[48]{'contents'}[0]{'args'}[0]{'contents'}[6];
 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[48]{'contents'}[0]{'extra'}{'def_parsed_hash'}{'type'}
 = 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[48]{'contents'}[0]{'args'}[0]{'contents'}[4];
-$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[48]{'contents'}[0]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[48]{'contents'}[0];
 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[50]{'contents'}[0]{'extra'}{'def_index_element'}{'contents'}[0]
 = 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[50]{'contents'}[0]{'args'}[0]{'contents'}[6];
 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[50]{'contents'}[0]{'extra'}{'def_index_element'}{'contents'}[2]
 = 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[50]{'contents'}[0]{'args'}[0]{'contents'}[2];
 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[50]{'contents'}[0]{'extra'}{'def_index_ref_element'}{'contents'}[0]
 = 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[50]{'contents'}[0]{'args'}[0]{'contents'}[6];
@@ -12157,64 +12038,50 @@ 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[50]{'content
 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[50]{'contents'}[0]{'extra'}{'def_parsed_hash'}{'class'}
 = 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[50]{'contents'}[0]{'args'}[0]{'contents'}[2];
 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[50]{'contents'}[0]{'extra'}{'def_parsed_hash'}{'name'}
 = 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[50]{'contents'}[0]{'args'}[0]{'contents'}[6];
 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[50]{'contents'}[0]{'extra'}{'def_parsed_hash'}{'type'}
 = 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[50]{'contents'}[0]{'args'}[0]{'contents'}[4];
-$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[50]{'contents'}[0]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[50]{'contents'}[0];
 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[52]{'contents'}[0]{'extra'}{'def_index_element'}
 = 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[52]{'contents'}[0]{'args'}[0]{'contents'}[2];
 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[52]{'contents'}[0]{'extra'}{'def_parsed_hash'}{'category'}
 = 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[52]{'contents'}[0]{'args'}[0]{'contents'}[0];
 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[52]{'contents'}[0]{'extra'}{'def_parsed_hash'}{'name'}
 = 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[52]{'contents'}[0]{'args'}[0]{'contents'}[2];
-$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[52]{'contents'}[0]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[52]{'contents'}[0];
 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[54]{'contents'}[0]{'extra'}{'def_index_element'}
 = 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[54]{'contents'}[0]{'args'}[0]{'contents'}[2];
 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[54]{'contents'}[0]{'extra'}{'def_parsed_hash'}{'category'}
 = 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[54]{'contents'}[0]{'args'}[0]{'contents'}[0];
 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[54]{'contents'}[0]{'extra'}{'def_parsed_hash'}{'name'}
 = 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[54]{'contents'}[0]{'args'}[0]{'contents'}[2];
-$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[54]{'contents'}[0]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[54]{'contents'}[0];
 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[56]{'contents'}[0]{'extra'}{'def_index_element'}
 = 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[56]{'contents'}[0]{'args'}[0]{'contents'}[2];
 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[56]{'contents'}[0]{'extra'}{'def_parsed_hash'}{'category'}
 = 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[56]{'contents'}[0]{'args'}[0]{'contents'}[0];
 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[56]{'contents'}[0]{'extra'}{'def_parsed_hash'}{'name'}
 = 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[56]{'contents'}[0]{'args'}[0]{'contents'}[2];
-$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[56]{'contents'}[0]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[56]{'contents'}[0];
 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[58]{'contents'}[0]{'extra'}{'def_index_element'}
 = 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[58]{'contents'}[0]{'args'}[0]{'contents'}[2];
 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[58]{'contents'}[0]{'extra'}{'def_parsed_hash'}{'category'}
 = 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[58]{'contents'}[0]{'args'}[0]{'contents'}[0];
 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[58]{'contents'}[0]{'extra'}{'def_parsed_hash'}{'name'}
 = 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[58]{'contents'}[0]{'args'}[0]{'contents'}[2];
-$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[58]{'contents'}[0]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[58]{'contents'}[0];
 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[60]{'contents'}[0]{'extra'}{'def_index_element'}
 = 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[60]{'contents'}[0]{'args'}[0]{'contents'}[2];
 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[60]{'contents'}[0]{'extra'}{'def_parsed_hash'}{'category'}
 = 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[60]{'contents'}[0]{'args'}[0]{'contents'}[0];
 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[60]{'contents'}[0]{'extra'}{'def_parsed_hash'}{'name'}
 = 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[60]{'contents'}[0]{'args'}[0]{'contents'}[2];
-$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[60]{'contents'}[0]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[60]{'contents'}[0];
 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[62]{'contents'}[0]{'extra'}{'def_index_element'}
 = 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[62]{'contents'}[0]{'args'}[0]{'contents'}[4];
 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[62]{'contents'}[0]{'extra'}{'def_parsed_hash'}{'category'}
 = 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[62]{'contents'}[0]{'args'}[0]{'contents'}[0];
 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[62]{'contents'}[0]{'extra'}{'def_parsed_hash'}{'name'}
 = 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[62]{'contents'}[0]{'args'}[0]{'contents'}[4];
 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[62]{'contents'}[0]{'extra'}{'def_parsed_hash'}{'type'}
 = 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[62]{'contents'}[0]{'args'}[0]{'contents'}[2];
-$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[62]{'contents'}[0]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[62]{'contents'}[0];
 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[64]{'contents'}[0]{'extra'}{'def_index_element'}
 = 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[64]{'contents'}[0]{'args'}[0]{'contents'}[4];
 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[64]{'contents'}[0]{'extra'}{'def_parsed_hash'}{'category'}
 = 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[64]{'contents'}[0]{'args'}[0]{'contents'}[0];
 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[64]{'contents'}[0]{'extra'}{'def_parsed_hash'}{'name'}
 = 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[64]{'contents'}[0]{'args'}[0]{'contents'}[4];
 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[64]{'contents'}[0]{'extra'}{'def_parsed_hash'}{'type'}
 = 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[64]{'contents'}[0]{'args'}[0]{'contents'}[2];
-$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[64]{'contents'}[0]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[64]{'contents'}[0];
 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[66]{'contents'}[0]{'extra'}{'def_index_element'}
 = 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[66]{'contents'}[0]{'args'}[0]{'contents'}[4];
 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[66]{'contents'}[0]{'extra'}{'def_parsed_hash'}{'category'}
 = 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[66]{'contents'}[0]{'args'}[0]{'contents'}[0];
 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[66]{'contents'}[0]{'extra'}{'def_parsed_hash'}{'name'}
 = 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[66]{'contents'}[0]{'args'}[0]{'contents'}[4];
 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[66]{'contents'}[0]{'extra'}{'def_parsed_hash'}{'type'}
 = 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[66]{'contents'}[0]{'args'}[0]{'contents'}[2];
-$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[66]{'contents'}[0]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[66]{'contents'}[0];
 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[68]{'contents'}[0]{'extra'}{'def_index_element'}
 = 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[68]{'contents'}[0]{'args'}[0]{'contents'}[4];
 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[68]{'contents'}[0]{'extra'}{'def_parsed_hash'}{'category'}
 = 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[68]{'contents'}[0]{'args'}[0]{'contents'}[0];
 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[68]{'contents'}[0]{'extra'}{'def_parsed_hash'}{'name'}
 = 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[68]{'contents'}[0]{'args'}[0]{'contents'}[4];
 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[68]{'contents'}[0]{'extra'}{'def_parsed_hash'}{'type'}
 = 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[68]{'contents'}[0]{'args'}[0]{'contents'}[2];
-$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[68]{'contents'}[0]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[68]{'contents'}[0];
 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[70]{'contents'}[0]{'extra'}{'def_index_element'}
 = 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[70]{'contents'}[0]{'args'}[0]{'contents'}[2];
 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[70]{'contents'}[0]{'extra'}{'def_parsed_hash'}{'category'}
 = 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[70]{'contents'}[0]{'args'}[0]{'contents'}[0];
 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[70]{'contents'}[0]{'extra'}{'def_parsed_hash'}{'name'}
 = 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[70]{'contents'}[0]{'args'}[0]{'contents'}[2];
-$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[70]{'contents'}[0]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[70]{'contents'}[0];
 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[72]{'contents'}[0]{'extra'}{'def_index_element'}
 = 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[72]{'contents'}[0]{'args'}[0]{'contents'}[2];
 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[72]{'contents'}[0]{'extra'}{'def_parsed_hash'}{'category'}
 = 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[72]{'contents'}[0]{'args'}[0]{'contents'}[0];
 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[72]{'contents'}[0]{'extra'}{'def_parsed_hash'}{'name'}
 = 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[72]{'contents'}[0]{'args'}[0]{'contents'}[2];
-$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[72]{'contents'}[0]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[72]{'contents'}[0];
 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[74]{'contents'}[0]{'extra'}{'def_index_element'}
 = 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[74]{'contents'}[0]{'args'}[0]{'contents'}[4];
 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[74]{'contents'}[0]{'extra'}{'def_parsed_hash'}{'category'}
 = 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[74]{'contents'}[0]{'args'}[0]{'contents'}[0];
 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[74]{'contents'}[0]{'extra'}{'def_parsed_hash'}{'class'}
 = 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[74]{'contents'}[0]{'args'}[0]{'contents'}[2];
 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[74]{'contents'}[0]{'extra'}{'def_parsed_hash'}{'name'}
 = 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[74]{'contents'}[0]{'args'}[0]{'contents'}[4];
-$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[74]{'contents'}[0]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[74]{'contents'}[0];
 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[76]{'contents'}[0]{'extra'}{'def_index_element'}
 = 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[76]{'contents'}[0]{'args'}[0]{'contents'}[2];
 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[76]{'contents'}[0]{'extra'}{'def_parsed_hash'}{'category'}
 = 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[76]{'contents'}[0]{'args'}[0]{'contents'}[0];
 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[76]{'contents'}[0]{'extra'}{'def_parsed_hash'}{'name'}
 = 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[76]{'contents'}[0]{'args'}[0]{'contents'}[2];
-$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[76]{'contents'}[0]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[76]{'contents'}[0];
 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[78]{'contents'}[0]{'extra'}{'def_index_element'}{'contents'}[0]
 = 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[78]{'contents'}[0]{'args'}[0]{'contents'}[6];
 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[78]{'contents'}[0]{'extra'}{'def_index_element'}{'contents'}[2]
 = 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[78]{'contents'}[0]{'args'}[0]{'contents'}[2];
 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[78]{'contents'}[0]{'extra'}{'def_index_ref_element'}{'contents'}[0]
 = 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[78]{'contents'}[0]{'args'}[0]{'contents'}[6];
@@ -12223,7 +12090,6 @@ 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[78]{'content
 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[78]{'contents'}[0]{'extra'}{'def_parsed_hash'}{'class'}
 = 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[78]{'contents'}[0]{'args'}[0]{'contents'}[2];
 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[78]{'contents'}[0]{'extra'}{'def_parsed_hash'}{'name'}
 = 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[78]{'contents'}[0]{'args'}[0]{'contents'}[6];
 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[78]{'contents'}[0]{'extra'}{'def_parsed_hash'}{'type'}
 = 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[78]{'contents'}[0]{'args'}[0]{'contents'}[4];
-$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[78]{'contents'}[0]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[78]{'contents'}[0];
 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[80]{'contents'}[0]{'extra'}{'def_index_element'}{'contents'}[0]
 = 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[80]{'contents'}[0]{'args'}[0]{'contents'}[6];
 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[80]{'contents'}[0]{'extra'}{'def_index_element'}{'contents'}[2]
 = 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[80]{'contents'}[0]{'args'}[0]{'contents'}[2];
 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[80]{'contents'}[0]{'extra'}{'def_index_ref_element'}{'contents'}[0]
 = 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[80]{'contents'}[0]{'args'}[0]{'contents'}[6];
@@ -12232,7 +12098,6 @@ 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[80]{'content
 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[80]{'contents'}[0]{'extra'}{'def_parsed_hash'}{'class'}
 = 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[80]{'contents'}[0]{'args'}[0]{'contents'}[2];
 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[80]{'contents'}[0]{'extra'}{'def_parsed_hash'}{'name'}
 = 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[80]{'contents'}[0]{'args'}[0]{'contents'}[6];
 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[80]{'contents'}[0]{'extra'}{'def_parsed_hash'}{'type'}
 = 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[80]{'contents'}[0]{'args'}[0]{'contents'}[4];
-$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[80]{'contents'}[0]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[80]{'contents'}[0];
 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[82]{'contents'}[0]{'extra'}{'def_index_element'}{'contents'}[0]
 = 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[82]{'contents'}[0]{'args'}[0]{'contents'}[4];
 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[82]{'contents'}[0]{'extra'}{'def_index_element'}{'contents'}[2]
 = 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[82]{'contents'}[0]{'args'}[0]{'contents'}[2];
 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[82]{'contents'}[0]{'extra'}{'def_index_ref_element'}{'contents'}[0]
 = 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[82]{'contents'}[0]{'args'}[0]{'contents'}[4];
@@ -12240,7 +12105,6 @@ 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[82]{'content
 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[82]{'contents'}[0]{'extra'}{'def_parsed_hash'}{'category'}
 = 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[82]{'contents'}[0]{'args'}[0]{'contents'}[0];
 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[82]{'contents'}[0]{'extra'}{'def_parsed_hash'}{'class'}
 = 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[82]{'contents'}[0]{'args'}[0]{'contents'}[2];
 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[82]{'contents'}[0]{'extra'}{'def_parsed_hash'}{'name'}
 = 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[82]{'contents'}[0]{'args'}[0]{'contents'}[4];
-$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[82]{'contents'}[0]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[82]{'contents'}[0];
 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[84]{'contents'}[0]{'extra'}{'def_index_element'}{'contents'}[0]
 = 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[84]{'contents'}[0]{'args'}[0]{'contents'}[4];
 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[84]{'contents'}[0]{'extra'}{'def_index_element'}{'contents'}[2]
 = 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[84]{'contents'}[0]{'args'}[0]{'contents'}[2];
 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[84]{'contents'}[0]{'extra'}{'def_index_ref_element'}{'contents'}[0]
 = 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[84]{'contents'}[0]{'args'}[0]{'contents'}[4];
@@ -12248,7 +12112,6 @@ 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[84]{'content
 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[84]{'contents'}[0]{'extra'}{'def_parsed_hash'}{'category'}
 = 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[84]{'contents'}[0]{'args'}[0]{'contents'}[0];
 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[84]{'contents'}[0]{'extra'}{'def_parsed_hash'}{'class'}
 = 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[84]{'contents'}[0]{'args'}[0]{'contents'}[2];
 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[84]{'contents'}[0]{'extra'}{'def_parsed_hash'}{'name'}
 = 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[84]{'contents'}[0]{'args'}[0]{'contents'}[4];
-$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[84]{'contents'}[0]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[84]{'contents'}[0];
 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[86]{'contents'}[0]{'extra'}{'def_index_element'}{'contents'}[0]
 = 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[86]{'contents'}[0]{'args'}[0]{'contents'}[6];
 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[86]{'contents'}[0]{'extra'}{'def_index_element'}{'contents'}[2]
 = 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[86]{'contents'}[0]{'args'}[0]{'contents'}[2];
 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[86]{'contents'}[0]{'extra'}{'def_index_ref_element'}{'contents'}[0]
 = 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[86]{'contents'}[0]{'args'}[0]{'contents'}[6];
@@ -12257,7 +12120,6 @@ 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[86]{'content
 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[86]{'contents'}[0]{'extra'}{'def_parsed_hash'}{'class'}
 = 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[86]{'contents'}[0]{'args'}[0]{'contents'}[2];
 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[86]{'contents'}[0]{'extra'}{'def_parsed_hash'}{'name'}
 = 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[86]{'contents'}[0]{'args'}[0]{'contents'}[6];
 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[86]{'contents'}[0]{'extra'}{'def_parsed_hash'}{'type'}
 = 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[86]{'contents'}[0]{'args'}[0]{'contents'}[4];
-$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[86]{'contents'}[0]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[86]{'contents'}[0];
 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[88]{'contents'}[0]{'extra'}{'def_index_element'}{'contents'}[0]
 = 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[88]{'contents'}[0]{'args'}[0]{'contents'}[6];
 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[88]{'contents'}[0]{'extra'}{'def_index_element'}{'contents'}[2]
 = 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[88]{'contents'}[0]{'args'}[0]{'contents'}[2];
 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[88]{'contents'}[0]{'extra'}{'def_index_ref_element'}{'contents'}[0]
 = 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[88]{'contents'}[0]{'args'}[0]{'contents'}[6];
@@ -12266,17 +12128,14 @@ 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[88]{'content
 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[88]{'contents'}[0]{'extra'}{'def_parsed_hash'}{'class'}
 = 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[88]{'contents'}[0]{'args'}[0]{'contents'}[2];
 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[88]{'contents'}[0]{'extra'}{'def_parsed_hash'}{'name'}
 = 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[88]{'contents'}[0]{'args'}[0]{'contents'}[6];
 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[88]{'contents'}[0]{'extra'}{'def_parsed_hash'}{'type'}
 = 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[88]{'contents'}[0]{'args'}[0]{'contents'}[4];
-$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[88]{'contents'}[0]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[88]{'contents'}[0];
 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[90]{'contents'}[0]{'extra'}{'def_index_element'}
 = 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[90]{'contents'}[0]{'args'}[0]{'contents'}[4];
 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[90]{'contents'}[0]{'extra'}{'def_parsed_hash'}{'category'}
 = 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[90]{'contents'}[0]{'args'}[0]{'contents'}[0];
 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[90]{'contents'}[0]{'extra'}{'def_parsed_hash'}{'name'}
 = 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[90]{'contents'}[0]{'args'}[0]{'contents'}[4];
 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[90]{'contents'}[0]{'extra'}{'def_parsed_hash'}{'type'}
 = 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[90]{'contents'}[0]{'args'}[0]{'contents'}[2];
-$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[90]{'contents'}[0]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[90]{'contents'}[0];
 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[92]{'contents'}[0]{'extra'}{'def_index_element'}
 = 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[92]{'contents'}[0]{'args'}[0]{'contents'}[4];
 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[92]{'contents'}[0]{'extra'}{'def_parsed_hash'}{'category'}
 = 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[92]{'contents'}[0]{'args'}[0]{'contents'}[0];
 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[92]{'contents'}[0]{'extra'}{'def_parsed_hash'}{'name'}
 = 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[92]{'contents'}[0]{'args'}[0]{'contents'}[4];
 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[92]{'contents'}[0]{'extra'}{'def_parsed_hash'}{'type'}
 = 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[92]{'contents'}[0]{'args'}[0]{'contents'}[2];
-$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[92]{'contents'}[0]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[92]{'contents'}[0];
 
 $result_texis{'all_commands_delimiters'} = '@deffn Command @var{forward--char} 
@var{nchars} {argument2} {argument3}         (arg in brace, [something @var{in 
v--ar}, @b{in, b} {, comma} a@var{pref} p]) last
 @end deffn
diff --git a/tp/t/results/def/all_commands_delimiters_printindex.pl 
b/tp/t/results/def/all_commands_delimiters_printindex.pl
index 4c830feab7..535370b773 100644
--- a/tp/t/results/def/all_commands_delimiters_printindex.pl
+++ b/tp/t/results/def/all_commands_delimiters_printindex.pl
@@ -439,12 +439,10 @@ $result_trees{'all_commands_delimiters_printindex'} = {
                   'name' => {}
                 },
                 'element_node' => {},
-                'index_entry' => {
-                  'entry_element' => {},
-                  'entry_number' => 1,
-                  'in_code' => 1,
-                  'index_name' => 'fn'
-                },
+                'index_entry' => [
+                  'fn',
+                  1
+                ],
                 'original_def_cmdname' => 'deffn'
               },
               'source_info' => {
@@ -833,12 +831,10 @@ $result_trees{'all_commands_delimiters_printindex'} = {
                   'name' => {}
                 },
                 'element_node' => {},
-                'index_entry' => {
-                  'entry_element' => {},
-                  'entry_number' => 1,
-                  'in_code' => 1,
-                  'index_name' => 'vr'
-                },
+                'index_entry' => [
+                  'vr',
+                  1
+                ],
                 'original_def_cmdname' => 'defvr'
               },
               'source_info' => {
@@ -1068,12 +1064,10 @@ $result_trees{'all_commands_delimiters_printindex'} = {
                   'type' => {}
                 },
                 'element_node' => {},
-                'index_entry' => {
-                  'entry_element' => {},
-                  'entry_number' => 2,
-                  'in_code' => 1,
-                  'index_name' => 'fn'
-                },
+                'index_entry' => [
+                  'fn',
+                  2
+                ],
                 'original_def_cmdname' => 'deftypefn'
               },
               'source_info' => {
@@ -1571,12 +1565,10 @@ $result_trees{'all_commands_delimiters_printindex'} = {
                   'type' => {}
                 },
                 'element_node' => {},
-                'index_entry' => {
-                  'entry_element' => {},
-                  'entry_number' => 3,
-                  'in_code' => 1,
-                  'index_name' => 'fn'
-                },
+                'index_entry' => [
+                  'fn',
+                  3
+                ],
                 'original_def_cmdname' => 'deftypefn'
               },
               'source_info' => {
@@ -1726,12 +1718,10 @@ $result_trees{'all_commands_delimiters_printindex'} = {
                   'type' => {}
                 },
                 'element_node' => {},
-                'index_entry' => {
-                  'entry_element' => {},
-                  'entry_number' => 4,
-                  'in_code' => 1,
-                  'index_name' => 'fn'
-                },
+                'index_entry' => [
+                  'fn',
+                  4
+                ],
                 'original_def_cmdname' => 'deftypefn'
               },
               'source_info' => {
@@ -2041,12 +2031,10 @@ $result_trees{'all_commands_delimiters_printindex'} = {
                   'type' => {}
                 },
                 'element_node' => {},
-                'index_entry' => {
-                  'entry_element' => {},
-                  'entry_number' => 5,
-                  'in_code' => 1,
-                  'index_name' => 'fn'
-                },
+                'index_entry' => [
+                  'fn',
+                  5
+                ],
                 'original_def_cmdname' => 'deftypefn'
               },
               'source_info' => {
@@ -2413,12 +2401,10 @@ $result_trees{'all_commands_delimiters_printindex'} = {
                   'type' => {}
                 },
                 'element_node' => {},
-                'index_entry' => {
-                  'entry_element' => {},
-                  'entry_number' => 2,
-                  'in_code' => 1,
-                  'index_name' => 'vr'
-                },
+                'index_entry' => [
+                  'vr',
+                  2
+                ],
                 'original_def_cmdname' => 'deftypevr'
               },
               'source_info' => {
@@ -2797,12 +2783,10 @@ $result_trees{'all_commands_delimiters_printindex'} = {
                   'name' => {}
                 },
                 'element_node' => {},
-                'index_entry' => {
-                  'entry_element' => {},
-                  'entry_number' => 1,
-                  'in_code' => 1,
-                  'index_name' => 'tp'
-                },
+                'index_entry' => [
+                  'tp',
+                  1
+                ],
                 'original_def_cmdname' => 'deftp'
               },
               'source_info' => {
@@ -3169,12 +3153,10 @@ $result_trees{'all_commands_delimiters_printindex'} = {
                   'name' => {}
                 },
                 'element_node' => {},
-                'index_entry' => {
-                  'entry_element' => {},
-                  'entry_number' => 3,
-                  'in_code' => 1,
-                  'index_name' => 'vr'
-                },
+                'index_entry' => [
+                  'vr',
+                  3
+                ],
                 'original_def_cmdname' => 'defcv'
               },
               'source_info' => {
@@ -3588,12 +3570,10 @@ $result_trees{'all_commands_delimiters_printindex'} = {
                   'type' => {}
                 },
                 'element_node' => {},
-                'index_entry' => {
-                  'entry_element' => {},
-                  'entry_number' => 4,
-                  'in_code' => 1,
-                  'index_name' => 'vr'
-                },
+                'index_entry' => [
+                  'vr',
+                  4
+                ],
                 'original_def_cmdname' => 'deftypecv'
               },
               'source_info' => {
@@ -3968,12 +3948,10 @@ $result_trees{'all_commands_delimiters_printindex'} = {
                   'name' => {}
                 },
                 'element_node' => {},
-                'index_entry' => {
-                  'entry_element' => {},
-                  'entry_number' => 6,
-                  'in_code' => 1,
-                  'index_name' => 'fn'
-                },
+                'index_entry' => [
+                  'fn',
+                  6
+                ],
                 'original_def_cmdname' => 'defop'
               },
               'source_info' => {
@@ -4377,12 +4355,10 @@ $result_trees{'all_commands_delimiters_printindex'} = {
                   'type' => {}
                 },
                 'element_node' => {},
-                'index_entry' => {
-                  'entry_element' => {},
-                  'entry_number' => 7,
-                  'in_code' => 1,
-                  'index_name' => 'fn'
-                },
+                'index_entry' => [
+                  'fn',
+                  7
+                ],
                 'original_def_cmdname' => 'deftypeop'
               },
               'source_info' => {
@@ -4572,12 +4548,10 @@ $result_trees{'all_commands_delimiters_printindex'} = {
                   'type' => {}
                 },
                 'element_node' => {},
-                'index_entry' => {
-                  'entry_element' => {},
-                  'entry_number' => 8,
-                  'in_code' => 1,
-                  'index_name' => 'fn'
-                },
+                'index_entry' => [
+                  'fn',
+                  8
+                ],
                 'original_def_cmdname' => 'deftypeop'
               },
               'source_info' => {
@@ -4787,12 +4761,10 @@ $result_trees{'all_commands_delimiters_printindex'} = {
                   'type' => {}
                 },
                 'element_node' => {},
-                'index_entry' => {
-                  'entry_element' => {},
-                  'entry_number' => 9,
-                  'in_code' => 1,
-                  'index_name' => 'fn'
-                },
+                'index_entry' => [
+                  'fn',
+                  9
+                ],
                 'original_def_cmdname' => 'deftypeop'
               },
               'source_info' => {
@@ -5002,12 +4974,10 @@ $result_trees{'all_commands_delimiters_printindex'} = {
                   'type' => {}
                 },
                 'element_node' => {},
-                'index_entry' => {
-                  'entry_element' => {},
-                  'entry_number' => 10,
-                  'in_code' => 1,
-                  'index_name' => 'fn'
-                },
+                'index_entry' => [
+                  'fn',
+                  10
+                ],
                 'original_def_cmdname' => 'deftypeop'
               },
               'source_info' => {
@@ -5197,12 +5167,10 @@ $result_trees{'all_commands_delimiters_printindex'} = {
                   'type' => {}
                 },
                 'element_node' => {},
-                'index_entry' => {
-                  'entry_element' => {},
-                  'entry_number' => 11,
-                  'in_code' => 1,
-                  'index_name' => 'fn'
-                },
+                'index_entry' => [
+                  'fn',
+                  11
+                ],
                 'original_def_cmdname' => 'deftypeop'
               },
               'source_info' => {
@@ -5392,12 +5360,10 @@ $result_trees{'all_commands_delimiters_printindex'} = {
                   'type' => {}
                 },
                 'element_node' => {},
-                'index_entry' => {
-                  'entry_element' => {},
-                  'entry_number' => 12,
-                  'in_code' => 1,
-                  'index_name' => 'fn'
-                },
+                'index_entry' => [
+                  'fn',
+                  12
+                ],
                 'original_def_cmdname' => 'deftypeop'
               },
               'source_info' => {
@@ -5607,12 +5573,10 @@ $result_trees{'all_commands_delimiters_printindex'} = {
                   'type' => {}
                 },
                 'element_node' => {},
-                'index_entry' => {
-                  'entry_element' => {},
-                  'entry_number' => 13,
-                  'in_code' => 1,
-                  'index_name' => 'fn'
-                },
+                'index_entry' => [
+                  'fn',
+                  13
+                ],
                 'original_def_cmdname' => 'deftypeop'
               },
               'source_info' => {
@@ -5822,12 +5786,10 @@ $result_trees{'all_commands_delimiters_printindex'} = {
                   'type' => {}
                 },
                 'element_node' => {},
-                'index_entry' => {
-                  'entry_element' => {},
-                  'entry_number' => 14,
-                  'in_code' => 1,
-                  'index_name' => 'fn'
-                },
+                'index_entry' => [
+                  'fn',
+                  14
+                ],
                 'original_def_cmdname' => 'deftypeop'
               },
               'source_info' => {
@@ -6017,12 +5979,10 @@ $result_trees{'all_commands_delimiters_printindex'} = {
                   'type' => {}
                 },
                 'element_node' => {},
-                'index_entry' => {
-                  'entry_element' => {},
-                  'entry_number' => 15,
-                  'in_code' => 1,
-                  'index_name' => 'fn'
-                },
+                'index_entry' => [
+                  'fn',
+                  15
+                ],
                 'original_def_cmdname' => 'deftypeop'
               },
               'source_info' => {
@@ -6212,12 +6172,10 @@ $result_trees{'all_commands_delimiters_printindex'} = {
                   'type' => {}
                 },
                 'element_node' => {},
-                'index_entry' => {
-                  'entry_element' => {},
-                  'entry_number' => 16,
-                  'in_code' => 1,
-                  'index_name' => 'fn'
-                },
+                'index_entry' => [
+                  'fn',
+                  16
+                ],
                 'original_def_cmdname' => 'deftypeop'
               },
               'source_info' => {
@@ -6427,12 +6385,10 @@ $result_trees{'all_commands_delimiters_printindex'} = {
                   'type' => {}
                 },
                 'element_node' => {},
-                'index_entry' => {
-                  'entry_element' => {},
-                  'entry_number' => 17,
-                  'in_code' => 1,
-                  'index_name' => 'fn'
-                },
+                'index_entry' => [
+                  'fn',
+                  17
+                ],
                 'original_def_cmdname' => 'deftypeop'
               },
               'source_info' => {
@@ -6642,12 +6598,10 @@ $result_trees{'all_commands_delimiters_printindex'} = {
                   'type' => {}
                 },
                 'element_node' => {},
-                'index_entry' => {
-                  'entry_element' => {},
-                  'entry_number' => 18,
-                  'in_code' => 1,
-                  'index_name' => 'fn'
-                },
+                'index_entry' => [
+                  'fn',
+                  18
+                ],
                 'original_def_cmdname' => 'deftypeop'
               },
               'source_info' => {
@@ -6837,12 +6791,10 @@ $result_trees{'all_commands_delimiters_printindex'} = {
                   'type' => {}
                 },
                 'element_node' => {},
-                'index_entry' => {
-                  'entry_element' => {},
-                  'entry_number' => 19,
-                  'in_code' => 1,
-                  'index_name' => 'fn'
-                },
+                'index_entry' => [
+                  'fn',
+                  19
+                ],
                 'original_def_cmdname' => 'deftypeop'
               },
               'source_info' => {
@@ -7032,12 +6984,10 @@ $result_trees{'all_commands_delimiters_printindex'} = {
                   'type' => {}
                 },
                 'element_node' => {},
-                'index_entry' => {
-                  'entry_element' => {},
-                  'entry_number' => 20,
-                  'in_code' => 1,
-                  'index_name' => 'fn'
-                },
+                'index_entry' => [
+                  'fn',
+                  20
+                ],
                 'original_def_cmdname' => 'deftypeop'
               },
               'source_info' => {
@@ -7260,12 +7210,10 @@ $result_trees{'all_commands_delimiters_printindex'} = {
                   'type' => {}
                 },
                 'element_node' => {},
-                'index_entry' => {
-                  'entry_element' => {},
-                  'entry_number' => 21,
-                  'in_code' => 1,
-                  'index_name' => 'fn'
-                },
+                'index_entry' => [
+                  'fn',
+                  21
+                ],
                 'original_def_cmdname' => 'deftypeop'
               },
               'source_info' => {
@@ -7412,12 +7360,10 @@ $result_trees{'all_commands_delimiters_printindex'} = {
                   'name' => {}
                 },
                 'element_node' => {},
-                'index_entry' => {
-                  'entry_element' => {},
-                  'entry_number' => 22,
-                  'in_code' => 1,
-                  'index_name' => 'fn'
-                },
+                'index_entry' => [
+                  'fn',
+                  22
+                ],
                 'original_def_cmdname' => 'defun'
               },
               'source_info' => {
@@ -7606,12 +7552,10 @@ $result_trees{'all_commands_delimiters_printindex'} = {
                   'name' => {}
                 },
                 'element_node' => {},
-                'index_entry' => {
-                  'entry_element' => {},
-                  'entry_number' => 23,
-                  'in_code' => 1,
-                  'index_name' => 'fn'
-                },
+                'index_entry' => [
+                  'fn',
+                  23
+                ],
                 'original_def_cmdname' => 'deffn'
               },
               'source_info' => {
@@ -7800,12 +7744,10 @@ $result_trees{'all_commands_delimiters_printindex'} = {
                   'name' => {}
                 },
                 'element_node' => {},
-                'index_entry' => {
-                  'entry_element' => {},
-                  'entry_number' => 24,
-                  'in_code' => 1,
-                  'index_name' => 'fn'
-                },
+                'index_entry' => [
+                  'fn',
+                  24
+                ],
                 'original_def_cmdname' => 'deffn'
               },
               'source_info' => {
@@ -7994,12 +7936,10 @@ $result_trees{'all_commands_delimiters_printindex'} = {
                   'name' => {}
                 },
                 'element_node' => {},
-                'index_entry' => {
-                  'entry_element' => {},
-                  'entry_number' => 5,
-                  'in_code' => 1,
-                  'index_name' => 'vr'
-                },
+                'index_entry' => [
+                  'vr',
+                  5
+                ],
                 'original_def_cmdname' => 'defvr'
               },
               'source_info' => {
@@ -8188,12 +8128,10 @@ $result_trees{'all_commands_delimiters_printindex'} = {
                   'name' => {}
                 },
                 'element_node' => {},
-                'index_entry' => {
-                  'entry_element' => {},
-                  'entry_number' => 6,
-                  'in_code' => 1,
-                  'index_name' => 'vr'
-                },
+                'index_entry' => [
+                  'vr',
+                  6
+                ],
                 'original_def_cmdname' => 'defvr'
               },
               'source_info' => {
@@ -8411,12 +8349,10 @@ $result_trees{'all_commands_delimiters_printindex'} = {
                   'type' => {}
                 },
                 'element_node' => {},
-                'index_entry' => {
-                  'entry_element' => {},
-                  'entry_number' => 25,
-                  'in_code' => 1,
-                  'index_name' => 'fn'
-                },
+                'index_entry' => [
+                  'fn',
+                  25
+                ],
                 'original_def_cmdname' => 'deftypefn'
               },
               'source_info' => {
@@ -8634,12 +8570,10 @@ $result_trees{'all_commands_delimiters_printindex'} = {
                   'type' => {}
                 },
                 'element_node' => {},
-                'index_entry' => {
-                  'entry_element' => {},
-                  'entry_number' => 26,
-                  'in_code' => 1,
-                  'index_name' => 'fn'
-                },
+                'index_entry' => [
+                  'fn',
+                  26
+                ],
                 'original_def_cmdname' => 'deftypefn'
               },
               'source_info' => {
@@ -8857,12 +8791,10 @@ $result_trees{'all_commands_delimiters_printindex'} = {
                   'type' => {}
                 },
                 'element_node' => {},
-                'index_entry' => {
-                  'entry_element' => {},
-                  'entry_number' => 7,
-                  'in_code' => 1,
-                  'index_name' => 'vr'
-                },
+                'index_entry' => [
+                  'vr',
+                  7
+                ],
                 'original_def_cmdname' => 'deftypevr'
               },
               'source_info' => {
@@ -9080,12 +9012,10 @@ $result_trees{'all_commands_delimiters_printindex'} = {
                   'type' => {}
                 },
                 'element_node' => {},
-                'index_entry' => {
-                  'entry_element' => {},
-                  'entry_number' => 8,
-                  'in_code' => 1,
-                  'index_name' => 'vr'
-                },
+                'index_entry' => [
+                  'vr',
+                  8
+                ],
                 'original_def_cmdname' => 'deftypevr'
               },
               'source_info' => {
@@ -9274,12 +9204,10 @@ $result_trees{'all_commands_delimiters_printindex'} = {
                   'name' => {}
                 },
                 'element_node' => {},
-                'index_entry' => {
-                  'entry_element' => {},
-                  'entry_number' => 2,
-                  'in_code' => 1,
-                  'index_name' => 'tp'
-                },
+                'index_entry' => [
+                  'tp',
+                  2
+                ],
                 'original_def_cmdname' => 'deftp'
               },
               'source_info' => {
@@ -9468,12 +9396,10 @@ $result_trees{'all_commands_delimiters_printindex'} = {
                   'name' => {}
                 },
                 'element_node' => {},
-                'index_entry' => {
-                  'entry_element' => {},
-                  'entry_number' => 3,
-                  'in_code' => 1,
-                  'index_name' => 'tp'
-                },
+                'index_entry' => [
+                  'tp',
+                  3
+                ],
                 'original_def_cmdname' => 'deftp'
               },
               'source_info' => {
@@ -9691,12 +9617,10 @@ $result_trees{'all_commands_delimiters_printindex'} = {
                   'name' => {}
                 },
                 'element_node' => {},
-                'index_entry' => {
-                  'entry_element' => {},
-                  'entry_number' => 9,
-                  'in_code' => 1,
-                  'index_name' => 'vr'
-                },
+                'index_entry' => [
+                  'vr',
+                  9
+                ],
                 'original_def_cmdname' => 'defcv'
               },
               'source_info' => {
@@ -9913,12 +9837,10 @@ $result_trees{'all_commands_delimiters_printindex'} = {
                   'name' => {}
                 },
                 'element_node' => {},
-                'index_entry' => {
-                  'entry_element' => {},
-                  'entry_number' => 4,
-                  'in_code' => 1,
-                  'index_name' => 'tp'
-                },
+                'index_entry' => [
+                  'tp',
+                  4
+                ],
                 'original_def_cmdname' => 'deftp'
               },
               'source_info' => {
@@ -10183,12 +10105,10 @@ $result_trees{'all_commands_delimiters_printindex'} = 
{
                   'type' => {}
                 },
                 'element_node' => {},
-                'index_entry' => {
-                  'entry_element' => {},
-                  'entry_number' => 10,
-                  'in_code' => 1,
-                  'index_name' => 'vr'
-                },
+                'index_entry' => [
+                  'vr',
+                  10
+                ],
                 'original_def_cmdname' => 'deftypecv'
               },
               'source_info' => {
@@ -10453,12 +10373,10 @@ $result_trees{'all_commands_delimiters_printindex'} = 
{
                   'type' => {}
                 },
                 'element_node' => {},
-                'index_entry' => {
-                  'entry_element' => {},
-                  'entry_number' => 11,
-                  'in_code' => 1,
-                  'index_name' => 'vr'
-                },
+                'index_entry' => [
+                  'vr',
+                  11
+                ],
                 'original_def_cmdname' => 'deftypecv'
               },
               'source_info' => {
@@ -10694,12 +10612,10 @@ $result_trees{'all_commands_delimiters_printindex'} = 
{
                   'name' => {}
                 },
                 'element_node' => {},
-                'index_entry' => {
-                  'entry_element' => {},
-                  'entry_number' => 27,
-                  'in_code' => 1,
-                  'index_name' => 'fn'
-                },
+                'index_entry' => [
+                  'fn',
+                  27
+                ],
                 'original_def_cmdname' => 'defop'
               },
               'source_info' => {
@@ -10935,12 +10851,10 @@ $result_trees{'all_commands_delimiters_printindex'} = 
{
                   'name' => {}
                 },
                 'element_node' => {},
-                'index_entry' => {
-                  'entry_element' => {},
-                  'entry_number' => 28,
-                  'in_code' => 1,
-                  'index_name' => 'fn'
-                },
+                'index_entry' => [
+                  'fn',
+                  28
+                ],
                 'original_def_cmdname' => 'defop'
               },
               'source_info' => {
@@ -11205,12 +11119,10 @@ $result_trees{'all_commands_delimiters_printindex'} = 
{
                   'type' => {}
                 },
                 'element_node' => {},
-                'index_entry' => {
-                  'entry_element' => {},
-                  'entry_number' => 29,
-                  'in_code' => 1,
-                  'index_name' => 'fn'
-                },
+                'index_entry' => [
+                  'fn',
+                  29
+                ],
                 'original_def_cmdname' => 'deftypeop'
               },
               'source_info' => {
@@ -11475,12 +11387,10 @@ $result_trees{'all_commands_delimiters_printindex'} = 
{
                   'type' => {}
                 },
                 'element_node' => {},
-                'index_entry' => {
-                  'entry_element' => {},
-                  'entry_number' => 30,
-                  'in_code' => 1,
-                  'index_name' => 'fn'
-                },
+                'index_entry' => [
+                  'fn',
+                  30
+                ],
                 'original_def_cmdname' => 'deftypeop'
               },
               'source_info' => {
@@ -11739,12 +11649,10 @@ $result_trees{'all_commands_delimiters_printindex'} = 
{
                   'type' => {}
                 },
                 'element_node' => {},
-                'index_entry' => {
-                  'entry_element' => {},
-                  'entry_number' => 31,
-                  'in_code' => 1,
-                  'index_name' => 'fn'
-                },
+                'index_entry' => [
+                  'fn',
+                  31
+                ],
                 'original_def_cmdname' => 'deftypefn'
               },
               'source_info' => {
@@ -12003,12 +11911,10 @@ $result_trees{'all_commands_delimiters_printindex'} = 
{
                   'type' => {}
                 },
                 'element_node' => {},
-                'index_entry' => {
-                  'entry_element' => {},
-                  'entry_number' => 32,
-                  'in_code' => 1,
-                  'index_name' => 'fn'
-                },
+                'index_entry' => [
+                  'fn',
+                  32
+                ],
                 'original_def_cmdname' => 'deftypefn'
               },
               'source_info' => {
@@ -12289,53 +12195,44 @@ 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[2]{'contents'}[1
 
$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'}{'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'}{'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'}{'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'}{'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'}{'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'}{'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'}{'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'}{'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'}{'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];
 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[2]{'contents'}[19]{'contents'}[0]{'extra'}{'def_index_ref_element'}{'contents'}[0]
 = 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[2]{'contents'}[19]{'contents'}[0]{'args'}[0]{'contents'}[6];
@@ -12345,7 +12242,6 @@ 
$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'}{'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'}{'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];
 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[2]{'contents'}[21]{'contents'}[0]{'extra'}{'def_index_ref_element'}{'contents'}[0]
 = 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[2]{'contents'}[21]{'contents'}[0]{'args'}[0]{'contents'}[4];
@@ -12354,7 +12250,6 @@ 
$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'}{'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'}{'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];
 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[2]{'contents'}[23]{'contents'}[0]{'extra'}{'def_index_ref_element'}{'contents'}[0]
 = 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[2]{'contents'}[23]{'contents'}[0]{'args'}[0]{'contents'}[6];
@@ -12364,7 +12259,6 @@ 
$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'}{'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'}{'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];
 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[2]{'contents'}[25]{'contents'}[0]{'extra'}{'def_index_ref_element'}{'contents'}[0]
 = 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[2]{'contents'}[25]{'contents'}[0]{'args'}[0]{'contents'}[6];
@@ -12374,7 +12268,6 @@ 
$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'}{'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'}{'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];
 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[2]{'contents'}[27]{'contents'}[0]{'extra'}{'def_index_ref_element'}{'contents'}[0]
 = 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[2]{'contents'}[27]{'contents'}[0]{'args'}[0]{'contents'}[6];
@@ -12384,7 +12277,6 @@ 
$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'}{'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'}{'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];
 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[2]{'contents'}[29]{'contents'}[0]{'extra'}{'def_index_ref_element'}{'contents'}[0]
 = 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[2]{'contents'}[29]{'contents'}[0]{'args'}[0]{'contents'}[6];
@@ -12394,7 +12286,6 @@ 
$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'}{'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'}{'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];
 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[2]{'contents'}[31]{'contents'}[0]{'extra'}{'def_index_ref_element'}{'contents'}[0]
 = 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[2]{'contents'}[31]{'contents'}[0]{'args'}[0]{'contents'}[6];
@@ -12404,7 +12295,6 @@ 
$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'}{'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'}{'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];
 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[2]{'contents'}[33]{'contents'}[0]{'extra'}{'def_index_ref_element'}{'contents'}[0]
 = 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[2]{'contents'}[33]{'contents'}[0]{'args'}[0]{'contents'}[6];
@@ -12414,7 +12304,6 @@ 
$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'}{'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'}{'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];
 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[2]{'contents'}[35]{'contents'}[0]{'extra'}{'def_index_ref_element'}{'contents'}[0]
 = 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[2]{'contents'}[35]{'contents'}[0]{'args'}[0]{'contents'}[6];
@@ -12424,7 +12313,6 @@ 
$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'}{'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'}{'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];
 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[2]{'contents'}[37]{'contents'}[0]{'extra'}{'def_index_ref_element'}{'contents'}[0]
 = 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[2]{'contents'}[37]{'contents'}[0]{'args'}[0]{'contents'}[6];
@@ -12434,7 +12322,6 @@ 
$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'}{'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'}{'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];
 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[2]{'contents'}[39]{'contents'}[0]{'extra'}{'def_index_ref_element'}{'contents'}[0]
 = 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[2]{'contents'}[39]{'contents'}[0]{'args'}[0]{'contents'}[6];
@@ -12444,7 +12331,6 @@ 
$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'}{'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'}{'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];
 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[2]{'contents'}[41]{'contents'}[0]{'extra'}{'def_index_ref_element'}{'contents'}[0]
 = 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[2]{'contents'}[41]{'contents'}[0]{'args'}[0]{'contents'}[6];
@@ -12454,7 +12340,6 @@ 
$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'}{'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'}{'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];
 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[2]{'contents'}[43]{'contents'}[0]{'extra'}{'def_index_ref_element'}{'contents'}[0]
 = 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[2]{'contents'}[43]{'contents'}[0]{'args'}[0]{'contents'}[6];
@@ -12464,7 +12349,6 @@ 
$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'}{'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'}{'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];
 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[2]{'contents'}[45]{'contents'}[0]{'extra'}{'def_index_ref_element'}{'contents'}[0]
 = 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[2]{'contents'}[45]{'contents'}[0]{'args'}[0]{'contents'}[6];
@@ -12474,7 +12358,6 @@ 
$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'}{'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'}{'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];
 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[2]{'contents'}[47]{'contents'}[0]{'extra'}{'def_index_ref_element'}{'contents'}[0]
 = 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[2]{'contents'}[47]{'contents'}[0]{'args'}[0]{'contents'}[6];
@@ -12484,7 +12367,6 @@ 
$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'}{'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'}{'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];
 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[2]{'contents'}[49]{'contents'}[0]{'extra'}{'def_index_ref_element'}{'contents'}[0]
 = 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[2]{'contents'}[49]{'contents'}[0]{'args'}[0]{'contents'}[6];
@@ -12494,7 +12376,6 @@ 
$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'}{'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'}{'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];
 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[2]{'contents'}[51]{'contents'}[0]{'extra'}{'def_index_ref_element'}{'contents'}[0]
 = 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[2]{'contents'}[51]{'contents'}[0]{'args'}[0]{'contents'}[6];
@@ -12504,77 +12385,63 @@ 
$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'}{'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'}{'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'}{'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'}{'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'}{'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'}{'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'}{'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'}{'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'}{'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'}{'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'}{'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'}{'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'}{'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'}{'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'}{'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];
 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[2]{'contents'}[79]{'contents'}[0]{'extra'}{'def_index_ref_element'}{'contents'}[0]
 = 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[2]{'contents'}[79]{'contents'}[0]{'args'}[0]{'contents'}[6];
@@ -12584,7 +12451,6 @@ 
$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'}{'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'}{'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];
 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[2]{'contents'}[81]{'contents'}[0]{'extra'}{'def_index_ref_element'}{'contents'}[0]
 = 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[2]{'contents'}[81]{'contents'}[0]{'args'}[0]{'contents'}[6];
@@ -12594,7 +12460,6 @@ 
$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'}{'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'}{'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];
 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[2]{'contents'}[83]{'contents'}[0]{'extra'}{'def_index_ref_element'}{'contents'}[0]
 = 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[2]{'contents'}[83]{'contents'}[0]{'args'}[0]{'contents'}[4];
@@ -12603,7 +12468,6 @@ 
$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'}{'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'}{'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];
 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[2]{'contents'}[85]{'contents'}[0]{'extra'}{'def_index_ref_element'}{'contents'}[0]
 = 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[2]{'contents'}[85]{'contents'}[0]{'args'}[0]{'contents'}[4];
@@ -12612,7 +12476,6 @@ 
$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'}{'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'}{'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];
 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[2]{'contents'}[87]{'contents'}[0]{'extra'}{'def_index_ref_element'}{'contents'}[0]
 = 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[2]{'contents'}[87]{'contents'}[0]{'args'}[0]{'contents'}[6];
@@ -12622,7 +12485,6 @@ 
$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'}{'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'}{'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];
 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[2]{'contents'}[89]{'contents'}[0]{'extra'}{'def_index_ref_element'}{'contents'}[0]
 = 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[2]{'contents'}[89]{'contents'}[0]{'args'}[0]{'contents'}[6];
@@ -12632,19 +12494,16 @@ 
$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'}{'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'}{'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'}{'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'}{'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_texis{'all_commands_delimiters_printindex'} = '@node Top
 @node chap
diff --git a/tp/t/results/def/all_commands_printindex.pl 
b/tp/t/results/def/all_commands_printindex.pl
index dab12858c7..5fb0127576 100644
--- a/tp/t/results/def/all_commands_printindex.pl
+++ b/tp/t/results/def/all_commands_printindex.pl
@@ -110,12 +110,10 @@ $result_trees{'all_commands_printindex'} = {
                   'name' => {}
                 },
                 'element_node' => {},
-                'index_entry' => {
-                  'entry_element' => {},
-                  'entry_number' => 1,
-                  'in_code' => 1,
-                  'index_name' => 'vr'
-                },
+                'index_entry' => [
+                  'vr',
+                  1
+                ],
                 'original_def_cmdname' => 'defvr'
               },
               'source_info' => {
@@ -245,12 +243,10 @@ $result_trees{'all_commands_printindex'} = {
                   'name' => {}
                 },
                 'element_node' => {},
-                'index_entry' => {
-                  'entry_element' => {},
-                  'entry_number' => 1,
-                  'in_code' => 1,
-                  'index_name' => 'fn'
-                },
+                'index_entry' => [
+                  'fn',
+                  1
+                ],
                 'original_def_cmdname' => 'deffn'
               },
               'source_info' => {
@@ -367,12 +363,10 @@ $result_trees{'all_commands_printindex'} = {
                   'name' => {}
                 },
                 'element_node' => {},
-                'index_entry' => {
-                  'entry_element' => {},
-                  'entry_number' => 2,
-                  'in_code' => 1,
-                  'index_name' => 'fn'
-                },
+                'index_entry' => [
+                  'fn',
+                  2
+                ],
                 'original_def_cmdname' => 'deffn'
               },
               'source_info' => {
@@ -516,12 +510,10 @@ $result_trees{'all_commands_printindex'} = {
                   'type' => {}
                 },
                 'element_node' => {},
-                'index_entry' => {
-                  'entry_element' => {},
-                  'entry_number' => 3,
-                  'in_code' => 1,
-                  'index_name' => 'fn'
-                },
+                'index_entry' => [
+                  'fn',
+                  3
+                ],
                 'original_def_cmdname' => 'deftypefn'
               },
               'source_info' => {
@@ -652,12 +644,10 @@ $result_trees{'all_commands_printindex'} = {
                   'type' => {}
                 },
                 'element_node' => {},
-                'index_entry' => {
-                  'entry_element' => {},
-                  'entry_number' => 4,
-                  'in_code' => 1,
-                  'index_name' => 'fn'
-                },
+                'index_entry' => [
+                  'fn',
+                  4
+                ],
                 'original_def_cmdname' => 'deftypefn'
               },
               'source_info' => {
@@ -833,12 +823,10 @@ $result_trees{'all_commands_printindex'} = {
                   'type' => {}
                 },
                 'element_node' => {},
-                'index_entry' => {
-                  'entry_element' => {},
-                  'entry_number' => 5,
-                  'in_code' => 1,
-                  'index_name' => 'fn'
-                },
+                'index_entry' => [
+                  'fn',
+                  5
+                ],
                 'original_def_cmdname' => 'deftypeop'
               },
               'source_info' => {
@@ -1001,12 +989,10 @@ $result_trees{'all_commands_printindex'} = {
                   'type' => {}
                 },
                 'element_node' => {},
-                'index_entry' => {
-                  'entry_element' => {},
-                  'entry_number' => 6,
-                  'in_code' => 1,
-                  'index_name' => 'fn'
-                },
+                'index_entry' => [
+                  'fn',
+                  6
+                ],
                 'original_def_cmdname' => 'deftypeop'
               },
               'source_info' => {
@@ -1137,12 +1123,10 @@ $result_trees{'all_commands_printindex'} = {
                   'type' => {}
                 },
                 'element_node' => {},
-                'index_entry' => {
-                  'entry_element' => {},
-                  'entry_number' => 2,
-                  'in_code' => 1,
-                  'index_name' => 'vr'
-                },
+                'index_entry' => [
+                  'vr',
+                  2
+                ],
                 'original_def_cmdname' => 'deftypevr'
               },
               'source_info' => {
@@ -1273,12 +1257,10 @@ $result_trees{'all_commands_printindex'} = {
                   'name' => {}
                 },
                 'element_node' => {},
-                'index_entry' => {
-                  'entry_element' => {},
-                  'entry_number' => 3,
-                  'in_code' => 1,
-                  'index_name' => 'vr'
-                },
+                'index_entry' => [
+                  'vr',
+                  3
+                ],
                 'original_def_cmdname' => 'defcv'
               },
               'source_info' => {
@@ -1422,12 +1404,10 @@ $result_trees{'all_commands_printindex'} = {
                   'name' => {}
                 },
                 'element_node' => {},
-                'index_entry' => {
-                  'entry_element' => {},
-                  'entry_number' => 4,
-                  'in_code' => 1,
-                  'index_name' => 'vr'
-                },
+                'index_entry' => [
+                  'vr',
+                  4
+                ],
                 'original_def_cmdname' => 'defcv'
               },
               'source_info' => {
@@ -1590,12 +1570,10 @@ $result_trees{'all_commands_printindex'} = {
                   'type' => {}
                 },
                 'element_node' => {},
-                'index_entry' => {
-                  'entry_element' => {},
-                  'entry_number' => 5,
-                  'in_code' => 1,
-                  'index_name' => 'vr'
-                },
+                'index_entry' => [
+                  'vr',
+                  5
+                ],
                 'original_def_cmdname' => 'deftypecv'
               },
               'source_info' => {
@@ -1771,12 +1749,10 @@ $result_trees{'all_commands_printindex'} = {
                   'type' => {}
                 },
                 'element_node' => {},
-                'index_entry' => {
-                  'entry_element' => {},
-                  'entry_number' => 6,
-                  'in_code' => 1,
-                  'index_name' => 'vr'
-                },
+                'index_entry' => [
+                  'vr',
+                  6
+                ],
                 'original_def_cmdname' => 'deftypecv'
               },
               'source_info' => {
@@ -1938,12 +1914,10 @@ $result_trees{'all_commands_printindex'} = {
                   'name' => {}
                 },
                 'element_node' => {},
-                'index_entry' => {
-                  'entry_element' => {},
-                  'entry_number' => 7,
-                  'in_code' => 1,
-                  'index_name' => 'fn'
-                },
+                'index_entry' => [
+                  'fn',
+                  7
+                ],
                 'original_def_cmdname' => 'defop'
               },
               'source_info' => {
@@ -2092,12 +2066,10 @@ $result_trees{'all_commands_printindex'} = {
                   'name' => {}
                 },
                 'element_node' => {},
-                'index_entry' => {
-                  'entry_element' => {},
-                  'entry_number' => 8,
-                  'in_code' => 1,
-                  'index_name' => 'fn'
-                },
+                'index_entry' => [
+                  'fn',
+                  8
+                ],
                 'original_def_cmdname' => 'defop'
               },
               'source_info' => {
@@ -2227,12 +2199,10 @@ $result_trees{'all_commands_printindex'} = {
                   'name' => {}
                 },
                 'element_node' => {},
-                'index_entry' => {
-                  'entry_element' => {},
-                  'entry_number' => 1,
-                  'in_code' => 1,
-                  'index_name' => 'tp'
-                },
+                'index_entry' => [
+                  'tp',
+                  1
+                ],
                 'original_def_cmdname' => 'deftp'
               },
               'source_info' => {
@@ -2367,12 +2337,10 @@ $result_trees{'all_commands_printindex'} = {
                   'name' => {}
                 },
                 'element_node' => {},
-                'index_entry' => {
-                  'entry_element' => {},
-                  'entry_number' => 9,
-                  'in_code' => 1,
-                  'index_name' => 'fn'
-                },
+                'index_entry' => [
+                  'fn',
+                  9
+                ],
                 'original_def_cmdname' => 'defun'
               },
               'source_info' => {
@@ -2507,12 +2475,10 @@ $result_trees{'all_commands_printindex'} = {
                   'name' => {}
                 },
                 'element_node' => {},
-                'index_entry' => {
-                  'entry_element' => {},
-                  'entry_number' => 10,
-                  'in_code' => 1,
-                  'index_name' => 'fn'
-                },
+                'index_entry' => [
+                  'fn',
+                  10
+                ],
                 'original_def_cmdname' => 'defmac'
               },
               'source_info' => {
@@ -2647,12 +2613,10 @@ $result_trees{'all_commands_printindex'} = {
                   'name' => {}
                 },
                 'element_node' => {},
-                'index_entry' => {
-                  'entry_element' => {},
-                  'entry_number' => 11,
-                  'in_code' => 1,
-                  'index_name' => 'fn'
-                },
+                'index_entry' => [
+                  'fn',
+                  11
+                ],
                 'original_def_cmdname' => 'defspec'
               },
               'source_info' => {
@@ -2774,12 +2738,10 @@ $result_trees{'all_commands_printindex'} = {
                   'name' => {}
                 },
                 'element_node' => {},
-                'index_entry' => {
-                  'entry_element' => {},
-                  'entry_number' => 7,
-                  'in_code' => 1,
-                  'index_name' => 'vr'
-                },
+                'index_entry' => [
+                  'vr',
+                  7
+                ],
                 'original_def_cmdname' => 'defvar'
               },
               'source_info' => {
@@ -2927,12 +2889,10 @@ $result_trees{'all_commands_printindex'} = {
                   'name' => {}
                 },
                 'element_node' => {},
-                'index_entry' => {
-                  'entry_element' => {},
-                  'entry_number' => 8,
-                  'in_code' => 1,
-                  'index_name' => 'vr'
-                },
+                'index_entry' => [
+                  'vr',
+                  8
+                ],
                 'original_def_cmdname' => 'defvar'
               },
               'source_info' => {
@@ -3054,12 +3014,10 @@ $result_trees{'all_commands_printindex'} = {
                   'name' => {}
                 },
                 'element_node' => {},
-                'index_entry' => {
-                  'entry_element' => {},
-                  'entry_number' => 9,
-                  'in_code' => 1,
-                  'index_name' => 'vr'
-                },
+                'index_entry' => [
+                  'vr',
+                  9
+                ],
                 'original_def_cmdname' => 'defopt'
               },
               'source_info' => {
@@ -3208,12 +3166,10 @@ $result_trees{'all_commands_printindex'} = {
                   'type' => {}
                 },
                 'element_node' => {},
-                'index_entry' => {
-                  'entry_element' => {},
-                  'entry_number' => 12,
-                  'in_code' => 1,
-                  'index_name' => 'fn'
-                },
+                'index_entry' => [
+                  'fn',
+                  12
+                ],
                 'original_def_cmdname' => 'deftypefun'
               },
               'source_info' => {
@@ -3349,12 +3305,10 @@ $result_trees{'all_commands_printindex'} = {
                   'type' => {}
                 },
                 'element_node' => {},
-                'index_entry' => {
-                  'entry_element' => {},
-                  'entry_number' => 10,
-                  'in_code' => 1,
-                  'index_name' => 'vr'
-                },
+                'index_entry' => [
+                  'vr',
+                  10
+                ],
                 'original_def_cmdname' => 'deftypevar'
               },
               'source_info' => {
@@ -3508,12 +3462,10 @@ $result_trees{'all_commands_printindex'} = {
                   'name' => {}
                 },
                 'element_node' => {},
-                'index_entry' => {
-                  'entry_element' => {},
-                  'entry_number' => 11,
-                  'in_code' => 1,
-                  'index_name' => 'vr'
-                },
+                'index_entry' => [
+                  'vr',
+                  11
+                ],
                 'original_def_cmdname' => 'defivar'
               },
               'source_info' => {
@@ -3681,12 +3633,10 @@ $result_trees{'all_commands_printindex'} = {
                   'type' => {}
                 },
                 'element_node' => {},
-                'index_entry' => {
-                  'entry_element' => {},
-                  'entry_number' => 12,
-                  'in_code' => 1,
-                  'index_name' => 'vr'
-                },
+                'index_entry' => [
+                  'vr',
+                  12
+                ],
                 'original_def_cmdname' => 'deftypeivar'
               },
               'source_info' => {
@@ -3853,12 +3803,10 @@ $result_trees{'all_commands_printindex'} = {
                   'name' => {}
                 },
                 'element_node' => {},
-                'index_entry' => {
-                  'entry_element' => {},
-                  'entry_number' => 13,
-                  'in_code' => 1,
-                  'index_name' => 'fn'
-                },
+                'index_entry' => [
+                  'fn',
+                  13
+                ],
                 'original_def_cmdname' => 'defmethod'
               },
               'source_info' => {
@@ -4039,12 +3987,10 @@ $result_trees{'all_commands_printindex'} = {
                   'type' => {}
                 },
                 'element_node' => {},
-                'index_entry' => {
-                  'entry_element' => {},
-                  'entry_number' => 14,
-                  'in_code' => 1,
-                  'index_name' => 'fn'
-                },
+                'index_entry' => [
+                  'fn',
+                  14
+                ],
                 'original_def_cmdname' => 'deftypemethod'
               },
               'source_info' => {
@@ -4339,29 +4285,24 @@ 
$result_trees{'all_commands_printindex'}{'contents'}[2]{'contents'}[1]{'contents
 
$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'}{'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'}{'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'}{'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'}{'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'}{'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];
 
$result_trees{'all_commands_printindex'}{'contents'}[2]{'contents'}[11]{'contents'}[0]{'extra'}{'def_index_ref_element'}{'contents'}[0]
 = 
$result_trees{'all_commands_printindex'}{'contents'}[2]{'contents'}[11]{'contents'}[0]{'args'}[0]{'contents'}[6];
@@ -4371,7 +4312,6 @@ 
$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'}{'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'}{'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];
 
$result_trees{'all_commands_printindex'}{'contents'}[2]{'contents'}[13]{'contents'}[0]{'extra'}{'def_index_ref_element'}{'contents'}[0]
 = 
$result_trees{'all_commands_printindex'}{'contents'}[2]{'contents'}[13]{'contents'}[0]{'args'}[0]{'contents'}[6];
@@ -4381,25 +4321,21 @@ 
$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'}{'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'}{'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'}{'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'}{'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'}{'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];
 
$result_trees{'all_commands_printindex'}{'contents'}[2]{'contents'}[21]{'contents'}[0]{'extra'}{'def_index_ref_element'}{'contents'}[0]
 = 
$result_trees{'all_commands_printindex'}{'contents'}[2]{'contents'}[21]{'contents'}[0]{'args'}[0]{'contents'}[6];
@@ -4409,7 +4345,6 @@ 
$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'}{'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'}{'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];
 
$result_trees{'all_commands_printindex'}{'contents'}[2]{'contents'}[23]{'contents'}[0]{'extra'}{'def_index_ref_element'}{'contents'}[0]
 = 
$result_trees{'all_commands_printindex'}{'contents'}[2]{'contents'}[23]{'contents'}[0]{'args'}[0]{'contents'}[6];
@@ -4419,7 +4354,6 @@ 
$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'}{'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'}{'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];
 
$result_trees{'all_commands_printindex'}{'contents'}[2]{'contents'}[25]{'contents'}[0]{'extra'}{'def_index_ref_element'}{'contents'}[0]
 = 
$result_trees{'all_commands_printindex'}{'contents'}[2]{'contents'}[25]{'contents'}[0]{'args'}[0]{'contents'}[4];
@@ -4428,7 +4362,6 @@ 
$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'}{'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'}{'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];
 
$result_trees{'all_commands_printindex'}{'contents'}[2]{'contents'}[27]{'contents'}[0]{'extra'}{'def_index_ref_element'}{'contents'}[0]
 = 
$result_trees{'all_commands_printindex'}{'contents'}[2]{'contents'}[27]{'contents'}[0]{'args'}[0]{'contents'}[4];
@@ -4437,54 +4370,44 @@ 
$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'}{'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'}{'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'}{'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'}{'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'}{'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'}{'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'}{'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'}{'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'}{'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'}{'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'}{'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];
 
$result_trees{'all_commands_printindex'}{'contents'}[2]{'contents'}[47]{'contents'}[0]{'extra'}{'def_index_ref_element'}{'contents'}[0]
 = 
$result_trees{'all_commands_printindex'}{'contents'}[2]{'contents'}[47]{'contents'}[0]{'args'}[0]{'contents'}[4];
@@ -4493,7 +4416,6 @@ 
$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'}{'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'}{'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];
 
$result_trees{'all_commands_printindex'}{'contents'}[2]{'contents'}[49]{'contents'}[0]{'extra'}{'def_index_ref_element'}{'contents'}[0]
 = 
$result_trees{'all_commands_printindex'}{'contents'}[2]{'contents'}[49]{'contents'}[0]{'args'}[0]{'contents'}[6];
@@ -4503,7 +4425,6 @@ 
$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'}{'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'}{'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];
 
$result_trees{'all_commands_printindex'}{'contents'}[2]{'contents'}[51]{'contents'}[0]{'extra'}{'def_index_ref_element'}{'contents'}[0]
 = 
$result_trees{'all_commands_printindex'}{'contents'}[2]{'contents'}[51]{'contents'}[0]{'args'}[0]{'contents'}[4];
@@ -4512,7 +4433,6 @@ 
$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'}{'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'}{'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];
 
$result_trees{'all_commands_printindex'}{'contents'}[2]{'contents'}[53]{'contents'}[0]{'extra'}{'def_index_ref_element'}{'contents'}[0]
 = 
$result_trees{'all_commands_printindex'}{'contents'}[2]{'contents'}[53]{'contents'}[0]{'args'}[0]{'contents'}[6];
@@ -4522,7 +4442,6 @@ 
$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'}{'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'}{'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_texis{'all_commands_printindex'} = '@node Top
 @node chap
diff --git a/tp/t/results/def/ampchar.pl b/tp/t/results/def/ampchar.pl
index 876e4eeb89..5069ae193a 100644
--- a/tp/t/results/def/ampchar.pl
+++ b/tp/t/results/def/ampchar.pl
@@ -139,12 +139,10 @@ $result_trees{'ampchar'} = {
                   'class' => {},
                   'name' => {}
                 },
-                'index_entry' => {
-                  'entry_element' => {},
-                  'entry_number' => 1,
-                  'in_code' => 1,
-                  'index_name' => 'fn'
-                },
+                'index_entry' => [
+                  'fn',
+                  1
+                ],
                 'original_def_cmdname' => 'defop'
               },
               'source_info' => {
@@ -260,7 +258,6 @@ 
$result_trees{'ampchar'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'extra'}{'
 
$result_trees{'ampchar'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'extra'}{'def_parsed_hash'}{'category'}
 = 
$result_trees{'ampchar'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0];
 
$result_trees{'ampchar'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'extra'}{'def_parsed_hash'}{'class'}
 = 
$result_trees{'ampchar'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[2];
 
$result_trees{'ampchar'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'extra'}{'def_parsed_hash'}{'name'}
 = 
$result_trees{'ampchar'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[4];
-$result_trees{'ampchar'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'extra'}{'index_entry'}{'entry_element'}
 = $result_trees{'ampchar'}{'contents'}[0]{'contents'}[0]{'contents'}[0];
 
 $result_texis{'ampchar'} = '@defop {Constructor} a b (@code{const 
std::vector<int>@&})
 @end defop
diff --git a/tp/t/results/def/code_in_def.pl b/tp/t/results/def/code_in_def.pl
index b93ef19278..009467252f 100644
--- a/tp/t/results/def/code_in_def.pl
+++ b/tp/t/results/def/code_in_def.pl
@@ -124,12 +124,10 @@ $result_trees{'code_in_def'} = {
                   'name' => {},
                   'type' => {}
                 },
-                'index_entry' => {
-                  'entry_element' => {},
-                  'entry_number' => 1,
-                  'in_code' => 1,
-                  'index_name' => 'fn'
-                },
+                'index_entry' => [
+                  'fn',
+                  1
+                ],
                 'original_def_cmdname' => 'deftypefn'
               },
               'source_info' => {
@@ -228,7 +226,6 @@ 
$result_trees{'code_in_def'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'extra
 
$result_trees{'code_in_def'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'extra'}{'def_parsed_hash'}{'category'}
 = 
$result_trees{'code_in_def'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0];
 
$result_trees{'code_in_def'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'extra'}{'def_parsed_hash'}{'name'}
 = 
$result_trees{'code_in_def'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[4];
 
$result_trees{'code_in_def'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'extra'}{'def_parsed_hash'}{'type'}
 = 
$result_trees{'code_in_def'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[2];
-$result_trees{'code_in_def'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'extra'}{'index_entry'}{'entry_element'}
 = $result_trees{'code_in_def'}{'contents'}[0]{'contents'}[0]{'contents'}[0];
 
 $result_texis{'code_in_def'} = '@deftypefn Function int foo (@code{const 
std::vector<int>@&} bar)
 Documentation of @code{foo}.
diff --git a/tp/t/results/def/def_defx_mismatch.pl 
b/tp/t/results/def/def_defx_mismatch.pl
index d601c177fd..54824da2f5 100644
--- a/tp/t/results/def/def_defx_mismatch.pl
+++ b/tp/t/results/def/def_defx_mismatch.pl
@@ -131,12 +131,10 @@ $result_trees{'def_defx_mismatch'} = {
                   'category' => {},
                   'name' => {}
                 },
-                'index_entry' => {
-                  'entry_element' => {},
-                  'entry_number' => 1,
-                  'in_code' => 1,
-                  'index_name' => 'fn'
-                },
+                'index_entry' => [
+                  'fn',
+                  1
+                ],
                 'original_def_cmdname' => 'defun'
               },
               'source_info' => {
@@ -259,12 +257,10 @@ $result_trees{'def_defx_mismatch'} = {
                   'category' => {},
                   'name' => {}
                 },
-                'index_entry' => {
-                  'entry_element' => {},
-                  'entry_number' => 2,
-                  'in_code' => 1,
-                  'index_name' => 'fn'
-                },
+                'index_entry' => [
+                  'fn',
+                  2
+                ],
                 'not_after_command' => 1,
                 'original_def_cmdname' => 'deffnx'
               },
@@ -357,11 +353,9 @@ $result_trees{'def_defx_mismatch'} = {
 
$result_trees{'def_defx_mismatch'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'extra'}{'def_index_element'}
 = 
$result_trees{'def_defx_mismatch'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[2];
 
$result_trees{'def_defx_mismatch'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'extra'}{'def_parsed_hash'}{'category'}
 = 
$result_trees{'def_defx_mismatch'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0];
 
$result_trees{'def_defx_mismatch'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'extra'}{'def_parsed_hash'}{'name'}
 = 
$result_trees{'def_defx_mismatch'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[2];
-$result_trees{'def_defx_mismatch'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'def_defx_mismatch'}{'contents'}[0]{'contents'}[0]{'contents'}[0];
 
$result_trees{'def_defx_mismatch'}{'contents'}[0]{'contents'}[0]{'contents'}[1]{'extra'}{'def_index_element'}
 = 
$result_trees{'def_defx_mismatch'}{'contents'}[0]{'contents'}[0]{'contents'}[1]{'args'}[0]{'contents'}[2];
 
$result_trees{'def_defx_mismatch'}{'contents'}[0]{'contents'}[0]{'contents'}[1]{'extra'}{'def_parsed_hash'}{'category'}
 = 
$result_trees{'def_defx_mismatch'}{'contents'}[0]{'contents'}[0]{'contents'}[1]{'args'}[0]{'contents'}[0];
 
$result_trees{'def_defx_mismatch'}{'contents'}[0]{'contents'}[0]{'contents'}[1]{'extra'}{'def_parsed_hash'}{'name'}
 = 
$result_trees{'def_defx_mismatch'}{'contents'}[0]{'contents'}[0]{'contents'}[1]{'args'}[0]{'contents'}[2];
-$result_trees{'def_defx_mismatch'}{'contents'}[0]{'contents'}[0]{'contents'}[1]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'def_defx_mismatch'}{'contents'}[0]{'contents'}[0]{'contents'}[1];
 
 $result_texis{'def_defx_mismatch'} = '@defun {my def} args @var{arg} @dots{}
 @deffnx {type} {name} and now the args
diff --git a/tp/t/results/def/def_groupings_args.pl 
b/tp/t/results/def/def_groupings_args.pl
index 2728d9d9e9..df0f3cf401 100644
--- a/tp/t/results/def/def_groupings_args.pl
+++ b/tp/t/results/def/def_groupings_args.pl
@@ -78,12 +78,10 @@ $result_trees{'def_groupings_args'} = {
                   'category' => {},
                   'name' => {}
                 },
-                'index_entry' => {
-                  'entry_element' => {},
-                  'entry_number' => 1,
-                  'in_code' => 1,
-                  'index_name' => 'fn'
-                },
+                'index_entry' => [
+                  'fn',
+                  1
+                ],
                 'original_def_cmdname' => 'deffn'
               },
               'source_info' => {
@@ -386,12 +384,10 @@ $result_trees{'def_groupings_args'} = {
                   'category' => {},
                   'name' => {}
                 },
-                'index_entry' => {
-                  'entry_element' => {},
-                  'entry_number' => 2,
-                  'in_code' => 1,
-                  'index_name' => 'fn'
-                },
+                'index_entry' => [
+                  'fn',
+                  2
+                ],
                 'original_def_cmdname' => 'deffn'
               },
               'source_info' => {
@@ -454,12 +450,10 @@ $result_trees{'def_groupings_args'} = {
 
$result_trees{'def_groupings_args'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'extra'}{'def_index_element'}
 = 
$result_trees{'def_groupings_args'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[2];
 
$result_trees{'def_groupings_args'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'extra'}{'def_parsed_hash'}{'category'}
 = 
$result_trees{'def_groupings_args'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0];
 
$result_trees{'def_groupings_args'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'extra'}{'def_parsed_hash'}{'name'}
 = 
$result_trees{'def_groupings_args'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[2];
-$result_trees{'def_groupings_args'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'def_groupings_args'}{'contents'}[0]{'contents'}[0]{'contents'}[0];
 
$result_trees{'def_groupings_args'}{'contents'}[0]{'contents'}[2]{'contents'}[0]{'extra'}{'def_parsed_hash'}{'category'}
 = 
$result_trees{'def_groupings_args'}{'contents'}[0]{'contents'}[2]{'contents'}[0]{'args'}[0]{'contents'}[0];
 
$result_trees{'def_groupings_args'}{'contents'}[0]{'contents'}[4]{'contents'}[0]{'extra'}{'def_index_element'}
 = 
$result_trees{'def_groupings_args'}{'contents'}[0]{'contents'}[4]{'contents'}[0]{'args'}[0]{'contents'}[2];
 
$result_trees{'def_groupings_args'}{'contents'}[0]{'contents'}[4]{'contents'}[0]{'extra'}{'def_parsed_hash'}{'category'}
 = 
$result_trees{'def_groupings_args'}{'contents'}[0]{'contents'}[4]{'contents'}[0]{'args'}[0]{'contents'}[0];
 
$result_trees{'def_groupings_args'}{'contents'}[0]{'contents'}[4]{'contents'}[0]{'extra'}{'def_parsed_hash'}{'name'}
 = 
$result_trees{'def_groupings_args'}{'contents'}[0]{'contents'}[4]{'contents'}[0]{'args'}[0]{'contents'}[2];
-$result_trees{'def_groupings_args'}{'contents'}[0]{'contents'}[4]{'contents'}[0]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'def_groupings_args'}{'contents'}[0]{'contents'}[4]{'contents'}[0];
 
 $result_texis{'def_groupings_args'} = '@deffn a b@code{aa}c
 @end deffn
diff --git a/tp/t/results/def/defx_after_comment.pl 
b/tp/t/results/def/defx_after_comment.pl
index 6d41138a7a..9865e1b8f7 100644
--- a/tp/t/results/def/defx_after_comment.pl
+++ b/tp/t/results/def/defx_after_comment.pl
@@ -93,12 +93,10 @@ $result_trees{'defx_after_comment'} = {
                   'category' => {},
                   'name' => {}
                 },
-                'index_entry' => {
-                  'entry_element' => {},
-                  'entry_number' => 1,
-                  'in_code' => 1,
-                  'index_name' => 'fn'
-                },
+                'index_entry' => [
+                  'fn',
+                  1
+                ],
                 'original_def_cmdname' => 'deffn'
               },
               'source_info' => {
@@ -187,12 +185,10 @@ $result_trees{'defx_after_comment'} = {
                   'category' => {},
                   'name' => {}
                 },
-                'index_entry' => {
-                  'entry_element' => {},
-                  'entry_number' => 2,
-                  'in_code' => 1,
-                  'index_name' => 'fn'
-                },
+                'index_entry' => [
+                  'fn',
+                  2
+                ],
                 'original_def_cmdname' => 'deffnx'
               },
               'info' => {
@@ -254,11 +250,9 @@ $result_trees{'defx_after_comment'} = {
 
$result_trees{'defx_after_comment'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'extra'}{'def_index_element'}
 = 
$result_trees{'defx_after_comment'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[2];
 
$result_trees{'defx_after_comment'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'extra'}{'def_parsed_hash'}{'category'}
 = 
$result_trees{'defx_after_comment'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0];
 
$result_trees{'defx_after_comment'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'extra'}{'def_parsed_hash'}{'name'}
 = 
$result_trees{'defx_after_comment'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[2];
-$result_trees{'defx_after_comment'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'defx_after_comment'}{'contents'}[0]{'contents'}[0]{'contents'}[0];
 
$result_trees{'defx_after_comment'}{'contents'}[0]{'contents'}[0]{'contents'}[2]{'extra'}{'def_index_element'}
 = 
$result_trees{'defx_after_comment'}{'contents'}[0]{'contents'}[0]{'contents'}[2]{'args'}[0]{'contents'}[2];
 
$result_trees{'defx_after_comment'}{'contents'}[0]{'contents'}[0]{'contents'}[2]{'extra'}{'def_parsed_hash'}{'category'}
 = 
$result_trees{'defx_after_comment'}{'contents'}[0]{'contents'}[0]{'contents'}[2]{'args'}[0]{'contents'}[0];
 
$result_trees{'defx_after_comment'}{'contents'}[0]{'contents'}[0]{'contents'}[2]{'extra'}{'def_parsed_hash'}{'name'}
 = 
$result_trees{'defx_after_comment'}{'contents'}[0]{'contents'}[0]{'contents'}[2]{'args'}[0]{'contents'}[2];
-$result_trees{'defx_after_comment'}{'contents'}[0]{'contents'}[0]{'contents'}[2]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'defx_after_comment'}{'contents'}[0]{'contents'}[0]{'contents'}[2];
 
 $result_texis{'defx_after_comment'} = '@deffn fset @var{i} a g
 @c comment
diff --git a/tp/t/results/def/defx_after_comment_in_example.pl 
b/tp/t/results/def/defx_after_comment_in_example.pl
index fbb4530635..d16844ba88 100644
--- a/tp/t/results/def/defx_after_comment_in_example.pl
+++ b/tp/t/results/def/defx_after_comment_in_example.pl
@@ -107,12 +107,10 @@ $result_trees{'defx_after_comment_in_example'} = {
                       'category' => {},
                       'name' => {}
                     },
-                    'index_entry' => {
-                      'entry_element' => {},
-                      'entry_number' => 1,
-                      'in_code' => 1,
-                      'index_name' => 'fn'
-                    },
+                    'index_entry' => [
+                      'fn',
+                      1
+                    ],
                     'original_def_cmdname' => 'deffn'
                   },
                   'source_info' => {
@@ -206,12 +204,10 @@ $result_trees{'defx_after_comment_in_example'} = {
                       'category' => {},
                       'name' => {}
                     },
-                    'index_entry' => {
-                      'entry_element' => {},
-                      'entry_number' => 2,
-                      'in_code' => 1,
-                      'index_name' => 'fn'
-                    },
+                    'index_entry' => [
+                      'fn',
+                      2
+                    ],
                     'original_def_cmdname' => 'deffnx'
                   },
                   'info' => {
@@ -318,11 +314,9 @@ $result_trees{'defx_after_comment_in_example'} = {
 
$result_trees{'defx_after_comment_in_example'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'extra'}{'def_index_element'}
 = 
$result_trees{'defx_after_comment_in_example'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[2];
 
$result_trees{'defx_after_comment_in_example'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'extra'}{'def_parsed_hash'}{'category'}
 = 
$result_trees{'defx_after_comment_in_example'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0];
 
$result_trees{'defx_after_comment_in_example'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'extra'}{'def_parsed_hash'}{'name'}
 = 
$result_trees{'defx_after_comment_in_example'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[2];
-$result_trees{'defx_after_comment_in_example'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'defx_after_comment_in_example'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[0];
 
$result_trees{'defx_after_comment_in_example'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[2]{'extra'}{'def_index_element'}
 = 
$result_trees{'defx_after_comment_in_example'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[2]{'args'}[0]{'contents'}[2];
 
$result_trees{'defx_after_comment_in_example'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[2]{'extra'}{'def_parsed_hash'}{'category'}
 = 
$result_trees{'defx_after_comment_in_example'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[2]{'args'}[0]{'contents'}[0];
 
$result_trees{'defx_after_comment_in_example'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[2]{'extra'}{'def_parsed_hash'}{'name'}
 = 
$result_trees{'defx_after_comment_in_example'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[2]{'args'}[0]{'contents'}[2];
-$result_trees{'defx_after_comment_in_example'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[2]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'defx_after_comment_in_example'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[2];
 
 $result_texis{'defx_after_comment_in_example'} = '@example
 @deffn fset @var{i} a g
diff --git a/tp/t/results/def/defx_after_empty_line.pl 
b/tp/t/results/def/defx_after_empty_line.pl
index ed4e4b3cd4..902098f3da 100644
--- a/tp/t/results/def/defx_after_empty_line.pl
+++ b/tp/t/results/def/defx_after_empty_line.pl
@@ -93,12 +93,10 @@ $result_trees{'defx_after_empty_line'} = {
                   'category' => {},
                   'name' => {}
                 },
-                'index_entry' => {
-                  'entry_element' => {},
-                  'entry_number' => 1,
-                  'in_code' => 1,
-                  'index_name' => 'fn'
-                },
+                'index_entry' => [
+                  'fn',
+                  1
+                ],
                 'original_def_cmdname' => 'deffn'
               },
               'source_info' => {
@@ -182,12 +180,10 @@ $result_trees{'defx_after_empty_line'} = {
                   'category' => {},
                   'name' => {}
                 },
-                'index_entry' => {
-                  'entry_element' => {},
-                  'entry_number' => 2,
-                  'in_code' => 1,
-                  'index_name' => 'fn'
-                },
+                'index_entry' => [
+                  'fn',
+                  2
+                ],
                 'original_def_cmdname' => 'deffnx'
               },
               'info' => {
@@ -249,11 +245,9 @@ $result_trees{'defx_after_empty_line'} = {
 
$result_trees{'defx_after_empty_line'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'extra'}{'def_index_element'}
 = 
$result_trees{'defx_after_empty_line'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[2];
 
$result_trees{'defx_after_empty_line'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'extra'}{'def_parsed_hash'}{'category'}
 = 
$result_trees{'defx_after_empty_line'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0];
 
$result_trees{'defx_after_empty_line'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'extra'}{'def_parsed_hash'}{'name'}
 = 
$result_trees{'defx_after_empty_line'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[2];
-$result_trees{'defx_after_empty_line'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'defx_after_empty_line'}{'contents'}[0]{'contents'}[0]{'contents'}[0];
 
$result_trees{'defx_after_empty_line'}{'contents'}[0]{'contents'}[0]{'contents'}[2]{'extra'}{'def_index_element'}
 = 
$result_trees{'defx_after_empty_line'}{'contents'}[0]{'contents'}[0]{'contents'}[2]{'args'}[0]{'contents'}[2];
 
$result_trees{'defx_after_empty_line'}{'contents'}[0]{'contents'}[0]{'contents'}[2]{'extra'}{'def_parsed_hash'}{'category'}
 = 
$result_trees{'defx_after_empty_line'}{'contents'}[0]{'contents'}[0]{'contents'}[2]{'args'}[0]{'contents'}[0];
 
$result_trees{'defx_after_empty_line'}{'contents'}[0]{'contents'}[0]{'contents'}[2]{'extra'}{'def_parsed_hash'}{'name'}
 = 
$result_trees{'defx_after_empty_line'}{'contents'}[0]{'contents'}[0]{'contents'}[2]{'args'}[0]{'contents'}[2];
-$result_trees{'defx_after_empty_line'}{'contents'}[0]{'contents'}[0]{'contents'}[2]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'defx_after_empty_line'}{'contents'}[0]{'contents'}[0]{'contents'}[2];
 
 $result_texis{'defx_after_empty_line'} = '@deffn fset @var{i} a g
 
diff --git a/tp/t/results/def/defx_after_empty_line_in_example.pl 
b/tp/t/results/def/defx_after_empty_line_in_example.pl
index d30cef0803..24a180f2de 100644
--- a/tp/t/results/def/defx_after_empty_line_in_example.pl
+++ b/tp/t/results/def/defx_after_empty_line_in_example.pl
@@ -107,12 +107,10 @@ $result_trees{'defx_after_empty_line_in_example'} = {
                       'category' => {},
                       'name' => {}
                     },
-                    'index_entry' => {
-                      'entry_element' => {},
-                      'entry_number' => 1,
-                      'in_code' => 1,
-                      'index_name' => 'fn'
-                    },
+                    'index_entry' => [
+                      'fn',
+                      1
+                    ],
                     'original_def_cmdname' => 'deffn'
                   },
                   'source_info' => {
@@ -226,12 +224,10 @@ $result_trees{'defx_after_empty_line_in_example'} = {
                       'category' => {},
                       'name' => {}
                     },
-                    'index_entry' => {
-                      'entry_element' => {},
-                      'entry_number' => 2,
-                      'in_code' => 1,
-                      'index_name' => 'fn'
-                    },
+                    'index_entry' => [
+                      'fn',
+                      2
+                    ],
                     'original_def_cmdname' => 'deffnx'
                   },
                   'info' => {
@@ -338,11 +334,9 @@ $result_trees{'defx_after_empty_line_in_example'} = {
 
$result_trees{'defx_after_empty_line_in_example'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'extra'}{'def_index_element'}
 = 
$result_trees{'defx_after_empty_line_in_example'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[2];
 
$result_trees{'defx_after_empty_line_in_example'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'extra'}{'def_parsed_hash'}{'category'}
 = 
$result_trees{'defx_after_empty_line_in_example'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0];
 
$result_trees{'defx_after_empty_line_in_example'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'extra'}{'def_parsed_hash'}{'name'}
 = 
$result_trees{'defx_after_empty_line_in_example'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[2];
-$result_trees{'defx_after_empty_line_in_example'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'defx_after_empty_line_in_example'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[0];
 
$result_trees{'defx_after_empty_line_in_example'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[2]{'extra'}{'def_index_element'}
 = 
$result_trees{'defx_after_empty_line_in_example'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[2]{'args'}[0]{'contents'}[2];
 
$result_trees{'defx_after_empty_line_in_example'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[2]{'extra'}{'def_parsed_hash'}{'category'}
 = 
$result_trees{'defx_after_empty_line_in_example'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[2]{'args'}[0]{'contents'}[0];
 
$result_trees{'defx_after_empty_line_in_example'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[2]{'extra'}{'def_parsed_hash'}{'name'}
 = 
$result_trees{'defx_after_empty_line_in_example'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[2]{'args'}[0]{'contents'}[2];
-$result_trees{'defx_after_empty_line_in_example'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[2]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'defx_after_empty_line_in_example'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[2];
 
 $result_texis{'defx_after_empty_line_in_example'} = '@example
 @deffn fset @var{i} a g
diff --git a/tp/t/results/def/defx_after_paragraph_end.pl 
b/tp/t/results/def/defx_after_paragraph_end.pl
index 083da17b11..0306bc8879 100644
--- a/tp/t/results/def/defx_after_paragraph_end.pl
+++ b/tp/t/results/def/defx_after_paragraph_end.pl
@@ -93,12 +93,10 @@ $result_trees{'defx_after_paragraph_end'} = {
                   'category' => {},
                   'name' => {}
                 },
-                'index_entry' => {
-                  'entry_element' => {},
-                  'entry_number' => 1,
-                  'in_code' => 1,
-                  'index_name' => 'fn'
-                },
+                'index_entry' => [
+                  'fn',
+                  1
+                ],
                 'original_def_cmdname' => 'deffn'
               },
               'source_info' => {
@@ -191,12 +189,10 @@ $result_trees{'defx_after_paragraph_end'} = {
                   'category' => {},
                   'name' => {}
                 },
-                'index_entry' => {
-                  'entry_element' => {},
-                  'entry_number' => 2,
-                  'in_code' => 1,
-                  'index_name' => 'fn'
-                },
+                'index_entry' => [
+                  'fn',
+                  2
+                ],
                 'not_after_command' => 1,
                 'original_def_cmdname' => 'deffnx'
               },
@@ -259,11 +255,9 @@ $result_trees{'defx_after_paragraph_end'} = {
 
$result_trees{'defx_after_paragraph_end'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'extra'}{'def_index_element'}
 = 
$result_trees{'defx_after_paragraph_end'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[2];
 
$result_trees{'defx_after_paragraph_end'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'extra'}{'def_parsed_hash'}{'category'}
 = 
$result_trees{'defx_after_paragraph_end'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0];
 
$result_trees{'defx_after_paragraph_end'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'extra'}{'def_parsed_hash'}{'name'}
 = 
$result_trees{'defx_after_paragraph_end'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[2];
-$result_trees{'defx_after_paragraph_end'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'defx_after_paragraph_end'}{'contents'}[0]{'contents'}[0]{'contents'}[0];
 
$result_trees{'defx_after_paragraph_end'}{'contents'}[0]{'contents'}[0]{'contents'}[2]{'extra'}{'def_index_element'}
 = 
$result_trees{'defx_after_paragraph_end'}{'contents'}[0]{'contents'}[0]{'contents'}[2]{'args'}[0]{'contents'}[2];
 
$result_trees{'defx_after_paragraph_end'}{'contents'}[0]{'contents'}[0]{'contents'}[2]{'extra'}{'def_parsed_hash'}{'category'}
 = 
$result_trees{'defx_after_paragraph_end'}{'contents'}[0]{'contents'}[0]{'contents'}[2]{'args'}[0]{'contents'}[0];
 
$result_trees{'defx_after_paragraph_end'}{'contents'}[0]{'contents'}[0]{'contents'}[2]{'extra'}{'def_parsed_hash'}{'name'}
 = 
$result_trees{'defx_after_paragraph_end'}{'contents'}[0]{'contents'}[0]{'contents'}[2]{'args'}[0]{'contents'}[2];
-$result_trees{'defx_after_paragraph_end'}{'contents'}[0]{'contents'}[0]{'contents'}[2]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'defx_after_paragraph_end'}{'contents'}[0]{'contents'}[0]{'contents'}[2];
 
 $result_texis{'defx_after_paragraph_end'} = '@deffn fset @var{i} a g
 Text in paragraph.
diff --git a/tp/t/results/def/defx_after_preformatted_with_text.pl 
b/tp/t/results/def/defx_after_preformatted_with_text.pl
index bf215deb82..731b81edef 100644
--- a/tp/t/results/def/defx_after_preformatted_with_text.pl
+++ b/tp/t/results/def/defx_after_preformatted_with_text.pl
@@ -107,12 +107,10 @@ $result_trees{'defx_after_preformatted_with_text'} = {
                       'category' => {},
                       'name' => {}
                     },
-                    'index_entry' => {
-                      'entry_element' => {},
-                      'entry_number' => 1,
-                      'in_code' => 1,
-                      'index_name' => 'fn'
-                    },
+                    'index_entry' => [
+                      'fn',
+                      1
+                    ],
                     'original_def_cmdname' => 'deffn'
                   },
                   'source_info' => {
@@ -205,12 +203,10 @@ $result_trees{'defx_after_preformatted_with_text'} = {
                       'category' => {},
                       'name' => {}
                     },
-                    'index_entry' => {
-                      'entry_element' => {},
-                      'entry_number' => 2,
-                      'in_code' => 1,
-                      'index_name' => 'fn'
-                    },
+                    'index_entry' => [
+                      'fn',
+                      2
+                    ],
                     'not_after_command' => 1,
                     'original_def_cmdname' => 'deffnx'
                   },
@@ -318,11 +314,9 @@ $result_trees{'defx_after_preformatted_with_text'} = {
 
$result_trees{'defx_after_preformatted_with_text'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'extra'}{'def_index_element'}
 = 
$result_trees{'defx_after_preformatted_with_text'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[2];
 
$result_trees{'defx_after_preformatted_with_text'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'extra'}{'def_parsed_hash'}{'category'}
 = 
$result_trees{'defx_after_preformatted_with_text'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0];
 
$result_trees{'defx_after_preformatted_with_text'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'extra'}{'def_parsed_hash'}{'name'}
 = 
$result_trees{'defx_after_preformatted_with_text'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[2];
-$result_trees{'defx_after_preformatted_with_text'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'defx_after_preformatted_with_text'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[0];
 
$result_trees{'defx_after_preformatted_with_text'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[2]{'extra'}{'def_index_element'}
 = 
$result_trees{'defx_after_preformatted_with_text'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[2]{'args'}[0]{'contents'}[2];
 
$result_trees{'defx_after_preformatted_with_text'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[2]{'extra'}{'def_parsed_hash'}{'category'}
 = 
$result_trees{'defx_after_preformatted_with_text'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[2]{'args'}[0]{'contents'}[0];
 
$result_trees{'defx_after_preformatted_with_text'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[2]{'extra'}{'def_parsed_hash'}{'name'}
 = 
$result_trees{'defx_after_preformatted_with_text'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[2]{'args'}[0]{'contents'}[2];
-$result_trees{'defx_after_preformatted_with_text'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[2]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'defx_after_preformatted_with_text'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[2];
 
 $result_texis{'defx_after_preformatted_with_text'} = '@example
 @deffn fset @var{i} a g
diff --git a/tp/t/results/def/defx_after_text.pl 
b/tp/t/results/def/defx_after_text.pl
index 3e0d59f5a5..b0ebf6b36b 100644
--- a/tp/t/results/def/defx_after_text.pl
+++ b/tp/t/results/def/defx_after_text.pl
@@ -93,12 +93,10 @@ $result_trees{'defx_after_text'} = {
                   'category' => {},
                   'name' => {}
                 },
-                'index_entry' => {
-                  'entry_element' => {},
-                  'entry_number' => 1,
-                  'in_code' => 1,
-                  'index_name' => 'fn'
-                },
+                'index_entry' => [
+                  'fn',
+                  1
+                ],
                 'original_def_cmdname' => 'deffn'
               },
               'source_info' => {
@@ -186,12 +184,10 @@ $result_trees{'defx_after_text'} = {
                   'category' => {},
                   'name' => {}
                 },
-                'index_entry' => {
-                  'entry_element' => {},
-                  'entry_number' => 2,
-                  'in_code' => 1,
-                  'index_name' => 'fn'
-                },
+                'index_entry' => [
+                  'fn',
+                  2
+                ],
                 'not_after_command' => 1,
                 'original_def_cmdname' => 'deffnx'
               },
@@ -254,11 +250,9 @@ $result_trees{'defx_after_text'} = {
 
$result_trees{'defx_after_text'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'extra'}{'def_index_element'}
 = 
$result_trees{'defx_after_text'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[2];
 
$result_trees{'defx_after_text'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'extra'}{'def_parsed_hash'}{'category'}
 = 
$result_trees{'defx_after_text'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0];
 
$result_trees{'defx_after_text'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'extra'}{'def_parsed_hash'}{'name'}
 = 
$result_trees{'defx_after_text'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[2];
-$result_trees{'defx_after_text'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'defx_after_text'}{'contents'}[0]{'contents'}[0]{'contents'}[0];
 
$result_trees{'defx_after_text'}{'contents'}[0]{'contents'}[0]{'contents'}[2]{'extra'}{'def_index_element'}
 = 
$result_trees{'defx_after_text'}{'contents'}[0]{'contents'}[0]{'contents'}[2]{'args'}[0]{'contents'}[2];
 
$result_trees{'defx_after_text'}{'contents'}[0]{'contents'}[0]{'contents'}[2]{'extra'}{'def_parsed_hash'}{'category'}
 = 
$result_trees{'defx_after_text'}{'contents'}[0]{'contents'}[0]{'contents'}[2]{'args'}[0]{'contents'}[0];
 
$result_trees{'defx_after_text'}{'contents'}[0]{'contents'}[0]{'contents'}[2]{'extra'}{'def_parsed_hash'}{'name'}
 = 
$result_trees{'defx_after_text'}{'contents'}[0]{'contents'}[0]{'contents'}[2]{'args'}[0]{'contents'}[2];
-$result_trees{'defx_after_text'}{'contents'}[0]{'contents'}[0]{'contents'}[2]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'defx_after_text'}{'contents'}[0]{'contents'}[0]{'contents'}[2];
 
 $result_texis{'defx_after_text'} = '@deffn fset @var{i} a g
 Text in deffn
diff --git a/tp/t/results/def/defx_in_example.pl 
b/tp/t/results/def/defx_in_example.pl
index 37e00a7f12..90445124df 100644
--- a/tp/t/results/def/defx_in_example.pl
+++ b/tp/t/results/def/defx_in_example.pl
@@ -107,12 +107,10 @@ $result_trees{'defx_in_example'} = {
                       'category' => {},
                       'name' => {}
                     },
-                    'index_entry' => {
-                      'entry_element' => {},
-                      'entry_number' => 1,
-                      'in_code' => 1,
-                      'index_name' => 'fn'
-                    },
+                    'index_entry' => [
+                      'fn',
+                      1
+                    ],
                     'original_def_cmdname' => 'deffn'
                   },
                   'source_info' => {
@@ -186,12 +184,10 @@ $result_trees{'defx_in_example'} = {
                       'category' => {},
                       'name' => {}
                     },
-                    'index_entry' => {
-                      'entry_element' => {},
-                      'entry_number' => 2,
-                      'in_code' => 1,
-                      'index_name' => 'fn'
-                    },
+                    'index_entry' => [
+                      'fn',
+                      2
+                    ],
                     'original_def_cmdname' => 'deffnx'
                   },
                   'info' => {
@@ -298,11 +294,9 @@ $result_trees{'defx_in_example'} = {
 
$result_trees{'defx_in_example'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'extra'}{'def_index_element'}
 = 
$result_trees{'defx_in_example'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[2];
 
$result_trees{'defx_in_example'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'extra'}{'def_parsed_hash'}{'category'}
 = 
$result_trees{'defx_in_example'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0];
 
$result_trees{'defx_in_example'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'extra'}{'def_parsed_hash'}{'name'}
 = 
$result_trees{'defx_in_example'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[2];
-$result_trees{'defx_in_example'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'defx_in_example'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[0];
 
$result_trees{'defx_in_example'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[1]{'extra'}{'def_index_element'}
 = 
$result_trees{'defx_in_example'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[1]{'args'}[0]{'contents'}[2];
 
$result_trees{'defx_in_example'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[1]{'extra'}{'def_parsed_hash'}{'category'}
 = 
$result_trees{'defx_in_example'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[1]{'args'}[0]{'contents'}[0];
 
$result_trees{'defx_in_example'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[1]{'extra'}{'def_parsed_hash'}{'name'}
 = 
$result_trees{'defx_in_example'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[1]{'args'}[0]{'contents'}[2];
-$result_trees{'defx_in_example'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[1]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'defx_in_example'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[1];
 
 $result_texis{'defx_in_example'} = '@example
 @deffn fset @var{i} a g
diff --git a/tp/t/results/def/double_command.pl 
b/tp/t/results/def/double_command.pl
index b29db59f4d..905a6dd8e3 100644
--- a/tp/t/results/def/double_command.pl
+++ b/tp/t/results/def/double_command.pl
@@ -278,12 +278,10 @@ $result_trees{'double_command'} = {
                           'name' => {}
                         },
                         'def_role' => 'arg',
-                        'index_entry' => {
-                          'entry_element' => {},
-                          'entry_number' => 1,
-                          'in_code' => 1,
-                          'index_name' => 'fn'
-                        },
+                        'index_entry' => [
+                          'fn',
+                          1
+                        ],
                         'not_after_command' => 1,
                         'original_def_cmdname' => 'deffnx'
                       },
@@ -310,12 +308,10 @@ $result_trees{'double_command'} = {
                   'category' => {},
                   'name' => {}
                 },
-                'index_entry' => {
-                  'entry_element' => {},
-                  'entry_number' => 2,
-                  'in_code' => 1,
-                  'index_name' => 'fn'
-                },
+                'index_entry' => [
+                  'fn',
+                  2
+                ],
                 'original_def_cmdname' => 'deffn'
               },
               'source_info' => {
@@ -477,12 +473,10 @@ $result_trees{'double_command'} = {
                               'category' => {},
                               'name' => {}
                             },
-                            'index_entry' => {
-                              'entry_element' => {},
-                              'entry_number' => 1,
-                              'in_code' => 1,
-                              'index_name' => 'vr'
-                            },
+                            'index_entry' => [
+                              'vr',
+                              1
+                            ],
                             'original_def_cmdname' => 'defvr'
                           },
                           'source_info' => {
@@ -518,12 +512,10 @@ $result_trees{'double_command'} = {
                   'category' => {},
                   'name' => {}
                 },
-                'index_entry' => {
-                  'entry_element' => {},
-                  'entry_number' => 3,
-                  'in_code' => 1,
-                  'index_name' => 'fn'
-                },
+                'index_entry' => [
+                  'fn',
+                  3
+                ],
                 'original_def_cmdname' => 'deffn'
               },
               'source_info' => {
@@ -600,19 +592,15 @@ $result_trees{'double_command'} = {
 
$result_trees{'double_command'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[17]{'extra'}{'def_index_element'}
 = 
$result_trees{'double_command'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[17]{'args'}[0]{'contents'}[2];
 
$result_trees{'double_command'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[17]{'extra'}{'def_parsed_hash'}{'category'}
 = 
$result_trees{'double_command'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[17]{'args'}[0]{'contents'}[0];
 
$result_trees{'double_command'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[17]{'extra'}{'def_parsed_hash'}{'name'}
 = 
$result_trees{'double_command'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[17]{'args'}[0]{'contents'}[2];
-$result_trees{'double_command'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[17]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'double_command'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[17];
 
$result_trees{'double_command'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'extra'}{'def_index_element'}
 = 
$result_trees{'double_command'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[2];
 
$result_trees{'double_command'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'extra'}{'def_parsed_hash'}{'category'}
 = 
$result_trees{'double_command'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0];
 
$result_trees{'double_command'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'extra'}{'def_parsed_hash'}{'name'}
 = 
$result_trees{'double_command'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[2];
-$result_trees{'double_command'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'extra'}{'index_entry'}{'entry_element'}
 = $result_trees{'double_command'}{'contents'}[0]{'contents'}[0]{'contents'}[0];
 
$result_trees{'double_command'}{'contents'}[0]{'contents'}[2]{'contents'}[0]{'args'}[0]{'contents'}[6]{'contents'}[0]{'extra'}{'def_index_element'}
 = 
$result_trees{'double_command'}{'contents'}[0]{'contents'}[2]{'contents'}[0]{'args'}[0]{'contents'}[6]{'contents'}[0]{'args'}[0]{'contents'}[2];
 
$result_trees{'double_command'}{'contents'}[0]{'contents'}[2]{'contents'}[0]{'args'}[0]{'contents'}[6]{'contents'}[0]{'extra'}{'def_parsed_hash'}{'category'}
 = 
$result_trees{'double_command'}{'contents'}[0]{'contents'}[2]{'contents'}[0]{'args'}[0]{'contents'}[6]{'contents'}[0]{'args'}[0]{'contents'}[0];
 
$result_trees{'double_command'}{'contents'}[0]{'contents'}[2]{'contents'}[0]{'args'}[0]{'contents'}[6]{'contents'}[0]{'extra'}{'def_parsed_hash'}{'name'}
 = 
$result_trees{'double_command'}{'contents'}[0]{'contents'}[2]{'contents'}[0]{'args'}[0]{'contents'}[6]{'contents'}[0]{'args'}[0]{'contents'}[2];
-$result_trees{'double_command'}{'contents'}[0]{'contents'}[2]{'contents'}[0]{'args'}[0]{'contents'}[6]{'contents'}[0]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'double_command'}{'contents'}[0]{'contents'}[2]{'contents'}[0]{'args'}[0]{'contents'}[6]{'contents'}[0];
 
$result_trees{'double_command'}{'contents'}[0]{'contents'}[2]{'contents'}[0]{'extra'}{'def_index_element'}
 = 
$result_trees{'double_command'}{'contents'}[0]{'contents'}[2]{'contents'}[0]{'args'}[0]{'contents'}[2];
 
$result_trees{'double_command'}{'contents'}[0]{'contents'}[2]{'contents'}[0]{'extra'}{'def_parsed_hash'}{'category'}
 = 
$result_trees{'double_command'}{'contents'}[0]{'contents'}[2]{'contents'}[0]{'args'}[0]{'contents'}[0];
 
$result_trees{'double_command'}{'contents'}[0]{'contents'}[2]{'contents'}[0]{'extra'}{'def_parsed_hash'}{'name'}
 = 
$result_trees{'double_command'}{'contents'}[0]{'contents'}[2]{'contents'}[0]{'args'}[0]{'contents'}[2];
-$result_trees{'double_command'}{'contents'}[0]{'contents'}[2]{'contents'}[0]{'extra'}{'index_entry'}{'entry_element'}
 = $result_trees{'double_command'}{'contents'}[0]{'contents'}[2]{'contents'}[0];
 
 $result_texis{'double_command'} = '@deffn func plot (a, b, c, ...) @deffnx 
func plot2 (a, b, c, ..., d)
 aaa
diff --git a/tp/t/results/def/empty_def_arguments.pl 
b/tp/t/results/def/empty_def_arguments.pl
index 715f4c0a07..43c2e93f9d 100644
--- a/tp/t/results/def/empty_def_arguments.pl
+++ b/tp/t/results/def/empty_def_arguments.pl
@@ -93,12 +93,10 @@ $result_trees{'empty_def_arguments'} = {
                   'category' => {},
                   'name' => {}
                 },
-                'index_entry' => {
-                  'entry_element' => {},
-                  'entry_number' => 1,
-                  'in_code' => 1,
-                  'index_name' => 'fn'
-                },
+                'index_entry' => [
+                  'fn',
+                  1
+                ],
                 'original_def_cmdname' => 'deffn'
               },
               'source_info' => {
@@ -578,7 +576,6 @@ $result_trees{'empty_def_arguments'} = {
 
$result_trees{'empty_def_arguments'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'extra'}{'def_index_element'}
 = 
$result_trees{'empty_def_arguments'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[2];
 
$result_trees{'empty_def_arguments'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'extra'}{'def_parsed_hash'}{'category'}
 = 
$result_trees{'empty_def_arguments'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0];
 
$result_trees{'empty_def_arguments'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'extra'}{'def_parsed_hash'}{'name'}
 = 
$result_trees{'empty_def_arguments'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[2];
-$result_trees{'empty_def_arguments'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'empty_def_arguments'}{'contents'}[0]{'contents'}[0]{'contents'}[0];
 
$result_trees{'empty_def_arguments'}{'contents'}[0]{'contents'}[0]{'contents'}[1]{'extra'}{'def_parsed_hash'}{'category'}
 = 
$result_trees{'empty_def_arguments'}{'contents'}[0]{'contents'}[0]{'contents'}[1]{'args'}[0]{'contents'}[0];
 
$result_trees{'empty_def_arguments'}{'contents'}[0]{'contents'}[0]{'contents'}[3]{'extra'}{'def_parsed_hash'}{'category'}
 = 
$result_trees{'empty_def_arguments'}{'contents'}[0]{'contents'}[0]{'contents'}[3]{'args'}[0]{'contents'}[0];
 
$result_trees{'empty_def_arguments'}{'contents'}[0]{'contents'}[0]{'contents'}[4]{'extra'}{'def_parsed_hash'}{'category'}
 = 
$result_trees{'empty_def_arguments'}{'contents'}[0]{'contents'}[0]{'contents'}[4]{'args'}[0]{'contents'}[0];
diff --git a/tp/t/results/def/empty_def_command.pl 
b/tp/t/results/def/empty_def_command.pl
index 70d98a64e3..83cf0f1bcb 100644
--- a/tp/t/results/def/empty_def_command.pl
+++ b/tp/t/results/def/empty_def_command.pl
@@ -52,12 +52,10 @@ $result_trees{'empty_def_command'} = {
                   'category' => {},
                   'name' => {}
                 },
-                'index_entry' => {
-                  'entry_element' => {},
-                  'entry_number' => 1,
-                  'in_code' => 1,
-                  'index_name' => 'fn'
-                },
+                'index_entry' => [
+                  'fn',
+                  1
+                ],
                 'original_def_cmdname' => 'deffn'
               },
               'source_info' => {
@@ -185,12 +183,10 @@ $result_trees{'empty_def_command'} = {
                   'category' => {},
                   'name' => {}
                 },
-                'index_entry' => {
-                  'entry_element' => {},
-                  'entry_number' => 2,
-                  'in_code' => 1,
-                  'index_name' => 'fn'
-                },
+                'index_entry' => [
+                  'fn',
+                  2
+                ],
                 'original_def_cmdname' => 'deffn'
               },
               'source_info' => {
@@ -241,12 +237,10 @@ $result_trees{'empty_def_command'} = {
                   'category' => {},
                   'name' => {}
                 },
-                'index_entry' => {
-                  'entry_element' => {},
-                  'entry_number' => 3,
-                  'in_code' => 1,
-                  'index_name' => 'fn'
-                },
+                'index_entry' => [
+                  'fn',
+                  3
+                ],
                 'original_def_cmdname' => 'deffnx'
               },
               'info' => {
@@ -314,15 +308,12 @@ $result_trees{'empty_def_command'} = {
 
$result_trees{'empty_def_command'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'extra'}{'def_index_element'}
 = 
$result_trees{'empty_def_command'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[2];
 
$result_trees{'empty_def_command'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'extra'}{'def_parsed_hash'}{'category'}
 = 
$result_trees{'empty_def_command'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0];
 
$result_trees{'empty_def_command'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'extra'}{'def_parsed_hash'}{'name'}
 = 
$result_trees{'empty_def_command'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[2];
-$result_trees{'empty_def_command'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'empty_def_command'}{'contents'}[0]{'contents'}[0]{'contents'}[0];
 
$result_trees{'empty_def_command'}{'contents'}[0]{'contents'}[2]{'contents'}[0]{'extra'}{'def_index_element'}
 = 
$result_trees{'empty_def_command'}{'contents'}[0]{'contents'}[2]{'contents'}[0]{'args'}[0]{'contents'}[2];
 
$result_trees{'empty_def_command'}{'contents'}[0]{'contents'}[2]{'contents'}[0]{'extra'}{'def_parsed_hash'}{'category'}
 = 
$result_trees{'empty_def_command'}{'contents'}[0]{'contents'}[2]{'contents'}[0]{'args'}[0]{'contents'}[0];
 
$result_trees{'empty_def_command'}{'contents'}[0]{'contents'}[2]{'contents'}[0]{'extra'}{'def_parsed_hash'}{'name'}
 = 
$result_trees{'empty_def_command'}{'contents'}[0]{'contents'}[2]{'contents'}[0]{'args'}[0]{'contents'}[2];
-$result_trees{'empty_def_command'}{'contents'}[0]{'contents'}[2]{'contents'}[0]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'empty_def_command'}{'contents'}[0]{'contents'}[2]{'contents'}[0];
 
$result_trees{'empty_def_command'}{'contents'}[0]{'contents'}[2]{'contents'}[1]{'extra'}{'def_index_element'}
 = 
$result_trees{'empty_def_command'}{'contents'}[0]{'contents'}[2]{'contents'}[1]{'args'}[0]{'contents'}[2];
 
$result_trees{'empty_def_command'}{'contents'}[0]{'contents'}[2]{'contents'}[1]{'extra'}{'def_parsed_hash'}{'category'}
 = 
$result_trees{'empty_def_command'}{'contents'}[0]{'contents'}[2]{'contents'}[1]{'args'}[0]{'contents'}[0];
 
$result_trees{'empty_def_command'}{'contents'}[0]{'contents'}[2]{'contents'}[1]{'extra'}{'def_parsed_hash'}{'name'}
 = 
$result_trees{'empty_def_command'}{'contents'}[0]{'contents'}[2]{'contents'}[1]{'args'}[0]{'contents'}[2];
-$result_trees{'empty_def_command'}{'contents'}[0]{'contents'}[2]{'contents'}[1]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'empty_def_command'}{'contents'}[0]{'contents'}[2]{'contents'}[1];
 
 $result_texis{'empty_def_command'} = '@deffn empty deffn
 @end deffn
diff --git a/tp/t/results/def/empty_deftype.pl 
b/tp/t/results/def/empty_deftype.pl
index a8f4eaa737..4dd28bfe6f 100644
--- a/tp/t/results/def/empty_deftype.pl
+++ b/tp/t/results/def/empty_deftype.pl
@@ -129,12 +129,10 @@ $result_trees{'empty_deftype'} = {
                   'name' => {},
                   'type' => {}
                 },
-                'index_entry' => {
-                  'entry_element' => {},
-                  'entry_number' => 1,
-                  'in_code' => 1,
-                  'index_name' => 'fn'
-                },
+                'index_entry' => [
+                  'fn',
+                  1
+                ],
                 'original_def_cmdname' => 'deftypefun'
               },
               'source_info' => {
@@ -308,12 +306,10 @@ $result_trees{'empty_deftype'} = {
                   'category' => {},
                   'name' => {}
                 },
-                'index_entry' => {
-                  'entry_element' => {},
-                  'entry_number' => 2,
-                  'in_code' => 1,
-                  'index_name' => 'fn'
-                },
+                'index_entry' => [
+                  'fn',
+                  2
+                ],
                 'original_def_cmdname' => 'defun'
               },
               'source_info' => {
@@ -538,12 +534,10 @@ $result_trees{'empty_deftype'} = {
                   'name' => {},
                   'type' => {}
                 },
-                'index_entry' => {
-                  'entry_element' => {},
-                  'entry_number' => 3,
-                  'in_code' => 1,
-                  'index_name' => 'fn'
-                },
+                'index_entry' => [
+                  'fn',
+                  3
+                ],
                 'original_def_cmdname' => 'deftypemethod'
               },
               'source_info' => {
@@ -749,12 +743,10 @@ $result_trees{'empty_deftype'} = {
                   'class' => {},
                   'name' => {}
                 },
-                'index_entry' => {
-                  'entry_element' => {},
-                  'entry_number' => 4,
-                  'in_code' => 1,
-                  'index_name' => 'fn'
-                },
+                'index_entry' => [
+                  'fn',
+                  4
+                ],
                 'original_def_cmdname' => 'defmethod'
               },
               'source_info' => {
@@ -832,11 +824,9 @@ 
$result_trees{'empty_deftype'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'ext
 
$result_trees{'empty_deftype'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'extra'}{'def_parsed_hash'}{'category'}
 = 
$result_trees{'empty_deftype'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0];
 
$result_trees{'empty_deftype'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'extra'}{'def_parsed_hash'}{'name'}
 = 
$result_trees{'empty_deftype'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[4];
 
$result_trees{'empty_deftype'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'extra'}{'def_parsed_hash'}{'type'}
 = 
$result_trees{'empty_deftype'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[2];
-$result_trees{'empty_deftype'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'extra'}{'index_entry'}{'entry_element'}
 = $result_trees{'empty_deftype'}{'contents'}[0]{'contents'}[0]{'contents'}[0];
 
$result_trees{'empty_deftype'}{'contents'}[0]{'contents'}[2]{'contents'}[0]{'extra'}{'def_index_element'}
 = 
$result_trees{'empty_deftype'}{'contents'}[0]{'contents'}[2]{'contents'}[0]{'args'}[0]{'contents'}[2];
 
$result_trees{'empty_deftype'}{'contents'}[0]{'contents'}[2]{'contents'}[0]{'extra'}{'def_parsed_hash'}{'category'}
 = 
$result_trees{'empty_deftype'}{'contents'}[0]{'contents'}[2]{'contents'}[0]{'args'}[0]{'contents'}[0];
 
$result_trees{'empty_deftype'}{'contents'}[0]{'contents'}[2]{'contents'}[0]{'extra'}{'def_parsed_hash'}{'name'}
 = 
$result_trees{'empty_deftype'}{'contents'}[0]{'contents'}[2]{'contents'}[0]{'args'}[0]{'contents'}[2];
-$result_trees{'empty_deftype'}{'contents'}[0]{'contents'}[2]{'contents'}[0]{'extra'}{'index_entry'}{'entry_element'}
 = $result_trees{'empty_deftype'}{'contents'}[0]{'contents'}[2]{'contents'}[0];
 
$result_trees{'empty_deftype'}{'contents'}[0]{'contents'}[4]{'contents'}[0]{'extra'}{'def_index_element'}{'contents'}[0]
 = 
$result_trees{'empty_deftype'}{'contents'}[0]{'contents'}[4]{'contents'}[0]{'args'}[0]{'contents'}[6];
 
$result_trees{'empty_deftype'}{'contents'}[0]{'contents'}[4]{'contents'}[0]{'extra'}{'def_index_element'}{'contents'}[2]
 = 
$result_trees{'empty_deftype'}{'contents'}[0]{'contents'}[4]{'contents'}[0]{'args'}[0]{'contents'}[2];
 
$result_trees{'empty_deftype'}{'contents'}[0]{'contents'}[4]{'contents'}[0]{'extra'}{'def_index_ref_element'}{'contents'}[0]
 = 
$result_trees{'empty_deftype'}{'contents'}[0]{'contents'}[4]{'contents'}[0]{'args'}[0]{'contents'}[6];
@@ -845,7 +835,6 @@ 
$result_trees{'empty_deftype'}{'contents'}[0]{'contents'}[4]{'contents'}[0]{'ext
 
$result_trees{'empty_deftype'}{'contents'}[0]{'contents'}[4]{'contents'}[0]{'extra'}{'def_parsed_hash'}{'class'}
 = 
$result_trees{'empty_deftype'}{'contents'}[0]{'contents'}[4]{'contents'}[0]{'args'}[0]{'contents'}[2];
 
$result_trees{'empty_deftype'}{'contents'}[0]{'contents'}[4]{'contents'}[0]{'extra'}{'def_parsed_hash'}{'name'}
 = 
$result_trees{'empty_deftype'}{'contents'}[0]{'contents'}[4]{'contents'}[0]{'args'}[0]{'contents'}[6];
 
$result_trees{'empty_deftype'}{'contents'}[0]{'contents'}[4]{'contents'}[0]{'extra'}{'def_parsed_hash'}{'type'}
 = 
$result_trees{'empty_deftype'}{'contents'}[0]{'contents'}[4]{'contents'}[0]{'args'}[0]{'contents'}[4];
-$result_trees{'empty_deftype'}{'contents'}[0]{'contents'}[4]{'contents'}[0]{'extra'}{'index_entry'}{'entry_element'}
 = $result_trees{'empty_deftype'}{'contents'}[0]{'contents'}[4]{'contents'}[0];
 
$result_trees{'empty_deftype'}{'contents'}[0]{'contents'}[6]{'contents'}[0]{'extra'}{'def_index_element'}{'contents'}[0]
 = 
$result_trees{'empty_deftype'}{'contents'}[0]{'contents'}[6]{'contents'}[0]{'args'}[0]{'contents'}[4];
 
$result_trees{'empty_deftype'}{'contents'}[0]{'contents'}[6]{'contents'}[0]{'extra'}{'def_index_element'}{'contents'}[2]
 = 
$result_trees{'empty_deftype'}{'contents'}[0]{'contents'}[6]{'contents'}[0]{'args'}[0]{'contents'}[2];
 
$result_trees{'empty_deftype'}{'contents'}[0]{'contents'}[6]{'contents'}[0]{'extra'}{'def_index_ref_element'}{'contents'}[0]
 = 
$result_trees{'empty_deftype'}{'contents'}[0]{'contents'}[6]{'contents'}[0]{'args'}[0]{'contents'}[4];
@@ -853,7 +842,6 @@ 
$result_trees{'empty_deftype'}{'contents'}[0]{'contents'}[6]{'contents'}[0]{'ext
 
$result_trees{'empty_deftype'}{'contents'}[0]{'contents'}[6]{'contents'}[0]{'extra'}{'def_parsed_hash'}{'category'}
 = 
$result_trees{'empty_deftype'}{'contents'}[0]{'contents'}[6]{'contents'}[0]{'args'}[0]{'contents'}[0];
 
$result_trees{'empty_deftype'}{'contents'}[0]{'contents'}[6]{'contents'}[0]{'extra'}{'def_parsed_hash'}{'class'}
 = 
$result_trees{'empty_deftype'}{'contents'}[0]{'contents'}[6]{'contents'}[0]{'args'}[0]{'contents'}[2];
 
$result_trees{'empty_deftype'}{'contents'}[0]{'contents'}[6]{'contents'}[0]{'extra'}{'def_parsed_hash'}{'name'}
 = 
$result_trees{'empty_deftype'}{'contents'}[0]{'contents'}[6]{'contents'}[0]{'args'}[0]{'contents'}[4];
-$result_trees{'empty_deftype'}{'contents'}[0]{'contents'}[6]{'contents'}[0]{'extra'}{'index_entry'}{'entry_element'}
 = $result_trees{'empty_deftype'}{'contents'}[0]{'contents'}[6]{'contents'}[0];
 
 $result_texis{'empty_deftype'} = '@deftypefun {} f (const type& x)
 Deftypefun.
diff --git a/tp/t/results/def/end_of_line_end_file.pl 
b/tp/t/results/def/end_of_line_end_file.pl
index 282792e09c..8f0b68b3fc 100644
--- a/tp/t/results/def/end_of_line_end_file.pl
+++ b/tp/t/results/def/end_of_line_end_file.pl
@@ -71,12 +71,10 @@ $result_trees{'end_of_line_end_file'} = {
                   'category' => {},
                   'name' => {}
                 },
-                'index_entry' => {
-                  'entry_element' => {},
-                  'entry_number' => 1,
-                  'in_code' => 1,
-                  'index_name' => 'fn'
-                },
+                'index_entry' => [
+                  'fn',
+                  1
+                ],
                 'original_def_cmdname' => 'deffn'
               },
               'source_info' => {
@@ -107,7 +105,6 @@ $result_trees{'end_of_line_end_file'} = {
 
$result_trees{'end_of_line_end_file'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'extra'}{'def_index_element'}
 = 
$result_trees{'end_of_line_end_file'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[2];
 
$result_trees{'end_of_line_end_file'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'extra'}{'def_parsed_hash'}{'category'}
 = 
$result_trees{'end_of_line_end_file'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0];
 
$result_trees{'end_of_line_end_file'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'extra'}{'def_parsed_hash'}{'name'}
 = 
$result_trees{'end_of_line_end_file'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[2];
-$result_trees{'end_of_line_end_file'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'end_of_line_end_file'}{'contents'}[0]{'contents'}[0]{'contents'}[0];
 
 $result_texis{'end_of_line_end_file'} = '@deffn category deffn_name arguments 
';
 
diff --git a/tp/t/results/def/end_of_line_protect_at_end.pl 
b/tp/t/results/def/end_of_line_protect_at_end.pl
index d57768cf0b..8af964fe13 100644
--- a/tp/t/results/def/end_of_line_protect_at_end.pl
+++ b/tp/t/results/def/end_of_line_protect_at_end.pl
@@ -69,12 +69,10 @@ $result_trees{'end_of_line_protect_at_end'} = {
                   'category' => {},
                   'name' => {}
                 },
-                'index_entry' => {
-                  'entry_element' => {},
-                  'entry_number' => 1,
-                  'in_code' => 1,
-                  'index_name' => 'fn'
-                },
+                'index_entry' => [
+                  'fn',
+                  1
+                ],
                 'original_def_cmdname' => 'deffn'
               },
               'source_info' => {
@@ -105,7 +103,6 @@ $result_trees{'end_of_line_protect_at_end'} = {
 
$result_trees{'end_of_line_protect_at_end'}{'contents'}[0]{'contents'}[1]{'contents'}[0]{'extra'}{'def_index_element'}
 = 
$result_trees{'end_of_line_protect_at_end'}{'contents'}[0]{'contents'}[1]{'contents'}[0]{'args'}[0]{'contents'}[2];
 
$result_trees{'end_of_line_protect_at_end'}{'contents'}[0]{'contents'}[1]{'contents'}[0]{'extra'}{'def_parsed_hash'}{'category'}
 = 
$result_trees{'end_of_line_protect_at_end'}{'contents'}[0]{'contents'}[1]{'contents'}[0]{'args'}[0]{'contents'}[0];
 
$result_trees{'end_of_line_protect_at_end'}{'contents'}[0]{'contents'}[1]{'contents'}[0]{'extra'}{'def_parsed_hash'}{'name'}
 = 
$result_trees{'end_of_line_protect_at_end'}{'contents'}[0]{'contents'}[1]{'contents'}[0]{'args'}[0]{'contents'}[2];
-$result_trees{'end_of_line_protect_at_end'}{'contents'}[0]{'contents'}[1]{'contents'}[0]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'end_of_line_protect_at_end'}{'contents'}[0]{'contents'}[1]{'contents'}[0];
 
 $result_texis{'end_of_line_protect_at_end'} = '
 @deffn category2 deffn_name2 arguments2 ';
diff --git a/tp/t/results/def/end_of_lines_protected.pl 
b/tp/t/results/def/end_of_lines_protected.pl
index 8779197431..98883ed6f0 100644
--- a/tp/t/results/def/end_of_lines_protected.pl
+++ b/tp/t/results/def/end_of_lines_protected.pl
@@ -196,12 +196,10 @@ $result_trees{'end_of_lines_protected'} = {
                   'category' => {},
                   'name' => {}
                 },
-                'index_entry' => {
-                  'entry_element' => {},
-                  'entry_number' => 1,
-                  'in_code' => 1,
-                  'index_name' => 'fn'
-                },
+                'index_entry' => [
+                  'fn',
+                  1
+                ],
                 'original_def_cmdname' => 'deffn'
               },
               'source_info' => {
@@ -278,7 +276,6 @@ $result_trees{'end_of_lines_protected'} = {
 
$result_trees{'end_of_lines_protected'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'extra'}{'def_index_element'}
 = 
$result_trees{'end_of_lines_protected'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[2];
 
$result_trees{'end_of_lines_protected'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'extra'}{'def_parsed_hash'}{'category'}
 = 
$result_trees{'end_of_lines_protected'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0];
 
$result_trees{'end_of_lines_protected'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'extra'}{'def_parsed_hash'}{'name'}
 = 
$result_trees{'end_of_lines_protected'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[2];
-$result_trees{'end_of_lines_protected'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'end_of_lines_protected'}{'contents'}[0]{'contents'}[0]{'contents'}[0];
 
 $result_texis{'end_of_lines_protected'} = '@deffn category deffn_name 
arguments    more {args   with end of line within} with 3 @@ @@ {one last arg}
 deffn
diff --git a/tp/t/results/def/end_of_lines_protected_in_footnote.pl 
b/tp/t/results/def/end_of_lines_protected_in_footnote.pl
index 8d98855305..151258342a 100644
--- a/tp/t/results/def/end_of_lines_protected_in_footnote.pl
+++ b/tp/t/results/def/end_of_lines_protected_in_footnote.pl
@@ -215,12 +215,10 @@ $result_trees{'end_of_lines_protected_in_footnote'} = {
                               'category' => {},
                               'name' => {}
                             },
-                            'index_entry' => {
-                              'entry_element' => {},
-                              'entry_number' => 1,
-                              'in_code' => 1,
-                              'index_name' => 'fn'
-                            },
+                            'index_entry' => [
+                              'fn',
+                              1
+                            ],
                             'original_def_cmdname' => 'deffn'
                           },
                           'source_info' => {
@@ -321,7 +319,6 @@ $result_trees{'end_of_lines_protected_in_footnote'} = {
 
$result_trees{'end_of_lines_protected_in_footnote'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0]{'contents'}[0]{'extra'}{'def_index_element'}
 = 
$result_trees{'end_of_lines_protected_in_footnote'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[2];
 
$result_trees{'end_of_lines_protected_in_footnote'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0]{'contents'}[0]{'extra'}{'def_parsed_hash'}{'category'}
 = 
$result_trees{'end_of_lines_protected_in_footnote'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0];
 
$result_trees{'end_of_lines_protected_in_footnote'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0]{'contents'}[0]{'extra'}{'def_parsed_hash'}{'name'}
 = 
$result_trees{'end_of_lines_protected_in_footnote'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[2];
-$result_trees{'end_of_lines_protected_in_footnote'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0]{'contents'}[0]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'end_of_lines_protected_in_footnote'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0]{'contents'}[0];
 
 $result_texis{'end_of_lines_protected_in_footnote'} = '@footnote{
 @deffn category deffn_name arguments arg2    more {args   with end of line 
within} with 3 @@ @@ {one last arg}
diff --git a/tp/t/results/def/end_of_lines_protected_non_ascii.pl 
b/tp/t/results/def/end_of_lines_protected_non_ascii.pl
index a7876b935d..2fce053643 100644
--- a/tp/t/results/def/end_of_lines_protected_non_ascii.pl
+++ b/tp/t/results/def/end_of_lines_protected_non_ascii.pl
@@ -210,12 +210,10 @@ $result_trees{'end_of_lines_protected_non_ascii'} = {
                   'category' => {},
                   'name' => {}
                 },
-                'index_entry' => {
-                  'entry_element' => {},
-                  'entry_number' => 1,
-                  'in_code' => 1,
-                  'index_name' => 'fn'
-                },
+                'index_entry' => [
+                  'fn',
+                  1
+                ],
                 'original_def_cmdname' => 'deffn'
               },
               'source_info' => {
@@ -297,7 +295,6 @@ $result_trees{'end_of_lines_protected_non_ascii'} = {
 
$result_trees{'end_of_lines_protected_non_ascii'}{'contents'}[0]{'contents'}[2]{'contents'}[0]{'extra'}{'def_index_element'}
 = 
$result_trees{'end_of_lines_protected_non_ascii'}{'contents'}[0]{'contents'}[2]{'contents'}[0]{'args'}[0]{'contents'}[2];
 
$result_trees{'end_of_lines_protected_non_ascii'}{'contents'}[0]{'contents'}[2]{'contents'}[0]{'extra'}{'def_parsed_hash'}{'category'}
 = 
$result_trees{'end_of_lines_protected_non_ascii'}{'contents'}[0]{'contents'}[2]{'contents'}[0]{'args'}[0]{'contents'}[0];
 
$result_trees{'end_of_lines_protected_non_ascii'}{'contents'}[0]{'contents'}[2]{'contents'}[0]{'extra'}{'def_parsed_hash'}{'name'}
 = 
$result_trees{'end_of_lines_protected_non_ascii'}{'contents'}[0]{'contents'}[2]{'contents'}[0]{'args'}[0]{'contents'}[2];
-$result_trees{'end_of_lines_protected_non_ascii'}{'contents'}[0]{'contents'}[2]{'contents'}[0]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'end_of_lines_protected_non_ascii'}{'contents'}[0]{'contents'}[2]{'contents'}[0];
 
 $result_texis{'end_of_lines_protected_non_ascii'} = '
 @deffn catégorie deffn_nùme àrguments    more {àrgs   with end ôf line within} 
with 3 @@ @@ {one last arg}
diff --git a/tp/t/results/def/inter_item_commands_in_def.pl 
b/tp/t/results/def/inter_item_commands_in_def.pl
index 3dc1c04064..37aa7e5faa 100644
--- a/tp/t/results/def/inter_item_commands_in_def.pl
+++ b/tp/t/results/def/inter_item_commands_in_def.pl
@@ -93,12 +93,10 @@ $result_trees{'inter_item_commands_in_def'} = {
                   'category' => {},
                   'name' => {}
                 },
-                'index_entry' => {
-                  'entry_element' => {},
-                  'entry_number' => 1,
-                  'in_code' => 1,
-                  'index_name' => 'fn'
-                },
+                'index_entry' => [
+                  'fn',
+                  1
+                ],
                 'original_def_cmdname' => 'deffn'
               },
               'source_info' => {
@@ -202,12 +200,10 @@ $result_trees{'inter_item_commands_in_def'} = {
                   'category' => {},
                   'name' => {}
                 },
-                'index_entry' => {
-                  'entry_element' => {},
-                  'entry_number' => 2,
-                  'in_code' => 1,
-                  'index_name' => 'fn'
-                },
+                'index_entry' => [
+                  'fn',
+                  2
+                ],
                 'original_def_cmdname' => 'deffnx'
               },
               'info' => {
@@ -243,12 +239,10 @@ $result_trees{'inter_item_commands_in_def'} = {
                   ],
                   'cmdname' => 'cindex',
                   'extra' => {
-                    'index_entry' => {
-                      'entry_element' => {},
-                      'entry_number' => 1,
-                      'in_code' => 0,
-                      'index_name' => 'cp'
-                    }
+                    'index_entry' => [
+                      'cp',
+                      1
+                    ]
                   },
                   'info' => {
                     'spaces_before_argument' => {
@@ -355,12 +349,10 @@ $result_trees{'inter_item_commands_in_def'} = {
                   'category' => {},
                   'name' => {}
                 },
-                'index_entry' => {
-                  'entry_element' => {},
-                  'entry_number' => 3,
-                  'in_code' => 1,
-                  'index_name' => 'fn'
-                },
+                'index_entry' => [
+                  'fn',
+                  3
+                ],
                 'original_def_cmdname' => 'deffnx'
               },
               'info' => {
@@ -396,12 +388,10 @@ $result_trees{'inter_item_commands_in_def'} = {
                   ],
                   'cmdname' => 'cindex',
                   'extra' => {
-                    'index_entry' => {
-                      'entry_element' => {},
-                      'entry_number' => 2,
-                      'in_code' => 0,
-                      'index_name' => 'cp'
-                    }
+                    'index_entry' => [
+                      'cp',
+                      2
+                    ]
                   },
                   'info' => {
                     'spaces_before_argument' => {
@@ -485,17 +475,12 @@ $result_trees{'inter_item_commands_in_def'} = {
 
$result_trees{'inter_item_commands_in_def'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'extra'}{'def_index_element'}
 = 
$result_trees{'inter_item_commands_in_def'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[2];
 
$result_trees{'inter_item_commands_in_def'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'extra'}{'def_parsed_hash'}{'category'}
 = 
$result_trees{'inter_item_commands_in_def'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0];
 
$result_trees{'inter_item_commands_in_def'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'extra'}{'def_parsed_hash'}{'name'}
 = 
$result_trees{'inter_item_commands_in_def'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[2];
-$result_trees{'inter_item_commands_in_def'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'inter_item_commands_in_def'}{'contents'}[0]{'contents'}[0]{'contents'}[0];
 
$result_trees{'inter_item_commands_in_def'}{'contents'}[0]{'contents'}[0]{'contents'}[2]{'extra'}{'def_index_element'}
 = 
$result_trees{'inter_item_commands_in_def'}{'contents'}[0]{'contents'}[0]{'contents'}[2]{'args'}[0]{'contents'}[2];
 
$result_trees{'inter_item_commands_in_def'}{'contents'}[0]{'contents'}[0]{'contents'}[2]{'extra'}{'def_parsed_hash'}{'category'}
 = 
$result_trees{'inter_item_commands_in_def'}{'contents'}[0]{'contents'}[0]{'contents'}[2]{'args'}[0]{'contents'}[0];
 
$result_trees{'inter_item_commands_in_def'}{'contents'}[0]{'contents'}[0]{'contents'}[2]{'extra'}{'def_parsed_hash'}{'name'}
 = 
$result_trees{'inter_item_commands_in_def'}{'contents'}[0]{'contents'}[0]{'contents'}[2]{'args'}[0]{'contents'}[2];
-$result_trees{'inter_item_commands_in_def'}{'contents'}[0]{'contents'}[0]{'contents'}[2]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'inter_item_commands_in_def'}{'contents'}[0]{'contents'}[0]{'contents'}[2];
-$result_trees{'inter_item_commands_in_def'}{'contents'}[0]{'contents'}[0]{'contents'}[3]{'contents'}[0]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'inter_item_commands_in_def'}{'contents'}[0]{'contents'}[0]{'contents'}[3]{'contents'}[0];
 
$result_trees{'inter_item_commands_in_def'}{'contents'}[0]{'contents'}[0]{'contents'}[4]{'extra'}{'def_index_element'}
 = 
$result_trees{'inter_item_commands_in_def'}{'contents'}[0]{'contents'}[0]{'contents'}[4]{'args'}[0]{'contents'}[2];
 
$result_trees{'inter_item_commands_in_def'}{'contents'}[0]{'contents'}[0]{'contents'}[4]{'extra'}{'def_parsed_hash'}{'category'}
 = 
$result_trees{'inter_item_commands_in_def'}{'contents'}[0]{'contents'}[0]{'contents'}[4]{'args'}[0]{'contents'}[0];
 
$result_trees{'inter_item_commands_in_def'}{'contents'}[0]{'contents'}[0]{'contents'}[4]{'extra'}{'def_parsed_hash'}{'name'}
 = 
$result_trees{'inter_item_commands_in_def'}{'contents'}[0]{'contents'}[0]{'contents'}[4]{'args'}[0]{'contents'}[2];
-$result_trees{'inter_item_commands_in_def'}{'contents'}[0]{'contents'}[0]{'contents'}[4]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'inter_item_commands_in_def'}{'contents'}[0]{'contents'}[0]{'contents'}[4];
-$result_trees{'inter_item_commands_in_def'}{'contents'}[0]{'contents'}[0]{'contents'}[5]{'contents'}[0]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'inter_item_commands_in_def'}{'contents'}[0]{'contents'}[0]{'contents'}[5]{'contents'}[0];
 
 $result_texis{'inter_item_commands_in_def'} = '@deffn fset @var{i} a g
 @c comment before first deffnx
diff --git a/tp/t/results/def/inter_item_commands_in_def_in_example.pl 
b/tp/t/results/def/inter_item_commands_in_def_in_example.pl
index a6f2c5d5a3..e85fa29337 100644
--- a/tp/t/results/def/inter_item_commands_in_def_in_example.pl
+++ b/tp/t/results/def/inter_item_commands_in_def_in_example.pl
@@ -107,12 +107,10 @@ $result_trees{'inter_item_commands_in_def_in_example'} = {
                       'category' => {},
                       'name' => {}
                     },
-                    'index_entry' => {
-                      'entry_element' => {},
-                      'entry_number' => 1,
-                      'in_code' => 1,
-                      'index_name' => 'fn'
-                    },
+                    'index_entry' => [
+                      'fn',
+                      1
+                    ],
                     'original_def_cmdname' => 'deffn'
                   },
                   'source_info' => {
@@ -221,12 +219,10 @@ $result_trees{'inter_item_commands_in_def_in_example'} = {
                       'category' => {},
                       'name' => {}
                     },
-                    'index_entry' => {
-                      'entry_element' => {},
-                      'entry_number' => 2,
-                      'in_code' => 1,
-                      'index_name' => 'fn'
-                    },
+                    'index_entry' => [
+                      'fn',
+                      2
+                    ],
                     'original_def_cmdname' => 'deffnx'
                   },
                   'info' => {
@@ -264,12 +260,10 @@ $result_trees{'inter_item_commands_in_def_in_example'} = {
                           ],
                           'cmdname' => 'cindex',
                           'extra' => {
-                            'index_entry' => {
-                              'entry_element' => {},
-                              'entry_number' => 1,
-                              'in_code' => 0,
-                              'index_name' => 'cp'
-                            }
+                            'index_entry' => [
+                              'cp',
+                              1
+                            ]
                           },
                           'info' => {
                             'spaces_before_argument' => {
@@ -379,12 +373,10 @@ $result_trees{'inter_item_commands_in_def_in_example'} = {
                       'category' => {},
                       'name' => {}
                     },
-                    'index_entry' => {
-                      'entry_element' => {},
-                      'entry_number' => 3,
-                      'in_code' => 1,
-                      'index_name' => 'fn'
-                    },
+                    'index_entry' => [
+                      'fn',
+                      3
+                    ],
                     'original_def_cmdname' => 'deffnx'
                   },
                   'info' => {
@@ -422,12 +414,10 @@ $result_trees{'inter_item_commands_in_def_in_example'} = {
                           ],
                           'cmdname' => 'cindex',
                           'extra' => {
-                            'index_entry' => {
-                              'entry_element' => {},
-                              'entry_number' => 2,
-                              'in_code' => 0,
-                              'index_name' => 'cp'
-                            }
+                            'index_entry' => [
+                              'cp',
+                              2
+                            ]
                           },
                           'info' => {
                             'spaces_before_argument' => {
@@ -548,17 +538,12 @@ $result_trees{'inter_item_commands_in_def_in_example'} = {
 
$result_trees{'inter_item_commands_in_def_in_example'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'extra'}{'def_index_element'}
 = 
$result_trees{'inter_item_commands_in_def_in_example'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[2];
 
$result_trees{'inter_item_commands_in_def_in_example'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'extra'}{'def_parsed_hash'}{'category'}
 = 
$result_trees{'inter_item_commands_in_def_in_example'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0];
 
$result_trees{'inter_item_commands_in_def_in_example'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'extra'}{'def_parsed_hash'}{'name'}
 = 
$result_trees{'inter_item_commands_in_def_in_example'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[2];
-$result_trees{'inter_item_commands_in_def_in_example'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'inter_item_commands_in_def_in_example'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[0];
 
$result_trees{'inter_item_commands_in_def_in_example'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[2]{'extra'}{'def_index_element'}
 = 
$result_trees{'inter_item_commands_in_def_in_example'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[2]{'args'}[0]{'contents'}[2];
 
$result_trees{'inter_item_commands_in_def_in_example'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[2]{'extra'}{'def_parsed_hash'}{'category'}
 = 
$result_trees{'inter_item_commands_in_def_in_example'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[2]{'args'}[0]{'contents'}[0];
 
$result_trees{'inter_item_commands_in_def_in_example'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[2]{'extra'}{'def_parsed_hash'}{'name'}
 = 
$result_trees{'inter_item_commands_in_def_in_example'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[2]{'args'}[0]{'contents'}[2];
-$result_trees{'inter_item_commands_in_def_in_example'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[2]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'inter_item_commands_in_def_in_example'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[2];
-$result_trees{'inter_item_commands_in_def_in_example'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[3]{'contents'}[0]{'contents'}[0]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'inter_item_commands_in_def_in_example'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[3]{'contents'}[0]{'contents'}[0];
 
$result_trees{'inter_item_commands_in_def_in_example'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[4]{'extra'}{'def_index_element'}
 = 
$result_trees{'inter_item_commands_in_def_in_example'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[4]{'args'}[0]{'contents'}[2];
 
$result_trees{'inter_item_commands_in_def_in_example'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[4]{'extra'}{'def_parsed_hash'}{'category'}
 = 
$result_trees{'inter_item_commands_in_def_in_example'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[4]{'args'}[0]{'contents'}[0];
 
$result_trees{'inter_item_commands_in_def_in_example'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[4]{'extra'}{'def_parsed_hash'}{'name'}
 = 
$result_trees{'inter_item_commands_in_def_in_example'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[4]{'args'}[0]{'contents'}[2];
-$result_trees{'inter_item_commands_in_def_in_example'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[4]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'inter_item_commands_in_def_in_example'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[4];
-$result_trees{'inter_item_commands_in_def_in_example'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[5]{'contents'}[0]{'contents'}[0]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'inter_item_commands_in_def_in_example'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[5]{'contents'}[0]{'contents'}[0];
 
 $result_texis{'inter_item_commands_in_def_in_example'} = '@example
 @deffn fset @var{i} a g
diff --git a/tp/t/results/def/leading_space_in_def_arg.pl 
b/tp/t/results/def/leading_space_in_def_arg.pl
index ead5ce97a6..8144feaf6f 100644
--- a/tp/t/results/def/leading_space_in_def_arg.pl
+++ b/tp/t/results/def/leading_space_in_def_arg.pl
@@ -80,12 +80,10 @@ $result_trees{'leading_space_in_def_arg'} = {
                   'category' => {},
                   'name' => {}
                 },
-                'index_entry' => {
-                  'entry_element' => {},
-                  'entry_number' => 1,
-                  'in_code' => 1,
-                  'index_name' => 'fn'
-                },
+                'index_entry' => [
+                  'fn',
+                  1
+                ],
                 'original_def_cmdname' => 'deffn'
               },
               'source_info' => {
@@ -148,7 +146,6 @@ $result_trees{'leading_space_in_def_arg'} = {
 
$result_trees{'leading_space_in_def_arg'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'extra'}{'def_index_element'}
 = 
$result_trees{'leading_space_in_def_arg'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[2];
 
$result_trees{'leading_space_in_def_arg'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'extra'}{'def_parsed_hash'}{'category'}
 = 
$result_trees{'leading_space_in_def_arg'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0];
 
$result_trees{'leading_space_in_def_arg'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'extra'}{'def_parsed_hash'}{'name'}
 = 
$result_trees{'leading_space_in_def_arg'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[2];
-$result_trees{'leading_space_in_def_arg'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'leading_space_in_def_arg'}{'contents'}[0]{'contents'}[0]{'contents'}[0];
 
 $result_texis{'leading_space_in_def_arg'} = '@deffn category { name} arg
 @end deffn
diff --git a/tp/t/results/def/no_category_or_no_name.pl 
b/tp/t/results/def/no_category_or_no_name.pl
index bee5cab155..b6d5bcb5f4 100644
--- a/tp/t/results/def/no_category_or_no_name.pl
+++ b/tp/t/results/def/no_category_or_no_name.pl
@@ -272,12 +272,10 @@ $result_trees{'no_category_or_no_name'} = {
                   'category' => {},
                   'name' => {}
                 },
-                'index_entry' => {
-                  'entry_element' => {},
-                  'entry_number' => 1,
-                  'in_code' => 1,
-                  'index_name' => 'fn'
-                },
+                'index_entry' => [
+                  'fn',
+                  1
+                ],
                 'original_def_cmdname' => 'deffn'
               },
               'source_info' => {
@@ -419,7 +417,6 @@ 
$result_trees{'no_category_or_no_name'}{'contents'}[0]{'contents'}[2]{'contents'
 
$result_trees{'no_category_or_no_name'}{'contents'}[0]{'contents'}[4]{'contents'}[0]{'extra'}{'def_index_element'}
 = 
$result_trees{'no_category_or_no_name'}{'contents'}[0]{'contents'}[4]{'contents'}[0]{'args'}[0]{'contents'}[2];
 
$result_trees{'no_category_or_no_name'}{'contents'}[0]{'contents'}[4]{'contents'}[0]{'extra'}{'def_parsed_hash'}{'category'}
 = 
$result_trees{'no_category_or_no_name'}{'contents'}[0]{'contents'}[4]{'contents'}[0]{'args'}[0]{'contents'}[0];
 
$result_trees{'no_category_or_no_name'}{'contents'}[0]{'contents'}[4]{'contents'}[0]{'extra'}{'def_parsed_hash'}{'name'}
 = 
$result_trees{'no_category_or_no_name'}{'contents'}[0]{'contents'}[4]{'contents'}[0]{'args'}[0]{'contents'}[2];
-$result_trees{'no_category_or_no_name'}{'contents'}[0]{'contents'}[4]{'contents'}[0]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'no_category_or_no_name'}{'contents'}[0]{'contents'}[4]{'contents'}[0];
 
$result_trees{'no_category_or_no_name'}{'contents'}[0]{'contents'}[4]{'contents'}[1]{'extra'}{'def_parsed_hash'}{'category'}
 = 
$result_trees{'no_category_or_no_name'}{'contents'}[0]{'contents'}[4]{'contents'}[1]{'args'}[0]{'contents'}[0];
 
 $result_texis{'no_category_or_no_name'} = '@deffn
diff --git a/tp/t/results/def/not_closed.pl b/tp/t/results/def/not_closed.pl
index 2a556464ef..ffb4c29941 100644
--- a/tp/t/results/def/not_closed.pl
+++ b/tp/t/results/def/not_closed.pl
@@ -65,12 +65,10 @@ $result_trees{'not_closed'} = {
                   'category' => {},
                   'name' => {}
                 },
-                'index_entry' => {
-                  'entry_element' => {},
-                  'entry_number' => 1,
-                  'in_code' => 1,
-                  'index_name' => 'fn'
-                },
+                'index_entry' => [
+                  'fn',
+                  1
+                ],
                 'original_def_cmdname' => 'deffn'
               },
               'source_info' => {
@@ -134,12 +132,10 @@ $result_trees{'not_closed'} = {
                   'category' => {},
                   'name' => {}
                 },
-                'index_entry' => {
-                  'entry_element' => {},
-                  'entry_number' => 2,
-                  'in_code' => 1,
-                  'index_name' => 'fn'
-                },
+                'index_entry' => [
+                  'fn',
+                  2
+                ],
                 'original_def_cmdname' => 'deffnx'
               },
               'info' => {
@@ -230,12 +226,10 @@ $result_trees{'not_closed'} = {
                           'category' => {},
                           'name' => {}
                         },
-                        'index_entry' => {
-                          'entry_element' => {},
-                          'entry_number' => 1,
-                          'in_code' => 1,
-                          'index_name' => 'vr'
-                        },
+                        'index_entry' => [
+                          'vr',
+                          1
+                        ],
                         'original_def_cmdname' => 'defvar'
                       },
                       'source_info' => {
@@ -281,15 +275,12 @@ $result_trees{'not_closed'} = {
 
$result_trees{'not_closed'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'extra'}{'def_index_element'}
 = 
$result_trees{'not_closed'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[2];
 
$result_trees{'not_closed'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'extra'}{'def_parsed_hash'}{'category'}
 = 
$result_trees{'not_closed'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0];
 
$result_trees{'not_closed'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'extra'}{'def_parsed_hash'}{'name'}
 = 
$result_trees{'not_closed'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[2];
-$result_trees{'not_closed'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'extra'}{'index_entry'}{'entry_element'}
 = $result_trees{'not_closed'}{'contents'}[0]{'contents'}[0]{'contents'}[0];
 
$result_trees{'not_closed'}{'contents'}[0]{'contents'}[0]{'contents'}[1]{'extra'}{'def_index_element'}
 = 
$result_trees{'not_closed'}{'contents'}[0]{'contents'}[0]{'contents'}[1]{'args'}[0]{'contents'}[2];
 
$result_trees{'not_closed'}{'contents'}[0]{'contents'}[0]{'contents'}[1]{'extra'}{'def_parsed_hash'}{'category'}
 = 
$result_trees{'not_closed'}{'contents'}[0]{'contents'}[0]{'contents'}[1]{'args'}[0]{'contents'}[0];
 
$result_trees{'not_closed'}{'contents'}[0]{'contents'}[0]{'contents'}[1]{'extra'}{'def_parsed_hash'}{'name'}
 = 
$result_trees{'not_closed'}{'contents'}[0]{'contents'}[0]{'contents'}[1]{'args'}[0]{'contents'}[2];
-$result_trees{'not_closed'}{'contents'}[0]{'contents'}[0]{'contents'}[1]{'extra'}{'index_entry'}{'entry_element'}
 = $result_trees{'not_closed'}{'contents'}[0]{'contents'}[0]{'contents'}[1];
 
$result_trees{'not_closed'}{'contents'}[0]{'contents'}[0]{'contents'}[2]{'contents'}[0]{'contents'}[0]{'extra'}{'def_index_element'}
 = 
$result_trees{'not_closed'}{'contents'}[0]{'contents'}[0]{'contents'}[2]{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[2];
 
$result_trees{'not_closed'}{'contents'}[0]{'contents'}[0]{'contents'}[2]{'contents'}[0]{'contents'}[0]{'extra'}{'def_parsed_hash'}{'category'}
 = 
$result_trees{'not_closed'}{'contents'}[0]{'contents'}[0]{'contents'}[2]{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0];
 
$result_trees{'not_closed'}{'contents'}[0]{'contents'}[0]{'contents'}[2]{'contents'}[0]{'contents'}[0]{'extra'}{'def_parsed_hash'}{'name'}
 = 
$result_trees{'not_closed'}{'contents'}[0]{'contents'}[0]{'contents'}[2]{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[2];
-$result_trees{'not_closed'}{'contents'}[0]{'contents'}[0]{'contents'}[2]{'contents'}[0]{'contents'}[0]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'not_closed'}{'contents'}[0]{'contents'}[0]{'contents'}[2]{'contents'}[0]{'contents'}[0];
 
 $result_texis{'not_closed'} = '@deffn truc bidule machin
 @deffnx truc chose args
diff --git a/tp/t/results/def/omit_def_space.pl 
b/tp/t/results/def/omit_def_space.pl
index 0929e74d1b..a02c585272 100644
--- a/tp/t/results/def/omit_def_space.pl
+++ b/tp/t/results/def/omit_def_space.pl
@@ -191,12 +191,10 @@ $result_trees{'omit_def_space'} = {
                   'name' => {}
                 },
                 'element_node' => {},
-                'index_entry' => {
-                  'entry_element' => {},
-                  'entry_number' => 1,
-                  'in_code' => 1,
-                  'index_name' => 'fn'
-                },
+                'index_entry' => [
+                  'fn',
+                  1
+                ],
                 'omit_def_name_space' => 1,
                 'original_def_cmdname' => 'defun'
               },
@@ -281,12 +279,10 @@ $result_trees{'omit_def_space'} = {
                   'name' => {}
                 },
                 'element_node' => {},
-                'index_entry' => {
-                  'entry_element' => {},
-                  'entry_number' => 2,
-                  'in_code' => 1,
-                  'index_name' => 'fn'
-                },
+                'index_entry' => [
+                  'fn',
+                  2
+                ],
                 'omit_def_name_space' => 1,
                 'original_def_cmdname' => 'defunx'
               },
@@ -382,12 +378,10 @@ 
$result_trees{'omit_def_space'}{'contents'}[2]{'contents'}[3]{'contents'}[0]{'ex
 
$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'}{'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'}{'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_texis{'omit_def_space'} = '@node Top
 
diff --git a/tp/t/results/def/protected_brace.pl 
b/tp/t/results/def/protected_brace.pl
index b0af2b5904..7eef080bd1 100644
--- a/tp/t/results/def/protected_brace.pl
+++ b/tp/t/results/def/protected_brace.pl
@@ -52,12 +52,10 @@ $result_trees{'protected_brace'} = {
                   'category' => {},
                   'name' => {}
                 },
-                'index_entry' => {
-                  'entry_element' => {},
-                  'entry_number' => 1,
-                  'in_code' => 1,
-                  'index_name' => 'fn'
-                },
+                'index_entry' => [
+                  'fn',
+                  1
+                ],
                 'original_def_cmdname' => 'deffn'
               },
               'source_info' => {
@@ -120,7 +118,6 @@ $result_trees{'protected_brace'} = {
 
$result_trees{'protected_brace'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'extra'}{'def_index_element'}
 = 
$result_trees{'protected_brace'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[2];
 
$result_trees{'protected_brace'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'extra'}{'def_parsed_hash'}{'category'}
 = 
$result_trees{'protected_brace'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0];
 
$result_trees{'protected_brace'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'extra'}{'def_parsed_hash'}{'name'}
 = 
$result_trees{'protected_brace'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[2];
-$result_trees{'protected_brace'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'protected_brace'}{'contents'}[0]{'contents'}[0]{'contents'}[0];
 
 $result_texis{'protected_brace'} = '@deffn c @{
 @end deffn
diff --git a/tp/t/results/def/ref_in_def.pl b/tp/t/results/def/ref_in_def.pl
index d925d907dc..897316977b 100644
--- a/tp/t/results/def/ref_in_def.pl
+++ b/tp/t/results/def/ref_in_def.pl
@@ -239,12 +239,10 @@ $result_trees{'ref_in_def'} = {
                   'name' => {}
                 },
                 'element_node' => {},
-                'index_entry' => {
-                  'entry_element' => {},
-                  'entry_number' => 1,
-                  'in_code' => 1,
-                  'index_name' => 'fn'
-                },
+                'index_entry' => [
+                  'fn',
+                  1
+                ],
                 'original_def_cmdname' => 'deffn'
               },
               'source_info' => {
@@ -450,12 +448,10 @@ $result_trees{'ref_in_def'} = {
                   'name' => {}
                 },
                 'element_node' => {},
-                'index_entry' => {
-                  'entry_element' => {},
-                  'entry_number' => 2,
-                  'in_code' => 1,
-                  'index_name' => 'fn'
-                },
+                'index_entry' => [
+                  'fn',
+                  2
+                ],
                 'original_def_cmdname' => 'deffnx'
               },
               'info' => {
@@ -586,7 +582,6 @@ 
$result_trees{'ref_in_def'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'extra'
 
$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'}{'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]{'args'}[0]{'extra'}{'node_content'}[0]
 = 
$result_trees{'ref_in_def'}{'contents'}[1]{'contents'}[1]{'contents'}[1]{'args'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0];
 
$result_trees{'ref_in_def'}{'contents'}[1]{'contents'}[1]{'contents'}[1]{'args'}[0]{'contents'}[2]{'args'}[0]{'extra'}{'node_content'}[0]
 = 
$result_trees{'ref_in_def'}{'contents'}[1]{'contents'}[1]{'contents'}[1]{'args'}[0]{'contents'}[2]{'args'}[0]{'contents'}[0];
 
$result_trees{'ref_in_def'}{'contents'}[1]{'contents'}[1]{'contents'}[1]{'args'}[0]{'contents'}[4]{'contents'}[0]{'args'}[0]{'extra'}{'node_content'}[0]
 = 
$result_trees{'ref_in_def'}{'contents'}[1]{'contents'}[1]{'contents'}[1]{'args'}[0]{'contents'}[4]{'contents'}[0]{'args'}[0]{'contents'}[0];
@@ -596,7 +591,6 @@ 
$result_trees{'ref_in_def'}{'contents'}[1]{'contents'}[1]{'contents'}[1]{'extra'
 
$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'}{'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_texis{'ref_in_def'} = '
 @node first
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 806b72f1e1..7db321ea2f 100644
--- a/tp/t/results/def/space_in_def_for_index.pl
+++ b/tp/t/results/def/space_in_def_for_index.pl
@@ -190,12 +190,10 @@ $result_trees{'space_in_def_for_index'} = {
                   'name' => {}
                 },
                 'element_node' => {},
-                'index_entry' => {
-                  'entry_element' => {},
-                  'entry_number' => 1,
-                  'in_code' => 1,
-                  'index_name' => 'fn'
-                },
+                'index_entry' => [
+                  'fn',
+                  1
+                ],
                 'original_def_cmdname' => 'deffn'
               },
               'source_info' => {
@@ -280,12 +278,10 @@ $result_trees{'space_in_def_for_index'} = {
                   'name' => {}
                 },
                 'element_node' => {},
-                'index_entry' => {
-                  'entry_element' => {},
-                  'entry_number' => 2,
-                  'in_code' => 1,
-                  'index_name' => 'fn'
-                },
+                'index_entry' => [
+                  'fn',
+                  2
+                ],
                 'original_def_cmdname' => 'deffnx'
               },
               'info' => {
@@ -406,12 +402,10 @@ 
$result_trees{'space_in_def_for_index'}{'contents'}[2]{'contents'}[1]{'contents'
 
$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'}{'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'}{'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_texis{'space_in_def_for_index'} = '@node Top
 @node chap
diff --git a/tp/t/results/def/wrong_braces_simple.pl 
b/tp/t/results/def/wrong_braces_simple.pl
index cf2fd636c8..1542788144 100644
--- a/tp/t/results/def/wrong_braces_simple.pl
+++ b/tp/t/results/def/wrong_braces_simple.pl
@@ -91,12 +91,10 @@ $result_trees{'wrong_braces_simple'} = {
                   'category' => {},
                   'name' => {}
                 },
-                'index_entry' => {
-                  'entry_element' => {},
-                  'entry_number' => 1,
-                  'in_code' => 1,
-                  'index_name' => 'fn'
-                },
+                'index_entry' => [
+                  'fn',
+                  1
+                ],
                 'original_def_cmdname' => 'deffn'
               },
               'source_info' => {
@@ -250,12 +248,10 @@ $result_trees{'wrong_braces_simple'} = {
                   'category' => {},
                   'name' => {}
                 },
-                'index_entry' => {
-                  'entry_element' => {},
-                  'entry_number' => 2,
-                  'in_code' => 1,
-                  'index_name' => 'fn'
-                },
+                'index_entry' => [
+                  'fn',
+                  2
+                ],
                 'original_def_cmdname' => 'deffn'
               },
               'source_info' => {
@@ -414,12 +410,10 @@ $result_trees{'wrong_braces_simple'} = {
                   'category' => {},
                   'name' => {}
                 },
-                'index_entry' => {
-                  'entry_element' => {},
-                  'entry_number' => 3,
-                  'in_code' => 1,
-                  'index_name' => 'fn'
-                },
+                'index_entry' => [
+                  'fn',
+                  3
+                ],
                 'original_def_cmdname' => 'deffn'
               },
               'source_info' => {
@@ -586,12 +580,10 @@ $result_trees{'wrong_braces_simple'} = {
                   'category' => {},
                   'name' => {}
                 },
-                'index_entry' => {
-                  'entry_element' => {},
-                  'entry_number' => 4,
-                  'in_code' => 1,
-                  'index_name' => 'fn'
-                },
+                'index_entry' => [
+                  'fn',
+                  4
+                ],
                 'original_def_cmdname' => 'deffn'
               },
               'source_info' => {
@@ -732,12 +724,10 @@ $result_trees{'wrong_braces_simple'} = {
                   'category' => {},
                   'name' => {}
                 },
-                'index_entry' => {
-                  'entry_element' => {},
-                  'entry_number' => 5,
-                  'in_code' => 1,
-                  'index_name' => 'fn'
-                },
+                'index_entry' => [
+                  'fn',
+                  5
+                ],
                 'original_def_cmdname' => 'deffn'
               },
               'source_info' => {
@@ -827,12 +817,10 @@ $result_trees{'wrong_braces_simple'} = {
                   'category' => {},
                   'name' => {}
                 },
-                'index_entry' => {
-                  'entry_element' => {},
-                  'entry_number' => 6,
-                  'in_code' => 1,
-                  'index_name' => 'fn'
-                },
+                'index_entry' => [
+                  'fn',
+                  6
+                ],
                 'original_def_cmdname' => 'deffnx'
               },
               'info' => {
@@ -940,12 +928,10 @@ $result_trees{'wrong_braces_simple'} = {
                   'category' => {},
                   'name' => {}
                 },
-                'index_entry' => {
-                  'entry_element' => {},
-                  'entry_number' => 7,
-                  'in_code' => 1,
-                  'index_name' => 'fn'
-                },
+                'index_entry' => [
+                  'fn',
+                  7
+                ],
                 'original_def_cmdname' => 'deffnx'
               },
               'info' => {
@@ -1058,12 +1044,10 @@ $result_trees{'wrong_braces_simple'} = {
                   'category' => {},
                   'name' => {}
                 },
-                'index_entry' => {
-                  'entry_element' => {},
-                  'entry_number' => 8,
-                  'in_code' => 1,
-                  'index_name' => 'fn'
-                },
+                'index_entry' => [
+                  'fn',
+                  8
+                ],
                 'original_def_cmdname' => 'deffnx'
               },
               'info' => {
@@ -1184,12 +1168,10 @@ $result_trees{'wrong_braces_simple'} = {
                   'category' => {},
                   'name' => {}
                 },
-                'index_entry' => {
-                  'entry_element' => {},
-                  'entry_number' => 9,
-                  'in_code' => 1,
-                  'index_name' => 'fn'
-                },
+                'index_entry' => [
+                  'fn',
+                  9
+                ],
                 'original_def_cmdname' => 'deffnx'
               },
               'info' => {
@@ -1257,39 +1239,30 @@ $result_trees{'wrong_braces_simple'} = {
 
$result_trees{'wrong_braces_simple'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'extra'}{'def_index_element'}
 = 
$result_trees{'wrong_braces_simple'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[2];
 
$result_trees{'wrong_braces_simple'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'extra'}{'def_parsed_hash'}{'category'}
 = 
$result_trees{'wrong_braces_simple'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0];
 
$result_trees{'wrong_braces_simple'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'extra'}{'def_parsed_hash'}{'name'}
 = 
$result_trees{'wrong_braces_simple'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[2];
-$result_trees{'wrong_braces_simple'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'wrong_braces_simple'}{'contents'}[0]{'contents'}[0]{'contents'}[0];
 
$result_trees{'wrong_braces_simple'}{'contents'}[0]{'contents'}[2]{'contents'}[0]{'extra'}{'def_index_element'}
 = 
$result_trees{'wrong_braces_simple'}{'contents'}[0]{'contents'}[2]{'contents'}[0]{'args'}[0]{'contents'}[2];
 
$result_trees{'wrong_braces_simple'}{'contents'}[0]{'contents'}[2]{'contents'}[0]{'extra'}{'def_parsed_hash'}{'category'}
 = 
$result_trees{'wrong_braces_simple'}{'contents'}[0]{'contents'}[2]{'contents'}[0]{'args'}[0]{'contents'}[0];
 
$result_trees{'wrong_braces_simple'}{'contents'}[0]{'contents'}[2]{'contents'}[0]{'extra'}{'def_parsed_hash'}{'name'}
 = 
$result_trees{'wrong_braces_simple'}{'contents'}[0]{'contents'}[2]{'contents'}[0]{'args'}[0]{'contents'}[2];
-$result_trees{'wrong_braces_simple'}{'contents'}[0]{'contents'}[2]{'contents'}[0]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'wrong_braces_simple'}{'contents'}[0]{'contents'}[2]{'contents'}[0];
 
$result_trees{'wrong_braces_simple'}{'contents'}[0]{'contents'}[4]{'contents'}[0]{'extra'}{'def_index_element'}
 = 
$result_trees{'wrong_braces_simple'}{'contents'}[0]{'contents'}[4]{'contents'}[0]{'args'}[0]{'contents'}[2];
 
$result_trees{'wrong_braces_simple'}{'contents'}[0]{'contents'}[4]{'contents'}[0]{'extra'}{'def_parsed_hash'}{'category'}
 = 
$result_trees{'wrong_braces_simple'}{'contents'}[0]{'contents'}[4]{'contents'}[0]{'args'}[0]{'contents'}[0];
 
$result_trees{'wrong_braces_simple'}{'contents'}[0]{'contents'}[4]{'contents'}[0]{'extra'}{'def_parsed_hash'}{'name'}
 = 
$result_trees{'wrong_braces_simple'}{'contents'}[0]{'contents'}[4]{'contents'}[0]{'args'}[0]{'contents'}[2];
-$result_trees{'wrong_braces_simple'}{'contents'}[0]{'contents'}[4]{'contents'}[0]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'wrong_braces_simple'}{'contents'}[0]{'contents'}[4]{'contents'}[0];
 
$result_trees{'wrong_braces_simple'}{'contents'}[0]{'contents'}[6]{'contents'}[0]{'extra'}{'def_index_element'}
 = 
$result_trees{'wrong_braces_simple'}{'contents'}[0]{'contents'}[6]{'contents'}[0]{'args'}[0]{'contents'}[2];
 
$result_trees{'wrong_braces_simple'}{'contents'}[0]{'contents'}[6]{'contents'}[0]{'extra'}{'def_parsed_hash'}{'category'}
 = 
$result_trees{'wrong_braces_simple'}{'contents'}[0]{'contents'}[6]{'contents'}[0]{'args'}[0]{'contents'}[0];
 
$result_trees{'wrong_braces_simple'}{'contents'}[0]{'contents'}[6]{'contents'}[0]{'extra'}{'def_parsed_hash'}{'name'}
 = 
$result_trees{'wrong_braces_simple'}{'contents'}[0]{'contents'}[6]{'contents'}[0]{'args'}[0]{'contents'}[2];
-$result_trees{'wrong_braces_simple'}{'contents'}[0]{'contents'}[6]{'contents'}[0]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'wrong_braces_simple'}{'contents'}[0]{'contents'}[6]{'contents'}[0];
 
$result_trees{'wrong_braces_simple'}{'contents'}[0]{'contents'}[8]{'contents'}[0]{'extra'}{'def_index_element'}
 = 
$result_trees{'wrong_braces_simple'}{'contents'}[0]{'contents'}[8]{'contents'}[0]{'args'}[0]{'contents'}[2];
 
$result_trees{'wrong_braces_simple'}{'contents'}[0]{'contents'}[8]{'contents'}[0]{'extra'}{'def_parsed_hash'}{'category'}
 = 
$result_trees{'wrong_braces_simple'}{'contents'}[0]{'contents'}[8]{'contents'}[0]{'args'}[0]{'contents'}[0];
 
$result_trees{'wrong_braces_simple'}{'contents'}[0]{'contents'}[8]{'contents'}[0]{'extra'}{'def_parsed_hash'}{'name'}
 = 
$result_trees{'wrong_braces_simple'}{'contents'}[0]{'contents'}[8]{'contents'}[0]{'args'}[0]{'contents'}[2];
-$result_trees{'wrong_braces_simple'}{'contents'}[0]{'contents'}[8]{'contents'}[0]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'wrong_braces_simple'}{'contents'}[0]{'contents'}[8]{'contents'}[0];
 
$result_trees{'wrong_braces_simple'}{'contents'}[0]{'contents'}[8]{'contents'}[1]{'extra'}{'def_index_element'}
 = 
$result_trees{'wrong_braces_simple'}{'contents'}[0]{'contents'}[8]{'contents'}[1]{'args'}[0]{'contents'}[2];
 
$result_trees{'wrong_braces_simple'}{'contents'}[0]{'contents'}[8]{'contents'}[1]{'extra'}{'def_parsed_hash'}{'category'}
 = 
$result_trees{'wrong_braces_simple'}{'contents'}[0]{'contents'}[8]{'contents'}[1]{'args'}[0]{'contents'}[0];
 
$result_trees{'wrong_braces_simple'}{'contents'}[0]{'contents'}[8]{'contents'}[1]{'extra'}{'def_parsed_hash'}{'name'}
 = 
$result_trees{'wrong_braces_simple'}{'contents'}[0]{'contents'}[8]{'contents'}[1]{'args'}[0]{'contents'}[2];
-$result_trees{'wrong_braces_simple'}{'contents'}[0]{'contents'}[8]{'contents'}[1]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'wrong_braces_simple'}{'contents'}[0]{'contents'}[8]{'contents'}[1];
 
$result_trees{'wrong_braces_simple'}{'contents'}[0]{'contents'}[8]{'contents'}[2]{'extra'}{'def_index_element'}
 = 
$result_trees{'wrong_braces_simple'}{'contents'}[0]{'contents'}[8]{'contents'}[2]{'args'}[0]{'contents'}[2];
 
$result_trees{'wrong_braces_simple'}{'contents'}[0]{'contents'}[8]{'contents'}[2]{'extra'}{'def_parsed_hash'}{'category'}
 = 
$result_trees{'wrong_braces_simple'}{'contents'}[0]{'contents'}[8]{'contents'}[2]{'args'}[0]{'contents'}[0];
 
$result_trees{'wrong_braces_simple'}{'contents'}[0]{'contents'}[8]{'contents'}[2]{'extra'}{'def_parsed_hash'}{'name'}
 = 
$result_trees{'wrong_braces_simple'}{'contents'}[0]{'contents'}[8]{'contents'}[2]{'args'}[0]{'contents'}[2];
-$result_trees{'wrong_braces_simple'}{'contents'}[0]{'contents'}[8]{'contents'}[2]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'wrong_braces_simple'}{'contents'}[0]{'contents'}[8]{'contents'}[2];
 
$result_trees{'wrong_braces_simple'}{'contents'}[0]{'contents'}[8]{'contents'}[3]{'extra'}{'def_index_element'}
 = 
$result_trees{'wrong_braces_simple'}{'contents'}[0]{'contents'}[8]{'contents'}[3]{'args'}[0]{'contents'}[2];
 
$result_trees{'wrong_braces_simple'}{'contents'}[0]{'contents'}[8]{'contents'}[3]{'extra'}{'def_parsed_hash'}{'category'}
 = 
$result_trees{'wrong_braces_simple'}{'contents'}[0]{'contents'}[8]{'contents'}[3]{'args'}[0]{'contents'}[0];
 
$result_trees{'wrong_braces_simple'}{'contents'}[0]{'contents'}[8]{'contents'}[3]{'extra'}{'def_parsed_hash'}{'name'}
 = 
$result_trees{'wrong_braces_simple'}{'contents'}[0]{'contents'}[8]{'contents'}[3]{'args'}[0]{'contents'}[2];
-$result_trees{'wrong_braces_simple'}{'contents'}[0]{'contents'}[8]{'contents'}[3]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'wrong_braces_simple'}{'contents'}[0]{'contents'}[8]{'contents'}[3];
 
$result_trees{'wrong_braces_simple'}{'contents'}[0]{'contents'}[8]{'contents'}[4]{'extra'}{'def_index_element'}
 = 
$result_trees{'wrong_braces_simple'}{'contents'}[0]{'contents'}[8]{'contents'}[4]{'args'}[0]{'contents'}[2];
 
$result_trees{'wrong_braces_simple'}{'contents'}[0]{'contents'}[8]{'contents'}[4]{'extra'}{'def_parsed_hash'}{'category'}
 = 
$result_trees{'wrong_braces_simple'}{'contents'}[0]{'contents'}[8]{'contents'}[4]{'args'}[0]{'contents'}[0];
 
$result_trees{'wrong_braces_simple'}{'contents'}[0]{'contents'}[8]{'contents'}[4]{'extra'}{'def_parsed_hash'}{'name'}
 = 
$result_trees{'wrong_braces_simple'}{'contents'}[0]{'contents'}[8]{'contents'}[4]{'args'}[0]{'contents'}[2];
-$result_trees{'wrong_braces_simple'}{'contents'}[0]{'contents'}[8]{'contents'}[4]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'wrong_braces_simple'}{'contents'}[0]{'contents'}[8]{'contents'}[4];
 
 $result_texis{'wrong_braces_simple'} = '@deffn truc machin bidule chose and 
 @end deffn
diff --git a/tp/t/results/def/wrong_braces_with_end_of_lines.pl 
b/tp/t/results/def/wrong_braces_with_end_of_lines.pl
index ac01d91fd1..567e40dfeb 100644
--- a/tp/t/results/def/wrong_braces_with_end_of_lines.pl
+++ b/tp/t/results/def/wrong_braces_with_end_of_lines.pl
@@ -98,12 +98,10 @@ $result_trees{'wrong_braces_with_end_of_lines'} = {
                   'category' => {},
                   'name' => {}
                 },
-                'index_entry' => {
-                  'entry_element' => {},
-                  'entry_number' => 1,
-                  'in_code' => 1,
-                  'index_name' => 'fn'
-                },
+                'index_entry' => [
+                  'fn',
+                  1
+                ],
                 'original_def_cmdname' => 'deffn'
               },
               'source_info' => {
@@ -271,12 +269,10 @@ $result_trees{'wrong_braces_with_end_of_lines'} = {
                   'category' => {},
                   'name' => {}
                 },
-                'index_entry' => {
-                  'entry_element' => {},
-                  'entry_number' => 2,
-                  'in_code' => 1,
-                  'index_name' => 'fn'
-                },
+                'index_entry' => [
+                  'fn',
+                  2
+                ],
                 'original_def_cmdname' => 'deffn'
               },
               'source_info' => {
@@ -359,11 +355,9 @@ $result_trees{'wrong_braces_with_end_of_lines'} = {
 
$result_trees{'wrong_braces_with_end_of_lines'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'extra'}{'def_index_element'}
 = 
$result_trees{'wrong_braces_with_end_of_lines'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[2];
 
$result_trees{'wrong_braces_with_end_of_lines'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'extra'}{'def_parsed_hash'}{'category'}
 = 
$result_trees{'wrong_braces_with_end_of_lines'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0];
 
$result_trees{'wrong_braces_with_end_of_lines'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'extra'}{'def_parsed_hash'}{'name'}
 = 
$result_trees{'wrong_braces_with_end_of_lines'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[2];
-$result_trees{'wrong_braces_with_end_of_lines'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'wrong_braces_with_end_of_lines'}{'contents'}[0]{'contents'}[0]{'contents'}[0];
 
$result_trees{'wrong_braces_with_end_of_lines'}{'contents'}[0]{'contents'}[2]{'contents'}[0]{'extra'}{'def_index_element'}
 = 
$result_trees{'wrong_braces_with_end_of_lines'}{'contents'}[0]{'contents'}[2]{'contents'}[0]{'args'}[0]{'contents'}[2];
 
$result_trees{'wrong_braces_with_end_of_lines'}{'contents'}[0]{'contents'}[2]{'contents'}[0]{'extra'}{'def_parsed_hash'}{'category'}
 = 
$result_trees{'wrong_braces_with_end_of_lines'}{'contents'}[0]{'contents'}[2]{'contents'}[0]{'args'}[0]{'contents'}[0];
 
$result_trees{'wrong_braces_with_end_of_lines'}{'contents'}[0]{'contents'}[2]{'contents'}[0]{'extra'}{'def_parsed_hash'}{'name'}
 = 
$result_trees{'wrong_braces_with_end_of_lines'}{'contents'}[0]{'contents'}[2]{'contents'}[0]{'args'}[0]{'contents'}[2];
-$result_trees{'wrong_braces_with_end_of_lines'}{'contents'}[0]{'contents'}[2]{'contents'}[0]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'wrong_braces_with_end_of_lines'}{'contents'}[0]{'contents'}[2]{'contents'}[0];
 
 $result_texis{'wrong_braces_with_end_of_lines'} = '@deffn category name args { 
  more args
 }deffn with @{
diff --git a/tp/t/results/float/cindex_in_caption.pl 
b/tp/t/results/float/cindex_in_caption.pl
index 828498ed57..27b2d90138 100644
--- a/tp/t/results/float/cindex_in_caption.pl
+++ b/tp/t/results/float/cindex_in_caption.pl
@@ -181,12 +181,10 @@ $result_trees{'cindex_in_caption'} = {
                       'cmdname' => 'cindex',
                       'extra' => {
                         'element_node' => {},
-                        'index_entry' => {
-                          'entry_element' => {},
-                          'entry_number' => 1,
-                          'in_code' => 0,
-                          'index_name' => 'cp'
-                        }
+                        'index_entry' => [
+                          'cp',
+                          1
+                        ]
                       },
                       'info' => {
                         'spaces_before_argument' => {
@@ -332,7 +330,6 @@ $result_trees{'cindex_in_caption'} = {
   'type' => 'document_root'
 };
 
$result_trees{'cindex_in_caption'}{'contents'}[2]{'contents'}[3]{'contents'}[1]{'args'}[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'}[1]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'cindex_in_caption'}{'contents'}[2]{'contents'}[3]{'contents'}[1]{'args'}[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 15dc10da56..5c104a1f03 100644
--- a/tp/t/results/float/complex_float.pl
+++ b/tp/t/results/float/complex_float.pl
@@ -454,12 +454,10 @@ $result_trees{'complex_float'} = {
               'cmdname' => 'cindex',
               'extra' => {
                 'element_node' => {},
-                'index_entry' => {
-                  'entry_element' => {},
-                  'entry_number' => 1,
-                  'in_code' => 0,
-                  'index_name' => 'cp'
-                }
+                'index_entry' => [
+                  'cp',
+                  1
+                ]
               },
               'info' => {
                 'spaces_before_argument' => {
@@ -1556,12 +1554,10 @@ $result_trees{'complex_float'} = {
                       'cmdname' => 'cindex',
                       'extra' => {
                         'element_node' => {},
-                        'index_entry' => {
-                          'entry_element' => {},
-                          'entry_number' => 2,
-                          'in_code' => 0,
-                          'index_name' => 'cp'
-                        }
+                        'index_entry' => [
+                          'cp',
+                          2
+                        ]
                       },
                       'info' => {
                         'spaces_before_argument' => {
@@ -2923,12 +2919,10 @@ $result_trees{'complex_float'} = {
                       'cmdname' => 'cindex',
                       'extra' => {
                         'element_node' => {},
-                        'index_entry' => {
-                          'entry_element' => {},
-                          'entry_number' => 3,
-                          'in_code' => 0,
-                          'index_name' => 'cp'
-                        }
+                        'index_entry' => [
+                          'cp',
+                          3
+                        ]
                       },
                       'info' => {
                         'spaces_before_argument' => {
@@ -3525,7 +3519,6 @@ $result_trees{'complex_float'} = {
 };
 
$result_trees{'complex_float'}{'contents'}[2]{'contents'}[5]{'contents'}[0]{'contents'}[1]{'extra'}{'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'}[5]{'extra'}{'element_node'}
 = $result_trees{'complex_float'}{'contents'}[1];
-$result_trees{'complex_float'}{'contents'}[2]{'contents'}[7]{'contents'}[5]{'extra'}{'index_entry'}{'entry_element'}
 = $result_trees{'complex_float'}{'contents'}[2]{'contents'}[7]{'contents'}[5];
 
$result_trees{'complex_float'}{'contents'}[2]{'contents'}[7]{'contents'}[8]{'extra'}{'command_as_argument'}
 = 
$result_trees{'complex_float'}{'contents'}[2]{'contents'}[7]{'contents'}[8]{'args'}[0]{'contents'}[0];
 
$result_trees{'complex_float'}{'contents'}[2]{'contents'}[7]{'contents'}[11]{'extra'}{'command_as_argument'}
 = 
$result_trees{'complex_float'}{'contents'}[2]{'contents'}[7]{'contents'}[11]{'args'}[0]{'contents'}[0];
 
$result_trees{'complex_float'}{'contents'}[2]{'contents'}[7]{'contents'}[13]{'contents'}[1]{'args'}[0]{'extra'}{'node_content'}[0]
 = 
$result_trees{'complex_float'}{'contents'}[2]{'contents'}[7]{'contents'}[13]{'contents'}[1]{'args'}[0]{'contents'}[0];
@@ -3533,7 +3526,6 @@ 
$result_trees{'complex_float'}{'contents'}[2]{'contents'}[7]{'contents'}[17]{'ar
 
$result_trees{'complex_float'}{'contents'}[2]{'contents'}[7]{'contents'}[17]{'args'}[0]{'contents'}[10]{'extra'}{'prototypes'}[0]{'contents'}[0]
 = 
$result_trees{'complex_float'}{'contents'}[2]{'contents'}[7]{'contents'}[17]{'args'}[0]{'contents'}[10]{'args'}[0]{'contents'}[0]{'contents'}[0];
 
$result_trees{'complex_float'}{'contents'}[2]{'contents'}[7]{'contents'}[17]{'args'}[0]{'contents'}[10]{'extra'}{'prototypes'}[1]{'contents'}[0]
 = 
$result_trees{'complex_float'}{'contents'}[2]{'contents'}[7]{'contents'}[17]{'args'}[0]{'contents'}[10]{'args'}[0]{'contents'}[2]{'contents'}[0];
 
$result_trees{'complex_float'}{'contents'}[2]{'contents'}[7]{'contents'}[17]{'args'}[0]{'contents'}[12]{'extra'}{'element_node'}
 = $result_trees{'complex_float'}{'contents'}[1];
-$result_trees{'complex_float'}{'contents'}[2]{'contents'}[7]{'contents'}[17]{'args'}[0]{'contents'}[12]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'complex_float'}{'contents'}[2]{'contents'}[7]{'contents'}[17]{'args'}[0]{'contents'}[12];
 
$result_trees{'complex_float'}{'contents'}[2]{'contents'}[7]{'contents'}[17]{'args'}[0]{'contents'}[15]{'extra'}{'command_as_argument'}
 = 
$result_trees{'complex_float'}{'contents'}[2]{'contents'}[7]{'contents'}[17]{'args'}[0]{'contents'}[15]{'args'}[0]{'contents'}[0];
 
$result_trees{'complex_float'}{'contents'}[2]{'contents'}[7]{'contents'}[17]{'args'}[0]{'contents'}[17]{'contents'}[1]{'args'}[0]{'extra'}{'node_content'}[0]
 = 
$result_trees{'complex_float'}{'contents'}[2]{'contents'}[7]{'contents'}[17]{'args'}[0]{'contents'}[17]{'contents'}[1]{'args'}[0]{'contents'}[0];
 
$result_trees{'complex_float'}{'contents'}[2]{'contents'}[7]{'contents'}[17]{'extra'}{'float'}
 = $result_trees{'complex_float'}{'contents'}[2]{'contents'}[7];
@@ -3545,7 +3537,6 @@ 
$result_trees{'complex_float'}{'contents'}[4]{'contents'}[1]{'contents'}[3]{'arg
 
$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'}[9]{'extra'}{'element_node'}
 = $result_trees{'complex_float'}{'contents'}[3];
-$result_trees{'complex_float'}{'contents'}[4]{'contents'}[1]{'contents'}[3]{'args'}[0]{'contents'}[9]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'complex_float'}{'contents'}[4]{'contents'}[1]{'contents'}[3]{'args'}[0]{'contents'}[9];
 
$result_trees{'complex_float'}{'contents'}[4]{'contents'}[1]{'contents'}[3]{'args'}[0]{'contents'}[12]{'extra'}{'command_as_argument'}
 = 
$result_trees{'complex_float'}{'contents'}[4]{'contents'}[1]{'contents'}[3]{'args'}[0]{'contents'}[12]{'args'}[0]{'contents'}[0];
 
$result_trees{'complex_float'}{'contents'}[4]{'contents'}[1]{'contents'}[3]{'args'}[0]{'contents'}[17]{'contents'}[1]{'args'}[0]{'extra'}{'node_content'}[0]
 = 
$result_trees{'complex_float'}{'contents'}[4]{'contents'}[1]{'contents'}[3]{'args'}[0]{'contents'}[17]{'contents'}[1]{'args'}[0]{'contents'}[0];
 
$result_trees{'complex_float'}{'contents'}[4]{'contents'}[1]{'contents'}[3]{'extra'}{'float'}
 = $result_trees{'complex_float'}{'contents'}[4]{'contents'}[1];
diff --git a/tp/t/results/float/float_copying.pl 
b/tp/t/results/float/float_copying.pl
index d73e641f3d..7ad5a14a3e 100644
--- a/tp/t/results/float/float_copying.pl
+++ b/tp/t/results/float/float_copying.pl
@@ -159,12 +159,10 @@ $result_trees{'float_copying'} = {
                                           'cmdname' => 'cindex',
                                           'extra' => {
                                             'element_region' => 'copying',
-                                            'index_entry' => {
-                                              'entry_element' => {},
-                                              'entry_number' => 1,
-                                              'in_code' => 0,
-                                              'index_name' => 'cp'
-                                            }
+                                            'index_entry' => [
+                                              'cp',
+                                              1
+                                            ]
                                           },
                                           'info' => {
                                             'spaces_before_argument' => {
@@ -198,12 +196,10 @@ $result_trees{'float_copying'} = {
                                           'cmdname' => 'findex',
                                           'extra' => {
                                             'element_region' => 'copying',
-                                            'index_entry' => {
-                                              'entry_element' => {},
-                                              'entry_number' => 1,
-                                              'in_code' => 1,
-                                              'index_name' => 'fn'
-                                            }
+                                            'index_entry' => [
+                                              'fn',
+                                              1
+                                            ]
                                           },
                                           'info' => {
                                             'spaces_before_argument' => {
@@ -341,12 +337,10 @@ $result_trees{'float_copying'} = {
                               'cmdname' => 'cindex',
                               'extra' => {
                                 'element_region' => 'copying',
-                                'index_entry' => {
-                                  'entry_element' => {},
-                                  'entry_number' => 2,
-                                  'in_code' => 0,
-                                  'index_name' => 'cp'
-                                }
+                                'index_entry' => [
+                                  'cp',
+                                  2
+                                ]
                               },
                               'info' => {
                                 'spaces_before_argument' => {
@@ -380,12 +374,10 @@ $result_trees{'float_copying'} = {
                               'cmdname' => 'findex',
                               'extra' => {
                                 'element_region' => 'copying',
-                                'index_entry' => {
-                                  'entry_element' => {},
-                                  'entry_number' => 2,
-                                  'in_code' => 1,
-                                  'index_name' => 'fn'
-                                }
+                                'index_entry' => [
+                                  'fn',
+                                  2
+                                ]
                               },
                               'info' => {
                                 'spaces_before_argument' => {
@@ -923,11 +915,7 @@ $result_trees{'float_copying'} = {
   ],
   'type' => 'document_root'
 };
-$result_trees{'float_copying'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[1]{'contents'}[3]{'args'}[0]{'contents'}[0]{'contents'}[1]{'args'}[0]{'contents'}[2]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'float_copying'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[1]{'contents'}[3]{'args'}[0]{'contents'}[0]{'contents'}[1]{'args'}[0]{'contents'}[2];
-$result_trees{'float_copying'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[1]{'contents'}[3]{'args'}[0]{'contents'}[0]{'contents'}[1]{'args'}[0]{'contents'}[3]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'float_copying'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[1]{'contents'}[3]{'args'}[0]{'contents'}[0]{'contents'}[1]{'args'}[0]{'contents'}[3];
 
$result_trees{'float_copying'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[1]{'contents'}[3]{'args'}[0]{'contents'}[0]{'contents'}[1]{'args'}[0]{'contents'}[5]{'contents'}[1]{'args'}[0]{'extra'}{'node_content'}[0]
 = 
$result_trees{'float_copying'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[1]{'contents'}[3]{'args'}[0]{'contents'}[0]{'contents'}[1]{'args'}[0]{'contents'}[5]{'contents'}[1]{'args'}[0]{'contents'}[0];
-$result_trees{'float_copying'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[1]{'contents'}[3]{'args'}[0]{'contents'}[4]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'float_copying'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[1]{'contents'}[3]{'args'}[0]{'contents'}[4];
-$result_trees{'float_copying'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[1]{'contents'}[3]{'args'}[0]{'contents'}[5]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'float_copying'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[1]{'contents'}[3]{'args'}[0]{'contents'}[5];
 
$result_trees{'float_copying'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[1]{'contents'}[3]{'extra'}{'float'}
 = 
$result_trees{'float_copying'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[1];
 
$result_trees{'float_copying'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[1]{'extra'}{'caption'}
 = 
$result_trees{'float_copying'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[1]{'contents'}[3];
 
$result_trees{'float_copying'}{'contents'}[2]{'contents'}[3]{'contents'}[0]{'contents'}[1]{'extra'}{'node_content'}[0]
 = 
$result_trees{'float_copying'}{'contents'}[2]{'contents'}[3]{'contents'}[0]{'contents'}[1]{'contents'}[0];
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 64d1d95aeb..e9dfe385f2 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
@@ -970,12 +970,10 @@ $result_trees{'char_latin1_latin1_in_refs'} = {
           'cmdname' => 'cindex',
           'extra' => {
             'element_node' => {},
-            'index_entry' => {
-              'entry_element' => {},
-              'entry_number' => 1,
-              'in_code' => 0,
-              'index_name' => 'cp'
-            }
+            'index_entry' => [
+              'cp',
+              1
+            ]
           },
           'info' => {
             'spaces_before_argument' => {
@@ -1009,12 +1007,10 @@ $result_trees{'char_latin1_latin1_in_refs'} = {
           'cmdname' => 'cindex',
           'extra' => {
             'element_node' => {},
-            'index_entry' => {
-              'entry_element' => {},
-              'entry_number' => 2,
-              'in_code' => 0,
-              'index_name' => 'cp'
-            }
+            'index_entry' => [
+              'cp',
+              2
+            ]
           },
           'info' => {
             'spaces_before_argument' => {
@@ -1048,12 +1044,10 @@ $result_trees{'char_latin1_latin1_in_refs'} = {
           'cmdname' => 'cindex',
           'extra' => {
             'element_node' => {},
-            'index_entry' => {
-              'entry_element' => {},
-              'entry_number' => 3,
-              'in_code' => 0,
-              'index_name' => 'cp'
-            }
+            'index_entry' => [
+              'cp',
+              3
+            ]
           },
           'info' => {
             'spaces_before_argument' => {
@@ -1087,12 +1081,10 @@ $result_trees{'char_latin1_latin1_in_refs'} = {
           'cmdname' => 'cindex',
           'extra' => {
             'element_node' => {},
-            'index_entry' => {
-              'entry_element' => {},
-              'entry_number' => 4,
-              'in_code' => 0,
-              'index_name' => 'cp'
-            }
+            'index_entry' => [
+              'cp',
+              4
+            ]
           },
           'info' => {
             'spaces_before_argument' => {
@@ -1126,12 +1118,10 @@ $result_trees{'char_latin1_latin1_in_refs'} = {
           'cmdname' => 'cindex',
           'extra' => {
             'element_node' => {},
-            'index_entry' => {
-              'entry_element' => {},
-              'entry_number' => 5,
-              'in_code' => 0,
-              'index_name' => 'cp'
-            }
+            'index_entry' => [
+              'cp',
+              5
+            ]
           },
           'info' => {
             'spaces_before_argument' => {
@@ -1165,12 +1155,10 @@ $result_trees{'char_latin1_latin1_in_refs'} = {
           'cmdname' => 'cindex',
           'extra' => {
             'element_node' => {},
-            'index_entry' => {
-              'entry_element' => {},
-              'entry_number' => 6,
-              'in_code' => 0,
-              'index_name' => 'cp'
-            }
+            'index_entry' => [
+              'cp',
+              6
+            ]
           },
           'info' => {
             'spaces_before_argument' => {
@@ -1226,17 +1214,11 @@ 
$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]{'args'}[0]{'extra'}{'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]{'args'}[0]{'extra'}{'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'}{'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'}{'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'}{'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'}{'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'}{'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'}{'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 bd49dee1c6..a8d670ebe7 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
@@ -970,12 +970,10 @@ $result_trees{'char_latin1_utf8_in_refs'} = {
           'cmdname' => 'cindex',
           'extra' => {
             'element_node' => {},
-            'index_entry' => {
-              'entry_element' => {},
-              'entry_number' => 1,
-              'in_code' => 0,
-              'index_name' => 'cp'
-            }
+            'index_entry' => [
+              'cp',
+              1
+            ]
           },
           'info' => {
             'spaces_before_argument' => {
@@ -1009,12 +1007,10 @@ $result_trees{'char_latin1_utf8_in_refs'} = {
           'cmdname' => 'cindex',
           'extra' => {
             'element_node' => {},
-            'index_entry' => {
-              'entry_element' => {},
-              'entry_number' => 2,
-              'in_code' => 0,
-              'index_name' => 'cp'
-            }
+            'index_entry' => [
+              'cp',
+              2
+            ]
           },
           'info' => {
             'spaces_before_argument' => {
@@ -1048,12 +1044,10 @@ $result_trees{'char_latin1_utf8_in_refs'} = {
           'cmdname' => 'cindex',
           'extra' => {
             'element_node' => {},
-            'index_entry' => {
-              'entry_element' => {},
-              'entry_number' => 3,
-              'in_code' => 0,
-              'index_name' => 'cp'
-            }
+            'index_entry' => [
+              'cp',
+              3
+            ]
           },
           'info' => {
             'spaces_before_argument' => {
@@ -1087,12 +1081,10 @@ $result_trees{'char_latin1_utf8_in_refs'} = {
           'cmdname' => 'cindex',
           'extra' => {
             'element_node' => {},
-            'index_entry' => {
-              'entry_element' => {},
-              'entry_number' => 4,
-              'in_code' => 0,
-              'index_name' => 'cp'
-            }
+            'index_entry' => [
+              'cp',
+              4
+            ]
           },
           'info' => {
             'spaces_before_argument' => {
@@ -1126,12 +1118,10 @@ $result_trees{'char_latin1_utf8_in_refs'} = {
           'cmdname' => 'cindex',
           'extra' => {
             'element_node' => {},
-            'index_entry' => {
-              'entry_element' => {},
-              'entry_number' => 5,
-              'in_code' => 0,
-              'index_name' => 'cp'
-            }
+            'index_entry' => [
+              'cp',
+              5
+            ]
           },
           'info' => {
             'spaces_before_argument' => {
@@ -1165,12 +1155,10 @@ $result_trees{'char_latin1_utf8_in_refs'} = {
           'cmdname' => 'cindex',
           'extra' => {
             'element_node' => {},
-            'index_entry' => {
-              'entry_element' => {},
-              'entry_number' => 6,
-              'in_code' => 0,
-              'index_name' => 'cp'
-            }
+            'index_entry' => [
+              'cp',
+              6
+            ]
           },
           'info' => {
             'spaces_before_argument' => {
@@ -1226,17 +1214,11 @@ 
$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]{'args'}[0]{'extra'}{'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]{'args'}[0]{'extra'}{'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'}{'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'}{'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'}{'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'}{'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'}{'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'}{'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 085c7a3c5d..763ff9c187 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
@@ -408,12 +408,10 @@ $result_trees{'char_latin2_latin2_in_refs'} = {
           'cmdname' => 'cindex',
           'extra' => {
             'element_node' => {},
-            'index_entry' => {
-              'entry_element' => {},
-              'entry_number' => 1,
-              'in_code' => 0,
-              'index_name' => 'cp'
-            }
+            'index_entry' => [
+              'cp',
+              1
+            ]
           },
           'info' => {
             'spaces_before_argument' => {
@@ -461,7 +459,6 @@ $result_trees{'char_latin2_latin2_in_refs'} = {
 
$result_trees{'char_latin2_latin2_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[0]{'args'}[0]{'extra'}{'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]{'contents'}[1]{'extra'}{'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'}[4]{'contents'}[1]{'extra'}{'element_node'}
 = $result_trees{'char_latin2_latin2_in_refs'}{'contents'}[3];
-$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 67b5a8ac83..0cd83175f3 100644
--- a/tp/t/results/formats_encodings/sample_utf8.pl
+++ b/tp/t/results/formats_encodings/sample_utf8.pl
@@ -834,12 +834,10 @@ $result_trees{'sample_utf8'} = {
           'cmdname' => 'cindex',
           'extra' => {
             'element_node' => {},
-            'index_entry' => {
-              'entry_element' => {},
-              'entry_number' => 1,
-              'in_code' => 0,
-              'index_name' => 'cp'
-            }
+            'index_entry' => [
+              'cp',
+              1
+            ]
           },
           'info' => {
             'spaces_before_argument' => {
@@ -887,12 +885,10 @@ $result_trees{'sample_utf8'} = {
           'cmdname' => 'cindex',
           'extra' => {
             'element_node' => {},
-            'index_entry' => {
-              'entry_element' => {},
-              'entry_number' => 2,
-              'in_code' => 0,
-              'index_name' => 'cp'
-            }
+            'index_entry' => [
+              'cp',
+              2
+            ]
           },
           'info' => {
             'spaces_before_argument' => {
@@ -926,12 +922,10 @@ $result_trees{'sample_utf8'} = {
           'cmdname' => 'cindex',
           'extra' => {
             'element_node' => {},
-            'index_entry' => {
-              'entry_element' => {},
-              'entry_number' => 3,
-              'in_code' => 0,
-              'index_name' => 'cp'
-            }
+            'index_entry' => [
+              'cp',
+              3
+            ]
           },
           'info' => {
             'spaces_before_argument' => {
@@ -965,12 +959,10 @@ $result_trees{'sample_utf8'} = {
           'cmdname' => 'cindex',
           'extra' => {
             'element_node' => {},
-            'index_entry' => {
-              'entry_element' => {},
-              'entry_number' => 4,
-              'in_code' => 0,
-              'index_name' => 'cp'
-            }
+            'index_entry' => [
+              'cp',
+              4
+            ]
           },
           'info' => {
             'spaces_before_argument' => {
@@ -1351,13 +1343,9 @@ 
$result_trees{'sample_utf8'}{'contents'}[2]{'contents'}[3]{'contents'}[0]{'conte
 
$result_trees{'sample_utf8'}{'contents'}[2]{'contents'}[3]{'contents'}[1]{'contents'}[1]{'extra'}{'node_content'}[0]
 = 
$result_trees{'sample_utf8'}{'contents'}[2]{'contents'}[3]{'contents'}[1]{'contents'}[1]{'contents'}[0];
 
$result_trees{'sample_utf8'}{'contents'}[2]{'contents'}[3]{'contents'}[2]{'contents'}[1]{'extra'}{'node_content'}[0]
 = 
$result_trees{'sample_utf8'}{'contents'}[2]{'contents'}[3]{'contents'}[2]{'contents'}[1]{'contents'}[0];
 
$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'}[4]{'extra'}{'element_node'}
 = $result_trees{'sample_utf8'}{'contents'}[3];
-$result_trees{'sample_utf8'}{'contents'}[4]{'contents'}[4]{'extra'}{'index_entry'}{'entry_element'}
 = $result_trees{'sample_utf8'}{'contents'}[4]{'contents'}[4];
 
$result_trees{'sample_utf8'}{'contents'}[4]{'contents'}[5]{'extra'}{'element_node'}
 = $result_trees{'sample_utf8'}{'contents'}[3];
-$result_trees{'sample_utf8'}{'contents'}[4]{'contents'}[5]{'extra'}{'index_entry'}{'entry_element'}
 = $result_trees{'sample_utf8'}{'contents'}[4]{'contents'}[5];
 
$result_trees{'sample_utf8'}{'contents'}[4]{'contents'}[6]{'extra'}{'element_node'}
 = $result_trees{'sample_utf8'}{'contents'}[3];
-$result_trees{'sample_utf8'}{'contents'}[4]{'contents'}[6]{'extra'}{'index_entry'}{'entry_element'}
 = $result_trees{'sample_utf8'}{'contents'}[4]{'contents'}[6];
 
 $result_texis{'sample_utf8'} = '\\input texinfo   @c -*-texinfo-*-
 @c %**start of header
diff --git a/tp/t/results/heading/heading_in_copying.pl 
b/tp/t/results/heading/heading_in_copying.pl
index b3c6578522..65881d037d 100644
--- a/tp/t/results/heading/heading_in_copying.pl
+++ b/tp/t/results/heading/heading_in_copying.pl
@@ -101,12 +101,10 @@ $result_trees{'heading_in_copying'} = {
               'cmdname' => 'cindex',
               'extra' => {
                 'element_region' => 'copying',
-                'index_entry' => {
-                  'entry_element' => {},
-                  'entry_number' => 1,
-                  'in_code' => 0,
-                  'index_name' => 'cp'
-                }
+                'index_entry' => [
+                  'cp',
+                  1
+                ]
               },
               'info' => {
                 'spaces_before_argument' => {
@@ -314,7 +312,6 @@ $result_trees{'heading_in_copying'} = {
   ],
   'type' => 'document_root'
 };
-$result_trees{'heading_in_copying'}{'contents'}[0]{'contents'}[0]{'contents'}[2]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'heading_in_copying'}{'contents'}[0]{'contents'}[0]{'contents'}[2];
 
 $result_texis{'heading_in_copying'} = '@copying
 
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 52ec637f21..ac9b532972 100644
--- a/tp/t/results/html_tests/deftypefnnewline_for_copying_after.pl
+++ b/tp/t/results/html_tests/deftypefnnewline_for_copying_after.pl
@@ -99,12 +99,10 @@ $result_trees{'deftypefnnewline_for_copying_after'} = {
                       'type' => {}
                     },
                     'element_region' => 'copying',
-                    'index_entry' => {
-                      'entry_element' => {},
-                      'entry_number' => 1,
-                      'in_code' => 1,
-                      'index_name' => 'fn'
-                    },
+                    'index_entry' => [
+                      'fn',
+                      1
+                    ],
                     'original_def_cmdname' => 'deftypefun'
                   },
                   'source_info' => {
@@ -499,12 +497,10 @@ $result_trees{'deftypefnnewline_for_copying_after'} = {
                   'type' => {}
                 },
                 'element_node' => {},
-                'index_entry' => {
-                  'entry_element' => {},
-                  'entry_number' => 2,
-                  'in_code' => 1,
-                  'index_name' => 'fn'
-                },
+                'index_entry' => [
+                  'fn',
+                  2
+                ],
                 'original_def_cmdname' => 'deftypefun'
               },
               'source_info' => {
@@ -597,13 +593,11 @@ 
$result_trees{'deftypefnnewline_for_copying_after'}{'contents'}[0]{'contents'}[0
 
$result_trees{'deftypefnnewline_for_copying_after'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'extra'}{'def_parsed_hash'}{'category'}
 = 
$result_trees{'deftypefnnewline_for_copying_after'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0];
 
$result_trees{'deftypefnnewline_for_copying_after'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'extra'}{'def_parsed_hash'}{'name'}
 = 
$result_trees{'deftypefnnewline_for_copying_after'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[4];
 
$result_trees{'deftypefnnewline_for_copying_after'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'extra'}{'def_parsed_hash'}{'type'}
 = 
$result_trees{'deftypefnnewline_for_copying_after'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[2];
-$result_trees{'deftypefnnewline_for_copying_after'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'deftypefnnewline_for_copying_after'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[0];
 
$result_trees{'deftypefnnewline_for_copying_after'}{'contents'}[4]{'contents'}[1]{'contents'}[0]{'extra'}{'def_index_element'}
 = 
$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'}{'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'}{'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
 @deftypefun TYPE NAME ARGUMENTS...
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 48390b3d32..4a1d8f1a8b 100644
--- a/tp/t/results/html_tests/deftypefnnewline_for_copying_before.pl
+++ b/tp/t/results/html_tests/deftypefnnewline_for_copying_before.pl
@@ -143,12 +143,10 @@ $result_trees{'deftypefnnewline_for_copying_before'} = {
                       'type' => {}
                     },
                     'element_region' => 'copying',
-                    'index_entry' => {
-                      'entry_element' => {},
-                      'entry_number' => 1,
-                      'in_code' => 1,
-                      'index_name' => 'fn'
-                    },
+                    'index_entry' => [
+                      'fn',
+                      1
+                    ],
                     'original_def_cmdname' => 'deftypefun'
                   },
                   'source_info' => {
@@ -464,12 +462,10 @@ $result_trees{'deftypefnnewline_for_copying_before'} = {
                   'type' => {}
                 },
                 'element_node' => {},
-                'index_entry' => {
-                  'entry_element' => {},
-                  'entry_number' => 2,
-                  'in_code' => 1,
-                  'index_name' => 'fn'
-                },
+                'index_entry' => [
+                  'fn',
+                  2
+                ],
                 'original_def_cmdname' => 'deftypefun'
               },
               'source_info' => {
@@ -562,13 +558,11 @@ 
$result_trees{'deftypefnnewline_for_copying_before'}{'contents'}[0]{'contents'}[
 
$result_trees{'deftypefnnewline_for_copying_before'}{'contents'}[0]{'contents'}[3]{'contents'}[0]{'contents'}[0]{'extra'}{'def_parsed_hash'}{'category'}
 = 
$result_trees{'deftypefnnewline_for_copying_before'}{'contents'}[0]{'contents'}[3]{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0];
 
$result_trees{'deftypefnnewline_for_copying_before'}{'contents'}[0]{'contents'}[3]{'contents'}[0]{'contents'}[0]{'extra'}{'def_parsed_hash'}{'name'}
 = 
$result_trees{'deftypefnnewline_for_copying_before'}{'contents'}[0]{'contents'}[3]{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[4];
 
$result_trees{'deftypefnnewline_for_copying_before'}{'contents'}[0]{'contents'}[3]{'contents'}[0]{'contents'}[0]{'extra'}{'def_parsed_hash'}{'type'}
 = 
$result_trees{'deftypefnnewline_for_copying_before'}{'contents'}[0]{'contents'}[3]{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[2];
-$result_trees{'deftypefnnewline_for_copying_before'}{'contents'}[0]{'contents'}[3]{'contents'}[0]{'contents'}[0]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'deftypefnnewline_for_copying_before'}{'contents'}[0]{'contents'}[3]{'contents'}[0]{'contents'}[0];
 
$result_trees{'deftypefnnewline_for_copying_before'}{'contents'}[4]{'contents'}[1]{'contents'}[0]{'extra'}{'def_index_element'}
 = 
$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'}{'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'}{'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'} = '
 @deftypefnnewline on
diff --git a/tp/t/results/html_tests/float_copying.pl 
b/tp/t/results/html_tests/float_copying.pl
index 6aa6c26baa..ae4041ee27 100644
--- a/tp/t/results/html_tests/float_copying.pl
+++ b/tp/t/results/html_tests/float_copying.pl
@@ -216,12 +216,10 @@ $result_trees{'float_copying'} = {
                                           'cmdname' => 'cindex',
                                           'extra' => {
                                             'element_region' => 'copying',
-                                            'index_entry' => {
-                                              'entry_element' => {},
-                                              'entry_number' => 1,
-                                              'in_code' => 0,
-                                              'index_name' => 'cp'
-                                            }
+                                            'index_entry' => [
+                                              'cp',
+                                              1
+                                            ]
                                           },
                                           'info' => {
                                             'spaces_before_argument' => {
@@ -255,12 +253,10 @@ $result_trees{'float_copying'} = {
                                           'cmdname' => 'findex',
                                           'extra' => {
                                             'element_region' => 'copying',
-                                            'index_entry' => {
-                                              'entry_element' => {},
-                                              'entry_number' => 1,
-                                              'in_code' => 1,
-                                              'index_name' => 'fn'
-                                            }
+                                            'index_entry' => [
+                                              'fn',
+                                              1
+                                            ]
                                           },
                                           'info' => {
                                             'spaces_before_argument' => {
@@ -398,12 +394,10 @@ $result_trees{'float_copying'} = {
                               'cmdname' => 'cindex',
                               'extra' => {
                                 'element_region' => 'copying',
-                                'index_entry' => {
-                                  'entry_element' => {},
-                                  'entry_number' => 2,
-                                  'in_code' => 0,
-                                  'index_name' => 'cp'
-                                }
+                                'index_entry' => [
+                                  'cp',
+                                  2
+                                ]
                               },
                               'info' => {
                                 'spaces_before_argument' => {
@@ -437,12 +431,10 @@ $result_trees{'float_copying'} = {
                               'cmdname' => 'findex',
                               'extra' => {
                                 'element_region' => 'copying',
-                                'index_entry' => {
-                                  'entry_element' => {},
-                                  'entry_number' => 2,
-                                  'in_code' => 1,
-                                  'index_name' => 'fn'
-                                }
+                                'index_entry' => [
+                                  'fn',
+                                  2
+                                ]
                               },
                               'info' => {
                                 'spaces_before_argument' => {
@@ -650,12 +642,10 @@ $result_trees{'float_copying'} = {
           'cmdname' => 'cindex',
           'extra' => {
             'element_node' => {},
-            'index_entry' => {
-              'entry_element' => {},
-              'entry_number' => 3,
-              'in_code' => 0,
-              'index_name' => 'cp'
-            }
+            'index_entry' => [
+              'cp',
+              3
+            ]
           },
           'info' => {
             'spaces_before_argument' => {
@@ -1070,12 +1060,10 @@ $result_trees{'float_copying'} = {
           'cmdname' => 'cindex',
           'extra' => {
             'element_node' => {},
-            'index_entry' => {
-              'entry_element' => {},
-              'entry_number' => 4,
-              'in_code' => 0,
-              'index_name' => 'cp'
-            }
+            'index_entry' => [
+              'cp',
+              4
+            ]
           },
           'info' => {
             'spaces_before_argument' => {
@@ -1323,22 +1311,16 @@ $result_trees{'float_copying'} = {
   ],
   'type' => 'document_root'
 };
-$result_trees{'float_copying'}{'contents'}[0]{'contents'}[1]{'contents'}[2]{'contents'}[1]{'contents'}[3]{'args'}[0]{'contents'}[0]{'contents'}[1]{'args'}[0]{'contents'}[2]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'float_copying'}{'contents'}[0]{'contents'}[1]{'contents'}[2]{'contents'}[1]{'contents'}[3]{'args'}[0]{'contents'}[0]{'contents'}[1]{'args'}[0]{'contents'}[2];
-$result_trees{'float_copying'}{'contents'}[0]{'contents'}[1]{'contents'}[2]{'contents'}[1]{'contents'}[3]{'args'}[0]{'contents'}[0]{'contents'}[1]{'args'}[0]{'contents'}[3]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'float_copying'}{'contents'}[0]{'contents'}[1]{'contents'}[2]{'contents'}[1]{'contents'}[3]{'args'}[0]{'contents'}[0]{'contents'}[1]{'args'}[0]{'contents'}[3];
 
$result_trees{'float_copying'}{'contents'}[0]{'contents'}[1]{'contents'}[2]{'contents'}[1]{'contents'}[3]{'args'}[0]{'contents'}[0]{'contents'}[1]{'args'}[0]{'contents'}[5]{'contents'}[1]{'args'}[0]{'extra'}{'node_content'}[0]
 = 
$result_trees{'float_copying'}{'contents'}[0]{'contents'}[1]{'contents'}[2]{'contents'}[1]{'contents'}[3]{'args'}[0]{'contents'}[0]{'contents'}[1]{'args'}[0]{'contents'}[5]{'contents'}[1]{'args'}[0]{'contents'}[0];
-$result_trees{'float_copying'}{'contents'}[0]{'contents'}[1]{'contents'}[2]{'contents'}[1]{'contents'}[3]{'args'}[0]{'contents'}[4]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'float_copying'}{'contents'}[0]{'contents'}[1]{'contents'}[2]{'contents'}[1]{'contents'}[3]{'args'}[0]{'contents'}[4];
-$result_trees{'float_copying'}{'contents'}[0]{'contents'}[1]{'contents'}[2]{'contents'}[1]{'contents'}[3]{'args'}[0]{'contents'}[5]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'float_copying'}{'contents'}[0]{'contents'}[1]{'contents'}[2]{'contents'}[1]{'contents'}[3]{'args'}[0]{'contents'}[5];
 
$result_trees{'float_copying'}{'contents'}[0]{'contents'}[1]{'contents'}[2]{'contents'}[1]{'contents'}[3]{'extra'}{'float'}
 = 
$result_trees{'float_copying'}{'contents'}[0]{'contents'}[1]{'contents'}[2]{'contents'}[1];
 
$result_trees{'float_copying'}{'contents'}[0]{'contents'}[1]{'contents'}[2]{'contents'}[1]{'extra'}{'caption'}
 = 
$result_trees{'float_copying'}{'contents'}[0]{'contents'}[1]{'contents'}[2]{'contents'}[1]{'contents'}[3];
 
$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]{'args'}[0]{'extra'}{'node_content'}[0]
 = 
$result_trees{'float_copying'}{'contents'}[2]{'contents'}[3]{'contents'}[1]{'args'}[0]{'contents'}[0];
 
$result_trees{'float_copying'}{'contents'}[2]{'contents'}[5]{'contents'}[1]{'args'}[0]{'extra'}{'node_content'}[0]
 = 
$result_trees{'float_copying'}{'contents'}[2]{'contents'}[5]{'contents'}[1]{'args'}[0]{'contents'}[0];
 
$result_trees{'float_copying'}{'contents'}[2]{'contents'}[9]{'contents'}[0]{'contents'}[1]{'extra'}{'node_content'}[0]
 = 
$result_trees{'float_copying'}{'contents'}[2]{'contents'}[9]{'contents'}[0]{'contents'}[1]{'contents'}[0];
 
$result_trees{'float_copying'}{'contents'}[4]{'contents'}[3]{'contents'}[1]{'args'}[0]{'extra'}{'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]{'args'}[0]{'extra'}{'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'}{'element_node'}
 = $result_trees{'float_copying'}{'contents'}[3];
-$result_trees{'float_copying'}{'contents'}[4]{'contents'}[7]{'extra'}{'index_entry'}{'entry_element'}
 = $result_trees{'float_copying'}{'contents'}[4]{'contents'}[7];
 
 $result_texis{'float_copying'} = '\\input texinfo @c -*-texinfo-*-
 
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 c71e0a279b..1ea1c84aa5 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
@@ -83,12 +83,10 @@ $result_trees{'index_and_node_same_name'} = {
           'cmdname' => 'cindex',
           'extra' => {
             'element_node' => {},
-            'index_entry' => {
-              'entry_element' => {},
-              'entry_number' => 1,
-              'in_code' => 0,
-              'index_name' => 'cp'
-            }
+            'index_entry' => [
+              'cp',
+              1
+            ]
           },
           'info' => {
             'spaces_before_argument' => {
@@ -161,7 +159,6 @@ $result_trees{'index_and_node_same_name'} = {
   'type' => 'document_root'
 };
 
$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_texis{'index_and_node_same_name'} = '@top top
 @node index node
diff --git a/tp/t/results/html_tests/index_below.pl 
b/tp/t/results/html_tests/index_below.pl
index 501b6b319d..a74e928a63 100644
--- a/tp/t/results/html_tests/index_below.pl
+++ b/tp/t/results/html_tests/index_below.pl
@@ -142,12 +142,10 @@ $result_trees{'index_below'} = [
             ],
             'cmdname' => 'cindex',
             'extra' => {
-              'index_entry' => {
-                'entry_element' => {},
-                'entry_number' => 1,
-                'in_code' => 0,
-                'index_name' => 'cp'
-              }
+              'index_entry' => [
+                'cp',
+                1
+              ]
             },
             'info' => {
               'spaces_before_argument' => {
@@ -216,7 +214,6 @@ $result_trees{'index_below'} = [
 ];
 $result_trees{'index_below'}[0]{'extra'}{'unit_command'} = 
$result_trees{'index_below'}[0]{'contents'}[1];
 $result_trees{'index_below'}[1]{'extra'}{'unit_command'} = 
$result_trees{'index_below'}[1]{'contents'}[0];
-$result_trees{'index_below'}[2]{'contents'}[0]{'contents'}[1]{'extra'}{'index_entry'}{'entry_element'}
 = $result_trees{'index_below'}[2]{'contents'}[0]{'contents'}[1];
 $result_trees{'index_below'}[2]{'extra'}{'unit_command'} = 
$result_trees{'index_below'}[2]{'contents'}[0];
 
 $result_texis{'index_below'} = '@top top
diff --git a/tp/t/results/indices/complex_recursive_synindex.pl 
b/tp/t/results/indices/complex_recursive_synindex.pl
index b002b65286..14eceeac95 100644
--- a/tp/t/results/indices/complex_recursive_synindex.pl
+++ b/tp/t/results/indices/complex_recursive_synindex.pl
@@ -400,12 +400,10 @@ $result_trees{'complex_recursive_synindex'} = {
           'cmdname' => 'eeeindex',
           'extra' => {
             'element_node' => {},
-            'index_entry' => {
-              'entry_element' => {},
-              'entry_number' => 1,
-              'in_code' => 0,
-              'index_name' => 'eee'
-            }
+            'index_entry' => [
+              'eee',
+              1
+            ]
           },
           'info' => {
             'spaces_before_argument' => {
@@ -513,12 +511,10 @@ $result_trees{'complex_recursive_synindex'} = {
           'cmdname' => 'cccindex',
           'extra' => {
             'element_node' => {},
-            'index_entry' => {
-              'entry_element' => {},
-              'entry_number' => 1,
-              'in_code' => 0,
-              'index_name' => 'ccc'
-            }
+            'index_entry' => [
+              'ccc',
+              1
+            ]
           },
           'info' => {
             'spaces_before_argument' => {
@@ -552,12 +548,10 @@ $result_trees{'complex_recursive_synindex'} = {
           'cmdname' => 'bbbindex',
           'extra' => {
             'element_node' => {},
-            'index_entry' => {
-              'entry_element' => {},
-              'entry_number' => 1,
-              'in_code' => 0,
-              'index_name' => 'bbb'
-            }
+            'index_entry' => [
+              'bbb',
+              1
+            ]
           },
           'info' => {
             'spaces_before_argument' => {
@@ -591,12 +585,10 @@ $result_trees{'complex_recursive_synindex'} = {
           'cmdname' => 'aaaindex',
           'extra' => {
             'element_node' => {},
-            'index_entry' => {
-              'entry_element' => {},
-              'entry_number' => 1,
-              'in_code' => 0,
-              'index_name' => 'aaa'
-            }
+            'index_entry' => [
+              'aaa',
+              1
+            ]
           },
           'info' => {
             'spaces_before_argument' => {
@@ -630,12 +622,10 @@ $result_trees{'complex_recursive_synindex'} = {
           'cmdname' => 'dddindex',
           'extra' => {
             'element_node' => {},
-            'index_entry' => {
-              'entry_element' => {},
-              'entry_number' => 1,
-              'in_code' => 0,
-              'index_name' => 'ddd'
-            }
+            'index_entry' => [
+              'ddd',
+              1
+            ]
           },
           'info' => {
             'spaces_before_argument' => {
@@ -669,12 +659,10 @@ $result_trees{'complex_recursive_synindex'} = {
           'cmdname' => 'eeeindex',
           'extra' => {
             'element_node' => {},
-            'index_entry' => {
-              'entry_element' => {},
-              'entry_number' => 2,
-              'in_code' => 0,
-              'index_name' => 'eee'
-            }
+            'index_entry' => [
+              'eee',
+              2
+            ]
           },
           'info' => {
             'spaces_before_argument' => {
@@ -948,17 +936,11 @@ $result_trees{'complex_recursive_synindex'} = {
   'type' => 'document_root'
 };
 
$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'}{'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'}{'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'}{'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'}{'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'}{'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_texis{'complex_recursive_synindex'} = '@node Top
 @node chap
diff --git a/tp/t/results/indices/def_syn_indices.pl 
b/tp/t/results/indices/def_syn_indices.pl
index 37a49dca78..6f11857a1b 100644
--- a/tp/t/results/indices/def_syn_indices.pl
+++ b/tp/t/results/indices/def_syn_indices.pl
@@ -255,12 +255,10 @@ $result_trees{'def_syn_indices'} = {
           'cmdname' => 'trucindex',
           'extra' => {
             'element_node' => {},
-            'index_entry' => {
-              'entry_element' => {},
-              'entry_number' => 1,
-              'in_code' => 0,
-              'index_name' => 'truc'
-            }
+            'index_entry' => [
+              'truc',
+              1
+            ]
           },
           'info' => {
             'spaces_before_argument' => {
@@ -413,12 +411,10 @@ $result_trees{'def_syn_indices'} = {
           'cmdname' => 'codeidxindex',
           'extra' => {
             'element_node' => {},
-            'index_entry' => {
-              'entry_element' => {},
-              'entry_number' => 1,
-              'in_code' => 1,
-              'index_name' => 'codeidx'
-            }
+            'index_entry' => [
+              'codeidx',
+              1
+            ]
           },
           'info' => {
             'spaces_before_argument' => {
@@ -457,12 +453,10 @@ $result_trees{'def_syn_indices'} = {
           'cmdname' => 'cindex',
           'extra' => {
             'element_node' => {},
-            'index_entry' => {
-              'entry_element' => {},
-              'entry_number' => 1,
-              'in_code' => 1,
-              'index_name' => 'cp'
-            }
+            'index_entry' => [
+              'cp',
+              1
+            ]
           },
           'info' => {
             'spaces_before_argument' => {
@@ -541,12 +535,10 @@ $result_trees{'def_syn_indices'} = {
           'cmdname' => 'kindex',
           'extra' => {
             'element_node' => {},
-            'index_entry' => {
-              'entry_element' => {},
-              'entry_number' => 1,
-              'in_code' => 1,
-              'index_name' => 'ky'
-            }
+            'index_entry' => [
+              'ky',
+              1
+            ]
           },
           'info' => {
             'spaces_before_argument' => {
@@ -580,12 +572,10 @@ $result_trees{'def_syn_indices'} = {
           'cmdname' => 'pindex',
           'extra' => {
             'element_node' => {},
-            'index_entry' => {
-              'entry_element' => {},
-              'entry_number' => 1,
-              'in_code' => 1,
-              'index_name' => 'pg'
-            }
+            'index_entry' => [
+              'pg',
+              1
+            ]
           },
           'info' => {
             'spaces_before_argument' => {
@@ -812,12 +802,10 @@ $result_trees{'def_syn_indices'} = {
           'cmdname' => 'defgindex',
           'extra' => {
             'element_node' => {},
-            'index_entry' => {
-              'entry_element' => {},
-              'entry_number' => 1,
-              'in_code' => 0,
-              'index_name' => 'defg'
-            }
+            'index_entry' => [
+              'defg',
+              1
+            ]
           },
           'info' => {
             'spaces_before_argument' => {
@@ -856,12 +844,10 @@ $result_trees{'def_syn_indices'} = {
           'cmdname' => 'abcindex',
           'extra' => {
             'element_node' => {},
-            'index_entry' => {
-              'entry_element' => {},
-              'entry_number' => 1,
-              'in_code' => 0,
-              'index_name' => 'abc'
-            }
+            'index_entry' => [
+              'abc',
+              1
+            ]
           },
           'info' => {
             'spaces_before_argument' => {
@@ -1324,19 +1310,12 @@ $result_trees{'def_syn_indices'} = {
   'type' => 'document_root'
 };
 
$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'}{'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'}{'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'}{'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'}{'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'}{'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'}{'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 6a5f5de9d3..6cd3c95c6f 100644
Binary files 
a/tp/t/results/indices/default_cp_index_and_one_letter_syncodeindex.pl and 
b/tp/t/results/indices/default_cp_index_and_one_letter_syncodeindex.pl differ
diff --git a/tp/t/results/indices/double_index_entry.pl 
b/tp/t/results/indices/double_index_entry.pl
index 70604e6ee9..a863625e57 100644
--- a/tp/t/results/indices/double_index_entry.pl
+++ b/tp/t/results/indices/double_index_entry.pl
@@ -60,12 +60,10 @@ $result_trees{'double_index_entry'} = {
           'cmdname' => 'cindex',
           'extra' => {
             'element_node' => {},
-            'index_entry' => {
-              'entry_element' => {},
-              'entry_number' => 1,
-              'in_code' => 0,
-              'index_name' => 'cp'
-            }
+            'index_entry' => [
+              'cp',
+              1
+            ]
           },
           'info' => {
             'spaces_before_argument' => {
@@ -118,12 +116,10 @@ $result_trees{'double_index_entry'} = {
           'cmdname' => 'cindex',
           'extra' => {
             'element_node' => {},
-            'index_entry' => {
-              'entry_element' => {},
-              'entry_number' => 2,
-              'in_code' => 0,
-              'index_name' => 'cp'
-            }
+            'index_entry' => [
+              'cp',
+              2
+            ]
           },
           'info' => {
             'spaces_before_argument' => {
@@ -325,12 +321,10 @@ $result_trees{'double_index_entry'} = {
           'cmdname' => 'cindex',
           'extra' => {
             'element_node' => {},
-            'index_entry' => {
-              'entry_element' => {},
-              'entry_number' => 3,
-              'in_code' => 0,
-              'index_name' => 'cp'
-            }
+            'index_entry' => [
+              'cp',
+              3
+            ]
           },
           'info' => {
             'spaces_before_argument' => {
@@ -403,13 +397,10 @@ $result_trees{'double_index_entry'} = {
   'type' => 'document_root'
 };
 
$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'}{'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]{'contents'}[1]{'extra'}{'node_content'}[0]
 = 
$result_trees{'double_index_entry'}{'contents'}[1]{'contents'}[7]{'contents'}[0]{'contents'}[1]{'contents'}[0];
 
$result_trees{'double_index_entry'}{'contents'}[2]{'args'}[3]{'extra'}{'node_content'}[0]
 = $result_trees{'double_index_entry'}{'contents'}[2]{'args'}[3]{'contents'}[0];
 
$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_texis{'double_index_entry'} = '@node Top
 
diff --git a/tp/t/results/indices/double_seeentry_seealso.pl 
b/tp/t/results/indices/double_seeentry_seealso.pl
index 66e5da7353..1170e27a79 100644
--- a/tp/t/results/indices/double_seeentry_seealso.pl
+++ b/tp/t/results/indices/double_seeentry_seealso.pl
@@ -206,12 +206,10 @@ $result_trees{'double_seeentry_seealso'} = {
           'cmdname' => 'cindex',
           'extra' => {
             'element_node' => {},
-            'index_entry' => {
-              'entry_element' => {},
-              'entry_number' => 1,
-              'in_code' => 0,
-              'index_name' => 'cp'
-            },
+            'index_entry' => [
+              'cp',
+              1
+            ],
             'seeentry' => {}
           },
           'info' => {
@@ -290,12 +288,10 @@ $result_trees{'double_seeentry_seealso'} = {
           'cmdname' => 'cindex',
           'extra' => {
             'element_node' => {},
-            'index_entry' => {
-              'entry_element' => {},
-              'entry_number' => 2,
-              'in_code' => 0,
-              'index_name' => 'cp'
-            },
+            'index_entry' => [
+              'cp',
+              2
+            ],
             'seealso' => {}
           },
           'info' => {
@@ -374,12 +370,10 @@ $result_trees{'double_seeentry_seealso'} = {
           'cmdname' => 'cindex',
           'extra' => {
             'element_node' => {},
-            'index_entry' => {
-              'entry_element' => {},
-              'entry_number' => 3,
-              'in_code' => 0,
-              'index_name' => 'cp'
-            },
+            'index_entry' => [
+              'cp',
+              3
+            ],
             'seealso' => {},
             'seeentry' => {}
           },
@@ -429,12 +423,10 @@ $result_trees{'double_seeentry_seealso'} = {
           'cmdname' => 'cindex',
           'extra' => {
             'element_node' => {},
-            'index_entry' => {
-              'entry_element' => {},
-              'entry_number' => 4,
-              'in_code' => 0,
-              'index_name' => 'cp'
-            },
+            'index_entry' => [
+              'cp',
+              4
+            ],
             'seealso' => {},
             'subentry' => {
               'args' => [
@@ -561,17 +553,13 @@ $result_trees{'double_seeentry_seealso'} = {
   'type' => 'document_root'
 };
 
$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'}{'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'}{'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'}{'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];
 $result_trees{'double_seeentry_seealso'}{'contents'}[4]{'contents'}[5] = 
$result_trees{'double_seeentry_seealso'}{'contents'}[4]{'contents'}[4]{'extra'}{'subentry'};
diff --git a/tp/t/results/indices/double_syncodeindex.pl 
b/tp/t/results/indices/double_syncodeindex.pl
index 8010963228..194a18536f 100644
--- a/tp/t/results/indices/double_syncodeindex.pl
+++ b/tp/t/results/indices/double_syncodeindex.pl
@@ -168,12 +168,10 @@ $result_trees{'double_syncodeindex'} = {
           'cmdname' => 'cindex',
           'extra' => {
             'element_node' => {},
-            'index_entry' => {
-              'entry_element' => {},
-              'entry_number' => 1,
-              'in_code' => 1,
-              'index_name' => 'cp'
-            }
+            'index_entry' => [
+              'cp',
+              1
+            ]
           },
           'info' => {
             'spaces_before_argument' => {
@@ -207,12 +205,10 @@ $result_trees{'double_syncodeindex'} = {
           'cmdname' => 'findex',
           'extra' => {
             'element_node' => {},
-            'index_entry' => {
-              'entry_element' => {},
-              'entry_number' => 1,
-              'in_code' => 1,
-              'index_name' => 'fn'
-            }
+            'index_entry' => [
+              'fn',
+              1
+            ]
           },
           'info' => {
             'spaces_before_argument' => {
@@ -319,9 +315,7 @@ $result_trees{'double_syncodeindex'} = {
   'type' => 'document_root'
 };
 
$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'}{'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_texis{'double_syncodeindex'} = '@syncodeindex cp fn
 @syncodeindex cp fn
diff --git a/tp/t/results/indices/empty_string_index_entry.pl 
b/tp/t/results/indices/empty_string_index_entry.pl
index b24e58662f..dbd85218ca 100644
--- a/tp/t/results/indices/empty_string_index_entry.pl
+++ b/tp/t/results/indices/empty_string_index_entry.pl
@@ -102,12 +102,10 @@ $result_trees{'empty_string_index_entry'} = {
           'cmdname' => 'findex',
           'extra' => {
             'element_node' => {},
-            'index_entry' => {
-              'entry_element' => {},
-              'entry_number' => 1,
-              'in_code' => 1,
-              'index_name' => 'fn'
-            }
+            'index_entry' => [
+              'fn',
+              1
+            ]
           },
           'info' => {
             'spaces_before_argument' => {
@@ -185,12 +183,10 @@ $result_trees{'empty_string_index_entry'} = {
                       'cmdname' => 'item',
                       'extra' => {
                         'element_node' => {},
-                        'index_entry' => {
-                          'entry_element' => {},
-                          'entry_number' => 2,
-                          'in_code' => 1,
-                          'index_name' => 'fn'
-                        }
+                        'index_entry' => [
+                          'fn',
+                          2
+                        ]
                       },
                       'info' => {
                         'spaces_before_argument' => {
@@ -366,12 +362,10 @@ $result_trees{'empty_string_index_entry'} = {
                   'name' => {}
                 },
                 'element_node' => {},
-                'index_entry' => {
-                  'entry_element' => {},
-                  'entry_number' => 3,
-                  'in_code' => 1,
-                  'index_name' => 'fn'
-                },
+                'index_entry' => [
+                  'fn',
+                  3
+                ],
                 'original_def_cmdname' => 'defun'
               },
               'source_info' => {
@@ -484,12 +478,10 @@ $result_trees{'empty_string_index_entry'} = {
                   'name' => {}
                 },
                 'element_node' => {},
-                'index_entry' => {
-                  'entry_element' => {},
-                  'entry_number' => 4,
-                  'in_code' => 1,
-                  'index_name' => 'fn'
-                },
+                'index_entry' => [
+                  'fn',
+                  4
+                ],
                 'original_def_cmdname' => 'defunx'
               },
               'info' => {
@@ -607,20 +599,16 @@ $result_trees{'empty_string_index_entry'} = {
   'type' => 'document_root'
 };
 
$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'}{'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'}{'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'}{'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_texis{'empty_string_index_entry'} = '@node Top
 @node chap
diff --git a/tp/t/results/indices/encoding_index_ascii.pl 
b/tp/t/results/indices/encoding_index_ascii.pl
index 2cd8e4dc97..742b5f0f2f 100644
--- a/tp/t/results/indices/encoding_index_ascii.pl
+++ b/tp/t/results/indices/encoding_index_ascii.pl
@@ -245,12 +245,10 @@ $result_trees{'encoding_index_ascii'} = {
           'cmdname' => 'cindex',
           'extra' => {
             'element_node' => {},
-            'index_entry' => {
-              'entry_element' => {},
-              'entry_number' => 1,
-              'in_code' => 0,
-              'index_name' => 'cp'
-            }
+            'index_entry' => [
+              'cp',
+              1
+            ]
           },
           'info' => {
             'spaces_before_argument' => {
@@ -356,12 +354,10 @@ $result_trees{'encoding_index_ascii'} = {
           'cmdname' => 'cindex',
           'extra' => {
             'element_node' => {},
-            'index_entry' => {
-              'entry_element' => {},
-              'entry_number' => 2,
-              'in_code' => 0,
-              'index_name' => 'cp'
-            }
+            'index_entry' => [
+              'cp',
+              2
+            ]
           },
           'info' => {
             'spaces_before_argument' => {
@@ -485,12 +481,10 @@ $result_trees{'encoding_index_ascii'} = {
           'cmdname' => 'cindex',
           'extra' => {
             'element_node' => {},
-            'index_entry' => {
-              'entry_element' => {},
-              'entry_number' => 3,
-              'in_code' => 0,
-              'index_name' => 'cp'
-            }
+            'index_entry' => [
+              'cp',
+              3
+            ]
           },
           'info' => {
             'spaces_before_argument' => {
@@ -524,12 +518,10 @@ $result_trees{'encoding_index_ascii'} = {
           'cmdname' => 'cindex',
           'extra' => {
             'element_node' => {},
-            'index_entry' => {
-              'entry_element' => {},
-              'entry_number' => 4,
-              'in_code' => 0,
-              'index_name' => 'cp'
-            }
+            'index_entry' => [
+              'cp',
+              4
+            ]
           },
           'info' => {
             'spaces_before_argument' => {
@@ -563,12 +555,10 @@ $result_trees{'encoding_index_ascii'} = {
           'cmdname' => 'cindex',
           'extra' => {
             'element_node' => {},
-            'index_entry' => {
-              'entry_element' => {},
-              'entry_number' => 5,
-              'in_code' => 0,
-              'index_name' => 'cp'
-            }
+            'index_entry' => [
+              'cp',
+              5
+            ]
           },
           'info' => {
             'spaces_before_argument' => {
@@ -602,12 +592,10 @@ $result_trees{'encoding_index_ascii'} = {
           'cmdname' => 'cindex',
           'extra' => {
             'element_node' => {},
-            'index_entry' => {
-              'entry_element' => {},
-              'entry_number' => 6,
-              'in_code' => 0,
-              'index_name' => 'cp'
-            }
+            'index_entry' => [
+              'cp',
+              6
+            ]
           },
           'info' => {
             'spaces_before_argument' => {
@@ -641,12 +629,10 @@ $result_trees{'encoding_index_ascii'} = {
           'cmdname' => 'cindex',
           'extra' => {
             'element_node' => {},
-            'index_entry' => {
-              'entry_element' => {},
-              'entry_number' => 7,
-              'in_code' => 0,
-              'index_name' => 'cp'
-            }
+            'index_entry' => [
+              'cp',
+              7
+            ]
           },
           'info' => {
             'spaces_before_argument' => {
@@ -680,12 +666,10 @@ $result_trees{'encoding_index_ascii'} = {
           'cmdname' => 'cindex',
           'extra' => {
             'element_node' => {},
-            'index_entry' => {
-              'entry_element' => {},
-              'entry_number' => 8,
-              'in_code' => 0,
-              'index_name' => 'cp'
-            }
+            'index_entry' => [
+              'cp',
+              8
+            ]
           },
           'info' => {
             'spaces_before_argument' => {
@@ -719,12 +703,10 @@ $result_trees{'encoding_index_ascii'} = {
           'cmdname' => 'cindex',
           'extra' => {
             'element_node' => {},
-            'index_entry' => {
-              'entry_element' => {},
-              'entry_number' => 9,
-              'in_code' => 0,
-              'index_name' => 'cp'
-            }
+            'index_entry' => [
+              'cp',
+              9
+            ]
           },
           'info' => {
             'spaces_before_argument' => {
@@ -758,12 +740,10 @@ $result_trees{'encoding_index_ascii'} = {
           'cmdname' => 'cindex',
           'extra' => {
             'element_node' => {},
-            'index_entry' => {
-              'entry_element' => {},
-              'entry_number' => 10,
-              'in_code' => 0,
-              'index_name' => 'cp'
-            }
+            'index_entry' => [
+              'cp',
+              10
+            ]
           },
           'info' => {
             'spaces_before_argument' => {
@@ -797,12 +777,10 @@ $result_trees{'encoding_index_ascii'} = {
           'cmdname' => 'cindex',
           'extra' => {
             'element_node' => {},
-            'index_entry' => {
-              'entry_element' => {},
-              'entry_number' => 11,
-              'in_code' => 0,
-              'index_name' => 'cp'
-            }
+            'index_entry' => [
+              'cp',
+              11
+            ]
           },
           'info' => {
             'spaces_before_argument' => {
@@ -836,12 +814,10 @@ $result_trees{'encoding_index_ascii'} = {
           'cmdname' => 'cindex',
           'extra' => {
             'element_node' => {},
-            'index_entry' => {
-              'entry_element' => {},
-              'entry_number' => 12,
-              'in_code' => 0,
-              'index_name' => 'cp'
-            }
+            'index_entry' => [
+              'cp',
+              12
+            ]
           },
           'info' => {
             'spaces_before_argument' => {
@@ -875,12 +851,10 @@ $result_trees{'encoding_index_ascii'} = {
           'cmdname' => 'cindex',
           'extra' => {
             'element_node' => {},
-            'index_entry' => {
-              'entry_element' => {},
-              'entry_number' => 13,
-              'in_code' => 0,
-              'index_name' => 'cp'
-            }
+            'index_entry' => [
+              'cp',
+              13
+            ]
           },
           'info' => {
             'spaces_before_argument' => {
@@ -914,12 +888,10 @@ $result_trees{'encoding_index_ascii'} = {
           'cmdname' => 'cindex',
           'extra' => {
             'element_node' => {},
-            'index_entry' => {
-              'entry_element' => {},
-              'entry_number' => 14,
-              'in_code' => 0,
-              'index_name' => 'cp'
-            }
+            'index_entry' => [
+              'cp',
+              14
+            ]
           },
           'info' => {
             'spaces_before_argument' => {
@@ -953,12 +925,10 @@ $result_trees{'encoding_index_ascii'} = {
           'cmdname' => 'cindex',
           'extra' => {
             'element_node' => {},
-            'index_entry' => {
-              'entry_element' => {},
-              'entry_number' => 15,
-              'in_code' => 0,
-              'index_name' => 'cp'
-            }
+            'index_entry' => [
+              'cp',
+              15
+            ]
           },
           'info' => {
             'spaces_before_argument' => {
@@ -992,12 +962,10 @@ $result_trees{'encoding_index_ascii'} = {
           'cmdname' => 'cindex',
           'extra' => {
             'element_node' => {},
-            'index_entry' => {
-              'entry_element' => {},
-              'entry_number' => 16,
-              'in_code' => 0,
-              'index_name' => 'cp'
-            }
+            'index_entry' => [
+              'cp',
+              16
+            ]
           },
           'info' => {
             'spaces_before_argument' => {
@@ -1031,12 +999,10 @@ $result_trees{'encoding_index_ascii'} = {
           'cmdname' => 'cindex',
           'extra' => {
             'element_node' => {},
-            'index_entry' => {
-              'entry_element' => {},
-              'entry_number' => 17,
-              'in_code' => 0,
-              'index_name' => 'cp'
-            }
+            'index_entry' => [
+              'cp',
+              17
+            ]
           },
           'info' => {
             'spaces_before_argument' => {
@@ -1070,12 +1036,10 @@ $result_trees{'encoding_index_ascii'} = {
           'cmdname' => 'cindex',
           'extra' => {
             'element_node' => {},
-            'index_entry' => {
-              'entry_element' => {},
-              'entry_number' => 18,
-              'in_code' => 0,
-              'index_name' => 'cp'
-            }
+            'index_entry' => [
+              'cp',
+              18
+            ]
           },
           'info' => {
             'spaces_before_argument' => {
@@ -1109,12 +1073,10 @@ $result_trees{'encoding_index_ascii'} = {
           'cmdname' => 'cindex',
           'extra' => {
             'element_node' => {},
-            'index_entry' => {
-              'entry_element' => {},
-              'entry_number' => 19,
-              'in_code' => 0,
-              'index_name' => 'cp'
-            }
+            'index_entry' => [
+              'cp',
+              19
+            ]
           },
           'info' => {
             'spaces_before_argument' => {
@@ -1148,12 +1110,10 @@ $result_trees{'encoding_index_ascii'} = {
           'cmdname' => 'cindex',
           'extra' => {
             'element_node' => {},
-            'index_entry' => {
-              'entry_element' => {},
-              'entry_number' => 20,
-              'in_code' => 0,
-              'index_name' => 'cp'
-            }
+            'index_entry' => [
+              'cp',
+              20
+            ]
           },
           'info' => {
             'spaces_before_argument' => {
@@ -1187,12 +1147,10 @@ $result_trees{'encoding_index_ascii'} = {
           'cmdname' => 'cindex',
           'extra' => {
             'element_node' => {},
-            'index_entry' => {
-              'entry_element' => {},
-              'entry_number' => 21,
-              'in_code' => 0,
-              'index_name' => 'cp'
-            }
+            'index_entry' => [
+              'cp',
+              21
+            ]
           },
           'info' => {
             'spaces_before_argument' => {
@@ -1226,12 +1184,10 @@ $result_trees{'encoding_index_ascii'} = {
           'cmdname' => 'cindex',
           'extra' => {
             'element_node' => {},
-            'index_entry' => {
-              'entry_element' => {},
-              'entry_number' => 22,
-              'in_code' => 0,
-              'index_name' => 'cp'
-            }
+            'index_entry' => [
+              'cp',
+              22
+            ]
           },
           'info' => {
             'spaces_before_argument' => {
@@ -1265,12 +1221,10 @@ $result_trees{'encoding_index_ascii'} = {
           'cmdname' => 'cindex',
           'extra' => {
             'element_node' => {},
-            'index_entry' => {
-              'entry_element' => {},
-              'entry_number' => 23,
-              'in_code' => 0,
-              'index_name' => 'cp'
-            }
+            'index_entry' => [
+              'cp',
+              23
+            ]
           },
           'info' => {
             'spaces_before_argument' => {
@@ -1304,12 +1258,10 @@ $result_trees{'encoding_index_ascii'} = {
           'cmdname' => 'cindex',
           'extra' => {
             'element_node' => {},
-            'index_entry' => {
-              'entry_element' => {},
-              'entry_number' => 24,
-              'in_code' => 0,
-              'index_name' => 'cp'
-            }
+            'index_entry' => [
+              'cp',
+              24
+            ]
           },
           'info' => {
             'spaces_before_argument' => {
@@ -1343,12 +1295,10 @@ $result_trees{'encoding_index_ascii'} = {
           'cmdname' => 'cindex',
           'extra' => {
             'element_node' => {},
-            'index_entry' => {
-              'entry_element' => {},
-              'entry_number' => 25,
-              'in_code' => 0,
-              'index_name' => 'cp'
-            }
+            'index_entry' => [
+              'cp',
+              25
+            ]
           },
           'info' => {
             'spaces_before_argument' => {
@@ -1382,12 +1332,10 @@ $result_trees{'encoding_index_ascii'} = {
           'cmdname' => 'cindex',
           'extra' => {
             'element_node' => {},
-            'index_entry' => {
-              'entry_element' => {},
-              'entry_number' => 26,
-              'in_code' => 0,
-              'index_name' => 'cp'
-            }
+            'index_entry' => [
+              'cp',
+              26
+            ]
           },
           'info' => {
             'spaces_before_argument' => {
@@ -1421,12 +1369,10 @@ $result_trees{'encoding_index_ascii'} = {
           'cmdname' => 'cindex',
           'extra' => {
             'element_node' => {},
-            'index_entry' => {
-              'entry_element' => {},
-              'entry_number' => 27,
-              'in_code' => 0,
-              'index_name' => 'cp'
-            }
+            'index_entry' => [
+              'cp',
+              27
+            ]
           },
           'info' => {
             'spaces_before_argument' => {
@@ -1460,12 +1406,10 @@ $result_trees{'encoding_index_ascii'} = {
           'cmdname' => 'cindex',
           'extra' => {
             'element_node' => {},
-            'index_entry' => {
-              'entry_element' => {},
-              'entry_number' => 28,
-              'in_code' => 0,
-              'index_name' => 'cp'
-            }
+            'index_entry' => [
+              'cp',
+              28
+            ]
           },
           'info' => {
             'spaces_before_argument' => {
@@ -1499,12 +1443,10 @@ $result_trees{'encoding_index_ascii'} = {
           'cmdname' => 'cindex',
           'extra' => {
             'element_node' => {},
-            'index_entry' => {
-              'entry_element' => {},
-              'entry_number' => 29,
-              'in_code' => 0,
-              'index_name' => 'cp'
-            }
+            'index_entry' => [
+              'cp',
+              29
+            ]
           },
           'info' => {
             'spaces_before_argument' => {
@@ -1538,12 +1480,10 @@ $result_trees{'encoding_index_ascii'} = {
           'cmdname' => 'cindex',
           'extra' => {
             'element_node' => {},
-            'index_entry' => {
-              'entry_element' => {},
-              'entry_number' => 30,
-              'in_code' => 0,
-              'index_name' => 'cp'
-            }
+            'index_entry' => [
+              'cp',
+              30
+            ]
           },
           'info' => {
             'spaces_before_argument' => {
@@ -1577,12 +1517,10 @@ $result_trees{'encoding_index_ascii'} = {
           'cmdname' => 'cindex',
           'extra' => {
             'element_node' => {},
-            'index_entry' => {
-              'entry_element' => {},
-              'entry_number' => 31,
-              'in_code' => 0,
-              'index_name' => 'cp'
-            }
+            'index_entry' => [
+              'cp',
+              31
+            ]
           },
           'info' => {
             'spaces_before_argument' => {
@@ -1626,12 +1564,10 @@ $result_trees{'encoding_index_ascii'} = {
           'cmdname' => 'cindex',
           'extra' => {
             'element_node' => {},
-            'index_entry' => {
-              'entry_element' => {},
-              'entry_number' => 32,
-              'in_code' => 0,
-              'index_name' => 'cp'
-            }
+            'index_entry' => [
+              'cp',
+              32
+            ]
           },
           'info' => {
             'spaces_before_argument' => {
@@ -1675,12 +1611,10 @@ $result_trees{'encoding_index_ascii'} = {
           'cmdname' => 'cindex',
           'extra' => {
             'element_node' => {},
-            'index_entry' => {
-              'entry_element' => {},
-              'entry_number' => 33,
-              'in_code' => 0,
-              'index_name' => 'cp'
-            }
+            'index_entry' => [
+              'cp',
+              33
+            ]
           },
           'info' => {
             'spaces_before_argument' => {
@@ -1753,12 +1687,10 @@ $result_trees{'encoding_index_ascii'} = {
           'cmdname' => 'cindex',
           'extra' => {
             'element_node' => {},
-            'index_entry' => {
-              'entry_element' => {},
-              'entry_number' => 34,
-              'in_code' => 0,
-              'index_name' => 'cp'
-            }
+            'index_entry' => [
+              'cp',
+              34
+            ]
           },
           'info' => {
             'spaces_before_argument' => {
@@ -1861,12 +1793,10 @@ $result_trees{'encoding_index_ascii'} = {
           'cmdname' => 'cindex',
           'extra' => {
             'element_node' => {},
-            'index_entry' => {
-              'entry_element' => {},
-              'entry_number' => 35,
-              'in_code' => 0,
-              'index_name' => 'cp'
-            }
+            'index_entry' => [
+              'cp',
+              35
+            ]
           },
           'info' => {
             'spaces_before_argument' => {
@@ -1910,12 +1840,10 @@ $result_trees{'encoding_index_ascii'} = {
           'cmdname' => 'cindex',
           'extra' => {
             'element_node' => {},
-            'index_entry' => {
-              'entry_element' => {},
-              'entry_number' => 36,
-              'in_code' => 0,
-              'index_name' => 'cp'
-            }
+            'index_entry' => [
+              'cp',
+              36
+            ]
           },
           'info' => {
             'spaces_before_argument' => {
@@ -1959,12 +1887,10 @@ $result_trees{'encoding_index_ascii'} = {
           'cmdname' => 'cindex',
           'extra' => {
             'element_node' => {},
-            'index_entry' => {
-              'entry_element' => {},
-              'entry_number' => 37,
-              'in_code' => 0,
-              'index_name' => 'cp'
-            }
+            'index_entry' => [
+              'cp',
+              37
+            ]
           },
           'info' => {
             'spaces_before_argument' => {
@@ -2008,12 +1934,10 @@ $result_trees{'encoding_index_ascii'} = {
           'cmdname' => 'cindex',
           'extra' => {
             'element_node' => {},
-            'index_entry' => {
-              'entry_element' => {},
-              'entry_number' => 38,
-              'in_code' => 0,
-              'index_name' => 'cp'
-            }
+            'index_entry' => [
+              'cp',
+              38
+            ]
           },
           'info' => {
             'spaces_before_argument' => {
@@ -2057,12 +1981,10 @@ $result_trees{'encoding_index_ascii'} = {
           'cmdname' => 'cindex',
           'extra' => {
             'element_node' => {},
-            'index_entry' => {
-              'entry_element' => {},
-              'entry_number' => 39,
-              'in_code' => 0,
-              'index_name' => 'cp'
-            }
+            'index_entry' => [
+              'cp',
+              39
+            ]
           },
           'info' => {
             'spaces_before_argument' => {
@@ -2106,12 +2028,10 @@ $result_trees{'encoding_index_ascii'} = {
           'cmdname' => 'cindex',
           'extra' => {
             'element_node' => {},
-            'index_entry' => {
-              'entry_element' => {},
-              'entry_number' => 40,
-              'in_code' => 0,
-              'index_name' => 'cp'
-            }
+            'index_entry' => [
+              'cp',
+              40
+            ]
           },
           'info' => {
             'spaces_before_argument' => {
@@ -2155,12 +2075,10 @@ $result_trees{'encoding_index_ascii'} = {
           'cmdname' => 'cindex',
           'extra' => {
             'element_node' => {},
-            'index_entry' => {
-              'entry_element' => {},
-              'entry_number' => 41,
-              'in_code' => 0,
-              'index_name' => 'cp'
-            }
+            'index_entry' => [
+              'cp',
+              41
+            ]
           },
           'info' => {
             'spaces_before_argument' => {
@@ -2204,12 +2122,10 @@ $result_trees{'encoding_index_ascii'} = {
           'cmdname' => 'cindex',
           'extra' => {
             'element_node' => {},
-            'index_entry' => {
-              'entry_element' => {},
-              'entry_number' => 42,
-              'in_code' => 0,
-              'index_name' => 'cp'
-            }
+            'index_entry' => [
+              'cp',
+              42
+            ]
           },
           'info' => {
             'spaces_before_argument' => {
@@ -2243,12 +2159,10 @@ $result_trees{'encoding_index_ascii'} = {
           'cmdname' => 'cindex',
           'extra' => {
             'element_node' => {},
-            'index_entry' => {
-              'entry_element' => {},
-              'entry_number' => 43,
-              'in_code' => 0,
-              'index_name' => 'cp'
-            }
+            'index_entry' => [
+              'cp',
+              43
+            ]
           },
           'info' => {
             'spaces_before_argument' => {
@@ -2282,12 +2196,10 @@ $result_trees{'encoding_index_ascii'} = {
           'cmdname' => 'cindex',
           'extra' => {
             'element_node' => {},
-            'index_entry' => {
-              'entry_element' => {},
-              'entry_number' => 44,
-              'in_code' => 0,
-              'index_name' => 'cp'
-            }
+            'index_entry' => [
+              'cp',
+              44
+            ]
           },
           'info' => {
             'spaces_before_argument' => {
@@ -2331,12 +2243,10 @@ $result_trees{'encoding_index_ascii'} = {
           'cmdname' => 'cindex',
           'extra' => {
             'element_node' => {},
-            'index_entry' => {
-              'entry_element' => {},
-              'entry_number' => 45,
-              'in_code' => 0,
-              'index_name' => 'cp'
-            }
+            'index_entry' => [
+              'cp',
+              45
+            ]
           },
           'info' => {
             'spaces_before_argument' => {
@@ -2380,12 +2290,10 @@ $result_trees{'encoding_index_ascii'} = {
           'cmdname' => 'cindex',
           'extra' => {
             'element_node' => {},
-            'index_entry' => {
-              'entry_element' => {},
-              'entry_number' => 46,
-              'in_code' => 0,
-              'index_name' => 'cp'
-            }
+            'index_entry' => [
+              'cp',
+              46
+            ]
           },
           'info' => {
             'spaces_before_argument' => {
@@ -2429,12 +2337,10 @@ $result_trees{'encoding_index_ascii'} = {
           'cmdname' => 'cindex',
           'extra' => {
             'element_node' => {},
-            'index_entry' => {
-              'entry_element' => {},
-              'entry_number' => 47,
-              'in_code' => 0,
-              'index_name' => 'cp'
-            }
+            'index_entry' => [
+              'cp',
+              47
+            ]
           },
           'info' => {
             'spaces_before_argument' => {
@@ -2468,12 +2374,10 @@ $result_trees{'encoding_index_ascii'} = {
           'cmdname' => 'cindex',
           'extra' => {
             'element_node' => {},
-            'index_entry' => {
-              'entry_element' => {},
-              'entry_number' => 48,
-              'in_code' => 0,
-              'index_name' => 'cp'
-            }
+            'index_entry' => [
+              'cp',
+              48
+            ]
           },
           'info' => {
             'spaces_before_argument' => {
@@ -2507,12 +2411,10 @@ $result_trees{'encoding_index_ascii'} = {
           'cmdname' => 'cindex',
           'extra' => {
             'element_node' => {},
-            'index_entry' => {
-              'entry_element' => {},
-              'entry_number' => 49,
-              'in_code' => 0,
-              'index_name' => 'cp'
-            }
+            'index_entry' => [
+              'cp',
+              49
+            ]
           },
           'info' => {
             'spaces_before_argument' => {
@@ -2546,12 +2448,10 @@ $result_trees{'encoding_index_ascii'} = {
           'cmdname' => 'cindex',
           'extra' => {
             'element_node' => {},
-            'index_entry' => {
-              'entry_element' => {},
-              'entry_number' => 50,
-              'in_code' => 0,
-              'index_name' => 'cp'
-            }
+            'index_entry' => [
+              'cp',
+              50
+            ]
           },
           'info' => {
             'spaces_before_argument' => {
@@ -2585,12 +2485,10 @@ $result_trees{'encoding_index_ascii'} = {
           'cmdname' => 'cindex',
           'extra' => {
             'element_node' => {},
-            'index_entry' => {
-              'entry_element' => {},
-              'entry_number' => 51,
-              'in_code' => 0,
-              'index_name' => 'cp'
-            }
+            'index_entry' => [
+              'cp',
+              51
+            ]
           },
           'info' => {
             'spaces_before_argument' => {
@@ -2624,12 +2522,10 @@ $result_trees{'encoding_index_ascii'} = {
           'cmdname' => 'cindex',
           'extra' => {
             'element_node' => {},
-            'index_entry' => {
-              'entry_element' => {},
-              'entry_number' => 52,
-              'in_code' => 0,
-              'index_name' => 'cp'
-            }
+            'index_entry' => [
+              'cp',
+              52
+            ]
           },
           'info' => {
             'spaces_before_argument' => {
@@ -2663,12 +2559,10 @@ $result_trees{'encoding_index_ascii'} = {
           'cmdname' => 'cindex',
           'extra' => {
             'element_node' => {},
-            'index_entry' => {
-              'entry_element' => {},
-              'entry_number' => 53,
-              'in_code' => 0,
-              'index_name' => 'cp'
-            }
+            'index_entry' => [
+              'cp',
+              53
+            ]
           },
           'info' => {
             'spaces_before_argument' => {
@@ -2702,12 +2596,10 @@ $result_trees{'encoding_index_ascii'} = {
           'cmdname' => 'cindex',
           'extra' => {
             'element_node' => {},
-            'index_entry' => {
-              'entry_element' => {},
-              'entry_number' => 54,
-              'in_code' => 0,
-              'index_name' => 'cp'
-            }
+            'index_entry' => [
+              'cp',
+              54
+            ]
           },
           'info' => {
             'spaces_before_argument' => {
@@ -2741,12 +2633,10 @@ $result_trees{'encoding_index_ascii'} = {
           'cmdname' => 'cindex',
           'extra' => {
             'element_node' => {},
-            'index_entry' => {
-              'entry_element' => {},
-              'entry_number' => 55,
-              'in_code' => 0,
-              'index_name' => 'cp'
-            }
+            'index_entry' => [
+              'cp',
+              55
+            ]
           },
           'info' => {
             'spaces_before_argument' => {
@@ -2819,115 +2709,60 @@ $result_trees{'encoding_index_ascii'} = {
   'type' => 'document_root'
 };
 
$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'}{'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'}{'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'}{'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'}{'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'}{'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'}{'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'}{'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'}{'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'}{'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'}{'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'}{'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'}{'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'}{'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'}{'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'}{'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'}{'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'}{'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'}{'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'}{'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'}{'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'}{'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'}{'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'}{'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'}{'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'}{'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'}{'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'}{'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'}{'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'}{'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'}{'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'}{'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'}{'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'}{'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'}{'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'}{'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'}{'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'}{'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'}{'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'}{'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'}{'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'}{'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'}{'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'}{'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'}{'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'}{'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'}{'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'}{'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'}{'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'}{'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'}{'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'}{'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'}{'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'}{'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'}{'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_texis{'encoding_index_ascii'} = '
 @setfilename encoding_index_ascii.info
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 49cc76226a..bc2b73d1da 100644
--- a/tp/t/results/indices/encoding_index_ascii_enable_encoding.pl
+++ b/tp/t/results/indices/encoding_index_ascii_enable_encoding.pl
@@ -245,12 +245,10 @@ $result_trees{'encoding_index_ascii_enable_encoding'} = {
           'cmdname' => 'cindex',
           'extra' => {
             'element_node' => {},
-            'index_entry' => {
-              'entry_element' => {},
-              'entry_number' => 1,
-              'in_code' => 0,
-              'index_name' => 'cp'
-            }
+            'index_entry' => [
+              'cp',
+              1
+            ]
           },
           'info' => {
             'spaces_before_argument' => {
@@ -356,12 +354,10 @@ $result_trees{'encoding_index_ascii_enable_encoding'} = {
           'cmdname' => 'cindex',
           'extra' => {
             'element_node' => {},
-            'index_entry' => {
-              'entry_element' => {},
-              'entry_number' => 2,
-              'in_code' => 0,
-              'index_name' => 'cp'
-            }
+            'index_entry' => [
+              'cp',
+              2
+            ]
           },
           'info' => {
             'spaces_before_argument' => {
@@ -485,12 +481,10 @@ $result_trees{'encoding_index_ascii_enable_encoding'} = {
           'cmdname' => 'cindex',
           'extra' => {
             'element_node' => {},
-            'index_entry' => {
-              'entry_element' => {},
-              'entry_number' => 3,
-              'in_code' => 0,
-              'index_name' => 'cp'
-            }
+            'index_entry' => [
+              'cp',
+              3
+            ]
           },
           'info' => {
             'spaces_before_argument' => {
@@ -524,12 +518,10 @@ $result_trees{'encoding_index_ascii_enable_encoding'} = {
           'cmdname' => 'cindex',
           'extra' => {
             'element_node' => {},
-            'index_entry' => {
-              'entry_element' => {},
-              'entry_number' => 4,
-              'in_code' => 0,
-              'index_name' => 'cp'
-            }
+            'index_entry' => [
+              'cp',
+              4
+            ]
           },
           'info' => {
             'spaces_before_argument' => {
@@ -563,12 +555,10 @@ $result_trees{'encoding_index_ascii_enable_encoding'} = {
           'cmdname' => 'cindex',
           'extra' => {
             'element_node' => {},
-            'index_entry' => {
-              'entry_element' => {},
-              'entry_number' => 5,
-              'in_code' => 0,
-              'index_name' => 'cp'
-            }
+            'index_entry' => [
+              'cp',
+              5
+            ]
           },
           'info' => {
             'spaces_before_argument' => {
@@ -602,12 +592,10 @@ $result_trees{'encoding_index_ascii_enable_encoding'} = {
           'cmdname' => 'cindex',
           'extra' => {
             'element_node' => {},
-            'index_entry' => {
-              'entry_element' => {},
-              'entry_number' => 6,
-              'in_code' => 0,
-              'index_name' => 'cp'
-            }
+            'index_entry' => [
+              'cp',
+              6
+            ]
           },
           'info' => {
             'spaces_before_argument' => {
@@ -641,12 +629,10 @@ $result_trees{'encoding_index_ascii_enable_encoding'} = {
           'cmdname' => 'cindex',
           'extra' => {
             'element_node' => {},
-            'index_entry' => {
-              'entry_element' => {},
-              'entry_number' => 7,
-              'in_code' => 0,
-              'index_name' => 'cp'
-            }
+            'index_entry' => [
+              'cp',
+              7
+            ]
           },
           'info' => {
             'spaces_before_argument' => {
@@ -680,12 +666,10 @@ $result_trees{'encoding_index_ascii_enable_encoding'} = {
           'cmdname' => 'cindex',
           'extra' => {
             'element_node' => {},
-            'index_entry' => {
-              'entry_element' => {},
-              'entry_number' => 8,
-              'in_code' => 0,
-              'index_name' => 'cp'
-            }
+            'index_entry' => [
+              'cp',
+              8
+            ]
           },
           'info' => {
             'spaces_before_argument' => {
@@ -719,12 +703,10 @@ $result_trees{'encoding_index_ascii_enable_encoding'} = {
           'cmdname' => 'cindex',
           'extra' => {
             'element_node' => {},
-            'index_entry' => {
-              'entry_element' => {},
-              'entry_number' => 9,
-              'in_code' => 0,
-              'index_name' => 'cp'
-            }
+            'index_entry' => [
+              'cp',
+              9
+            ]
           },
           'info' => {
             'spaces_before_argument' => {
@@ -758,12 +740,10 @@ $result_trees{'encoding_index_ascii_enable_encoding'} = {
           'cmdname' => 'cindex',
           'extra' => {
             'element_node' => {},
-            'index_entry' => {
-              'entry_element' => {},
-              'entry_number' => 10,
-              'in_code' => 0,
-              'index_name' => 'cp'
-            }
+            'index_entry' => [
+              'cp',
+              10
+            ]
           },
           'info' => {
             'spaces_before_argument' => {
@@ -797,12 +777,10 @@ $result_trees{'encoding_index_ascii_enable_encoding'} = {
           'cmdname' => 'cindex',
           'extra' => {
             'element_node' => {},
-            'index_entry' => {
-              'entry_element' => {},
-              'entry_number' => 11,
-              'in_code' => 0,
-              'index_name' => 'cp'
-            }
+            'index_entry' => [
+              'cp',
+              11
+            ]
           },
           'info' => {
             'spaces_before_argument' => {
@@ -836,12 +814,10 @@ $result_trees{'encoding_index_ascii_enable_encoding'} = {
           'cmdname' => 'cindex',
           'extra' => {
             'element_node' => {},
-            'index_entry' => {
-              'entry_element' => {},
-              'entry_number' => 12,
-              'in_code' => 0,
-              'index_name' => 'cp'
-            }
+            'index_entry' => [
+              'cp',
+              12
+            ]
           },
           'info' => {
             'spaces_before_argument' => {
@@ -875,12 +851,10 @@ $result_trees{'encoding_index_ascii_enable_encoding'} = {
           'cmdname' => 'cindex',
           'extra' => {
             'element_node' => {},
-            'index_entry' => {
-              'entry_element' => {},
-              'entry_number' => 13,
-              'in_code' => 0,
-              'index_name' => 'cp'
-            }
+            'index_entry' => [
+              'cp',
+              13
+            ]
           },
           'info' => {
             'spaces_before_argument' => {
@@ -914,12 +888,10 @@ $result_trees{'encoding_index_ascii_enable_encoding'} = {
           'cmdname' => 'cindex',
           'extra' => {
             'element_node' => {},
-            'index_entry' => {
-              'entry_element' => {},
-              'entry_number' => 14,
-              'in_code' => 0,
-              'index_name' => 'cp'
-            }
+            'index_entry' => [
+              'cp',
+              14
+            ]
           },
           'info' => {
             'spaces_before_argument' => {
@@ -953,12 +925,10 @@ $result_trees{'encoding_index_ascii_enable_encoding'} = {
           'cmdname' => 'cindex',
           'extra' => {
             'element_node' => {},
-            'index_entry' => {
-              'entry_element' => {},
-              'entry_number' => 15,
-              'in_code' => 0,
-              'index_name' => 'cp'
-            }
+            'index_entry' => [
+              'cp',
+              15
+            ]
           },
           'info' => {
             'spaces_before_argument' => {
@@ -992,12 +962,10 @@ $result_trees{'encoding_index_ascii_enable_encoding'} = {
           'cmdname' => 'cindex',
           'extra' => {
             'element_node' => {},
-            'index_entry' => {
-              'entry_element' => {},
-              'entry_number' => 16,
-              'in_code' => 0,
-              'index_name' => 'cp'
-            }
+            'index_entry' => [
+              'cp',
+              16
+            ]
           },
           'info' => {
             'spaces_before_argument' => {
@@ -1031,12 +999,10 @@ $result_trees{'encoding_index_ascii_enable_encoding'} = {
           'cmdname' => 'cindex',
           'extra' => {
             'element_node' => {},
-            'index_entry' => {
-              'entry_element' => {},
-              'entry_number' => 17,
-              'in_code' => 0,
-              'index_name' => 'cp'
-            }
+            'index_entry' => [
+              'cp',
+              17
+            ]
           },
           'info' => {
             'spaces_before_argument' => {
@@ -1070,12 +1036,10 @@ $result_trees{'encoding_index_ascii_enable_encoding'} = 
{
           'cmdname' => 'cindex',
           'extra' => {
             'element_node' => {},
-            'index_entry' => {
-              'entry_element' => {},
-              'entry_number' => 18,
-              'in_code' => 0,
-              'index_name' => 'cp'
-            }
+            'index_entry' => [
+              'cp',
+              18
+            ]
           },
           'info' => {
             'spaces_before_argument' => {
@@ -1109,12 +1073,10 @@ $result_trees{'encoding_index_ascii_enable_encoding'} = 
{
           'cmdname' => 'cindex',
           'extra' => {
             'element_node' => {},
-            'index_entry' => {
-              'entry_element' => {},
-              'entry_number' => 19,
-              'in_code' => 0,
-              'index_name' => 'cp'
-            }
+            'index_entry' => [
+              'cp',
+              19
+            ]
           },
           'info' => {
             'spaces_before_argument' => {
@@ -1148,12 +1110,10 @@ $result_trees{'encoding_index_ascii_enable_encoding'} = 
{
           'cmdname' => 'cindex',
           'extra' => {
             'element_node' => {},
-            'index_entry' => {
-              'entry_element' => {},
-              'entry_number' => 20,
-              'in_code' => 0,
-              'index_name' => 'cp'
-            }
+            'index_entry' => [
+              'cp',
+              20
+            ]
           },
           'info' => {
             'spaces_before_argument' => {
@@ -1187,12 +1147,10 @@ $result_trees{'encoding_index_ascii_enable_encoding'} = 
{
           'cmdname' => 'cindex',
           'extra' => {
             'element_node' => {},
-            'index_entry' => {
-              'entry_element' => {},
-              'entry_number' => 21,
-              'in_code' => 0,
-              'index_name' => 'cp'
-            }
+            'index_entry' => [
+              'cp',
+              21
+            ]
           },
           'info' => {
             'spaces_before_argument' => {
@@ -1226,12 +1184,10 @@ $result_trees{'encoding_index_ascii_enable_encoding'} = 
{
           'cmdname' => 'cindex',
           'extra' => {
             'element_node' => {},
-            'index_entry' => {
-              'entry_element' => {},
-              'entry_number' => 22,
-              'in_code' => 0,
-              'index_name' => 'cp'
-            }
+            'index_entry' => [
+              'cp',
+              22
+            ]
           },
           'info' => {
             'spaces_before_argument' => {
@@ -1265,12 +1221,10 @@ $result_trees{'encoding_index_ascii_enable_encoding'} = 
{
           'cmdname' => 'cindex',
           'extra' => {
             'element_node' => {},
-            'index_entry' => {
-              'entry_element' => {},
-              'entry_number' => 23,
-              'in_code' => 0,
-              'index_name' => 'cp'
-            }
+            'index_entry' => [
+              'cp',
+              23
+            ]
           },
           'info' => {
             'spaces_before_argument' => {
@@ -1304,12 +1258,10 @@ $result_trees{'encoding_index_ascii_enable_encoding'} = 
{
           'cmdname' => 'cindex',
           'extra' => {
             'element_node' => {},
-            'index_entry' => {
-              'entry_element' => {},
-              'entry_number' => 24,
-              'in_code' => 0,
-              'index_name' => 'cp'
-            }
+            'index_entry' => [
+              'cp',
+              24
+            ]
           },
           'info' => {
             'spaces_before_argument' => {
@@ -1343,12 +1295,10 @@ $result_trees{'encoding_index_ascii_enable_encoding'} = 
{
           'cmdname' => 'cindex',
           'extra' => {
             'element_node' => {},
-            'index_entry' => {
-              'entry_element' => {},
-              'entry_number' => 25,
-              'in_code' => 0,
-              'index_name' => 'cp'
-            }
+            'index_entry' => [
+              'cp',
+              25
+            ]
           },
           'info' => {
             'spaces_before_argument' => {
@@ -1382,12 +1332,10 @@ $result_trees{'encoding_index_ascii_enable_encoding'} = 
{
           'cmdname' => 'cindex',
           'extra' => {
             'element_node' => {},
-            'index_entry' => {
-              'entry_element' => {},
-              'entry_number' => 26,
-              'in_code' => 0,
-              'index_name' => 'cp'
-            }
+            'index_entry' => [
+              'cp',
+              26
+            ]
           },
           'info' => {
             'spaces_before_argument' => {
@@ -1421,12 +1369,10 @@ $result_trees{'encoding_index_ascii_enable_encoding'} = 
{
           'cmdname' => 'cindex',
           'extra' => {
             'element_node' => {},
-            'index_entry' => {
-              'entry_element' => {},
-              'entry_number' => 27,
-              'in_code' => 0,
-              'index_name' => 'cp'
-            }
+            'index_entry' => [
+              'cp',
+              27
+            ]
           },
           'info' => {
             'spaces_before_argument' => {
@@ -1460,12 +1406,10 @@ $result_trees{'encoding_index_ascii_enable_encoding'} = 
{
           'cmdname' => 'cindex',
           'extra' => {
             'element_node' => {},
-            'index_entry' => {
-              'entry_element' => {},
-              'entry_number' => 28,
-              'in_code' => 0,
-              'index_name' => 'cp'
-            }
+            'index_entry' => [
+              'cp',
+              28
+            ]
           },
           'info' => {
             'spaces_before_argument' => {
@@ -1499,12 +1443,10 @@ $result_trees{'encoding_index_ascii_enable_encoding'} = 
{
           'cmdname' => 'cindex',
           'extra' => {
             'element_node' => {},
-            'index_entry' => {
-              'entry_element' => {},
-              'entry_number' => 29,
-              'in_code' => 0,
-              'index_name' => 'cp'
-            }
+            'index_entry' => [
+              'cp',
+              29
+            ]
           },
           'info' => {
             'spaces_before_argument' => {
@@ -1538,12 +1480,10 @@ $result_trees{'encoding_index_ascii_enable_encoding'} = 
{
           'cmdname' => 'cindex',
           'extra' => {
             'element_node' => {},
-            'index_entry' => {
-              'entry_element' => {},
-              'entry_number' => 30,
-              'in_code' => 0,
-              'index_name' => 'cp'
-            }
+            'index_entry' => [
+              'cp',
+              30
+            ]
           },
           'info' => {
             'spaces_before_argument' => {
@@ -1577,12 +1517,10 @@ $result_trees{'encoding_index_ascii_enable_encoding'} = 
{
           'cmdname' => 'cindex',
           'extra' => {
             'element_node' => {},
-            'index_entry' => {
-              'entry_element' => {},
-              'entry_number' => 31,
-              'in_code' => 0,
-              'index_name' => 'cp'
-            }
+            'index_entry' => [
+              'cp',
+              31
+            ]
           },
           'info' => {
             'spaces_before_argument' => {
@@ -1626,12 +1564,10 @@ $result_trees{'encoding_index_ascii_enable_encoding'} = 
{
           'cmdname' => 'cindex',
           'extra' => {
             'element_node' => {},
-            'index_entry' => {
-              'entry_element' => {},
-              'entry_number' => 32,
-              'in_code' => 0,
-              'index_name' => 'cp'
-            }
+            'index_entry' => [
+              'cp',
+              32
+            ]
           },
           'info' => {
             'spaces_before_argument' => {
@@ -1675,12 +1611,10 @@ $result_trees{'encoding_index_ascii_enable_encoding'} = 
{
           'cmdname' => 'cindex',
           'extra' => {
             'element_node' => {},
-            'index_entry' => {
-              'entry_element' => {},
-              'entry_number' => 33,
-              'in_code' => 0,
-              'index_name' => 'cp'
-            }
+            'index_entry' => [
+              'cp',
+              33
+            ]
           },
           'info' => {
             'spaces_before_argument' => {
@@ -1753,12 +1687,10 @@ $result_trees{'encoding_index_ascii_enable_encoding'} = 
{
           'cmdname' => 'cindex',
           'extra' => {
             'element_node' => {},
-            'index_entry' => {
-              'entry_element' => {},
-              'entry_number' => 34,
-              'in_code' => 0,
-              'index_name' => 'cp'
-            }
+            'index_entry' => [
+              'cp',
+              34
+            ]
           },
           'info' => {
             'spaces_before_argument' => {
@@ -1861,12 +1793,10 @@ $result_trees{'encoding_index_ascii_enable_encoding'} = 
{
           'cmdname' => 'cindex',
           'extra' => {
             'element_node' => {},
-            'index_entry' => {
-              'entry_element' => {},
-              'entry_number' => 35,
-              'in_code' => 0,
-              'index_name' => 'cp'
-            }
+            'index_entry' => [
+              'cp',
+              35
+            ]
           },
           'info' => {
             'spaces_before_argument' => {
@@ -1910,12 +1840,10 @@ $result_trees{'encoding_index_ascii_enable_encoding'} = 
{
           'cmdname' => 'cindex',
           'extra' => {
             'element_node' => {},
-            'index_entry' => {
-              'entry_element' => {},
-              'entry_number' => 36,
-              'in_code' => 0,
-              'index_name' => 'cp'
-            }
+            'index_entry' => [
+              'cp',
+              36
+            ]
           },
           'info' => {
             'spaces_before_argument' => {
@@ -1959,12 +1887,10 @@ $result_trees{'encoding_index_ascii_enable_encoding'} = 
{
           'cmdname' => 'cindex',
           'extra' => {
             'element_node' => {},
-            'index_entry' => {
-              'entry_element' => {},
-              'entry_number' => 37,
-              'in_code' => 0,
-              'index_name' => 'cp'
-            }
+            'index_entry' => [
+              'cp',
+              37
+            ]
           },
           'info' => {
             'spaces_before_argument' => {
@@ -2008,12 +1934,10 @@ $result_trees{'encoding_index_ascii_enable_encoding'} = 
{
           'cmdname' => 'cindex',
           'extra' => {
             'element_node' => {},
-            'index_entry' => {
-              'entry_element' => {},
-              'entry_number' => 38,
-              'in_code' => 0,
-              'index_name' => 'cp'
-            }
+            'index_entry' => [
+              'cp',
+              38
+            ]
           },
           'info' => {
             'spaces_before_argument' => {
@@ -2057,12 +1981,10 @@ $result_trees{'encoding_index_ascii_enable_encoding'} = 
{
           'cmdname' => 'cindex',
           'extra' => {
             'element_node' => {},
-            'index_entry' => {
-              'entry_element' => {},
-              'entry_number' => 39,
-              'in_code' => 0,
-              'index_name' => 'cp'
-            }
+            'index_entry' => [
+              'cp',
+              39
+            ]
           },
           'info' => {
             'spaces_before_argument' => {
@@ -2106,12 +2028,10 @@ $result_trees{'encoding_index_ascii_enable_encoding'} = 
{
           'cmdname' => 'cindex',
           'extra' => {
             'element_node' => {},
-            'index_entry' => {
-              'entry_element' => {},
-              'entry_number' => 40,
-              'in_code' => 0,
-              'index_name' => 'cp'
-            }
+            'index_entry' => [
+              'cp',
+              40
+            ]
           },
           'info' => {
             'spaces_before_argument' => {
@@ -2155,12 +2075,10 @@ $result_trees{'encoding_index_ascii_enable_encoding'} = 
{
           'cmdname' => 'cindex',
           'extra' => {
             'element_node' => {},
-            'index_entry' => {
-              'entry_element' => {},
-              'entry_number' => 41,
-              'in_code' => 0,
-              'index_name' => 'cp'
-            }
+            'index_entry' => [
+              'cp',
+              41
+            ]
           },
           'info' => {
             'spaces_before_argument' => {
@@ -2204,12 +2122,10 @@ $result_trees{'encoding_index_ascii_enable_encoding'} = 
{
           'cmdname' => 'cindex',
           'extra' => {
             'element_node' => {},
-            'index_entry' => {
-              'entry_element' => {},
-              'entry_number' => 42,
-              'in_code' => 0,
-              'index_name' => 'cp'
-            }
+            'index_entry' => [
+              'cp',
+              42
+            ]
           },
           'info' => {
             'spaces_before_argument' => {
@@ -2243,12 +2159,10 @@ $result_trees{'encoding_index_ascii_enable_encoding'} = 
{
           'cmdname' => 'cindex',
           'extra' => {
             'element_node' => {},
-            'index_entry' => {
-              'entry_element' => {},
-              'entry_number' => 43,
-              'in_code' => 0,
-              'index_name' => 'cp'
-            }
+            'index_entry' => [
+              'cp',
+              43
+            ]
           },
           'info' => {
             'spaces_before_argument' => {
@@ -2282,12 +2196,10 @@ $result_trees{'encoding_index_ascii_enable_encoding'} = 
{
           'cmdname' => 'cindex',
           'extra' => {
             'element_node' => {},
-            'index_entry' => {
-              'entry_element' => {},
-              'entry_number' => 44,
-              'in_code' => 0,
-              'index_name' => 'cp'
-            }
+            'index_entry' => [
+              'cp',
+              44
+            ]
           },
           'info' => {
             'spaces_before_argument' => {
@@ -2331,12 +2243,10 @@ $result_trees{'encoding_index_ascii_enable_encoding'} = 
{
           'cmdname' => 'cindex',
           'extra' => {
             'element_node' => {},
-            'index_entry' => {
-              'entry_element' => {},
-              'entry_number' => 45,
-              'in_code' => 0,
-              'index_name' => 'cp'
-            }
+            'index_entry' => [
+              'cp',
+              45
+            ]
           },
           'info' => {
             'spaces_before_argument' => {
@@ -2380,12 +2290,10 @@ $result_trees{'encoding_index_ascii_enable_encoding'} = 
{
           'cmdname' => 'cindex',
           'extra' => {
             'element_node' => {},
-            'index_entry' => {
-              'entry_element' => {},
-              'entry_number' => 46,
-              'in_code' => 0,
-              'index_name' => 'cp'
-            }
+            'index_entry' => [
+              'cp',
+              46
+            ]
           },
           'info' => {
             'spaces_before_argument' => {
@@ -2429,12 +2337,10 @@ $result_trees{'encoding_index_ascii_enable_encoding'} = 
{
           'cmdname' => 'cindex',
           'extra' => {
             'element_node' => {},
-            'index_entry' => {
-              'entry_element' => {},
-              'entry_number' => 47,
-              'in_code' => 0,
-              'index_name' => 'cp'
-            }
+            'index_entry' => [
+              'cp',
+              47
+            ]
           },
           'info' => {
             'spaces_before_argument' => {
@@ -2468,12 +2374,10 @@ $result_trees{'encoding_index_ascii_enable_encoding'} = 
{
           'cmdname' => 'cindex',
           'extra' => {
             'element_node' => {},
-            'index_entry' => {
-              'entry_element' => {},
-              'entry_number' => 48,
-              'in_code' => 0,
-              'index_name' => 'cp'
-            }
+            'index_entry' => [
+              'cp',
+              48
+            ]
           },
           'info' => {
             'spaces_before_argument' => {
@@ -2507,12 +2411,10 @@ $result_trees{'encoding_index_ascii_enable_encoding'} = 
{
           'cmdname' => 'cindex',
           'extra' => {
             'element_node' => {},
-            'index_entry' => {
-              'entry_element' => {},
-              'entry_number' => 49,
-              'in_code' => 0,
-              'index_name' => 'cp'
-            }
+            'index_entry' => [
+              'cp',
+              49
+            ]
           },
           'info' => {
             'spaces_before_argument' => {
@@ -2546,12 +2448,10 @@ $result_trees{'encoding_index_ascii_enable_encoding'} = 
{
           'cmdname' => 'cindex',
           'extra' => {
             'element_node' => {},
-            'index_entry' => {
-              'entry_element' => {},
-              'entry_number' => 50,
-              'in_code' => 0,
-              'index_name' => 'cp'
-            }
+            'index_entry' => [
+              'cp',
+              50
+            ]
           },
           'info' => {
             'spaces_before_argument' => {
@@ -2585,12 +2485,10 @@ $result_trees{'encoding_index_ascii_enable_encoding'} = 
{
           'cmdname' => 'cindex',
           'extra' => {
             'element_node' => {},
-            'index_entry' => {
-              'entry_element' => {},
-              'entry_number' => 51,
-              'in_code' => 0,
-              'index_name' => 'cp'
-            }
+            'index_entry' => [
+              'cp',
+              51
+            ]
           },
           'info' => {
             'spaces_before_argument' => {
@@ -2624,12 +2522,10 @@ $result_trees{'encoding_index_ascii_enable_encoding'} = 
{
           'cmdname' => 'cindex',
           'extra' => {
             'element_node' => {},
-            'index_entry' => {
-              'entry_element' => {},
-              'entry_number' => 52,
-              'in_code' => 0,
-              'index_name' => 'cp'
-            }
+            'index_entry' => [
+              'cp',
+              52
+            ]
           },
           'info' => {
             'spaces_before_argument' => {
@@ -2663,12 +2559,10 @@ $result_trees{'encoding_index_ascii_enable_encoding'} = 
{
           'cmdname' => 'cindex',
           'extra' => {
             'element_node' => {},
-            'index_entry' => {
-              'entry_element' => {},
-              'entry_number' => 53,
-              'in_code' => 0,
-              'index_name' => 'cp'
-            }
+            'index_entry' => [
+              'cp',
+              53
+            ]
           },
           'info' => {
             'spaces_before_argument' => {
@@ -2702,12 +2596,10 @@ $result_trees{'encoding_index_ascii_enable_encoding'} = 
{
           'cmdname' => 'cindex',
           'extra' => {
             'element_node' => {},
-            'index_entry' => {
-              'entry_element' => {},
-              'entry_number' => 54,
-              'in_code' => 0,
-              'index_name' => 'cp'
-            }
+            'index_entry' => [
+              'cp',
+              54
+            ]
           },
           'info' => {
             'spaces_before_argument' => {
@@ -2741,12 +2633,10 @@ $result_trees{'encoding_index_ascii_enable_encoding'} = 
{
           'cmdname' => 'cindex',
           'extra' => {
             'element_node' => {},
-            'index_entry' => {
-              'entry_element' => {},
-              'entry_number' => 55,
-              'in_code' => 0,
-              'index_name' => 'cp'
-            }
+            'index_entry' => [
+              'cp',
+              55
+            ]
           },
           'info' => {
             'spaces_before_argument' => {
@@ -2819,115 +2709,60 @@ $result_trees{'encoding_index_ascii_enable_encoding'} 
= {
   'type' => 'document_root'
 };
 
$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'}{'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'}{'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'}{'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'}{'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'}{'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'}{'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'}{'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'}{'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'}{'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'}{'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'}{'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'}{'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'}{'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'}{'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'}{'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'}{'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'}{'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'}{'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'}{'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'}{'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'}{'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'}{'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'}{'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'}{'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'}{'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'}{'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'}{'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'}{'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'}{'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'}{'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'}{'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'}{'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'}{'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'}{'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'}{'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'}{'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'}{'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'}{'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'}{'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'}{'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'}{'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'}{'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'}{'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'}{'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'}{'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'}{'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'}{'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'}{'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'}{'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'}{'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'}{'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'}{'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'}{'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'}{'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_texis{'encoding_index_ascii_enable_encoding'} = '
 @setfilename encoding_index_ascii_enable_encoding.info
diff --git a/tp/t/results/indices/encoding_index_latin1.pl 
b/tp/t/results/indices/encoding_index_latin1.pl
index 28dd43a2e9..2b2d90e9fe 100644
--- a/tp/t/results/indices/encoding_index_latin1.pl
+++ b/tp/t/results/indices/encoding_index_latin1.pl
@@ -179,12 +179,10 @@ $result_trees{'encoding_index_latin1'} = {
           'cmdname' => 'cindex',
           'extra' => {
             'element_node' => {},
-            'index_entry' => {
-              'entry_element' => {},
-              'entry_number' => 1,
-              'in_code' => 0,
-              'index_name' => 'cp'
-            }
+            'index_entry' => [
+              'cp',
+              1
+            ]
           },
           'info' => {
             'spaces_before_argument' => {
@@ -290,12 +288,10 @@ $result_trees{'encoding_index_latin1'} = {
           'cmdname' => 'cindex',
           'extra' => {
             'element_node' => {},
-            'index_entry' => {
-              'entry_element' => {},
-              'entry_number' => 2,
-              'in_code' => 0,
-              'index_name' => 'cp'
-            }
+            'index_entry' => [
+              'cp',
+              2
+            ]
           },
           'info' => {
             'spaces_before_argument' => {
@@ -419,12 +415,10 @@ $result_trees{'encoding_index_latin1'} = {
           'cmdname' => 'cindex',
           'extra' => {
             'element_node' => {},
-            'index_entry' => {
-              'entry_element' => {},
-              'entry_number' => 3,
-              'in_code' => 0,
-              'index_name' => 'cp'
-            }
+            'index_entry' => [
+              'cp',
+              3
+            ]
           },
           'info' => {
             'spaces_before_argument' => {
@@ -458,12 +452,10 @@ $result_trees{'encoding_index_latin1'} = {
           'cmdname' => 'cindex',
           'extra' => {
             'element_node' => {},
-            'index_entry' => {
-              'entry_element' => {},
-              'entry_number' => 4,
-              'in_code' => 0,
-              'index_name' => 'cp'
-            }
+            'index_entry' => [
+              'cp',
+              4
+            ]
           },
           'info' => {
             'spaces_before_argument' => {
@@ -497,12 +489,10 @@ $result_trees{'encoding_index_latin1'} = {
           'cmdname' => 'cindex',
           'extra' => {
             'element_node' => {},
-            'index_entry' => {
-              'entry_element' => {},
-              'entry_number' => 5,
-              'in_code' => 0,
-              'index_name' => 'cp'
-            }
+            'index_entry' => [
+              'cp',
+              5
+            ]
           },
           'info' => {
             'spaces_before_argument' => {
@@ -536,12 +526,10 @@ $result_trees{'encoding_index_latin1'} = {
           'cmdname' => 'cindex',
           'extra' => {
             'element_node' => {},
-            'index_entry' => {
-              'entry_element' => {},
-              'entry_number' => 6,
-              'in_code' => 0,
-              'index_name' => 'cp'
-            }
+            'index_entry' => [
+              'cp',
+              6
+            ]
           },
           'info' => {
             'spaces_before_argument' => {
@@ -575,12 +563,10 @@ $result_trees{'encoding_index_latin1'} = {
           'cmdname' => 'cindex',
           'extra' => {
             'element_node' => {},
-            'index_entry' => {
-              'entry_element' => {},
-              'entry_number' => 7,
-              'in_code' => 0,
-              'index_name' => 'cp'
-            }
+            'index_entry' => [
+              'cp',
+              7
+            ]
           },
           'info' => {
             'spaces_before_argument' => {
@@ -614,12 +600,10 @@ $result_trees{'encoding_index_latin1'} = {
           'cmdname' => 'cindex',
           'extra' => {
             'element_node' => {},
-            'index_entry' => {
-              'entry_element' => {},
-              'entry_number' => 8,
-              'in_code' => 0,
-              'index_name' => 'cp'
-            }
+            'index_entry' => [
+              'cp',
+              8
+            ]
           },
           'info' => {
             'spaces_before_argument' => {
@@ -653,12 +637,10 @@ $result_trees{'encoding_index_latin1'} = {
           'cmdname' => 'cindex',
           'extra' => {
             'element_node' => {},
-            'index_entry' => {
-              'entry_element' => {},
-              'entry_number' => 9,
-              'in_code' => 0,
-              'index_name' => 'cp'
-            }
+            'index_entry' => [
+              'cp',
+              9
+            ]
           },
           'info' => {
             'spaces_before_argument' => {
@@ -692,12 +674,10 @@ $result_trees{'encoding_index_latin1'} = {
           'cmdname' => 'cindex',
           'extra' => {
             'element_node' => {},
-            'index_entry' => {
-              'entry_element' => {},
-              'entry_number' => 10,
-              'in_code' => 0,
-              'index_name' => 'cp'
-            }
+            'index_entry' => [
+              'cp',
+              10
+            ]
           },
           'info' => {
             'spaces_before_argument' => {
@@ -731,12 +711,10 @@ $result_trees{'encoding_index_latin1'} = {
           'cmdname' => 'cindex',
           'extra' => {
             'element_node' => {},
-            'index_entry' => {
-              'entry_element' => {},
-              'entry_number' => 11,
-              'in_code' => 0,
-              'index_name' => 'cp'
-            }
+            'index_entry' => [
+              'cp',
+              11
+            ]
           },
           'info' => {
             'spaces_before_argument' => {
@@ -770,12 +748,10 @@ $result_trees{'encoding_index_latin1'} = {
           'cmdname' => 'cindex',
           'extra' => {
             'element_node' => {},
-            'index_entry' => {
-              'entry_element' => {},
-              'entry_number' => 12,
-              'in_code' => 0,
-              'index_name' => 'cp'
-            }
+            'index_entry' => [
+              'cp',
+              12
+            ]
           },
           'info' => {
             'spaces_before_argument' => {
@@ -809,12 +785,10 @@ $result_trees{'encoding_index_latin1'} = {
           'cmdname' => 'cindex',
           'extra' => {
             'element_node' => {},
-            'index_entry' => {
-              'entry_element' => {},
-              'entry_number' => 13,
-              'in_code' => 0,
-              'index_name' => 'cp'
-            }
+            'index_entry' => [
+              'cp',
+              13
+            ]
           },
           'info' => {
             'spaces_before_argument' => {
@@ -848,12 +822,10 @@ $result_trees{'encoding_index_latin1'} = {
           'cmdname' => 'cindex',
           'extra' => {
             'element_node' => {},
-            'index_entry' => {
-              'entry_element' => {},
-              'entry_number' => 14,
-              'in_code' => 0,
-              'index_name' => 'cp'
-            }
+            'index_entry' => [
+              'cp',
+              14
+            ]
           },
           'info' => {
             'spaces_before_argument' => {
@@ -887,12 +859,10 @@ $result_trees{'encoding_index_latin1'} = {
           'cmdname' => 'cindex',
           'extra' => {
             'element_node' => {},
-            'index_entry' => {
-              'entry_element' => {},
-              'entry_number' => 15,
-              'in_code' => 0,
-              'index_name' => 'cp'
-            }
+            'index_entry' => [
+              'cp',
+              15
+            ]
           },
           'info' => {
             'spaces_before_argument' => {
@@ -926,12 +896,10 @@ $result_trees{'encoding_index_latin1'} = {
           'cmdname' => 'cindex',
           'extra' => {
             'element_node' => {},
-            'index_entry' => {
-              'entry_element' => {},
-              'entry_number' => 16,
-              'in_code' => 0,
-              'index_name' => 'cp'
-            }
+            'index_entry' => [
+              'cp',
+              16
+            ]
           },
           'info' => {
             'spaces_before_argument' => {
@@ -965,12 +933,10 @@ $result_trees{'encoding_index_latin1'} = {
           'cmdname' => 'cindex',
           'extra' => {
             'element_node' => {},
-            'index_entry' => {
-              'entry_element' => {},
-              'entry_number' => 17,
-              'in_code' => 0,
-              'index_name' => 'cp'
-            }
+            'index_entry' => [
+              'cp',
+              17
+            ]
           },
           'info' => {
             'spaces_before_argument' => {
@@ -1004,12 +970,10 @@ $result_trees{'encoding_index_latin1'} = {
           'cmdname' => 'cindex',
           'extra' => {
             'element_node' => {},
-            'index_entry' => {
-              'entry_element' => {},
-              'entry_number' => 18,
-              'in_code' => 0,
-              'index_name' => 'cp'
-            }
+            'index_entry' => [
+              'cp',
+              18
+            ]
           },
           'info' => {
             'spaces_before_argument' => {
@@ -1043,12 +1007,10 @@ $result_trees{'encoding_index_latin1'} = {
           'cmdname' => 'cindex',
           'extra' => {
             'element_node' => {},
-            'index_entry' => {
-              'entry_element' => {},
-              'entry_number' => 19,
-              'in_code' => 0,
-              'index_name' => 'cp'
-            }
+            'index_entry' => [
+              'cp',
+              19
+            ]
           },
           'info' => {
             'spaces_before_argument' => {
@@ -1082,12 +1044,10 @@ $result_trees{'encoding_index_latin1'} = {
           'cmdname' => 'cindex',
           'extra' => {
             'element_node' => {},
-            'index_entry' => {
-              'entry_element' => {},
-              'entry_number' => 20,
-              'in_code' => 0,
-              'index_name' => 'cp'
-            }
+            'index_entry' => [
+              'cp',
+              20
+            ]
           },
           'info' => {
             'spaces_before_argument' => {
@@ -1121,12 +1081,10 @@ $result_trees{'encoding_index_latin1'} = {
           'cmdname' => 'cindex',
           'extra' => {
             'element_node' => {},
-            'index_entry' => {
-              'entry_element' => {},
-              'entry_number' => 21,
-              'in_code' => 0,
-              'index_name' => 'cp'
-            }
+            'index_entry' => [
+              'cp',
+              21
+            ]
           },
           'info' => {
             'spaces_before_argument' => {
@@ -1160,12 +1118,10 @@ $result_trees{'encoding_index_latin1'} = {
           'cmdname' => 'cindex',
           'extra' => {
             'element_node' => {},
-            'index_entry' => {
-              'entry_element' => {},
-              'entry_number' => 22,
-              'in_code' => 0,
-              'index_name' => 'cp'
-            }
+            'index_entry' => [
+              'cp',
+              22
+            ]
           },
           'info' => {
             'spaces_before_argument' => {
@@ -1199,12 +1155,10 @@ $result_trees{'encoding_index_latin1'} = {
           'cmdname' => 'cindex',
           'extra' => {
             'element_node' => {},
-            'index_entry' => {
-              'entry_element' => {},
-              'entry_number' => 23,
-              'in_code' => 0,
-              'index_name' => 'cp'
-            }
+            'index_entry' => [
+              'cp',
+              23
+            ]
           },
           'info' => {
             'spaces_before_argument' => {
@@ -1238,12 +1192,10 @@ $result_trees{'encoding_index_latin1'} = {
           'cmdname' => 'cindex',
           'extra' => {
             'element_node' => {},
-            'index_entry' => {
-              'entry_element' => {},
-              'entry_number' => 24,
-              'in_code' => 0,
-              'index_name' => 'cp'
-            }
+            'index_entry' => [
+              'cp',
+              24
+            ]
           },
           'info' => {
             'spaces_before_argument' => {
@@ -1277,12 +1229,10 @@ $result_trees{'encoding_index_latin1'} = {
           'cmdname' => 'cindex',
           'extra' => {
             'element_node' => {},
-            'index_entry' => {
-              'entry_element' => {},
-              'entry_number' => 25,
-              'in_code' => 0,
-              'index_name' => 'cp'
-            }
+            'index_entry' => [
+              'cp',
+              25
+            ]
           },
           'info' => {
             'spaces_before_argument' => {
@@ -1316,12 +1266,10 @@ $result_trees{'encoding_index_latin1'} = {
           'cmdname' => 'cindex',
           'extra' => {
             'element_node' => {},
-            'index_entry' => {
-              'entry_element' => {},
-              'entry_number' => 26,
-              'in_code' => 0,
-              'index_name' => 'cp'
-            }
+            'index_entry' => [
+              'cp',
+              26
+            ]
           },
           'info' => {
             'spaces_before_argument' => {
@@ -1355,12 +1303,10 @@ $result_trees{'encoding_index_latin1'} = {
           'cmdname' => 'cindex',
           'extra' => {
             'element_node' => {},
-            'index_entry' => {
-              'entry_element' => {},
-              'entry_number' => 27,
-              'in_code' => 0,
-              'index_name' => 'cp'
-            }
+            'index_entry' => [
+              'cp',
+              27
+            ]
           },
           'info' => {
             'spaces_before_argument' => {
@@ -1394,12 +1340,10 @@ $result_trees{'encoding_index_latin1'} = {
           'cmdname' => 'cindex',
           'extra' => {
             'element_node' => {},
-            'index_entry' => {
-              'entry_element' => {},
-              'entry_number' => 28,
-              'in_code' => 0,
-              'index_name' => 'cp'
-            }
+            'index_entry' => [
+              'cp',
+              28
+            ]
           },
           'info' => {
             'spaces_before_argument' => {
@@ -1433,12 +1377,10 @@ $result_trees{'encoding_index_latin1'} = {
           'cmdname' => 'cindex',
           'extra' => {
             'element_node' => {},
-            'index_entry' => {
-              'entry_element' => {},
-              'entry_number' => 29,
-              'in_code' => 0,
-              'index_name' => 'cp'
-            }
+            'index_entry' => [
+              'cp',
+              29
+            ]
           },
           'info' => {
             'spaces_before_argument' => {
@@ -1472,12 +1414,10 @@ $result_trees{'encoding_index_latin1'} = {
           'cmdname' => 'cindex',
           'extra' => {
             'element_node' => {},
-            'index_entry' => {
-              'entry_element' => {},
-              'entry_number' => 30,
-              'in_code' => 0,
-              'index_name' => 'cp'
-            }
+            'index_entry' => [
+              'cp',
+              30
+            ]
           },
           'info' => {
             'spaces_before_argument' => {
@@ -1511,12 +1451,10 @@ $result_trees{'encoding_index_latin1'} = {
           'cmdname' => 'cindex',
           'extra' => {
             'element_node' => {},
-            'index_entry' => {
-              'entry_element' => {},
-              'entry_number' => 31,
-              'in_code' => 0,
-              'index_name' => 'cp'
-            }
+            'index_entry' => [
+              'cp',
+              31
+            ]
           },
           'info' => {
             'spaces_before_argument' => {
@@ -1560,12 +1498,10 @@ $result_trees{'encoding_index_latin1'} = {
           'cmdname' => 'cindex',
           'extra' => {
             'element_node' => {},
-            'index_entry' => {
-              'entry_element' => {},
-              'entry_number' => 32,
-              'in_code' => 0,
-              'index_name' => 'cp'
-            }
+            'index_entry' => [
+              'cp',
+              32
+            ]
           },
           'info' => {
             'spaces_before_argument' => {
@@ -1609,12 +1545,10 @@ $result_trees{'encoding_index_latin1'} = {
           'cmdname' => 'cindex',
           'extra' => {
             'element_node' => {},
-            'index_entry' => {
-              'entry_element' => {},
-              'entry_number' => 33,
-              'in_code' => 0,
-              'index_name' => 'cp'
-            }
+            'index_entry' => [
+              'cp',
+              33
+            ]
           },
           'info' => {
             'spaces_before_argument' => {
@@ -1687,12 +1621,10 @@ $result_trees{'encoding_index_latin1'} = {
           'cmdname' => 'cindex',
           'extra' => {
             'element_node' => {},
-            'index_entry' => {
-              'entry_element' => {},
-              'entry_number' => 34,
-              'in_code' => 0,
-              'index_name' => 'cp'
-            }
+            'index_entry' => [
+              'cp',
+              34
+            ]
           },
           'info' => {
             'spaces_before_argument' => {
@@ -1795,12 +1727,10 @@ $result_trees{'encoding_index_latin1'} = {
           'cmdname' => 'cindex',
           'extra' => {
             'element_node' => {},
-            'index_entry' => {
-              'entry_element' => {},
-              'entry_number' => 35,
-              'in_code' => 0,
-              'index_name' => 'cp'
-            }
+            'index_entry' => [
+              'cp',
+              35
+            ]
           },
           'info' => {
             'spaces_before_argument' => {
@@ -1844,12 +1774,10 @@ $result_trees{'encoding_index_latin1'} = {
           'cmdname' => 'cindex',
           'extra' => {
             'element_node' => {},
-            'index_entry' => {
-              'entry_element' => {},
-              'entry_number' => 36,
-              'in_code' => 0,
-              'index_name' => 'cp'
-            }
+            'index_entry' => [
+              'cp',
+              36
+            ]
           },
           'info' => {
             'spaces_before_argument' => {
@@ -1893,12 +1821,10 @@ $result_trees{'encoding_index_latin1'} = {
           'cmdname' => 'cindex',
           'extra' => {
             'element_node' => {},
-            'index_entry' => {
-              'entry_element' => {},
-              'entry_number' => 37,
-              'in_code' => 0,
-              'index_name' => 'cp'
-            }
+            'index_entry' => [
+              'cp',
+              37
+            ]
           },
           'info' => {
             'spaces_before_argument' => {
@@ -1942,12 +1868,10 @@ $result_trees{'encoding_index_latin1'} = {
           'cmdname' => 'cindex',
           'extra' => {
             'element_node' => {},
-            'index_entry' => {
-              'entry_element' => {},
-              'entry_number' => 38,
-              'in_code' => 0,
-              'index_name' => 'cp'
-            }
+            'index_entry' => [
+              'cp',
+              38
+            ]
           },
           'info' => {
             'spaces_before_argument' => {
@@ -1991,12 +1915,10 @@ $result_trees{'encoding_index_latin1'} = {
           'cmdname' => 'cindex',
           'extra' => {
             'element_node' => {},
-            'index_entry' => {
-              'entry_element' => {},
-              'entry_number' => 39,
-              'in_code' => 0,
-              'index_name' => 'cp'
-            }
+            'index_entry' => [
+              'cp',
+              39
+            ]
           },
           'info' => {
             'spaces_before_argument' => {
@@ -2040,12 +1962,10 @@ $result_trees{'encoding_index_latin1'} = {
           'cmdname' => 'cindex',
           'extra' => {
             'element_node' => {},
-            'index_entry' => {
-              'entry_element' => {},
-              'entry_number' => 40,
-              'in_code' => 0,
-              'index_name' => 'cp'
-            }
+            'index_entry' => [
+              'cp',
+              40
+            ]
           },
           'info' => {
             'spaces_before_argument' => {
@@ -2089,12 +2009,10 @@ $result_trees{'encoding_index_latin1'} = {
           'cmdname' => 'cindex',
           'extra' => {
             'element_node' => {},
-            'index_entry' => {
-              'entry_element' => {},
-              'entry_number' => 41,
-              'in_code' => 0,
-              'index_name' => 'cp'
-            }
+            'index_entry' => [
+              'cp',
+              41
+            ]
           },
           'info' => {
             'spaces_before_argument' => {
@@ -2138,12 +2056,10 @@ $result_trees{'encoding_index_latin1'} = {
           'cmdname' => 'cindex',
           'extra' => {
             'element_node' => {},
-            'index_entry' => {
-              'entry_element' => {},
-              'entry_number' => 42,
-              'in_code' => 0,
-              'index_name' => 'cp'
-            }
+            'index_entry' => [
+              'cp',
+              42
+            ]
           },
           'info' => {
             'spaces_before_argument' => {
@@ -2177,12 +2093,10 @@ $result_trees{'encoding_index_latin1'} = {
           'cmdname' => 'cindex',
           'extra' => {
             'element_node' => {},
-            'index_entry' => {
-              'entry_element' => {},
-              'entry_number' => 43,
-              'in_code' => 0,
-              'index_name' => 'cp'
-            }
+            'index_entry' => [
+              'cp',
+              43
+            ]
           },
           'info' => {
             'spaces_before_argument' => {
@@ -2216,12 +2130,10 @@ $result_trees{'encoding_index_latin1'} = {
           'cmdname' => 'cindex',
           'extra' => {
             'element_node' => {},
-            'index_entry' => {
-              'entry_element' => {},
-              'entry_number' => 44,
-              'in_code' => 0,
-              'index_name' => 'cp'
-            }
+            'index_entry' => [
+              'cp',
+              44
+            ]
           },
           'info' => {
             'spaces_before_argument' => {
@@ -2265,12 +2177,10 @@ $result_trees{'encoding_index_latin1'} = {
           'cmdname' => 'cindex',
           'extra' => {
             'element_node' => {},
-            'index_entry' => {
-              'entry_element' => {},
-              'entry_number' => 45,
-              'in_code' => 0,
-              'index_name' => 'cp'
-            }
+            'index_entry' => [
+              'cp',
+              45
+            ]
           },
           'info' => {
             'spaces_before_argument' => {
@@ -2314,12 +2224,10 @@ $result_trees{'encoding_index_latin1'} = {
           'cmdname' => 'cindex',
           'extra' => {
             'element_node' => {},
-            'index_entry' => {
-              'entry_element' => {},
-              'entry_number' => 46,
-              'in_code' => 0,
-              'index_name' => 'cp'
-            }
+            'index_entry' => [
+              'cp',
+              46
+            ]
           },
           'info' => {
             'spaces_before_argument' => {
@@ -2363,12 +2271,10 @@ $result_trees{'encoding_index_latin1'} = {
           'cmdname' => 'cindex',
           'extra' => {
             'element_node' => {},
-            'index_entry' => {
-              'entry_element' => {},
-              'entry_number' => 47,
-              'in_code' => 0,
-              'index_name' => 'cp'
-            }
+            'index_entry' => [
+              'cp',
+              47
+            ]
           },
           'info' => {
             'spaces_before_argument' => {
@@ -2402,12 +2308,10 @@ $result_trees{'encoding_index_latin1'} = {
           'cmdname' => 'cindex',
           'extra' => {
             'element_node' => {},
-            'index_entry' => {
-              'entry_element' => {},
-              'entry_number' => 48,
-              'in_code' => 0,
-              'index_name' => 'cp'
-            }
+            'index_entry' => [
+              'cp',
+              48
+            ]
           },
           'info' => {
             'spaces_before_argument' => {
@@ -2441,12 +2345,10 @@ $result_trees{'encoding_index_latin1'} = {
           'cmdname' => 'cindex',
           'extra' => {
             'element_node' => {},
-            'index_entry' => {
-              'entry_element' => {},
-              'entry_number' => 49,
-              'in_code' => 0,
-              'index_name' => 'cp'
-            }
+            'index_entry' => [
+              'cp',
+              49
+            ]
           },
           'info' => {
             'spaces_before_argument' => {
@@ -2480,12 +2382,10 @@ $result_trees{'encoding_index_latin1'} = {
           'cmdname' => 'cindex',
           'extra' => {
             'element_node' => {},
-            'index_entry' => {
-              'entry_element' => {},
-              'entry_number' => 50,
-              'in_code' => 0,
-              'index_name' => 'cp'
-            }
+            'index_entry' => [
+              'cp',
+              50
+            ]
           },
           'info' => {
             'spaces_before_argument' => {
@@ -2519,12 +2419,10 @@ $result_trees{'encoding_index_latin1'} = {
           'cmdname' => 'cindex',
           'extra' => {
             'element_node' => {},
-            'index_entry' => {
-              'entry_element' => {},
-              'entry_number' => 51,
-              'in_code' => 0,
-              'index_name' => 'cp'
-            }
+            'index_entry' => [
+              'cp',
+              51
+            ]
           },
           'info' => {
             'spaces_before_argument' => {
@@ -2558,12 +2456,10 @@ $result_trees{'encoding_index_latin1'} = {
           'cmdname' => 'cindex',
           'extra' => {
             'element_node' => {},
-            'index_entry' => {
-              'entry_element' => {},
-              'entry_number' => 52,
-              'in_code' => 0,
-              'index_name' => 'cp'
-            }
+            'index_entry' => [
+              'cp',
+              52
+            ]
           },
           'info' => {
             'spaces_before_argument' => {
@@ -2597,12 +2493,10 @@ $result_trees{'encoding_index_latin1'} = {
           'cmdname' => 'cindex',
           'extra' => {
             'element_node' => {},
-            'index_entry' => {
-              'entry_element' => {},
-              'entry_number' => 53,
-              'in_code' => 0,
-              'index_name' => 'cp'
-            }
+            'index_entry' => [
+              'cp',
+              53
+            ]
           },
           'info' => {
             'spaces_before_argument' => {
@@ -2636,12 +2530,10 @@ $result_trees{'encoding_index_latin1'} = {
           'cmdname' => 'cindex',
           'extra' => {
             'element_node' => {},
-            'index_entry' => {
-              'entry_element' => {},
-              'entry_number' => 54,
-              'in_code' => 0,
-              'index_name' => 'cp'
-            }
+            'index_entry' => [
+              'cp',
+              54
+            ]
           },
           'info' => {
             'spaces_before_argument' => {
@@ -2675,12 +2567,10 @@ $result_trees{'encoding_index_latin1'} = {
           'cmdname' => 'cindex',
           'extra' => {
             'element_node' => {},
-            'index_entry' => {
-              'entry_element' => {},
-              'entry_number' => 55,
-              'in_code' => 0,
-              'index_name' => 'cp'
-            }
+            'index_entry' => [
+              'cp',
+              55
+            ]
           },
           'info' => {
             'spaces_before_argument' => {
@@ -2763,115 +2653,60 @@ $result_trees{'encoding_index_latin1'} = {
   'type' => 'document_root'
 };
 
$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'}{'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'}{'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'}{'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'}{'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'}{'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'}{'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'}{'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'}{'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'}{'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'}{'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'}{'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'}{'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'}{'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'}{'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'}{'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'}{'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'}{'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'}{'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'}{'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'}{'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'}{'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'}{'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'}{'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'}{'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'}{'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'}{'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'}{'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'}{'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'}{'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'}{'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'}{'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'}{'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'}{'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'}{'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'}{'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'}{'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'}{'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'}{'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'}{'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'}{'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'}{'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'}{'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'}{'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'}{'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'}{'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'}{'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'}{'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'}{'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'}{'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'}{'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'}{'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'}{'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'}{'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'}{'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_texis{'encoding_index_latin1'} = '
 @documentencoding iso-8859-1
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 3015a3d864..a6bbdafe51 100644
--- a/tp/t/results/indices/encoding_index_latin1_enable_encoding.pl
+++ b/tp/t/results/indices/encoding_index_latin1_enable_encoding.pl
@@ -179,12 +179,10 @@ $result_trees{'encoding_index_latin1_enable_encoding'} = {
           'cmdname' => 'cindex',
           'extra' => {
             'element_node' => {},
-            'index_entry' => {
-              'entry_element' => {},
-              'entry_number' => 1,
-              'in_code' => 0,
-              'index_name' => 'cp'
-            }
+            'index_entry' => [
+              'cp',
+              1
+            ]
           },
           'info' => {
             'spaces_before_argument' => {
@@ -290,12 +288,10 @@ $result_trees{'encoding_index_latin1_enable_encoding'} = {
           'cmdname' => 'cindex',
           'extra' => {
             'element_node' => {},
-            'index_entry' => {
-              'entry_element' => {},
-              'entry_number' => 2,
-              'in_code' => 0,
-              'index_name' => 'cp'
-            }
+            'index_entry' => [
+              'cp',
+              2
+            ]
           },
           'info' => {
             'spaces_before_argument' => {
@@ -419,12 +415,10 @@ $result_trees{'encoding_index_latin1_enable_encoding'} = {
           'cmdname' => 'cindex',
           'extra' => {
             'element_node' => {},
-            'index_entry' => {
-              'entry_element' => {},
-              'entry_number' => 3,
-              'in_code' => 0,
-              'index_name' => 'cp'
-            }
+            'index_entry' => [
+              'cp',
+              3
+            ]
           },
           'info' => {
             'spaces_before_argument' => {
@@ -458,12 +452,10 @@ $result_trees{'encoding_index_latin1_enable_encoding'} = {
           'cmdname' => 'cindex',
           'extra' => {
             'element_node' => {},
-            'index_entry' => {
-              'entry_element' => {},
-              'entry_number' => 4,
-              'in_code' => 0,
-              'index_name' => 'cp'
-            }
+            'index_entry' => [
+              'cp',
+              4
+            ]
           },
           'info' => {
             'spaces_before_argument' => {
@@ -497,12 +489,10 @@ $result_trees{'encoding_index_latin1_enable_encoding'} = {
           'cmdname' => 'cindex',
           'extra' => {
             'element_node' => {},
-            'index_entry' => {
-              'entry_element' => {},
-              'entry_number' => 5,
-              'in_code' => 0,
-              'index_name' => 'cp'
-            }
+            'index_entry' => [
+              'cp',
+              5
+            ]
           },
           'info' => {
             'spaces_before_argument' => {
@@ -536,12 +526,10 @@ $result_trees{'encoding_index_latin1_enable_encoding'} = {
           'cmdname' => 'cindex',
           'extra' => {
             'element_node' => {},
-            'index_entry' => {
-              'entry_element' => {},
-              'entry_number' => 6,
-              'in_code' => 0,
-              'index_name' => 'cp'
-            }
+            'index_entry' => [
+              'cp',
+              6
+            ]
           },
           'info' => {
             'spaces_before_argument' => {
@@ -575,12 +563,10 @@ $result_trees{'encoding_index_latin1_enable_encoding'} = {
           'cmdname' => 'cindex',
           'extra' => {
             'element_node' => {},
-            'index_entry' => {
-              'entry_element' => {},
-              'entry_number' => 7,
-              'in_code' => 0,
-              'index_name' => 'cp'
-            }
+            'index_entry' => [
+              'cp',
+              7
+            ]
           },
           'info' => {
             'spaces_before_argument' => {
@@ -614,12 +600,10 @@ $result_trees{'encoding_index_latin1_enable_encoding'} = {
           'cmdname' => 'cindex',
           'extra' => {
             'element_node' => {},
-            'index_entry' => {
-              'entry_element' => {},
-              'entry_number' => 8,
-              'in_code' => 0,
-              'index_name' => 'cp'
-            }
+            'index_entry' => [
+              'cp',
+              8
+            ]
           },
           'info' => {
             'spaces_before_argument' => {
@@ -653,12 +637,10 @@ $result_trees{'encoding_index_latin1_enable_encoding'} = {
           'cmdname' => 'cindex',
           'extra' => {
             'element_node' => {},
-            'index_entry' => {
-              'entry_element' => {},
-              'entry_number' => 9,
-              'in_code' => 0,
-              'index_name' => 'cp'
-            }
+            'index_entry' => [
+              'cp',
+              9
+            ]
           },
           'info' => {
             'spaces_before_argument' => {
@@ -692,12 +674,10 @@ $result_trees{'encoding_index_latin1_enable_encoding'} = {
           'cmdname' => 'cindex',
           'extra' => {
             'element_node' => {},
-            'index_entry' => {
-              'entry_element' => {},
-              'entry_number' => 10,
-              'in_code' => 0,
-              'index_name' => 'cp'
-            }
+            'index_entry' => [
+              'cp',
+              10
+            ]
           },
           'info' => {
             'spaces_before_argument' => {
@@ -731,12 +711,10 @@ $result_trees{'encoding_index_latin1_enable_encoding'} = {
           'cmdname' => 'cindex',
           'extra' => {
             'element_node' => {},
-            'index_entry' => {
-              'entry_element' => {},
-              'entry_number' => 11,
-              'in_code' => 0,
-              'index_name' => 'cp'
-            }
+            'index_entry' => [
+              'cp',
+              11
+            ]
           },
           'info' => {
             'spaces_before_argument' => {
@@ -770,12 +748,10 @@ $result_trees{'encoding_index_latin1_enable_encoding'} = {
           'cmdname' => 'cindex',
           'extra' => {
             'element_node' => {},
-            'index_entry' => {
-              'entry_element' => {},
-              'entry_number' => 12,
-              'in_code' => 0,
-              'index_name' => 'cp'
-            }
+            'index_entry' => [
+              'cp',
+              12
+            ]
           },
           'info' => {
             'spaces_before_argument' => {
@@ -809,12 +785,10 @@ $result_trees{'encoding_index_latin1_enable_encoding'} = {
           'cmdname' => 'cindex',
           'extra' => {
             'element_node' => {},
-            'index_entry' => {
-              'entry_element' => {},
-              'entry_number' => 13,
-              'in_code' => 0,
-              'index_name' => 'cp'
-            }
+            'index_entry' => [
+              'cp',
+              13
+            ]
           },
           'info' => {
             'spaces_before_argument' => {
@@ -848,12 +822,10 @@ $result_trees{'encoding_index_latin1_enable_encoding'} = {
           'cmdname' => 'cindex',
           'extra' => {
             'element_node' => {},
-            'index_entry' => {
-              'entry_element' => {},
-              'entry_number' => 14,
-              'in_code' => 0,
-              'index_name' => 'cp'
-            }
+            'index_entry' => [
+              'cp',
+              14
+            ]
           },
           'info' => {
             'spaces_before_argument' => {
@@ -887,12 +859,10 @@ $result_trees{'encoding_index_latin1_enable_encoding'} = {
           'cmdname' => 'cindex',
           'extra' => {
             'element_node' => {},
-            'index_entry' => {
-              'entry_element' => {},
-              'entry_number' => 15,
-              'in_code' => 0,
-              'index_name' => 'cp'
-            }
+            'index_entry' => [
+              'cp',
+              15
+            ]
           },
           'info' => {
             'spaces_before_argument' => {
@@ -926,12 +896,10 @@ $result_trees{'encoding_index_latin1_enable_encoding'} = {
           'cmdname' => 'cindex',
           'extra' => {
             'element_node' => {},
-            'index_entry' => {
-              'entry_element' => {},
-              'entry_number' => 16,
-              'in_code' => 0,
-              'index_name' => 'cp'
-            }
+            'index_entry' => [
+              'cp',
+              16
+            ]
           },
           'info' => {
             'spaces_before_argument' => {
@@ -965,12 +933,10 @@ $result_trees{'encoding_index_latin1_enable_encoding'} = {
           'cmdname' => 'cindex',
           'extra' => {
             'element_node' => {},
-            'index_entry' => {
-              'entry_element' => {},
-              'entry_number' => 17,
-              'in_code' => 0,
-              'index_name' => 'cp'
-            }
+            'index_entry' => [
+              'cp',
+              17
+            ]
           },
           'info' => {
             'spaces_before_argument' => {
@@ -1004,12 +970,10 @@ $result_trees{'encoding_index_latin1_enable_encoding'} = 
{
           'cmdname' => 'cindex',
           'extra' => {
             'element_node' => {},
-            'index_entry' => {
-              'entry_element' => {},
-              'entry_number' => 18,
-              'in_code' => 0,
-              'index_name' => 'cp'
-            }
+            'index_entry' => [
+              'cp',
+              18
+            ]
           },
           'info' => {
             'spaces_before_argument' => {
@@ -1043,12 +1007,10 @@ $result_trees{'encoding_index_latin1_enable_encoding'} 
= {
           'cmdname' => 'cindex',
           'extra' => {
             'element_node' => {},
-            'index_entry' => {
-              'entry_element' => {},
-              'entry_number' => 19,
-              'in_code' => 0,
-              'index_name' => 'cp'
-            }
+            'index_entry' => [
+              'cp',
+              19
+            ]
           },
           'info' => {
             'spaces_before_argument' => {
@@ -1082,12 +1044,10 @@ $result_trees{'encoding_index_latin1_enable_encoding'} 
= {
           'cmdname' => 'cindex',
           'extra' => {
             'element_node' => {},
-            'index_entry' => {
-              'entry_element' => {},
-              'entry_number' => 20,
-              'in_code' => 0,
-              'index_name' => 'cp'
-            }
+            'index_entry' => [
+              'cp',
+              20
+            ]
           },
           'info' => {
             'spaces_before_argument' => {
@@ -1121,12 +1081,10 @@ $result_trees{'encoding_index_latin1_enable_encoding'} 
= {
           'cmdname' => 'cindex',
           'extra' => {
             'element_node' => {},
-            'index_entry' => {
-              'entry_element' => {},
-              'entry_number' => 21,
-              'in_code' => 0,
-              'index_name' => 'cp'
-            }
+            'index_entry' => [
+              'cp',
+              21
+            ]
           },
           'info' => {
             'spaces_before_argument' => {
@@ -1160,12 +1118,10 @@ $result_trees{'encoding_index_latin1_enable_encoding'} 
= {
           'cmdname' => 'cindex',
           'extra' => {
             'element_node' => {},
-            'index_entry' => {
-              'entry_element' => {},
-              'entry_number' => 22,
-              'in_code' => 0,
-              'index_name' => 'cp'
-            }
+            'index_entry' => [
+              'cp',
+              22
+            ]
           },
           'info' => {
             'spaces_before_argument' => {
@@ -1199,12 +1155,10 @@ $result_trees{'encoding_index_latin1_enable_encoding'} 
= {
           'cmdname' => 'cindex',
           'extra' => {
             'element_node' => {},
-            'index_entry' => {
-              'entry_element' => {},
-              'entry_number' => 23,
-              'in_code' => 0,
-              'index_name' => 'cp'
-            }
+            'index_entry' => [
+              'cp',
+              23
+            ]
           },
           'info' => {
             'spaces_before_argument' => {
@@ -1238,12 +1192,10 @@ $result_trees{'encoding_index_latin1_enable_encoding'} 
= {
           'cmdname' => 'cindex',
           'extra' => {
             'element_node' => {},
-            'index_entry' => {
-              'entry_element' => {},
-              'entry_number' => 24,
-              'in_code' => 0,
-              'index_name' => 'cp'
-            }
+            'index_entry' => [
+              'cp',
+              24
+            ]
           },
           'info' => {
             'spaces_before_argument' => {
@@ -1277,12 +1229,10 @@ $result_trees{'encoding_index_latin1_enable_encoding'} 
= {
           'cmdname' => 'cindex',
           'extra' => {
             'element_node' => {},
-            'index_entry' => {
-              'entry_element' => {},
-              'entry_number' => 25,
-              'in_code' => 0,
-              'index_name' => 'cp'
-            }
+            'index_entry' => [
+              'cp',
+              25
+            ]
           },
           'info' => {
             'spaces_before_argument' => {
@@ -1316,12 +1266,10 @@ $result_trees{'encoding_index_latin1_enable_encoding'} 
= {
           'cmdname' => 'cindex',
           'extra' => {
             'element_node' => {},
-            'index_entry' => {
-              'entry_element' => {},
-              'entry_number' => 26,
-              'in_code' => 0,
-              'index_name' => 'cp'
-            }
+            'index_entry' => [
+              'cp',
+              26
+            ]
           },
           'info' => {
             'spaces_before_argument' => {
@@ -1355,12 +1303,10 @@ $result_trees{'encoding_index_latin1_enable_encoding'} 
= {
           'cmdname' => 'cindex',
           'extra' => {
             'element_node' => {},
-            'index_entry' => {
-              'entry_element' => {},
-              'entry_number' => 27,
-              'in_code' => 0,
-              'index_name' => 'cp'
-            }
+            'index_entry' => [
+              'cp',
+              27
+            ]
           },
           'info' => {
             'spaces_before_argument' => {
@@ -1394,12 +1340,10 @@ $result_trees{'encoding_index_latin1_enable_encoding'} 
= {
           'cmdname' => 'cindex',
           'extra' => {
             'element_node' => {},
-            'index_entry' => {
-              'entry_element' => {},
-              'entry_number' => 28,
-              'in_code' => 0,
-              'index_name' => 'cp'
-            }
+            'index_entry' => [
+              'cp',
+              28
+            ]
           },
           'info' => {
             'spaces_before_argument' => {
@@ -1433,12 +1377,10 @@ $result_trees{'encoding_index_latin1_enable_encoding'} 
= {
           'cmdname' => 'cindex',
           'extra' => {
             'element_node' => {},
-            'index_entry' => {
-              'entry_element' => {},
-              'entry_number' => 29,
-              'in_code' => 0,
-              'index_name' => 'cp'
-            }
+            'index_entry' => [
+              'cp',
+              29
+            ]
           },
           'info' => {
             'spaces_before_argument' => {
@@ -1472,12 +1414,10 @@ $result_trees{'encoding_index_latin1_enable_encoding'} 
= {
           'cmdname' => 'cindex',
           'extra' => {
             'element_node' => {},
-            'index_entry' => {
-              'entry_element' => {},
-              'entry_number' => 30,
-              'in_code' => 0,
-              'index_name' => 'cp'
-            }
+            'index_entry' => [
+              'cp',
+              30
+            ]
           },
           'info' => {
             'spaces_before_argument' => {
@@ -1511,12 +1451,10 @@ $result_trees{'encoding_index_latin1_enable_encoding'} 
= {
           'cmdname' => 'cindex',
           'extra' => {
             'element_node' => {},
-            'index_entry' => {
-              'entry_element' => {},
-              'entry_number' => 31,
-              'in_code' => 0,
-              'index_name' => 'cp'
-            }
+            'index_entry' => [
+              'cp',
+              31
+            ]
           },
           'info' => {
             'spaces_before_argument' => {
@@ -1560,12 +1498,10 @@ $result_trees{'encoding_index_latin1_enable_encoding'} 
= {
           'cmdname' => 'cindex',
           'extra' => {
             'element_node' => {},
-            'index_entry' => {
-              'entry_element' => {},
-              'entry_number' => 32,
-              'in_code' => 0,
-              'index_name' => 'cp'
-            }
+            'index_entry' => [
+              'cp',
+              32
+            ]
           },
           'info' => {
             'spaces_before_argument' => {
@@ -1609,12 +1545,10 @@ $result_trees{'encoding_index_latin1_enable_encoding'} 
= {
           'cmdname' => 'cindex',
           'extra' => {
             'element_node' => {},
-            'index_entry' => {
-              'entry_element' => {},
-              'entry_number' => 33,
-              'in_code' => 0,
-              'index_name' => 'cp'
-            }
+            'index_entry' => [
+              'cp',
+              33
+            ]
           },
           'info' => {
             'spaces_before_argument' => {
@@ -1687,12 +1621,10 @@ $result_trees{'encoding_index_latin1_enable_encoding'} 
= {
           'cmdname' => 'cindex',
           'extra' => {
             'element_node' => {},
-            'index_entry' => {
-              'entry_element' => {},
-              'entry_number' => 34,
-              'in_code' => 0,
-              'index_name' => 'cp'
-            }
+            'index_entry' => [
+              'cp',
+              34
+            ]
           },
           'info' => {
             'spaces_before_argument' => {
@@ -1795,12 +1727,10 @@ $result_trees{'encoding_index_latin1_enable_encoding'} 
= {
           'cmdname' => 'cindex',
           'extra' => {
             'element_node' => {},
-            'index_entry' => {
-              'entry_element' => {},
-              'entry_number' => 35,
-              'in_code' => 0,
-              'index_name' => 'cp'
-            }
+            'index_entry' => [
+              'cp',
+              35
+            ]
           },
           'info' => {
             'spaces_before_argument' => {
@@ -1844,12 +1774,10 @@ $result_trees{'encoding_index_latin1_enable_encoding'} 
= {
           'cmdname' => 'cindex',
           'extra' => {
             'element_node' => {},
-            'index_entry' => {
-              'entry_element' => {},
-              'entry_number' => 36,
-              'in_code' => 0,
-              'index_name' => 'cp'
-            }
+            'index_entry' => [
+              'cp',
+              36
+            ]
           },
           'info' => {
             'spaces_before_argument' => {
@@ -1893,12 +1821,10 @@ $result_trees{'encoding_index_latin1_enable_encoding'} 
= {
           'cmdname' => 'cindex',
           'extra' => {
             'element_node' => {},
-            'index_entry' => {
-              'entry_element' => {},
-              'entry_number' => 37,
-              'in_code' => 0,
-              'index_name' => 'cp'
-            }
+            'index_entry' => [
+              'cp',
+              37
+            ]
           },
           'info' => {
             'spaces_before_argument' => {
@@ -1942,12 +1868,10 @@ $result_trees{'encoding_index_latin1_enable_encoding'} 
= {
           'cmdname' => 'cindex',
           'extra' => {
             'element_node' => {},
-            'index_entry' => {
-              'entry_element' => {},
-              'entry_number' => 38,
-              'in_code' => 0,
-              'index_name' => 'cp'
-            }
+            'index_entry' => [
+              'cp',
+              38
+            ]
           },
           'info' => {
             'spaces_before_argument' => {
@@ -1991,12 +1915,10 @@ $result_trees{'encoding_index_latin1_enable_encoding'} 
= {
           'cmdname' => 'cindex',
           'extra' => {
             'element_node' => {},
-            'index_entry' => {
-              'entry_element' => {},
-              'entry_number' => 39,
-              'in_code' => 0,
-              'index_name' => 'cp'
-            }
+            'index_entry' => [
+              'cp',
+              39
+            ]
           },
           'info' => {
             'spaces_before_argument' => {
@@ -2040,12 +1962,10 @@ $result_trees{'encoding_index_latin1_enable_encoding'} 
= {
           'cmdname' => 'cindex',
           'extra' => {
             'element_node' => {},
-            'index_entry' => {
-              'entry_element' => {},
-              'entry_number' => 40,
-              'in_code' => 0,
-              'index_name' => 'cp'
-            }
+            'index_entry' => [
+              'cp',
+              40
+            ]
           },
           'info' => {
             'spaces_before_argument' => {
@@ -2089,12 +2009,10 @@ $result_trees{'encoding_index_latin1_enable_encoding'} 
= {
           'cmdname' => 'cindex',
           'extra' => {
             'element_node' => {},
-            'index_entry' => {
-              'entry_element' => {},
-              'entry_number' => 41,
-              'in_code' => 0,
-              'index_name' => 'cp'
-            }
+            'index_entry' => [
+              'cp',
+              41
+            ]
           },
           'info' => {
             'spaces_before_argument' => {
@@ -2138,12 +2056,10 @@ $result_trees{'encoding_index_latin1_enable_encoding'} 
= {
           'cmdname' => 'cindex',
           'extra' => {
             'element_node' => {},
-            'index_entry' => {
-              'entry_element' => {},
-              'entry_number' => 42,
-              'in_code' => 0,
-              'index_name' => 'cp'
-            }
+            'index_entry' => [
+              'cp',
+              42
+            ]
           },
           'info' => {
             'spaces_before_argument' => {
@@ -2177,12 +2093,10 @@ $result_trees{'encoding_index_latin1_enable_encoding'} 
= {
           'cmdname' => 'cindex',
           'extra' => {
             'element_node' => {},
-            'index_entry' => {
-              'entry_element' => {},
-              'entry_number' => 43,
-              'in_code' => 0,
-              'index_name' => 'cp'
-            }
+            'index_entry' => [
+              'cp',
+              43
+            ]
           },
           'info' => {
             'spaces_before_argument' => {
@@ -2216,12 +2130,10 @@ $result_trees{'encoding_index_latin1_enable_encoding'} 
= {
           'cmdname' => 'cindex',
           'extra' => {
             'element_node' => {},
-            'index_entry' => {
-              'entry_element' => {},
-              'entry_number' => 44,
-              'in_code' => 0,
-              'index_name' => 'cp'
-            }
+            'index_entry' => [
+              'cp',
+              44
+            ]
           },
           'info' => {
             'spaces_before_argument' => {
@@ -2265,12 +2177,10 @@ $result_trees{'encoding_index_latin1_enable_encoding'} 
= {
           'cmdname' => 'cindex',
           'extra' => {
             'element_node' => {},
-            'index_entry' => {
-              'entry_element' => {},
-              'entry_number' => 45,
-              'in_code' => 0,
-              'index_name' => 'cp'
-            }
+            'index_entry' => [
+              'cp',
+              45
+            ]
           },
           'info' => {
             'spaces_before_argument' => {
@@ -2314,12 +2224,10 @@ $result_trees{'encoding_index_latin1_enable_encoding'} 
= {
           'cmdname' => 'cindex',
           'extra' => {
             'element_node' => {},
-            'index_entry' => {
-              'entry_element' => {},
-              'entry_number' => 46,
-              'in_code' => 0,
-              'index_name' => 'cp'
-            }
+            'index_entry' => [
+              'cp',
+              46
+            ]
           },
           'info' => {
             'spaces_before_argument' => {
@@ -2363,12 +2271,10 @@ $result_trees{'encoding_index_latin1_enable_encoding'} 
= {
           'cmdname' => 'cindex',
           'extra' => {
             'element_node' => {},
-            'index_entry' => {
-              'entry_element' => {},
-              'entry_number' => 47,
-              'in_code' => 0,
-              'index_name' => 'cp'
-            }
+            'index_entry' => [
+              'cp',
+              47
+            ]
           },
           'info' => {
             'spaces_before_argument' => {
@@ -2402,12 +2308,10 @@ $result_trees{'encoding_index_latin1_enable_encoding'} 
= {
           'cmdname' => 'cindex',
           'extra' => {
             'element_node' => {},
-            'index_entry' => {
-              'entry_element' => {},
-              'entry_number' => 48,
-              'in_code' => 0,
-              'index_name' => 'cp'
-            }
+            'index_entry' => [
+              'cp',
+              48
+            ]
           },
           'info' => {
             'spaces_before_argument' => {
@@ -2441,12 +2345,10 @@ $result_trees{'encoding_index_latin1_enable_encoding'} 
= {
           'cmdname' => 'cindex',
           'extra' => {
             'element_node' => {},
-            'index_entry' => {
-              'entry_element' => {},
-              'entry_number' => 49,
-              'in_code' => 0,
-              'index_name' => 'cp'
-            }
+            'index_entry' => [
+              'cp',
+              49
+            ]
           },
           'info' => {
             'spaces_before_argument' => {
@@ -2480,12 +2382,10 @@ $result_trees{'encoding_index_latin1_enable_encoding'} 
= {
           'cmdname' => 'cindex',
           'extra' => {
             'element_node' => {},
-            'index_entry' => {
-              'entry_element' => {},
-              'entry_number' => 50,
-              'in_code' => 0,
-              'index_name' => 'cp'
-            }
+            'index_entry' => [
+              'cp',
+              50
+            ]
           },
           'info' => {
             'spaces_before_argument' => {
@@ -2519,12 +2419,10 @@ $result_trees{'encoding_index_latin1_enable_encoding'} 
= {
           'cmdname' => 'cindex',
           'extra' => {
             'element_node' => {},
-            'index_entry' => {
-              'entry_element' => {},
-              'entry_number' => 51,
-              'in_code' => 0,
-              'index_name' => 'cp'
-            }
+            'index_entry' => [
+              'cp',
+              51
+            ]
           },
           'info' => {
             'spaces_before_argument' => {
@@ -2558,12 +2456,10 @@ $result_trees{'encoding_index_latin1_enable_encoding'} 
= {
           'cmdname' => 'cindex',
           'extra' => {
             'element_node' => {},
-            'index_entry' => {
-              'entry_element' => {},
-              'entry_number' => 52,
-              'in_code' => 0,
-              'index_name' => 'cp'
-            }
+            'index_entry' => [
+              'cp',
+              52
+            ]
           },
           'info' => {
             'spaces_before_argument' => {
@@ -2597,12 +2493,10 @@ $result_trees{'encoding_index_latin1_enable_encoding'} 
= {
           'cmdname' => 'cindex',
           'extra' => {
             'element_node' => {},
-            'index_entry' => {
-              'entry_element' => {},
-              'entry_number' => 53,
-              'in_code' => 0,
-              'index_name' => 'cp'
-            }
+            'index_entry' => [
+              'cp',
+              53
+            ]
           },
           'info' => {
             'spaces_before_argument' => {
@@ -2636,12 +2530,10 @@ $result_trees{'encoding_index_latin1_enable_encoding'} 
= {
           'cmdname' => 'cindex',
           'extra' => {
             'element_node' => {},
-            'index_entry' => {
-              'entry_element' => {},
-              'entry_number' => 54,
-              'in_code' => 0,
-              'index_name' => 'cp'
-            }
+            'index_entry' => [
+              'cp',
+              54
+            ]
           },
           'info' => {
             'spaces_before_argument' => {
@@ -2675,12 +2567,10 @@ $result_trees{'encoding_index_latin1_enable_encoding'} 
= {
           'cmdname' => 'cindex',
           'extra' => {
             'element_node' => {},
-            'index_entry' => {
-              'entry_element' => {},
-              'entry_number' => 55,
-              'in_code' => 0,
-              'index_name' => 'cp'
-            }
+            'index_entry' => [
+              'cp',
+              55
+            ]
           },
           'info' => {
             'spaces_before_argument' => {
@@ -2763,115 +2653,60 @@ $result_trees{'encoding_index_latin1_enable_encoding'} 
= {
   'type' => 'document_root'
 };
 
$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'}{'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'}{'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'}{'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'}{'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'}{'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'}{'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'}{'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'}{'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'}{'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'}{'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'}{'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'}{'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'}{'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'}{'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'}{'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'}{'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'}{'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'}{'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'}{'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'}{'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'}{'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'}{'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'}{'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'}{'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'}{'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'}{'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'}{'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'}{'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'}{'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'}{'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'}{'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'}{'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'}{'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'}{'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'}{'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'}{'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'}{'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'}{'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'}{'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'}{'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'}{'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'}{'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'}{'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'}{'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'}{'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'}{'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'}{'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'}{'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'}{'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'}{'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'}{'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'}{'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'}{'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'}{'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_texis{'encoding_index_latin1_enable_encoding'} = '
 @documentencoding iso-8859-1
diff --git a/tp/t/results/indices/encoding_index_utf8.pl 
b/tp/t/results/indices/encoding_index_utf8.pl
index 6fbc6e6975..0cbb83a131 100644
--- a/tp/t/results/indices/encoding_index_utf8.pl
+++ b/tp/t/results/indices/encoding_index_utf8.pl
@@ -179,12 +179,10 @@ $result_trees{'encoding_index_utf8'} = {
           'cmdname' => 'cindex',
           'extra' => {
             'element_node' => {},
-            'index_entry' => {
-              'entry_element' => {},
-              'entry_number' => 1,
-              'in_code' => 0,
-              'index_name' => 'cp'
-            }
+            'index_entry' => [
+              'cp',
+              1
+            ]
           },
           'info' => {
             'spaces_before_argument' => {
@@ -290,12 +288,10 @@ $result_trees{'encoding_index_utf8'} = {
           'cmdname' => 'cindex',
           'extra' => {
             'element_node' => {},
-            'index_entry' => {
-              'entry_element' => {},
-              'entry_number' => 2,
-              'in_code' => 0,
-              'index_name' => 'cp'
-            }
+            'index_entry' => [
+              'cp',
+              2
+            ]
           },
           'info' => {
             'spaces_before_argument' => {
@@ -419,12 +415,10 @@ $result_trees{'encoding_index_utf8'} = {
           'cmdname' => 'cindex',
           'extra' => {
             'element_node' => {},
-            'index_entry' => {
-              'entry_element' => {},
-              'entry_number' => 3,
-              'in_code' => 0,
-              'index_name' => 'cp'
-            }
+            'index_entry' => [
+              'cp',
+              3
+            ]
           },
           'info' => {
             'spaces_before_argument' => {
@@ -458,12 +452,10 @@ $result_trees{'encoding_index_utf8'} = {
           'cmdname' => 'cindex',
           'extra' => {
             'element_node' => {},
-            'index_entry' => {
-              'entry_element' => {},
-              'entry_number' => 4,
-              'in_code' => 0,
-              'index_name' => 'cp'
-            }
+            'index_entry' => [
+              'cp',
+              4
+            ]
           },
           'info' => {
             'spaces_before_argument' => {
@@ -497,12 +489,10 @@ $result_trees{'encoding_index_utf8'} = {
           'cmdname' => 'cindex',
           'extra' => {
             'element_node' => {},
-            'index_entry' => {
-              'entry_element' => {},
-              'entry_number' => 5,
-              'in_code' => 0,
-              'index_name' => 'cp'
-            }
+            'index_entry' => [
+              'cp',
+              5
+            ]
           },
           'info' => {
             'spaces_before_argument' => {
@@ -536,12 +526,10 @@ $result_trees{'encoding_index_utf8'} = {
           'cmdname' => 'cindex',
           'extra' => {
             'element_node' => {},
-            'index_entry' => {
-              'entry_element' => {},
-              'entry_number' => 6,
-              'in_code' => 0,
-              'index_name' => 'cp'
-            }
+            'index_entry' => [
+              'cp',
+              6
+            ]
           },
           'info' => {
             'spaces_before_argument' => {
@@ -575,12 +563,10 @@ $result_trees{'encoding_index_utf8'} = {
           'cmdname' => 'cindex',
           'extra' => {
             'element_node' => {},
-            'index_entry' => {
-              'entry_element' => {},
-              'entry_number' => 7,
-              'in_code' => 0,
-              'index_name' => 'cp'
-            }
+            'index_entry' => [
+              'cp',
+              7
+            ]
           },
           'info' => {
             'spaces_before_argument' => {
@@ -614,12 +600,10 @@ $result_trees{'encoding_index_utf8'} = {
           'cmdname' => 'cindex',
           'extra' => {
             'element_node' => {},
-            'index_entry' => {
-              'entry_element' => {},
-              'entry_number' => 8,
-              'in_code' => 0,
-              'index_name' => 'cp'
-            }
+            'index_entry' => [
+              'cp',
+              8
+            ]
           },
           'info' => {
             'spaces_before_argument' => {
@@ -653,12 +637,10 @@ $result_trees{'encoding_index_utf8'} = {
           'cmdname' => 'cindex',
           'extra' => {
             'element_node' => {},
-            'index_entry' => {
-              'entry_element' => {},
-              'entry_number' => 9,
-              'in_code' => 0,
-              'index_name' => 'cp'
-            }
+            'index_entry' => [
+              'cp',
+              9
+            ]
           },
           'info' => {
             'spaces_before_argument' => {
@@ -692,12 +674,10 @@ $result_trees{'encoding_index_utf8'} = {
           'cmdname' => 'cindex',
           'extra' => {
             'element_node' => {},
-            'index_entry' => {
-              'entry_element' => {},
-              'entry_number' => 10,
-              'in_code' => 0,
-              'index_name' => 'cp'
-            }
+            'index_entry' => [
+              'cp',
+              10
+            ]
           },
           'info' => {
             'spaces_before_argument' => {
@@ -731,12 +711,10 @@ $result_trees{'encoding_index_utf8'} = {
           'cmdname' => 'cindex',
           'extra' => {
             'element_node' => {},
-            'index_entry' => {
-              'entry_element' => {},
-              'entry_number' => 11,
-              'in_code' => 0,
-              'index_name' => 'cp'
-            }
+            'index_entry' => [
+              'cp',
+              11
+            ]
           },
           'info' => {
             'spaces_before_argument' => {
@@ -770,12 +748,10 @@ $result_trees{'encoding_index_utf8'} = {
           'cmdname' => 'cindex',
           'extra' => {
             'element_node' => {},
-            'index_entry' => {
-              'entry_element' => {},
-              'entry_number' => 12,
-              'in_code' => 0,
-              'index_name' => 'cp'
-            }
+            'index_entry' => [
+              'cp',
+              12
+            ]
           },
           'info' => {
             'spaces_before_argument' => {
@@ -809,12 +785,10 @@ $result_trees{'encoding_index_utf8'} = {
           'cmdname' => 'cindex',
           'extra' => {
             'element_node' => {},
-            'index_entry' => {
-              'entry_element' => {},
-              'entry_number' => 13,
-              'in_code' => 0,
-              'index_name' => 'cp'
-            }
+            'index_entry' => [
+              'cp',
+              13
+            ]
           },
           'info' => {
             'spaces_before_argument' => {
@@ -848,12 +822,10 @@ $result_trees{'encoding_index_utf8'} = {
           'cmdname' => 'cindex',
           'extra' => {
             'element_node' => {},
-            'index_entry' => {
-              'entry_element' => {},
-              'entry_number' => 14,
-              'in_code' => 0,
-              'index_name' => 'cp'
-            }
+            'index_entry' => [
+              'cp',
+              14
+            ]
           },
           'info' => {
             'spaces_before_argument' => {
@@ -887,12 +859,10 @@ $result_trees{'encoding_index_utf8'} = {
           'cmdname' => 'cindex',
           'extra' => {
             'element_node' => {},
-            'index_entry' => {
-              'entry_element' => {},
-              'entry_number' => 15,
-              'in_code' => 0,
-              'index_name' => 'cp'
-            }
+            'index_entry' => [
+              'cp',
+              15
+            ]
           },
           'info' => {
             'spaces_before_argument' => {
@@ -926,12 +896,10 @@ $result_trees{'encoding_index_utf8'} = {
           'cmdname' => 'cindex',
           'extra' => {
             'element_node' => {},
-            'index_entry' => {
-              'entry_element' => {},
-              'entry_number' => 16,
-              'in_code' => 0,
-              'index_name' => 'cp'
-            }
+            'index_entry' => [
+              'cp',
+              16
+            ]
           },
           'info' => {
             'spaces_before_argument' => {
@@ -965,12 +933,10 @@ $result_trees{'encoding_index_utf8'} = {
           'cmdname' => 'cindex',
           'extra' => {
             'element_node' => {},
-            'index_entry' => {
-              'entry_element' => {},
-              'entry_number' => 17,
-              'in_code' => 0,
-              'index_name' => 'cp'
-            }
+            'index_entry' => [
+              'cp',
+              17
+            ]
           },
           'info' => {
             'spaces_before_argument' => {
@@ -1004,12 +970,10 @@ $result_trees{'encoding_index_utf8'} = {
           'cmdname' => 'cindex',
           'extra' => {
             'element_node' => {},
-            'index_entry' => {
-              'entry_element' => {},
-              'entry_number' => 18,
-              'in_code' => 0,
-              'index_name' => 'cp'
-            }
+            'index_entry' => [
+              'cp',
+              18
+            ]
           },
           'info' => {
             'spaces_before_argument' => {
@@ -1043,12 +1007,10 @@ $result_trees{'encoding_index_utf8'} = {
           'cmdname' => 'cindex',
           'extra' => {
             'element_node' => {},
-            'index_entry' => {
-              'entry_element' => {},
-              'entry_number' => 19,
-              'in_code' => 0,
-              'index_name' => 'cp'
-            }
+            'index_entry' => [
+              'cp',
+              19
+            ]
           },
           'info' => {
             'spaces_before_argument' => {
@@ -1082,12 +1044,10 @@ $result_trees{'encoding_index_utf8'} = {
           'cmdname' => 'cindex',
           'extra' => {
             'element_node' => {},
-            'index_entry' => {
-              'entry_element' => {},
-              'entry_number' => 20,
-              'in_code' => 0,
-              'index_name' => 'cp'
-            }
+            'index_entry' => [
+              'cp',
+              20
+            ]
           },
           'info' => {
             'spaces_before_argument' => {
@@ -1121,12 +1081,10 @@ $result_trees{'encoding_index_utf8'} = {
           'cmdname' => 'cindex',
           'extra' => {
             'element_node' => {},
-            'index_entry' => {
-              'entry_element' => {},
-              'entry_number' => 21,
-              'in_code' => 0,
-              'index_name' => 'cp'
-            }
+            'index_entry' => [
+              'cp',
+              21
+            ]
           },
           'info' => {
             'spaces_before_argument' => {
@@ -1160,12 +1118,10 @@ $result_trees{'encoding_index_utf8'} = {
           'cmdname' => 'cindex',
           'extra' => {
             'element_node' => {},
-            'index_entry' => {
-              'entry_element' => {},
-              'entry_number' => 22,
-              'in_code' => 0,
-              'index_name' => 'cp'
-            }
+            'index_entry' => [
+              'cp',
+              22
+            ]
           },
           'info' => {
             'spaces_before_argument' => {
@@ -1199,12 +1155,10 @@ $result_trees{'encoding_index_utf8'} = {
           'cmdname' => 'cindex',
           'extra' => {
             'element_node' => {},
-            'index_entry' => {
-              'entry_element' => {},
-              'entry_number' => 23,
-              'in_code' => 0,
-              'index_name' => 'cp'
-            }
+            'index_entry' => [
+              'cp',
+              23
+            ]
           },
           'info' => {
             'spaces_before_argument' => {
@@ -1238,12 +1192,10 @@ $result_trees{'encoding_index_utf8'} = {
           'cmdname' => 'cindex',
           'extra' => {
             'element_node' => {},
-            'index_entry' => {
-              'entry_element' => {},
-              'entry_number' => 24,
-              'in_code' => 0,
-              'index_name' => 'cp'
-            }
+            'index_entry' => [
+              'cp',
+              24
+            ]
           },
           'info' => {
             'spaces_before_argument' => {
@@ -1277,12 +1229,10 @@ $result_trees{'encoding_index_utf8'} = {
           'cmdname' => 'cindex',
           'extra' => {
             'element_node' => {},
-            'index_entry' => {
-              'entry_element' => {},
-              'entry_number' => 25,
-              'in_code' => 0,
-              'index_name' => 'cp'
-            }
+            'index_entry' => [
+              'cp',
+              25
+            ]
           },
           'info' => {
             'spaces_before_argument' => {
@@ -1316,12 +1266,10 @@ $result_trees{'encoding_index_utf8'} = {
           'cmdname' => 'cindex',
           'extra' => {
             'element_node' => {},
-            'index_entry' => {
-              'entry_element' => {},
-              'entry_number' => 26,
-              'in_code' => 0,
-              'index_name' => 'cp'
-            }
+            'index_entry' => [
+              'cp',
+              26
+            ]
           },
           'info' => {
             'spaces_before_argument' => {
@@ -1355,12 +1303,10 @@ $result_trees{'encoding_index_utf8'} = {
           'cmdname' => 'cindex',
           'extra' => {
             'element_node' => {},
-            'index_entry' => {
-              'entry_element' => {},
-              'entry_number' => 27,
-              'in_code' => 0,
-              'index_name' => 'cp'
-            }
+            'index_entry' => [
+              'cp',
+              27
+            ]
           },
           'info' => {
             'spaces_before_argument' => {
@@ -1394,12 +1340,10 @@ $result_trees{'encoding_index_utf8'} = {
           'cmdname' => 'cindex',
           'extra' => {
             'element_node' => {},
-            'index_entry' => {
-              'entry_element' => {},
-              'entry_number' => 28,
-              'in_code' => 0,
-              'index_name' => 'cp'
-            }
+            'index_entry' => [
+              'cp',
+              28
+            ]
           },
           'info' => {
             'spaces_before_argument' => {
@@ -1433,12 +1377,10 @@ $result_trees{'encoding_index_utf8'} = {
           'cmdname' => 'cindex',
           'extra' => {
             'element_node' => {},
-            'index_entry' => {
-              'entry_element' => {},
-              'entry_number' => 29,
-              'in_code' => 0,
-              'index_name' => 'cp'
-            }
+            'index_entry' => [
+              'cp',
+              29
+            ]
           },
           'info' => {
             'spaces_before_argument' => {
@@ -1472,12 +1414,10 @@ $result_trees{'encoding_index_utf8'} = {
           'cmdname' => 'cindex',
           'extra' => {
             'element_node' => {},
-            'index_entry' => {
-              'entry_element' => {},
-              'entry_number' => 30,
-              'in_code' => 0,
-              'index_name' => 'cp'
-            }
+            'index_entry' => [
+              'cp',
+              30
+            ]
           },
           'info' => {
             'spaces_before_argument' => {
@@ -1511,12 +1451,10 @@ $result_trees{'encoding_index_utf8'} = {
           'cmdname' => 'cindex',
           'extra' => {
             'element_node' => {},
-            'index_entry' => {
-              'entry_element' => {},
-              'entry_number' => 31,
-              'in_code' => 0,
-              'index_name' => 'cp'
-            }
+            'index_entry' => [
+              'cp',
+              31
+            ]
           },
           'info' => {
             'spaces_before_argument' => {
@@ -1560,12 +1498,10 @@ $result_trees{'encoding_index_utf8'} = {
           'cmdname' => 'cindex',
           'extra' => {
             'element_node' => {},
-            'index_entry' => {
-              'entry_element' => {},
-              'entry_number' => 32,
-              'in_code' => 0,
-              'index_name' => 'cp'
-            }
+            'index_entry' => [
+              'cp',
+              32
+            ]
           },
           'info' => {
             'spaces_before_argument' => {
@@ -1609,12 +1545,10 @@ $result_trees{'encoding_index_utf8'} = {
           'cmdname' => 'cindex',
           'extra' => {
             'element_node' => {},
-            'index_entry' => {
-              'entry_element' => {},
-              'entry_number' => 33,
-              'in_code' => 0,
-              'index_name' => 'cp'
-            }
+            'index_entry' => [
+              'cp',
+              33
+            ]
           },
           'info' => {
             'spaces_before_argument' => {
@@ -1687,12 +1621,10 @@ $result_trees{'encoding_index_utf8'} = {
           'cmdname' => 'cindex',
           'extra' => {
             'element_node' => {},
-            'index_entry' => {
-              'entry_element' => {},
-              'entry_number' => 34,
-              'in_code' => 0,
-              'index_name' => 'cp'
-            }
+            'index_entry' => [
+              'cp',
+              34
+            ]
           },
           'info' => {
             'spaces_before_argument' => {
@@ -1795,12 +1727,10 @@ $result_trees{'encoding_index_utf8'} = {
           'cmdname' => 'cindex',
           'extra' => {
             'element_node' => {},
-            'index_entry' => {
-              'entry_element' => {},
-              'entry_number' => 35,
-              'in_code' => 0,
-              'index_name' => 'cp'
-            }
+            'index_entry' => [
+              'cp',
+              35
+            ]
           },
           'info' => {
             'spaces_before_argument' => {
@@ -1844,12 +1774,10 @@ $result_trees{'encoding_index_utf8'} = {
           'cmdname' => 'cindex',
           'extra' => {
             'element_node' => {},
-            'index_entry' => {
-              'entry_element' => {},
-              'entry_number' => 36,
-              'in_code' => 0,
-              'index_name' => 'cp'
-            }
+            'index_entry' => [
+              'cp',
+              36
+            ]
           },
           'info' => {
             'spaces_before_argument' => {
@@ -1893,12 +1821,10 @@ $result_trees{'encoding_index_utf8'} = {
           'cmdname' => 'cindex',
           'extra' => {
             'element_node' => {},
-            'index_entry' => {
-              'entry_element' => {},
-              'entry_number' => 37,
-              'in_code' => 0,
-              'index_name' => 'cp'
-            }
+            'index_entry' => [
+              'cp',
+              37
+            ]
           },
           'info' => {
             'spaces_before_argument' => {
@@ -1942,12 +1868,10 @@ $result_trees{'encoding_index_utf8'} = {
           'cmdname' => 'cindex',
           'extra' => {
             'element_node' => {},
-            'index_entry' => {
-              'entry_element' => {},
-              'entry_number' => 38,
-              'in_code' => 0,
-              'index_name' => 'cp'
-            }
+            'index_entry' => [
+              'cp',
+              38
+            ]
           },
           'info' => {
             'spaces_before_argument' => {
@@ -1991,12 +1915,10 @@ $result_trees{'encoding_index_utf8'} = {
           'cmdname' => 'cindex',
           'extra' => {
             'element_node' => {},
-            'index_entry' => {
-              'entry_element' => {},
-              'entry_number' => 39,
-              'in_code' => 0,
-              'index_name' => 'cp'
-            }
+            'index_entry' => [
+              'cp',
+              39
+            ]
           },
           'info' => {
             'spaces_before_argument' => {
@@ -2040,12 +1962,10 @@ $result_trees{'encoding_index_utf8'} = {
           'cmdname' => 'cindex',
           'extra' => {
             'element_node' => {},
-            'index_entry' => {
-              'entry_element' => {},
-              'entry_number' => 40,
-              'in_code' => 0,
-              'index_name' => 'cp'
-            }
+            'index_entry' => [
+              'cp',
+              40
+            ]
           },
           'info' => {
             'spaces_before_argument' => {
@@ -2089,12 +2009,10 @@ $result_trees{'encoding_index_utf8'} = {
           'cmdname' => 'cindex',
           'extra' => {
             'element_node' => {},
-            'index_entry' => {
-              'entry_element' => {},
-              'entry_number' => 41,
-              'in_code' => 0,
-              'index_name' => 'cp'
-            }
+            'index_entry' => [
+              'cp',
+              41
+            ]
           },
           'info' => {
             'spaces_before_argument' => {
@@ -2138,12 +2056,10 @@ $result_trees{'encoding_index_utf8'} = {
           'cmdname' => 'cindex',
           'extra' => {
             'element_node' => {},
-            'index_entry' => {
-              'entry_element' => {},
-              'entry_number' => 42,
-              'in_code' => 0,
-              'index_name' => 'cp'
-            }
+            'index_entry' => [
+              'cp',
+              42
+            ]
           },
           'info' => {
             'spaces_before_argument' => {
@@ -2177,12 +2093,10 @@ $result_trees{'encoding_index_utf8'} = {
           'cmdname' => 'cindex',
           'extra' => {
             'element_node' => {},
-            'index_entry' => {
-              'entry_element' => {},
-              'entry_number' => 43,
-              'in_code' => 0,
-              'index_name' => 'cp'
-            }
+            'index_entry' => [
+              'cp',
+              43
+            ]
           },
           'info' => {
             'spaces_before_argument' => {
@@ -2216,12 +2130,10 @@ $result_trees{'encoding_index_utf8'} = {
           'cmdname' => 'cindex',
           'extra' => {
             'element_node' => {},
-            'index_entry' => {
-              'entry_element' => {},
-              'entry_number' => 44,
-              'in_code' => 0,
-              'index_name' => 'cp'
-            }
+            'index_entry' => [
+              'cp',
+              44
+            ]
           },
           'info' => {
             'spaces_before_argument' => {
@@ -2265,12 +2177,10 @@ $result_trees{'encoding_index_utf8'} = {
           'cmdname' => 'cindex',
           'extra' => {
             'element_node' => {},
-            'index_entry' => {
-              'entry_element' => {},
-              'entry_number' => 45,
-              'in_code' => 0,
-              'index_name' => 'cp'
-            }
+            'index_entry' => [
+              'cp',
+              45
+            ]
           },
           'info' => {
             'spaces_before_argument' => {
@@ -2314,12 +2224,10 @@ $result_trees{'encoding_index_utf8'} = {
           'cmdname' => 'cindex',
           'extra' => {
             'element_node' => {},
-            'index_entry' => {
-              'entry_element' => {},
-              'entry_number' => 46,
-              'in_code' => 0,
-              'index_name' => 'cp'
-            }
+            'index_entry' => [
+              'cp',
+              46
+            ]
           },
           'info' => {
             'spaces_before_argument' => {
@@ -2363,12 +2271,10 @@ $result_trees{'encoding_index_utf8'} = {
           'cmdname' => 'cindex',
           'extra' => {
             'element_node' => {},
-            'index_entry' => {
-              'entry_element' => {},
-              'entry_number' => 47,
-              'in_code' => 0,
-              'index_name' => 'cp'
-            }
+            'index_entry' => [
+              'cp',
+              47
+            ]
           },
           'info' => {
             'spaces_before_argument' => {
@@ -2402,12 +2308,10 @@ $result_trees{'encoding_index_utf8'} = {
           'cmdname' => 'cindex',
           'extra' => {
             'element_node' => {},
-            'index_entry' => {
-              'entry_element' => {},
-              'entry_number' => 48,
-              'in_code' => 0,
-              'index_name' => 'cp'
-            }
+            'index_entry' => [
+              'cp',
+              48
+            ]
           },
           'info' => {
             'spaces_before_argument' => {
@@ -2441,12 +2345,10 @@ $result_trees{'encoding_index_utf8'} = {
           'cmdname' => 'cindex',
           'extra' => {
             'element_node' => {},
-            'index_entry' => {
-              'entry_element' => {},
-              'entry_number' => 49,
-              'in_code' => 0,
-              'index_name' => 'cp'
-            }
+            'index_entry' => [
+              'cp',
+              49
+            ]
           },
           'info' => {
             'spaces_before_argument' => {
@@ -2480,12 +2382,10 @@ $result_trees{'encoding_index_utf8'} = {
           'cmdname' => 'cindex',
           'extra' => {
             'element_node' => {},
-            'index_entry' => {
-              'entry_element' => {},
-              'entry_number' => 50,
-              'in_code' => 0,
-              'index_name' => 'cp'
-            }
+            'index_entry' => [
+              'cp',
+              50
+            ]
           },
           'info' => {
             'spaces_before_argument' => {
@@ -2519,12 +2419,10 @@ $result_trees{'encoding_index_utf8'} = {
           'cmdname' => 'cindex',
           'extra' => {
             'element_node' => {},
-            'index_entry' => {
-              'entry_element' => {},
-              'entry_number' => 51,
-              'in_code' => 0,
-              'index_name' => 'cp'
-            }
+            'index_entry' => [
+              'cp',
+              51
+            ]
           },
           'info' => {
             'spaces_before_argument' => {
@@ -2558,12 +2456,10 @@ $result_trees{'encoding_index_utf8'} = {
           'cmdname' => 'cindex',
           'extra' => {
             'element_node' => {},
-            'index_entry' => {
-              'entry_element' => {},
-              'entry_number' => 52,
-              'in_code' => 0,
-              'index_name' => 'cp'
-            }
+            'index_entry' => [
+              'cp',
+              52
+            ]
           },
           'info' => {
             'spaces_before_argument' => {
@@ -2597,12 +2493,10 @@ $result_trees{'encoding_index_utf8'} = {
           'cmdname' => 'cindex',
           'extra' => {
             'element_node' => {},
-            'index_entry' => {
-              'entry_element' => {},
-              'entry_number' => 53,
-              'in_code' => 0,
-              'index_name' => 'cp'
-            }
+            'index_entry' => [
+              'cp',
+              53
+            ]
           },
           'info' => {
             'spaces_before_argument' => {
@@ -2636,12 +2530,10 @@ $result_trees{'encoding_index_utf8'} = {
           'cmdname' => 'cindex',
           'extra' => {
             'element_node' => {},
-            'index_entry' => {
-              'entry_element' => {},
-              'entry_number' => 54,
-              'in_code' => 0,
-              'index_name' => 'cp'
-            }
+            'index_entry' => [
+              'cp',
+              54
+            ]
           },
           'info' => {
             'spaces_before_argument' => {
@@ -2675,12 +2567,10 @@ $result_trees{'encoding_index_utf8'} = {
           'cmdname' => 'cindex',
           'extra' => {
             'element_node' => {},
-            'index_entry' => {
-              'entry_element' => {},
-              'entry_number' => 55,
-              'in_code' => 0,
-              'index_name' => 'cp'
-            }
+            'index_entry' => [
+              'cp',
+              55
+            ]
           },
           'info' => {
             'spaces_before_argument' => {
@@ -2763,115 +2653,60 @@ $result_trees{'encoding_index_utf8'} = {
   'type' => 'document_root'
 };
 
$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'}{'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'}{'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'}{'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'}{'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'}{'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'}{'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'}{'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'}{'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'}{'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'}{'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'}{'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'}{'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'}{'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'}{'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'}{'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'}{'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'}{'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'}{'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'}{'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'}{'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'}{'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'}{'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'}{'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'}{'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'}{'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'}{'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'}{'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'}{'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'}{'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'}{'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'}{'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'}{'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'}{'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'}{'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'}{'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'}{'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'}{'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'}{'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'}{'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'}{'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'}{'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'}{'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'}{'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'}{'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'}{'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'}{'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'}{'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'}{'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'}{'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'}{'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'}{'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'}{'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'}{'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'}{'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_texis{'encoding_index_utf8'} = '
 @documentencoding utf-8
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 50c6c4b565..c2a7b25eb3 100644
--- a/tp/t/results/indices/encoding_index_utf8_enable_encoding.pl
+++ b/tp/t/results/indices/encoding_index_utf8_enable_encoding.pl
@@ -179,12 +179,10 @@ $result_trees{'encoding_index_utf8_enable_encoding'} = {
           'cmdname' => 'cindex',
           'extra' => {
             'element_node' => {},
-            'index_entry' => {
-              'entry_element' => {},
-              'entry_number' => 1,
-              'in_code' => 0,
-              'index_name' => 'cp'
-            }
+            'index_entry' => [
+              'cp',
+              1
+            ]
           },
           'info' => {
             'spaces_before_argument' => {
@@ -290,12 +288,10 @@ $result_trees{'encoding_index_utf8_enable_encoding'} = {
           'cmdname' => 'cindex',
           'extra' => {
             'element_node' => {},
-            'index_entry' => {
-              'entry_element' => {},
-              'entry_number' => 2,
-              'in_code' => 0,
-              'index_name' => 'cp'
-            }
+            'index_entry' => [
+              'cp',
+              2
+            ]
           },
           'info' => {
             'spaces_before_argument' => {
@@ -419,12 +415,10 @@ $result_trees{'encoding_index_utf8_enable_encoding'} = {
           'cmdname' => 'cindex',
           'extra' => {
             'element_node' => {},
-            'index_entry' => {
-              'entry_element' => {},
-              'entry_number' => 3,
-              'in_code' => 0,
-              'index_name' => 'cp'
-            }
+            'index_entry' => [
+              'cp',
+              3
+            ]
           },
           'info' => {
             'spaces_before_argument' => {
@@ -458,12 +452,10 @@ $result_trees{'encoding_index_utf8_enable_encoding'} = {
           'cmdname' => 'cindex',
           'extra' => {
             'element_node' => {},
-            'index_entry' => {
-              'entry_element' => {},
-              'entry_number' => 4,
-              'in_code' => 0,
-              'index_name' => 'cp'
-            }
+            'index_entry' => [
+              'cp',
+              4
+            ]
           },
           'info' => {
             'spaces_before_argument' => {
@@ -497,12 +489,10 @@ $result_trees{'encoding_index_utf8_enable_encoding'} = {
           'cmdname' => 'cindex',
           'extra' => {
             'element_node' => {},
-            'index_entry' => {
-              'entry_element' => {},
-              'entry_number' => 5,
-              'in_code' => 0,
-              'index_name' => 'cp'
-            }
+            'index_entry' => [
+              'cp',
+              5
+            ]
           },
           'info' => {
             'spaces_before_argument' => {
@@ -536,12 +526,10 @@ $result_trees{'encoding_index_utf8_enable_encoding'} = {
           'cmdname' => 'cindex',
           'extra' => {
             'element_node' => {},
-            'index_entry' => {
-              'entry_element' => {},
-              'entry_number' => 6,
-              'in_code' => 0,
-              'index_name' => 'cp'
-            }
+            'index_entry' => [
+              'cp',
+              6
+            ]
           },
           'info' => {
             'spaces_before_argument' => {
@@ -575,12 +563,10 @@ $result_trees{'encoding_index_utf8_enable_encoding'} = {
           'cmdname' => 'cindex',
           'extra' => {
             'element_node' => {},
-            'index_entry' => {
-              'entry_element' => {},
-              'entry_number' => 7,
-              'in_code' => 0,
-              'index_name' => 'cp'
-            }
+            'index_entry' => [
+              'cp',
+              7
+            ]
           },
           'info' => {
             'spaces_before_argument' => {
@@ -614,12 +600,10 @@ $result_trees{'encoding_index_utf8_enable_encoding'} = {
           'cmdname' => 'cindex',
           'extra' => {
             'element_node' => {},
-            'index_entry' => {
-              'entry_element' => {},
-              'entry_number' => 8,
-              'in_code' => 0,
-              'index_name' => 'cp'
-            }
+            'index_entry' => [
+              'cp',
+              8
+            ]
           },
           'info' => {
             'spaces_before_argument' => {
@@ -653,12 +637,10 @@ $result_trees{'encoding_index_utf8_enable_encoding'} = {
           'cmdname' => 'cindex',
           'extra' => {
             'element_node' => {},
-            'index_entry' => {
-              'entry_element' => {},
-              'entry_number' => 9,
-              'in_code' => 0,
-              'index_name' => 'cp'
-            }
+            'index_entry' => [
+              'cp',
+              9
+            ]
           },
           'info' => {
             'spaces_before_argument' => {
@@ -692,12 +674,10 @@ $result_trees{'encoding_index_utf8_enable_encoding'} = {
           'cmdname' => 'cindex',
           'extra' => {
             'element_node' => {},
-            'index_entry' => {
-              'entry_element' => {},
-              'entry_number' => 10,
-              'in_code' => 0,
-              'index_name' => 'cp'
-            }
+            'index_entry' => [
+              'cp',
+              10
+            ]
           },
           'info' => {
             'spaces_before_argument' => {
@@ -731,12 +711,10 @@ $result_trees{'encoding_index_utf8_enable_encoding'} = {
           'cmdname' => 'cindex',
           'extra' => {
             'element_node' => {},
-            'index_entry' => {
-              'entry_element' => {},
-              'entry_number' => 11,
-              'in_code' => 0,
-              'index_name' => 'cp'
-            }
+            'index_entry' => [
+              'cp',
+              11
+            ]
           },
           'info' => {
             'spaces_before_argument' => {
@@ -770,12 +748,10 @@ $result_trees{'encoding_index_utf8_enable_encoding'} = {
           'cmdname' => 'cindex',
           'extra' => {
             'element_node' => {},
-            'index_entry' => {
-              'entry_element' => {},
-              'entry_number' => 12,
-              'in_code' => 0,
-              'index_name' => 'cp'
-            }
+            'index_entry' => [
+              'cp',
+              12
+            ]
           },
           'info' => {
             'spaces_before_argument' => {
@@ -809,12 +785,10 @@ $result_trees{'encoding_index_utf8_enable_encoding'} = {
           'cmdname' => 'cindex',
           'extra' => {
             'element_node' => {},
-            'index_entry' => {
-              'entry_element' => {},
-              'entry_number' => 13,
-              'in_code' => 0,
-              'index_name' => 'cp'
-            }
+            'index_entry' => [
+              'cp',
+              13
+            ]
           },
           'info' => {
             'spaces_before_argument' => {
@@ -848,12 +822,10 @@ $result_trees{'encoding_index_utf8_enable_encoding'} = {
           'cmdname' => 'cindex',
           'extra' => {
             'element_node' => {},
-            'index_entry' => {
-              'entry_element' => {},
-              'entry_number' => 14,
-              'in_code' => 0,
-              'index_name' => 'cp'
-            }
+            'index_entry' => [
+              'cp',
+              14
+            ]
           },
           'info' => {
             'spaces_before_argument' => {
@@ -887,12 +859,10 @@ $result_trees{'encoding_index_utf8_enable_encoding'} = {
           'cmdname' => 'cindex',
           'extra' => {
             'element_node' => {},
-            'index_entry' => {
-              'entry_element' => {},
-              'entry_number' => 15,
-              'in_code' => 0,
-              'index_name' => 'cp'
-            }
+            'index_entry' => [
+              'cp',
+              15
+            ]
           },
           'info' => {
             'spaces_before_argument' => {
@@ -926,12 +896,10 @@ $result_trees{'encoding_index_utf8_enable_encoding'} = {
           'cmdname' => 'cindex',
           'extra' => {
             'element_node' => {},
-            'index_entry' => {
-              'entry_element' => {},
-              'entry_number' => 16,
-              'in_code' => 0,
-              'index_name' => 'cp'
-            }
+            'index_entry' => [
+              'cp',
+              16
+            ]
           },
           'info' => {
             'spaces_before_argument' => {
@@ -965,12 +933,10 @@ $result_trees{'encoding_index_utf8_enable_encoding'} = {
           'cmdname' => 'cindex',
           'extra' => {
             'element_node' => {},
-            'index_entry' => {
-              'entry_element' => {},
-              'entry_number' => 17,
-              'in_code' => 0,
-              'index_name' => 'cp'
-            }
+            'index_entry' => [
+              'cp',
+              17
+            ]
           },
           'info' => {
             'spaces_before_argument' => {
@@ -1004,12 +970,10 @@ $result_trees{'encoding_index_utf8_enable_encoding'} = {
           'cmdname' => 'cindex',
           'extra' => {
             'element_node' => {},
-            'index_entry' => {
-              'entry_element' => {},
-              'entry_number' => 18,
-              'in_code' => 0,
-              'index_name' => 'cp'
-            }
+            'index_entry' => [
+              'cp',
+              18
+            ]
           },
           'info' => {
             'spaces_before_argument' => {
@@ -1043,12 +1007,10 @@ $result_trees{'encoding_index_utf8_enable_encoding'} = {
           'cmdname' => 'cindex',
           'extra' => {
             'element_node' => {},
-            'index_entry' => {
-              'entry_element' => {},
-              'entry_number' => 19,
-              'in_code' => 0,
-              'index_name' => 'cp'
-            }
+            'index_entry' => [
+              'cp',
+              19
+            ]
           },
           'info' => {
             'spaces_before_argument' => {
@@ -1082,12 +1044,10 @@ $result_trees{'encoding_index_utf8_enable_encoding'} = {
           'cmdname' => 'cindex',
           'extra' => {
             'element_node' => {},
-            'index_entry' => {
-              'entry_element' => {},
-              'entry_number' => 20,
-              'in_code' => 0,
-              'index_name' => 'cp'
-            }
+            'index_entry' => [
+              'cp',
+              20
+            ]
           },
           'info' => {
             'spaces_before_argument' => {
@@ -1121,12 +1081,10 @@ $result_trees{'encoding_index_utf8_enable_encoding'} = {
           'cmdname' => 'cindex',
           'extra' => {
             'element_node' => {},
-            'index_entry' => {
-              'entry_element' => {},
-              'entry_number' => 21,
-              'in_code' => 0,
-              'index_name' => 'cp'
-            }
+            'index_entry' => [
+              'cp',
+              21
+            ]
           },
           'info' => {
             'spaces_before_argument' => {
@@ -1160,12 +1118,10 @@ $result_trees{'encoding_index_utf8_enable_encoding'} = {
           'cmdname' => 'cindex',
           'extra' => {
             'element_node' => {},
-            'index_entry' => {
-              'entry_element' => {},
-              'entry_number' => 22,
-              'in_code' => 0,
-              'index_name' => 'cp'
-            }
+            'index_entry' => [
+              'cp',
+              22
+            ]
           },
           'info' => {
             'spaces_before_argument' => {
@@ -1199,12 +1155,10 @@ $result_trees{'encoding_index_utf8_enable_encoding'} = {
           'cmdname' => 'cindex',
           'extra' => {
             'element_node' => {},
-            'index_entry' => {
-              'entry_element' => {},
-              'entry_number' => 23,
-              'in_code' => 0,
-              'index_name' => 'cp'
-            }
+            'index_entry' => [
+              'cp',
+              23
+            ]
           },
           'info' => {
             'spaces_before_argument' => {
@@ -1238,12 +1192,10 @@ $result_trees{'encoding_index_utf8_enable_encoding'} = {
           'cmdname' => 'cindex',
           'extra' => {
             'element_node' => {},
-            'index_entry' => {
-              'entry_element' => {},
-              'entry_number' => 24,
-              'in_code' => 0,
-              'index_name' => 'cp'
-            }
+            'index_entry' => [
+              'cp',
+              24
+            ]
           },
           'info' => {
             'spaces_before_argument' => {
@@ -1277,12 +1229,10 @@ $result_trees{'encoding_index_utf8_enable_encoding'} = {
           'cmdname' => 'cindex',
           'extra' => {
             'element_node' => {},
-            'index_entry' => {
-              'entry_element' => {},
-              'entry_number' => 25,
-              'in_code' => 0,
-              'index_name' => 'cp'
-            }
+            'index_entry' => [
+              'cp',
+              25
+            ]
           },
           'info' => {
             'spaces_before_argument' => {
@@ -1316,12 +1266,10 @@ $result_trees{'encoding_index_utf8_enable_encoding'} = {
           'cmdname' => 'cindex',
           'extra' => {
             'element_node' => {},
-            'index_entry' => {
-              'entry_element' => {},
-              'entry_number' => 26,
-              'in_code' => 0,
-              'index_name' => 'cp'
-            }
+            'index_entry' => [
+              'cp',
+              26
+            ]
           },
           'info' => {
             'spaces_before_argument' => {
@@ -1355,12 +1303,10 @@ $result_trees{'encoding_index_utf8_enable_encoding'} = {
           'cmdname' => 'cindex',
           'extra' => {
             'element_node' => {},
-            'index_entry' => {
-              'entry_element' => {},
-              'entry_number' => 27,
-              'in_code' => 0,
-              'index_name' => 'cp'
-            }
+            'index_entry' => [
+              'cp',
+              27
+            ]
           },
           'info' => {
             'spaces_before_argument' => {
@@ -1394,12 +1340,10 @@ $result_trees{'encoding_index_utf8_enable_encoding'} = {
           'cmdname' => 'cindex',
           'extra' => {
             'element_node' => {},
-            'index_entry' => {
-              'entry_element' => {},
-              'entry_number' => 28,
-              'in_code' => 0,
-              'index_name' => 'cp'
-            }
+            'index_entry' => [
+              'cp',
+              28
+            ]
           },
           'info' => {
             'spaces_before_argument' => {
@@ -1433,12 +1377,10 @@ $result_trees{'encoding_index_utf8_enable_encoding'} = {
           'cmdname' => 'cindex',
           'extra' => {
             'element_node' => {},
-            'index_entry' => {
-              'entry_element' => {},
-              'entry_number' => 29,
-              'in_code' => 0,
-              'index_name' => 'cp'
-            }
+            'index_entry' => [
+              'cp',
+              29
+            ]
           },
           'info' => {
             'spaces_before_argument' => {
@@ -1472,12 +1414,10 @@ $result_trees{'encoding_index_utf8_enable_encoding'} = {
           'cmdname' => 'cindex',
           'extra' => {
             'element_node' => {},
-            'index_entry' => {
-              'entry_element' => {},
-              'entry_number' => 30,
-              'in_code' => 0,
-              'index_name' => 'cp'
-            }
+            'index_entry' => [
+              'cp',
+              30
+            ]
           },
           'info' => {
             'spaces_before_argument' => {
@@ -1511,12 +1451,10 @@ $result_trees{'encoding_index_utf8_enable_encoding'} = {
           'cmdname' => 'cindex',
           'extra' => {
             'element_node' => {},
-            'index_entry' => {
-              'entry_element' => {},
-              'entry_number' => 31,
-              'in_code' => 0,
-              'index_name' => 'cp'
-            }
+            'index_entry' => [
+              'cp',
+              31
+            ]
           },
           'info' => {
             'spaces_before_argument' => {
@@ -1560,12 +1498,10 @@ $result_trees{'encoding_index_utf8_enable_encoding'} = {
           'cmdname' => 'cindex',
           'extra' => {
             'element_node' => {},
-            'index_entry' => {
-              'entry_element' => {},
-              'entry_number' => 32,
-              'in_code' => 0,
-              'index_name' => 'cp'
-            }
+            'index_entry' => [
+              'cp',
+              32
+            ]
           },
           'info' => {
             'spaces_before_argument' => {
@@ -1609,12 +1545,10 @@ $result_trees{'encoding_index_utf8_enable_encoding'} = {
           'cmdname' => 'cindex',
           'extra' => {
             'element_node' => {},
-            'index_entry' => {
-              'entry_element' => {},
-              'entry_number' => 33,
-              'in_code' => 0,
-              'index_name' => 'cp'
-            }
+            'index_entry' => [
+              'cp',
+              33
+            ]
           },
           'info' => {
             'spaces_before_argument' => {
@@ -1687,12 +1621,10 @@ $result_trees{'encoding_index_utf8_enable_encoding'} = {
           'cmdname' => 'cindex',
           'extra' => {
             'element_node' => {},
-            'index_entry' => {
-              'entry_element' => {},
-              'entry_number' => 34,
-              'in_code' => 0,
-              'index_name' => 'cp'
-            }
+            'index_entry' => [
+              'cp',
+              34
+            ]
           },
           'info' => {
             'spaces_before_argument' => {
@@ -1795,12 +1727,10 @@ $result_trees{'encoding_index_utf8_enable_encoding'} = {
           'cmdname' => 'cindex',
           'extra' => {
             'element_node' => {},
-            'index_entry' => {
-              'entry_element' => {},
-              'entry_number' => 35,
-              'in_code' => 0,
-              'index_name' => 'cp'
-            }
+            'index_entry' => [
+              'cp',
+              35
+            ]
           },
           'info' => {
             'spaces_before_argument' => {
@@ -1844,12 +1774,10 @@ $result_trees{'encoding_index_utf8_enable_encoding'} = {
           'cmdname' => 'cindex',
           'extra' => {
             'element_node' => {},
-            'index_entry' => {
-              'entry_element' => {},
-              'entry_number' => 36,
-              'in_code' => 0,
-              'index_name' => 'cp'
-            }
+            'index_entry' => [
+              'cp',
+              36
+            ]
           },
           'info' => {
             'spaces_before_argument' => {
@@ -1893,12 +1821,10 @@ $result_trees{'encoding_index_utf8_enable_encoding'} = {
           'cmdname' => 'cindex',
           'extra' => {
             'element_node' => {},
-            'index_entry' => {
-              'entry_element' => {},
-              'entry_number' => 37,
-              'in_code' => 0,
-              'index_name' => 'cp'
-            }
+            'index_entry' => [
+              'cp',
+              37
+            ]
           },
           'info' => {
             'spaces_before_argument' => {
@@ -1942,12 +1868,10 @@ $result_trees{'encoding_index_utf8_enable_encoding'} = {
           'cmdname' => 'cindex',
           'extra' => {
             'element_node' => {},
-            'index_entry' => {
-              'entry_element' => {},
-              'entry_number' => 38,
-              'in_code' => 0,
-              'index_name' => 'cp'
-            }
+            'index_entry' => [
+              'cp',
+              38
+            ]
           },
           'info' => {
             'spaces_before_argument' => {
@@ -1991,12 +1915,10 @@ $result_trees{'encoding_index_utf8_enable_encoding'} = {
           'cmdname' => 'cindex',
           'extra' => {
             'element_node' => {},
-            'index_entry' => {
-              'entry_element' => {},
-              'entry_number' => 39,
-              'in_code' => 0,
-              'index_name' => 'cp'
-            }
+            'index_entry' => [
+              'cp',
+              39
+            ]
           },
           'info' => {
             'spaces_before_argument' => {
@@ -2040,12 +1962,10 @@ $result_trees{'encoding_index_utf8_enable_encoding'} = {
           'cmdname' => 'cindex',
           'extra' => {
             'element_node' => {},
-            'index_entry' => {
-              'entry_element' => {},
-              'entry_number' => 40,
-              'in_code' => 0,
-              'index_name' => 'cp'
-            }
+            'index_entry' => [
+              'cp',
+              40
+            ]
           },
           'info' => {
             'spaces_before_argument' => {
@@ -2089,12 +2009,10 @@ $result_trees{'encoding_index_utf8_enable_encoding'} = {
           'cmdname' => 'cindex',
           'extra' => {
             'element_node' => {},
-            'index_entry' => {
-              'entry_element' => {},
-              'entry_number' => 41,
-              'in_code' => 0,
-              'index_name' => 'cp'
-            }
+            'index_entry' => [
+              'cp',
+              41
+            ]
           },
           'info' => {
             'spaces_before_argument' => {
@@ -2138,12 +2056,10 @@ $result_trees{'encoding_index_utf8_enable_encoding'} = {
           'cmdname' => 'cindex',
           'extra' => {
             'element_node' => {},
-            'index_entry' => {
-              'entry_element' => {},
-              'entry_number' => 42,
-              'in_code' => 0,
-              'index_name' => 'cp'
-            }
+            'index_entry' => [
+              'cp',
+              42
+            ]
           },
           'info' => {
             'spaces_before_argument' => {
@@ -2177,12 +2093,10 @@ $result_trees{'encoding_index_utf8_enable_encoding'} = {
           'cmdname' => 'cindex',
           'extra' => {
             'element_node' => {},
-            'index_entry' => {
-              'entry_element' => {},
-              'entry_number' => 43,
-              'in_code' => 0,
-              'index_name' => 'cp'
-            }
+            'index_entry' => [
+              'cp',
+              43
+            ]
           },
           'info' => {
             'spaces_before_argument' => {
@@ -2216,12 +2130,10 @@ $result_trees{'encoding_index_utf8_enable_encoding'} = {
           'cmdname' => 'cindex',
           'extra' => {
             'element_node' => {},
-            'index_entry' => {
-              'entry_element' => {},
-              'entry_number' => 44,
-              'in_code' => 0,
-              'index_name' => 'cp'
-            }
+            'index_entry' => [
+              'cp',
+              44
+            ]
           },
           'info' => {
             'spaces_before_argument' => {
@@ -2265,12 +2177,10 @@ $result_trees{'encoding_index_utf8_enable_encoding'} = {
           'cmdname' => 'cindex',
           'extra' => {
             'element_node' => {},
-            'index_entry' => {
-              'entry_element' => {},
-              'entry_number' => 45,
-              'in_code' => 0,
-              'index_name' => 'cp'
-            }
+            'index_entry' => [
+              'cp',
+              45
+            ]
           },
           'info' => {
             'spaces_before_argument' => {
@@ -2314,12 +2224,10 @@ $result_trees{'encoding_index_utf8_enable_encoding'} = {
           'cmdname' => 'cindex',
           'extra' => {
             'element_node' => {},
-            'index_entry' => {
-              'entry_element' => {},
-              'entry_number' => 46,
-              'in_code' => 0,
-              'index_name' => 'cp'
-            }
+            'index_entry' => [
+              'cp',
+              46
+            ]
           },
           'info' => {
             'spaces_before_argument' => {
@@ -2363,12 +2271,10 @@ $result_trees{'encoding_index_utf8_enable_encoding'} = {
           'cmdname' => 'cindex',
           'extra' => {
             'element_node' => {},
-            'index_entry' => {
-              'entry_element' => {},
-              'entry_number' => 47,
-              'in_code' => 0,
-              'index_name' => 'cp'
-            }
+            'index_entry' => [
+              'cp',
+              47
+            ]
           },
           'info' => {
             'spaces_before_argument' => {
@@ -2402,12 +2308,10 @@ $result_trees{'encoding_index_utf8_enable_encoding'} = {
           'cmdname' => 'cindex',
           'extra' => {
             'element_node' => {},
-            'index_entry' => {
-              'entry_element' => {},
-              'entry_number' => 48,
-              'in_code' => 0,
-              'index_name' => 'cp'
-            }
+            'index_entry' => [
+              'cp',
+              48
+            ]
           },
           'info' => {
             'spaces_before_argument' => {
@@ -2441,12 +2345,10 @@ $result_trees{'encoding_index_utf8_enable_encoding'} = {
           'cmdname' => 'cindex',
           'extra' => {
             'element_node' => {},
-            'index_entry' => {
-              'entry_element' => {},
-              'entry_number' => 49,
-              'in_code' => 0,
-              'index_name' => 'cp'
-            }
+            'index_entry' => [
+              'cp',
+              49
+            ]
           },
           'info' => {
             'spaces_before_argument' => {
@@ -2480,12 +2382,10 @@ $result_trees{'encoding_index_utf8_enable_encoding'} = {
           'cmdname' => 'cindex',
           'extra' => {
             'element_node' => {},
-            'index_entry' => {
-              'entry_element' => {},
-              'entry_number' => 50,
-              'in_code' => 0,
-              'index_name' => 'cp'
-            }
+            'index_entry' => [
+              'cp',
+              50
+            ]
           },
           'info' => {
             'spaces_before_argument' => {
@@ -2519,12 +2419,10 @@ $result_trees{'encoding_index_utf8_enable_encoding'} = {
           'cmdname' => 'cindex',
           'extra' => {
             'element_node' => {},
-            'index_entry' => {
-              'entry_element' => {},
-              'entry_number' => 51,
-              'in_code' => 0,
-              'index_name' => 'cp'
-            }
+            'index_entry' => [
+              'cp',
+              51
+            ]
           },
           'info' => {
             'spaces_before_argument' => {
@@ -2558,12 +2456,10 @@ $result_trees{'encoding_index_utf8_enable_encoding'} = {
           'cmdname' => 'cindex',
           'extra' => {
             'element_node' => {},
-            'index_entry' => {
-              'entry_element' => {},
-              'entry_number' => 52,
-              'in_code' => 0,
-              'index_name' => 'cp'
-            }
+            'index_entry' => [
+              'cp',
+              52
+            ]
           },
           'info' => {
             'spaces_before_argument' => {
@@ -2597,12 +2493,10 @@ $result_trees{'encoding_index_utf8_enable_encoding'} = {
           'cmdname' => 'cindex',
           'extra' => {
             'element_node' => {},
-            'index_entry' => {
-              'entry_element' => {},
-              'entry_number' => 53,
-              'in_code' => 0,
-              'index_name' => 'cp'
-            }
+            'index_entry' => [
+              'cp',
+              53
+            ]
           },
           'info' => {
             'spaces_before_argument' => {
@@ -2636,12 +2530,10 @@ $result_trees{'encoding_index_utf8_enable_encoding'} = {
           'cmdname' => 'cindex',
           'extra' => {
             'element_node' => {},
-            'index_entry' => {
-              'entry_element' => {},
-              'entry_number' => 54,
-              'in_code' => 0,
-              'index_name' => 'cp'
-            }
+            'index_entry' => [
+              'cp',
+              54
+            ]
           },
           'info' => {
             'spaces_before_argument' => {
@@ -2675,12 +2567,10 @@ $result_trees{'encoding_index_utf8_enable_encoding'} = {
           'cmdname' => 'cindex',
           'extra' => {
             'element_node' => {},
-            'index_entry' => {
-              'entry_element' => {},
-              'entry_number' => 55,
-              'in_code' => 0,
-              'index_name' => 'cp'
-            }
+            'index_entry' => [
+              'cp',
+              55
+            ]
           },
           'info' => {
             'spaces_before_argument' => {
@@ -2763,115 +2653,60 @@ $result_trees{'encoding_index_utf8_enable_encoding'} = 
{
   'type' => 'document_root'
 };
 
$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'}{'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'}{'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'}{'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'}{'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'}{'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'}{'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'}{'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'}{'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'}{'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'}{'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'}{'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'}{'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'}{'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'}{'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'}{'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'}{'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'}{'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'}{'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'}{'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'}{'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'}{'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'}{'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'}{'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'}{'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'}{'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'}{'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'}{'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'}{'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'}{'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'}{'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'}{'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'}{'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'}{'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'}{'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'}{'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'}{'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'}{'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'}{'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'}{'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'}{'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'}{'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'}{'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'}{'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'}{'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'}{'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'}{'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'}{'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'}{'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'}{'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'}{'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'}{'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'}{'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'}{'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'}{'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_texis{'encoding_index_utf8_enable_encoding'} = '
 @documentencoding utf-8
diff --git a/tp/t/results/indices/explicit_sort_key.pl 
b/tp/t/results/indices/explicit_sort_key.pl
index a7ca555664..25aed526b0 100644
--- a/tp/t/results/indices/explicit_sort_key.pl
+++ b/tp/t/results/indices/explicit_sort_key.pl
@@ -180,12 +180,10 @@ $result_trees{'explicit_sort_key'} = {
           'cmdname' => 'SKindex',
           'extra' => {
             'element_node' => {},
-            'index_entry' => {
-              'entry_element' => {},
-              'entry_number' => 1,
-              'in_code' => 0,
-              'index_name' => 'SK'
-            },
+            'index_entry' => [
+              'SK',
+              1
+            ],
             'sortas' => 'A'
           },
           'info' => {
@@ -242,12 +240,10 @@ $result_trees{'explicit_sort_key'} = {
           'cmdname' => 'SKindex',
           'extra' => {
             'element_node' => {},
-            'index_entry' => {
-              'entry_element' => {},
-              'entry_number' => 2,
-              'in_code' => 0,
-              'index_name' => 'SK'
-            },
+            'index_entry' => [
+              'SK',
+              2
+            ],
             'sortas' => 'B'
           },
           'info' => {
@@ -304,12 +300,10 @@ $result_trees{'explicit_sort_key'} = {
           'cmdname' => 'SKindex',
           'extra' => {
             'element_node' => {},
-            'index_entry' => {
-              'entry_element' => {},
-              'entry_number' => 3,
-              'in_code' => 0,
-              'index_name' => 'SK'
-            },
+            'index_entry' => [
+              'SK',
+              3
+            ],
             'sortas' => '0'
           },
           'info' => {
@@ -377,12 +371,10 @@ $result_trees{'explicit_sort_key'} = {
           'cmdname' => 'SKindex',
           'extra' => {
             'element_node' => {},
-            'index_entry' => {
-              'entry_element' => {},
-              'entry_number' => 4,
-              'in_code' => 0,
-              'index_name' => 'SK'
-            }
+            'index_entry' => [
+              'SK',
+              4
+            ]
           },
           'info' => {
             'spaces_before_argument' => {
@@ -619,13 +611,9 @@ $result_trees{'explicit_sort_key'} = {
   'type' => 'document_root'
 };
 
$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'}{'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'}{'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'}{'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_texis{'explicit_sort_key'} = '@node Top
 @top
diff --git a/tp/t/results/indices/ftable_vtable.pl 
b/tp/t/results/indices/ftable_vtable.pl
index 5a07db8597..4df4aafb11 100644
--- a/tp/t/results/indices/ftable_vtable.pl
+++ b/tp/t/results/indices/ftable_vtable.pl
@@ -131,12 +131,10 @@ $result_trees{'ftable_vtable'} = {
                       'cmdname' => 'item',
                       'extra' => {
                         'element_node' => {},
-                        'index_entry' => {
-                          'entry_element' => {},
-                          'entry_number' => 1,
-                          'in_code' => 1,
-                          'index_name' => 'fn'
-                        }
+                        'index_entry' => [
+                          'fn',
+                          1
+                        ]
                       },
                       'info' => {
                         'spaces_before_argument' => {
@@ -169,12 +167,10 @@ $result_trees{'ftable_vtable'} = {
                       'cmdname' => 'itemx',
                       'extra' => {
                         'element_node' => {},
-                        'index_entry' => {
-                          'entry_element' => {},
-                          'entry_number' => 2,
-                          'in_code' => 1,
-                          'index_name' => 'fn'
-                        }
+                        'index_entry' => [
+                          'fn',
+                          2
+                        ]
                       },
                       'info' => {
                         'spaces_before_argument' => {
@@ -231,12 +227,10 @@ $result_trees{'ftable_vtable'} = {
                       'cmdname' => 'item',
                       'extra' => {
                         'element_node' => {},
-                        'index_entry' => {
-                          'entry_element' => {},
-                          'entry_number' => 3,
-                          'in_code' => 1,
-                          'index_name' => 'fn'
-                        }
+                        'index_entry' => [
+                          'fn',
+                          3
+                        ]
                       },
                       'info' => {
                         'spaces_before_argument' => {
@@ -369,12 +363,10 @@ $result_trees{'ftable_vtable'} = {
                       'cmdname' => 'item',
                       'extra' => {
                         'element_node' => {},
-                        'index_entry' => {
-                          'entry_element' => {},
-                          'entry_number' => 1,
-                          'in_code' => 1,
-                          'index_name' => 'vr'
-                        }
+                        'index_entry' => [
+                          'vr',
+                          1
+                        ]
                       },
                       'info' => {
                         'spaces_before_argument' => {
@@ -407,12 +399,10 @@ $result_trees{'ftable_vtable'} = {
                       'cmdname' => 'itemx',
                       'extra' => {
                         'element_node' => {},
-                        'index_entry' => {
-                          'entry_element' => {},
-                          'entry_number' => 2,
-                          'in_code' => 1,
-                          'index_name' => 'vr'
-                        }
+                        'index_entry' => [
+                          'vr',
+                          2
+                        ]
                       },
                       'info' => {
                         'spaces_before_argument' => {
@@ -469,12 +459,10 @@ $result_trees{'ftable_vtable'} = {
                       'cmdname' => 'item',
                       'extra' => {
                         'element_node' => {},
-                        'index_entry' => {
-                          'entry_element' => {},
-                          'entry_number' => 3,
-                          'in_code' => 1,
-                          'index_name' => 'vr'
-                        }
+                        'index_entry' => [
+                          'vr',
+                          3
+                        ]
                       },
                       'info' => {
                         'spaces_before_argument' => {
@@ -565,12 +553,10 @@ $result_trees{'ftable_vtable'} = {
           'cmdname' => 'findex',
           'extra' => {
             'element_node' => {},
-            'index_entry' => {
-              'entry_element' => {},
-              'entry_number' => 4,
-              'in_code' => 1,
-              'index_name' => 'fn'
-            }
+            'index_entry' => [
+              'fn',
+              4
+            ]
           },
           'info' => {
             'spaces_before_argument' => {
@@ -687,21 +673,14 @@ $result_trees{'ftable_vtable'} = {
   'type' => 'document_root'
 };
 
$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'}{'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'}{'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'}{'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'}{'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'}{'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'}{'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_texis{'ftable_vtable'} = '
 @node Top
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 9f79a77e85..106163a124 100644
--- a/tp/t/results/indices/ignored_sort_char_empty_entries.pl
+++ b/tp/t/results/indices/ignored_sort_char_empty_entries.pl
@@ -142,12 +142,10 @@ $result_trees{'ignored_sort_char_empty_entries'} = {
           'cmdname' => 'findex',
           'extra' => {
             'element_node' => {},
-            'index_entry' => {
-              'entry_element' => {},
-              'entry_number' => 1,
-              'in_code' => 1,
-              'index_name' => 'fn'
-            },
+            'index_entry' => [
+              'fn',
+              1
+            ],
             'index_ignore_chars' => '-'
           },
           'info' => {
@@ -182,12 +180,10 @@ $result_trees{'ignored_sort_char_empty_entries'} = {
           'cmdname' => 'findex',
           'extra' => {
             'element_node' => {},
-            'index_entry' => {
-              'entry_element' => {},
-              'entry_number' => 2,
-              'in_code' => 1,
-              'index_name' => 'fn'
-            },
+            'index_entry' => [
+              'fn',
+              2
+            ],
             'index_ignore_chars' => '-'
           },
           'info' => {
@@ -222,12 +218,10 @@ $result_trees{'ignored_sort_char_empty_entries'} = {
           'cmdname' => 'findex',
           'extra' => {
             'element_node' => {},
-            'index_entry' => {
-              'entry_element' => {},
-              'entry_number' => 3,
-              'in_code' => 1,
-              'index_name' => 'fn'
-            },
+            'index_entry' => [
+              'fn',
+              3
+            ],
             'index_ignore_chars' => '-'
           },
           'info' => {
@@ -284,12 +278,10 @@ $result_trees{'ignored_sort_char_empty_entries'} = {
           'cmdname' => 'findex',
           'extra' => {
             'element_node' => {},
-            'index_entry' => {
-              'entry_element' => {},
-              'entry_number' => 4,
-              'in_code' => 1,
-              'index_name' => 'fn'
-            },
+            'index_entry' => [
+              'fn',
+              4
+            ],
             'index_ignore_chars' => '-',
             'sortas' => '--'
           },
@@ -364,13 +356,9 @@ $result_trees{'ignored_sort_char_empty_entries'} = {
   'type' => 'document_root'
 };
 
$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'}{'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'}{'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'}{'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_texis{'ignored_sort_char_empty_entries'} = '@set txiindexhyphenignore
 
diff --git a/tp/t/results/indices/image_lines_count.pl 
b/tp/t/results/indices/image_lines_count.pl
index a63681a003..70bc85d3f7 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 b65f81754d..2575486af2 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 be6d03aede..03fde9e3fc 100644
--- a/tp/t/results/indices/index_and_node_same_name.pl
+++ b/tp/t/results/indices/index_and_node_same_name.pl
@@ -106,12 +106,10 @@ $result_trees{'index_and_node_same_name'} = {
           'cmdname' => 'cindex',
           'extra' => {
             'element_node' => {},
-            'index_entry' => {
-              'entry_element' => {},
-              'entry_number' => 1,
-              'in_code' => 0,
-              'index_name' => 'cp'
-            }
+            'index_entry' => [
+              'cp',
+              1
+            ]
           },
           'info' => {
             'spaces_before_argument' => {
@@ -265,7 +263,6 @@ $result_trees{'index_and_node_same_name'} = {
   'type' => 'document_root'
 };
 
$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_texis{'index_and_node_same_name'} = '@node Top
 @top Test index entry with node name clash
diff --git a/tp/t/results/indices/index_entries_before_nodes.pl 
b/tp/t/results/indices/index_entries_before_nodes.pl
index 589b8e9ee9..0eab7378d5 100644
Binary files a/tp/t/results/indices/index_entries_before_nodes.pl and 
b/tp/t/results/indices/index_entries_before_nodes.pl differ
diff --git a/tp/t/results/indices/index_entries_locations.pl 
b/tp/t/results/indices/index_entries_locations.pl
index de214daf35..56f4adc599 100644
--- a/tp/t/results/indices/index_entries_locations.pl
+++ b/tp/t/results/indices/index_entries_locations.pl
@@ -125,12 +125,10 @@ $result_trees{'index_entries_locations'} = {
           'cmdname' => 'cindex',
           'extra' => {
             'element_node' => {},
-            'index_entry' => {
-              'entry_element' => {},
-              'entry_number' => 1,
-              'in_code' => 0,
-              'index_name' => 'cp'
-            }
+            'index_entry' => [
+              'cp',
+              1
+            ]
           },
           'info' => {
             'spaces_before_argument' => {
@@ -173,12 +171,10 @@ $result_trees{'index_entries_locations'} = {
           'cmdname' => 'cindex',
           'extra' => {
             'element_node' => {},
-            'index_entry' => {
-              'entry_element' => {},
-              'entry_number' => 2,
-              'in_code' => 0,
-              'index_name' => 'cp'
-            }
+            'index_entry' => [
+              'cp',
+              2
+            ]
           },
           'info' => {
             'spaces_before_argument' => {
@@ -231,12 +227,10 @@ $result_trees{'index_entries_locations'} = {
           'cmdname' => 'cindex',
           'extra' => {
             'element_node' => {},
-            'index_entry' => {
-              'entry_element' => {},
-              'entry_number' => 3,
-              'in_code' => 0,
-              'index_name' => 'cp'
-            }
+            'index_entry' => [
+              'cp',
+              3
+            ]
           },
           'info' => {
             'spaces_before_argument' => {
@@ -284,12 +278,10 @@ $result_trees{'index_entries_locations'} = {
           'cmdname' => 'cindex',
           'extra' => {
             'element_node' => {},
-            'index_entry' => {
-              'entry_element' => {},
-              'entry_number' => 4,
-              'in_code' => 0,
-              'index_name' => 'cp'
-            }
+            'index_entry' => [
+              'cp',
+              4
+            ]
           },
           'info' => {
             'spaces_before_argument' => {
@@ -376,13 +368,9 @@ $result_trees{'index_entries_locations'} = {
   'type' => 'document_root'
 };
 
$result_trees{'index_entries_locations'}{'contents'}[2]{'contents'}[4]{'extra'}{'element_node'}
 = $result_trees{'index_entries_locations'}{'contents'}[2];
-$result_trees{'index_entries_locations'}{'contents'}[2]{'contents'}[4]{'extra'}{'index_entry'}{'entry_element'}
 = $result_trees{'index_entries_locations'}{'contents'}[2]{'contents'}[4];
 
$result_trees{'index_entries_locations'}{'contents'}[2]{'contents'}[6]{'extra'}{'element_node'}
 = $result_trees{'index_entries_locations'}{'contents'}[2];
-$result_trees{'index_entries_locations'}{'contents'}[2]{'contents'}[6]{'extra'}{'index_entry'}{'entry_element'}
 = $result_trees{'index_entries_locations'}{'contents'}[2]{'contents'}[6];
 
$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]{'contents'}[13]{'extra'}{'element_node'}
 = $result_trees{'index_entries_locations'}{'contents'}[2];
-$result_trees{'index_entries_locations'}{'contents'}[2]{'contents'}[13]{'extra'}{'index_entry'}{'entry_element'}
 = $result_trees{'index_entries_locations'}{'contents'}[2]{'contents'}[13];
 
 $result_texis{'index_entries_locations'} = '
 @node Top
diff --git a/tp/t/results/indices/index_entry_before_first_node.pl 
b/tp/t/results/indices/index_entry_before_first_node.pl
index bdd9cffaa9..6d8b522dcc 100644
Binary files a/tp/t/results/indices/index_entry_before_first_node.pl and 
b/tp/t/results/indices/index_entry_before_first_node.pl differ
diff --git a/tp/t/results/indices/index_entry_before_node.pl 
b/tp/t/results/indices/index_entry_before_node.pl
index 876844742e..eeaa5f502c 100644
--- a/tp/t/results/indices/index_entry_before_node.pl
+++ b/tp/t/results/indices/index_entry_before_node.pl
@@ -294,12 +294,10 @@ $result_trees{'index_entry_before_node'} = {
           'cmdname' => 'cindex',
           'extra' => {
             'element_node' => {},
-            'index_entry' => {
-              'entry_element' => {},
-              'entry_number' => 1,
-              'in_code' => 0,
-              'index_name' => 'cp'
-            }
+            'index_entry' => [
+              'cp',
+              1
+            ]
           },
           'info' => {
             'spaces_before_argument' => {
@@ -446,7 +444,6 @@ 
$result_trees{'index_entry_before_node'}{'contents'}[1]{'contents'}[1]{'contents
 
$result_trees{'index_entry_before_node'}{'contents'}[2]{'args'}[1]{'extra'}{'node_content'}[0]
 = 
$result_trees{'index_entry_before_node'}{'contents'}[2]{'args'}[1]{'contents'}[0];
 
$result_trees{'index_entry_before_node'}{'contents'}[2]{'args'}[3]{'extra'}{'node_content'}[0]
 = 
$result_trees{'index_entry_before_node'}{'contents'}[2]{'args'}[3]{'contents'}[0];
 
$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'}[3]{'args'}[2]{'extra'}{'node_content'}[0]
 = 
$result_trees{'index_entry_before_node'}{'contents'}[3]{'args'}[2]{'contents'}[0];
 
$result_trees{'index_entry_before_node'}{'contents'}[3]{'args'}[3]{'extra'}{'node_content'}[0]
 = 
$result_trees{'index_entry_before_node'}{'contents'}[3]{'args'}[3]{'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 4f037f905c..5e431e0c41 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 a3addaa9b0..918334b2c5 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
@@ -267,12 +267,10 @@ 
$result_trees{'index_entry_in_footnote_different_node_end'} = {
                       'cmdname' => 'cindex',
                       'extra' => {
                         'element_node' => {},
-                        'index_entry' => {
-                          'entry_element' => {},
-                          'entry_number' => 1,
-                          'in_code' => 0,
-                          'index_name' => 'cp'
-                        }
+                        'index_entry' => [
+                          'cp',
+                          1
+                        ]
                       },
                       'info' => {
                         'spaces_before_argument' => {
@@ -339,12 +337,10 @@ 
$result_trees{'index_entry_in_footnote_different_node_end'} = {
                       'cmdname' => 'cindex',
                       'extra' => {
                         'element_node' => {},
-                        'index_entry' => {
-                          'entry_element' => {},
-                          'entry_number' => 2,
-                          'in_code' => 0,
-                          'index_name' => 'cp'
-                        }
+                        'index_entry' => [
+                          'cp',
+                          2
+                        ]
                       },
                       'info' => {
                         'spaces_before_argument' => {
@@ -476,9 +472,7 @@ $result_trees{'index_entry_in_footnote_different_node_end'} 
= {
 
$result_trees{'index_entry_in_footnote_different_node_end'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'contents'}[1]{'extra'}{'node_content'}[0]
 = 
$result_trees{'index_entry_in_footnote_different_node_end'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'contents'}[1]{'contents'}[0];
 
$result_trees{'index_entry_in_footnote_different_node_end'}{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'extra'}{'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'}[2]{'contents'}[1]{'contents'}[1]{'args'}[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'}[1]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'index_entry_in_footnote_different_node_end'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'args'}[0]{'contents'}[1];
 
$result_trees{'index_entry_in_footnote_different_node_end'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'args'}[0]{'contents'}[7]{'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'}[7]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'index_entry_in_footnote_different_node_end'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'args'}[0]{'contents'}[7];
 
 $result_texis{'index_entry_in_footnote_different_node_end'} = '@node Top
 
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 f29bbb245b..ec4e478331 100644
--- a/tp/t/results/indices/index_entry_in_footnote_sections.pl
+++ b/tp/t/results/indices/index_entry_in_footnote_sections.pl
@@ -124,12 +124,10 @@ $result_trees{'index_entry_in_footnote_sections'} = {
                       'cmdname' => 'cindex',
                       'extra' => {
                         'element_node' => {},
-                        'index_entry' => {
-                          'entry_element' => {},
-                          'entry_number' => 1,
-                          'in_code' => 0,
-                          'index_name' => 'cp'
-                        }
+                        'index_entry' => [
+                          'cp',
+                          1
+                        ]
                       },
                       'info' => {
                         'spaces_before_argument' => {
@@ -287,7 +285,6 @@ $result_trees{'index_entry_in_footnote_sections'} = {
   'type' => 'document_root'
 };
 
$result_trees{'index_entry_in_footnote_sections'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'args'}[0]{'contents'}[3]{'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'}[3]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'index_entry_in_footnote_sections'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'args'}[0]{'contents'}[3];
 
 $result_texis{'index_entry_in_footnote_sections'} = '@node Top
 @top index_entry_in_footnote
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 a4be0534e6..f745468c0c 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
@@ -124,12 +124,10 @@ 
$result_trees{'index_entry_in_footnote_sections_separate'} = {
                       'cmdname' => 'cindex',
                       'extra' => {
                         'element_node' => {},
-                        'index_entry' => {
-                          'entry_element' => {},
-                          'entry_number' => 1,
-                          'in_code' => 0,
-                          'index_name' => 'cp'
-                        }
+                        'index_entry' => [
+                          'cp',
+                          1
+                        ]
                       },
                       'info' => {
                         'spaces_before_argument' => {
@@ -287,7 +285,6 @@ $result_trees{'index_entry_in_footnote_sections_separate'} 
= {
   'type' => 'document_root'
 };
 
$result_trees{'index_entry_in_footnote_sections_separate'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'args'}[0]{'contents'}[3]{'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'}[3]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'index_entry_in_footnote_sections_separate'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'args'}[0]{'contents'}[3];
 
 $result_texis{'index_entry_in_footnote_sections_separate'} = '@node Top
 @top index_entry_in_footnote
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 efa73101a0..5b03faca8a 100644
--- a/tp/t/results/indices/index_entry_in_footnote_separate.pl
+++ b/tp/t/results/indices/index_entry_in_footnote_separate.pl
@@ -302,12 +302,10 @@ $result_trees{'index_entry_in_footnote_separate'} = {
                       'cmdname' => 'cindex',
                       'extra' => {
                         'element_node' => {},
-                        'index_entry' => {
-                          'entry_element' => {},
-                          'entry_number' => 1,
-                          'in_code' => 0,
-                          'index_name' => 'cp'
-                        }
+                        'index_entry' => [
+                          'cp',
+                          1
+                        ]
                       },
                       'info' => {
                         'spaces_before_argument' => {
@@ -374,12 +372,10 @@ $result_trees{'index_entry_in_footnote_separate'} = {
                       'cmdname' => 'cindex',
                       'extra' => {
                         'element_node' => {},
-                        'index_entry' => {
-                          'entry_element' => {},
-                          'entry_number' => 2,
-                          'in_code' => 0,
-                          'index_name' => 'cp'
-                        }
+                        'index_entry' => [
+                          'cp',
+                          2
+                        ]
                       },
                       'info' => {
                         'spaces_before_argument' => {
@@ -511,9 +507,7 @@ $result_trees{'index_entry_in_footnote_separate'} = {
 
$result_trees{'index_entry_in_footnote_separate'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'contents'}[1]{'extra'}{'node_content'}[0]
 = 
$result_trees{'index_entry_in_footnote_separate'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'contents'}[1]{'contents'}[0];
 
$result_trees{'index_entry_in_footnote_separate'}{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'extra'}{'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'}[2]{'contents'}[1]{'contents'}[1]{'args'}[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'}[1]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'index_entry_in_footnote_separate'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'args'}[0]{'contents'}[1];
 
$result_trees{'index_entry_in_footnote_separate'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'args'}[0]{'contents'}[7]{'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'}[7]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'index_entry_in_footnote_separate'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'args'}[0]{'contents'}[7];
 
 $result_texis{'index_entry_in_footnote_separate'} = '@footnotestyle separate
 @node Top
diff --git a/tp/t/results/indices/index_no_node.pl 
b/tp/t/results/indices/index_no_node.pl
index 77f525dd6f..6221e1c25b 100644
--- a/tp/t/results/indices/index_no_node.pl
+++ b/tp/t/results/indices/index_no_node.pl
@@ -90,12 +90,10 @@ $result_trees{'index_no_node'} = {
           ],
           'cmdname' => 'cindex',
           'extra' => {
-            'index_entry' => {
-              'entry_element' => {},
-              'entry_number' => 1,
-              'in_code' => 0,
-              'index_name' => 'cp'
-            }
+            'index_entry' => [
+              'cp',
+              1
+            ]
           },
           'info' => {
             'spaces_before_argument' => {
@@ -237,12 +235,10 @@ $result_trees{'index_no_node'} = {
           ],
           'cmdname' => 'cindex',
           'extra' => {
-            'index_entry' => {
-              'entry_element' => {},
-              'entry_number' => 2,
-              'in_code' => 0,
-              'index_name' => 'cp'
-            }
+            'index_entry' => [
+              'cp',
+              2
+            ]
           },
           'info' => {
             'spaces_before_argument' => {
@@ -284,12 +280,10 @@ $result_trees{'index_no_node'} = {
           ],
           'cmdname' => 'cindex',
           'extra' => {
-            'index_entry' => {
-              'entry_element' => {},
-              'entry_number' => 3,
-              'in_code' => 0,
-              'index_name' => 'cp'
-            }
+            'index_entry' => [
+              'cp',
+              3
+            ]
           },
           'info' => {
             'spaces_before_argument' => {
@@ -402,12 +396,10 @@ $result_trees{'index_no_node'} = {
           ],
           'cmdname' => 'cindex',
           'extra' => {
-            'index_entry' => {
-              'entry_element' => {},
-              'entry_number' => 4,
-              'in_code' => 0,
-              'index_name' => 'cp'
-            }
+            'index_entry' => [
+              'cp',
+              4
+            ]
           },
           'info' => {
             'spaces_before_argument' => {
@@ -440,12 +432,10 @@ $result_trees{'index_no_node'} = {
           ],
           'cmdname' => 'cindex',
           'extra' => {
-            'index_entry' => {
-              'entry_element' => {},
-              'entry_number' => 5,
-              'in_code' => 0,
-              'index_name' => 'cp'
-            }
+            'index_entry' => [
+              'cp',
+              5
+            ]
           },
           'info' => {
             'spaces_before_argument' => {
@@ -478,12 +468,10 @@ $result_trees{'index_no_node'} = {
           ],
           'cmdname' => 'cindex',
           'extra' => {
-            'index_entry' => {
-              'entry_element' => {},
-              'entry_number' => 6,
-              'in_code' => 0,
-              'index_name' => 'cp'
-            }
+            'index_entry' => [
+              'cp',
+              6
+            ]
           },
           'info' => {
             'spaces_before_argument' => {
@@ -516,12 +504,10 @@ $result_trees{'index_no_node'} = {
           ],
           'cmdname' => 'cindex',
           'extra' => {
-            'index_entry' => {
-              'entry_element' => {},
-              'entry_number' => 7,
-              'in_code' => 0,
-              'index_name' => 'cp'
-            }
+            'index_entry' => [
+              'cp',
+              7
+            ]
           },
           'info' => {
             'spaces_before_argument' => {
@@ -554,12 +540,10 @@ $result_trees{'index_no_node'} = {
           ],
           'cmdname' => 'cindex',
           'extra' => {
-            'index_entry' => {
-              'entry_element' => {},
-              'entry_number' => 8,
-              'in_code' => 0,
-              'index_name' => 'cp'
-            }
+            'index_entry' => [
+              'cp',
+              8
+            ]
           },
           'info' => {
             'spaces_before_argument' => {
@@ -592,12 +576,10 @@ $result_trees{'index_no_node'} = {
           ],
           'cmdname' => 'cindex',
           'extra' => {
-            'index_entry' => {
-              'entry_element' => {},
-              'entry_number' => 9,
-              'in_code' => 0,
-              'index_name' => 'cp'
-            }
+            'index_entry' => [
+              'cp',
+              9
+            ]
           },
           'info' => {
             'spaces_before_argument' => {
@@ -683,12 +665,10 @@ $result_trees{'index_no_node'} = {
           ],
           'cmdname' => 'cindex',
           'extra' => {
-            'index_entry' => {
-              'entry_element' => {},
-              'entry_number' => 10,
-              'in_code' => 0,
-              'index_name' => 'cp'
-            }
+            'index_entry' => [
+              'cp',
+              10
+            ]
           },
           'info' => {
             'spaces_before_argument' => {
@@ -801,12 +781,10 @@ $result_trees{'index_no_node'} = {
           ],
           'cmdname' => 'cindex',
           'extra' => {
-            'index_entry' => {
-              'entry_element' => {},
-              'entry_number' => 11,
-              'in_code' => 0,
-              'index_name' => 'cp'
-            }
+            'index_entry' => [
+              'cp',
+              11
+            ]
           },
           'info' => {
             'spaces_before_argument' => {
@@ -848,12 +826,10 @@ $result_trees{'index_no_node'} = {
           ],
           'cmdname' => 'cindex',
           'extra' => {
-            'index_entry' => {
-              'entry_element' => {},
-              'entry_number' => 12,
-              'in_code' => 0,
-              'index_name' => 'cp'
-            }
+            'index_entry' => [
+              'cp',
+              12
+            ]
           },
           'info' => {
             'spaces_before_argument' => {
@@ -956,12 +932,10 @@ $result_trees{'index_no_node'} = {
           ],
           'cmdname' => 'cindex',
           'extra' => {
-            'index_entry' => {
-              'entry_element' => {},
-              'entry_number' => 13,
-              'in_code' => 0,
-              'index_name' => 'cp'
-            }
+            'index_entry' => [
+              'cp',
+              13
+            ]
           },
           'info' => {
             'spaces_before_argument' => {
@@ -1042,12 +1016,10 @@ $result_trees{'index_no_node'} = {
           ],
           'cmdname' => 'cindex',
           'extra' => {
-            'index_entry' => {
-              'entry_element' => {},
-              'entry_number' => 14,
-              'in_code' => 0,
-              'index_name' => 'cp'
-            }
+            'index_entry' => [
+              'cp',
+              14
+            ]
           },
           'info' => {
             'spaces_before_argument' => {
@@ -1141,20 +1113,6 @@ $result_trees{'index_no_node'} = {
   ],
   'type' => 'document_root'
 };
-$result_trees{'index_no_node'}{'contents'}[0]{'contents'}[2]{'extra'}{'index_entry'}{'entry_element'}
 = $result_trees{'index_no_node'}{'contents'}[0]{'contents'}[2];
-$result_trees{'index_no_node'}{'contents'}[1]{'contents'}[2]{'extra'}{'index_entry'}{'entry_element'}
 = $result_trees{'index_no_node'}{'contents'}[1]{'contents'}[2];
-$result_trees{'index_no_node'}{'contents'}[1]{'contents'}[4]{'extra'}{'index_entry'}{'entry_element'}
 = $result_trees{'index_no_node'}{'contents'}[1]{'contents'}[4];
-$result_trees{'index_no_node'}{'contents'}[2]{'contents'}[1]{'extra'}{'index_entry'}{'entry_element'}
 = $result_trees{'index_no_node'}{'contents'}[2]{'contents'}[1];
-$result_trees{'index_no_node'}{'contents'}[2]{'contents'}[2]{'extra'}{'index_entry'}{'entry_element'}
 = $result_trees{'index_no_node'}{'contents'}[2]{'contents'}[2];
-$result_trees{'index_no_node'}{'contents'}[2]{'contents'}[3]{'extra'}{'index_entry'}{'entry_element'}
 = $result_trees{'index_no_node'}{'contents'}[2]{'contents'}[3];
-$result_trees{'index_no_node'}{'contents'}[2]{'contents'}[4]{'extra'}{'index_entry'}{'entry_element'}
 = $result_trees{'index_no_node'}{'contents'}[2]{'contents'}[4];
-$result_trees{'index_no_node'}{'contents'}[2]{'contents'}[5]{'extra'}{'index_entry'}{'entry_element'}
 = $result_trees{'index_no_node'}{'contents'}[2]{'contents'}[5];
-$result_trees{'index_no_node'}{'contents'}[2]{'contents'}[6]{'extra'}{'index_entry'}{'entry_element'}
 = $result_trees{'index_no_node'}{'contents'}[2]{'contents'}[6];
-$result_trees{'index_no_node'}{'contents'}[2]{'contents'}[11]{'extra'}{'index_entry'}{'entry_element'}
 = $result_trees{'index_no_node'}{'contents'}[2]{'contents'}[11];
-$result_trees{'index_no_node'}{'contents'}[3]{'contents'}[2]{'extra'}{'index_entry'}{'entry_element'}
 = $result_trees{'index_no_node'}{'contents'}[3]{'contents'}[2];
-$result_trees{'index_no_node'}{'contents'}[3]{'contents'}[4]{'extra'}{'index_entry'}{'entry_element'}
 = $result_trees{'index_no_node'}{'contents'}[3]{'contents'}[4];
-$result_trees{'index_no_node'}{'contents'}[4]{'contents'}[0]{'extra'}{'index_entry'}{'entry_element'}
 = $result_trees{'index_no_node'}{'contents'}[4]{'contents'}[0];
-$result_trees{'index_no_node'}{'contents'}[4]{'contents'}[4]{'extra'}{'index_entry'}{'entry_element'}
 = $result_trees{'index_no_node'}{'contents'}[4]{'contents'}[4];
 
 $result_texis{'index_no_node'} = '\\input texinfo @c -*-texinfo-*-
 
diff --git a/tp/t/results/indices/index_no_node_no_top.pl 
b/tp/t/results/indices/index_no_node_no_top.pl
index 7c4ff4f841..b1e995e8a0 100644
--- a/tp/t/results/indices/index_no_node_no_top.pl
+++ b/tp/t/results/indices/index_no_node_no_top.pl
@@ -47,12 +47,10 @@ $result_trees{'index_no_node_no_top'} = {
           ],
           'cmdname' => 'cindex',
           'extra' => {
-            'index_entry' => {
-              'entry_element' => {},
-              'entry_number' => 1,
-              'in_code' => 0,
-              'index_name' => 'cp'
-            }
+            'index_entry' => [
+              'cp',
+              1
+            ]
           },
           'info' => {
             'spaces_before_argument' => {
@@ -194,12 +192,10 @@ $result_trees{'index_no_node_no_top'} = {
           ],
           'cmdname' => 'cindex',
           'extra' => {
-            'index_entry' => {
-              'entry_element' => {},
-              'entry_number' => 2,
-              'in_code' => 0,
-              'index_name' => 'cp'
-            }
+            'index_entry' => [
+              'cp',
+              2
+            ]
           },
           'info' => {
             'spaces_before_argument' => {
@@ -241,12 +237,10 @@ $result_trees{'index_no_node_no_top'} = {
           ],
           'cmdname' => 'cindex',
           'extra' => {
-            'index_entry' => {
-              'entry_element' => {},
-              'entry_number' => 3,
-              'in_code' => 0,
-              'index_name' => 'cp'
-            }
+            'index_entry' => [
+              'cp',
+              3
+            ]
           },
           'info' => {
             'spaces_before_argument' => {
@@ -359,12 +353,10 @@ $result_trees{'index_no_node_no_top'} = {
           ],
           'cmdname' => 'cindex',
           'extra' => {
-            'index_entry' => {
-              'entry_element' => {},
-              'entry_number' => 4,
-              'in_code' => 0,
-              'index_name' => 'cp'
-            }
+            'index_entry' => [
+              'cp',
+              4
+            ]
           },
           'info' => {
             'spaces_before_argument' => {
@@ -397,12 +389,10 @@ $result_trees{'index_no_node_no_top'} = {
           ],
           'cmdname' => 'cindex',
           'extra' => {
-            'index_entry' => {
-              'entry_element' => {},
-              'entry_number' => 5,
-              'in_code' => 0,
-              'index_name' => 'cp'
-            }
+            'index_entry' => [
+              'cp',
+              5
+            ]
           },
           'info' => {
             'spaces_before_argument' => {
@@ -435,12 +425,10 @@ $result_trees{'index_no_node_no_top'} = {
           ],
           'cmdname' => 'cindex',
           'extra' => {
-            'index_entry' => {
-              'entry_element' => {},
-              'entry_number' => 6,
-              'in_code' => 0,
-              'index_name' => 'cp'
-            }
+            'index_entry' => [
+              'cp',
+              6
+            ]
           },
           'info' => {
             'spaces_before_argument' => {
@@ -473,12 +461,10 @@ $result_trees{'index_no_node_no_top'} = {
           ],
           'cmdname' => 'cindex',
           'extra' => {
-            'index_entry' => {
-              'entry_element' => {},
-              'entry_number' => 7,
-              'in_code' => 0,
-              'index_name' => 'cp'
-            }
+            'index_entry' => [
+              'cp',
+              7
+            ]
           },
           'info' => {
             'spaces_before_argument' => {
@@ -511,12 +497,10 @@ $result_trees{'index_no_node_no_top'} = {
           ],
           'cmdname' => 'cindex',
           'extra' => {
-            'index_entry' => {
-              'entry_element' => {},
-              'entry_number' => 8,
-              'in_code' => 0,
-              'index_name' => 'cp'
-            }
+            'index_entry' => [
+              'cp',
+              8
+            ]
           },
           'info' => {
             'spaces_before_argument' => {
@@ -549,12 +533,10 @@ $result_trees{'index_no_node_no_top'} = {
           ],
           'cmdname' => 'cindex',
           'extra' => {
-            'index_entry' => {
-              'entry_element' => {},
-              'entry_number' => 9,
-              'in_code' => 0,
-              'index_name' => 'cp'
-            }
+            'index_entry' => [
+              'cp',
+              9
+            ]
           },
           'info' => {
             'spaces_before_argument' => {
@@ -640,12 +622,10 @@ $result_trees{'index_no_node_no_top'} = {
           ],
           'cmdname' => 'cindex',
           'extra' => {
-            'index_entry' => {
-              'entry_element' => {},
-              'entry_number' => 10,
-              'in_code' => 0,
-              'index_name' => 'cp'
-            }
+            'index_entry' => [
+              'cp',
+              10
+            ]
           },
           'info' => {
             'spaces_before_argument' => {
@@ -758,12 +738,10 @@ $result_trees{'index_no_node_no_top'} = {
           ],
           'cmdname' => 'cindex',
           'extra' => {
-            'index_entry' => {
-              'entry_element' => {},
-              'entry_number' => 11,
-              'in_code' => 0,
-              'index_name' => 'cp'
-            }
+            'index_entry' => [
+              'cp',
+              11
+            ]
           },
           'info' => {
             'spaces_before_argument' => {
@@ -805,12 +783,10 @@ $result_trees{'index_no_node_no_top'} = {
           ],
           'cmdname' => 'cindex',
           'extra' => {
-            'index_entry' => {
-              'entry_element' => {},
-              'entry_number' => 12,
-              'in_code' => 0,
-              'index_name' => 'cp'
-            }
+            'index_entry' => [
+              'cp',
+              12
+            ]
           },
           'info' => {
             'spaces_before_argument' => {
@@ -913,12 +889,10 @@ $result_trees{'index_no_node_no_top'} = {
           ],
           'cmdname' => 'cindex',
           'extra' => {
-            'index_entry' => {
-              'entry_element' => {},
-              'entry_number' => 13,
-              'in_code' => 0,
-              'index_name' => 'cp'
-            }
+            'index_entry' => [
+              'cp',
+              13
+            ]
           },
           'info' => {
             'spaces_before_argument' => {
@@ -999,12 +973,10 @@ $result_trees{'index_no_node_no_top'} = {
           ],
           'cmdname' => 'cindex',
           'extra' => {
-            'index_entry' => {
-              'entry_element' => {},
-              'entry_number' => 14,
-              'in_code' => 0,
-              'index_name' => 'cp'
-            }
+            'index_entry' => [
+              'cp',
+              14
+            ]
           },
           'info' => {
             'spaces_before_argument' => {
@@ -1098,20 +1070,6 @@ $result_trees{'index_no_node_no_top'} = {
   ],
   'type' => 'document_root'
 };
-$result_trees{'index_no_node_no_top'}{'contents'}[0]{'contents'}[2]{'extra'}{'index_entry'}{'entry_element'}
 = $result_trees{'index_no_node_no_top'}{'contents'}[0]{'contents'}[2];
-$result_trees{'index_no_node_no_top'}{'contents'}[1]{'contents'}[2]{'extra'}{'index_entry'}{'entry_element'}
 = $result_trees{'index_no_node_no_top'}{'contents'}[1]{'contents'}[2];
-$result_trees{'index_no_node_no_top'}{'contents'}[1]{'contents'}[4]{'extra'}{'index_entry'}{'entry_element'}
 = $result_trees{'index_no_node_no_top'}{'contents'}[1]{'contents'}[4];
-$result_trees{'index_no_node_no_top'}{'contents'}[2]{'contents'}[1]{'extra'}{'index_entry'}{'entry_element'}
 = $result_trees{'index_no_node_no_top'}{'contents'}[2]{'contents'}[1];
-$result_trees{'index_no_node_no_top'}{'contents'}[2]{'contents'}[2]{'extra'}{'index_entry'}{'entry_element'}
 = $result_trees{'index_no_node_no_top'}{'contents'}[2]{'contents'}[2];
-$result_trees{'index_no_node_no_top'}{'contents'}[2]{'contents'}[3]{'extra'}{'index_entry'}{'entry_element'}
 = $result_trees{'index_no_node_no_top'}{'contents'}[2]{'contents'}[3];
-$result_trees{'index_no_node_no_top'}{'contents'}[2]{'contents'}[4]{'extra'}{'index_entry'}{'entry_element'}
 = $result_trees{'index_no_node_no_top'}{'contents'}[2]{'contents'}[4];
-$result_trees{'index_no_node_no_top'}{'contents'}[2]{'contents'}[5]{'extra'}{'index_entry'}{'entry_element'}
 = $result_trees{'index_no_node_no_top'}{'contents'}[2]{'contents'}[5];
-$result_trees{'index_no_node_no_top'}{'contents'}[2]{'contents'}[6]{'extra'}{'index_entry'}{'entry_element'}
 = $result_trees{'index_no_node_no_top'}{'contents'}[2]{'contents'}[6];
-$result_trees{'index_no_node_no_top'}{'contents'}[2]{'contents'}[11]{'extra'}{'index_entry'}{'entry_element'}
 = $result_trees{'index_no_node_no_top'}{'contents'}[2]{'contents'}[11];
-$result_trees{'index_no_node_no_top'}{'contents'}[3]{'contents'}[2]{'extra'}{'index_entry'}{'entry_element'}
 = $result_trees{'index_no_node_no_top'}{'contents'}[3]{'contents'}[2];
-$result_trees{'index_no_node_no_top'}{'contents'}[3]{'contents'}[4]{'extra'}{'index_entry'}{'entry_element'}
 = $result_trees{'index_no_node_no_top'}{'contents'}[3]{'contents'}[4];
-$result_trees{'index_no_node_no_top'}{'contents'}[4]{'contents'}[0]{'extra'}{'index_entry'}{'entry_element'}
 = $result_trees{'index_no_node_no_top'}{'contents'}[4]{'contents'}[0];
-$result_trees{'index_no_node_no_top'}{'contents'}[4]{'contents'}[4]{'extra'}{'index_entry'}{'entry_element'}
 = $result_trees{'index_no_node_no_top'}{'contents'}[4]{'contents'}[4];
 
 $result_texis{'index_no_node_no_top'} = '\\input texinfo @c -*-texinfo-*-
 
diff --git a/tp/t/results/indices/index_no_node_no_top_no_node.pl 
b/tp/t/results/indices/index_no_node_no_top_no_node.pl
index 2b9cbbcc8d..292e01e771 100644
--- a/tp/t/results/indices/index_no_node_no_top_no_node.pl
+++ b/tp/t/results/indices/index_no_node_no_top_no_node.pl
@@ -47,12 +47,10 @@ $result_trees{'index_no_node_no_top_no_node'} = {
           ],
           'cmdname' => 'cindex',
           'extra' => {
-            'index_entry' => {
-              'entry_element' => {},
-              'entry_number' => 1,
-              'in_code' => 0,
-              'index_name' => 'cp'
-            }
+            'index_entry' => [
+              'cp',
+              1
+            ]
           },
           'info' => {
             'spaces_before_argument' => {
@@ -194,12 +192,10 @@ $result_trees{'index_no_node_no_top_no_node'} = {
           ],
           'cmdname' => 'cindex',
           'extra' => {
-            'index_entry' => {
-              'entry_element' => {},
-              'entry_number' => 2,
-              'in_code' => 0,
-              'index_name' => 'cp'
-            }
+            'index_entry' => [
+              'cp',
+              2
+            ]
           },
           'info' => {
             'spaces_before_argument' => {
@@ -241,12 +237,10 @@ $result_trees{'index_no_node_no_top_no_node'} = {
           ],
           'cmdname' => 'cindex',
           'extra' => {
-            'index_entry' => {
-              'entry_element' => {},
-              'entry_number' => 3,
-              'in_code' => 0,
-              'index_name' => 'cp'
-            }
+            'index_entry' => [
+              'cp',
+              3
+            ]
           },
           'info' => {
             'spaces_before_argument' => {
@@ -359,12 +353,10 @@ $result_trees{'index_no_node_no_top_no_node'} = {
           ],
           'cmdname' => 'cindex',
           'extra' => {
-            'index_entry' => {
-              'entry_element' => {},
-              'entry_number' => 4,
-              'in_code' => 0,
-              'index_name' => 'cp'
-            }
+            'index_entry' => [
+              'cp',
+              4
+            ]
           },
           'info' => {
             'spaces_before_argument' => {
@@ -397,12 +389,10 @@ $result_trees{'index_no_node_no_top_no_node'} = {
           ],
           'cmdname' => 'cindex',
           'extra' => {
-            'index_entry' => {
-              'entry_element' => {},
-              'entry_number' => 5,
-              'in_code' => 0,
-              'index_name' => 'cp'
-            }
+            'index_entry' => [
+              'cp',
+              5
+            ]
           },
           'info' => {
             'spaces_before_argument' => {
@@ -435,12 +425,10 @@ $result_trees{'index_no_node_no_top_no_node'} = {
           ],
           'cmdname' => 'cindex',
           'extra' => {
-            'index_entry' => {
-              'entry_element' => {},
-              'entry_number' => 6,
-              'in_code' => 0,
-              'index_name' => 'cp'
-            }
+            'index_entry' => [
+              'cp',
+              6
+            ]
           },
           'info' => {
             'spaces_before_argument' => {
@@ -473,12 +461,10 @@ $result_trees{'index_no_node_no_top_no_node'} = {
           ],
           'cmdname' => 'cindex',
           'extra' => {
-            'index_entry' => {
-              'entry_element' => {},
-              'entry_number' => 7,
-              'in_code' => 0,
-              'index_name' => 'cp'
-            }
+            'index_entry' => [
+              'cp',
+              7
+            ]
           },
           'info' => {
             'spaces_before_argument' => {
@@ -511,12 +497,10 @@ $result_trees{'index_no_node_no_top_no_node'} = {
           ],
           'cmdname' => 'cindex',
           'extra' => {
-            'index_entry' => {
-              'entry_element' => {},
-              'entry_number' => 8,
-              'in_code' => 0,
-              'index_name' => 'cp'
-            }
+            'index_entry' => [
+              'cp',
+              8
+            ]
           },
           'info' => {
             'spaces_before_argument' => {
@@ -549,12 +533,10 @@ $result_trees{'index_no_node_no_top_no_node'} = {
           ],
           'cmdname' => 'cindex',
           'extra' => {
-            'index_entry' => {
-              'entry_element' => {},
-              'entry_number' => 9,
-              'in_code' => 0,
-              'index_name' => 'cp'
-            }
+            'index_entry' => [
+              'cp',
+              9
+            ]
           },
           'info' => {
             'spaces_before_argument' => {
@@ -640,12 +622,10 @@ $result_trees{'index_no_node_no_top_no_node'} = {
           ],
           'cmdname' => 'cindex',
           'extra' => {
-            'index_entry' => {
-              'entry_element' => {},
-              'entry_number' => 10,
-              'in_code' => 0,
-              'index_name' => 'cp'
-            }
+            'index_entry' => [
+              'cp',
+              10
+            ]
           },
           'info' => {
             'spaces_before_argument' => {
@@ -758,12 +738,10 @@ $result_trees{'index_no_node_no_top_no_node'} = {
           ],
           'cmdname' => 'cindex',
           'extra' => {
-            'index_entry' => {
-              'entry_element' => {},
-              'entry_number' => 11,
-              'in_code' => 0,
-              'index_name' => 'cp'
-            }
+            'index_entry' => [
+              'cp',
+              11
+            ]
           },
           'info' => {
             'spaces_before_argument' => {
@@ -805,12 +783,10 @@ $result_trees{'index_no_node_no_top_no_node'} = {
           ],
           'cmdname' => 'cindex',
           'extra' => {
-            'index_entry' => {
-              'entry_element' => {},
-              'entry_number' => 12,
-              'in_code' => 0,
-              'index_name' => 'cp'
-            }
+            'index_entry' => [
+              'cp',
+              12
+            ]
           },
           'info' => {
             'spaces_before_argument' => {
@@ -913,12 +889,10 @@ $result_trees{'index_no_node_no_top_no_node'} = {
           ],
           'cmdname' => 'cindex',
           'extra' => {
-            'index_entry' => {
-              'entry_element' => {},
-              'entry_number' => 13,
-              'in_code' => 0,
-              'index_name' => 'cp'
-            }
+            'index_entry' => [
+              'cp',
+              13
+            ]
           },
           'info' => {
             'spaces_before_argument' => {
@@ -999,12 +973,10 @@ $result_trees{'index_no_node_no_top_no_node'} = {
           ],
           'cmdname' => 'cindex',
           'extra' => {
-            'index_entry' => {
-              'entry_element' => {},
-              'entry_number' => 14,
-              'in_code' => 0,
-              'index_name' => 'cp'
-            }
+            'index_entry' => [
+              'cp',
+              14
+            ]
           },
           'info' => {
             'spaces_before_argument' => {
@@ -1098,20 +1070,6 @@ $result_trees{'index_no_node_no_top_no_node'} = {
   ],
   'type' => 'document_root'
 };
-$result_trees{'index_no_node_no_top_no_node'}{'contents'}[0]{'contents'}[2]{'extra'}{'index_entry'}{'entry_element'}
 = $result_trees{'index_no_node_no_top_no_node'}{'contents'}[0]{'contents'}[2];
-$result_trees{'index_no_node_no_top_no_node'}{'contents'}[1]{'contents'}[2]{'extra'}{'index_entry'}{'entry_element'}
 = $result_trees{'index_no_node_no_top_no_node'}{'contents'}[1]{'contents'}[2];
-$result_trees{'index_no_node_no_top_no_node'}{'contents'}[1]{'contents'}[4]{'extra'}{'index_entry'}{'entry_element'}
 = $result_trees{'index_no_node_no_top_no_node'}{'contents'}[1]{'contents'}[4];
-$result_trees{'index_no_node_no_top_no_node'}{'contents'}[2]{'contents'}[1]{'extra'}{'index_entry'}{'entry_element'}
 = $result_trees{'index_no_node_no_top_no_node'}{'contents'}[2]{'contents'}[1];
-$result_trees{'index_no_node_no_top_no_node'}{'contents'}[2]{'contents'}[2]{'extra'}{'index_entry'}{'entry_element'}
 = $result_trees{'index_no_node_no_top_no_node'}{'contents'}[2]{'contents'}[2];
-$result_trees{'index_no_node_no_top_no_node'}{'contents'}[2]{'contents'}[3]{'extra'}{'index_entry'}{'entry_element'}
 = $result_trees{'index_no_node_no_top_no_node'}{'contents'}[2]{'contents'}[3];
-$result_trees{'index_no_node_no_top_no_node'}{'contents'}[2]{'contents'}[4]{'extra'}{'index_entry'}{'entry_element'}
 = $result_trees{'index_no_node_no_top_no_node'}{'contents'}[2]{'contents'}[4];
-$result_trees{'index_no_node_no_top_no_node'}{'contents'}[2]{'contents'}[5]{'extra'}{'index_entry'}{'entry_element'}
 = $result_trees{'index_no_node_no_top_no_node'}{'contents'}[2]{'contents'}[5];
-$result_trees{'index_no_node_no_top_no_node'}{'contents'}[2]{'contents'}[6]{'extra'}{'index_entry'}{'entry_element'}
 = $result_trees{'index_no_node_no_top_no_node'}{'contents'}[2]{'contents'}[6];
-$result_trees{'index_no_node_no_top_no_node'}{'contents'}[2]{'contents'}[11]{'extra'}{'index_entry'}{'entry_element'}
 = $result_trees{'index_no_node_no_top_no_node'}{'contents'}[2]{'contents'}[11];
-$result_trees{'index_no_node_no_top_no_node'}{'contents'}[3]{'contents'}[2]{'extra'}{'index_entry'}{'entry_element'}
 = $result_trees{'index_no_node_no_top_no_node'}{'contents'}[3]{'contents'}[2];
-$result_trees{'index_no_node_no_top_no_node'}{'contents'}[3]{'contents'}[4]{'extra'}{'index_entry'}{'entry_element'}
 = $result_trees{'index_no_node_no_top_no_node'}{'contents'}[3]{'contents'}[4];
-$result_trees{'index_no_node_no_top_no_node'}{'contents'}[4]{'contents'}[0]{'extra'}{'index_entry'}{'entry_element'}
 = $result_trees{'index_no_node_no_top_no_node'}{'contents'}[4]{'contents'}[0];
-$result_trees{'index_no_node_no_top_no_node'}{'contents'}[4]{'contents'}[4]{'extra'}{'index_entry'}{'entry_element'}
 = $result_trees{'index_no_node_no_top_no_node'}{'contents'}[4]{'contents'}[4];
 
 $result_texis{'index_no_node_no_top_no_node'} = '\\input texinfo @c 
-*-texinfo-*-
 
diff --git a/tp/t/results/indices/index_nodes.pl 
b/tp/t/results/indices/index_nodes.pl
index 75371df7a3..ba92937527 100644
--- a/tp/t/results/indices/index_nodes.pl
+++ b/tp/t/results/indices/index_nodes.pl
@@ -70,12 +70,10 @@ $result_trees{'index_nodes'} = {
           'cmdname' => 'cindex',
           'extra' => {
             'element_node' => {},
-            'index_entry' => {
-              'entry_element' => {},
-              'entry_number' => 1,
-              'in_code' => 0,
-              'index_name' => 'cp'
-            }
+            'index_entry' => [
+              'cp',
+              1
+            ]
           },
           'info' => {
             'spaces_before_argument' => {
@@ -427,12 +425,10 @@ $result_trees{'index_nodes'} = {
           'cmdname' => 'cindex',
           'extra' => {
             'element_node' => {},
-            'index_entry' => {
-              'entry_element' => {},
-              'entry_number' => 2,
-              'in_code' => 0,
-              'index_name' => 'cp'
-            }
+            'index_entry' => [
+              'cp',
+              2
+            ]
           },
           'info' => {
             'spaces_before_argument' => {
@@ -466,12 +462,10 @@ $result_trees{'index_nodes'} = {
           'cmdname' => 'cindex',
           'extra' => {
             'element_node' => {},
-            'index_entry' => {
-              'entry_element' => {},
-              'entry_number' => 3,
-              'in_code' => 0,
-              'index_name' => 'cp'
-            }
+            'index_entry' => [
+              'cp',
+              3
+            ]
           },
           'info' => {
             'spaces_before_argument' => {
@@ -505,12 +499,10 @@ $result_trees{'index_nodes'} = {
           'cmdname' => 'findex',
           'extra' => {
             'element_node' => {},
-            'index_entry' => {
-              'entry_element' => {},
-              'entry_number' => 1,
-              'in_code' => 1,
-              'index_name' => 'fn'
-            }
+            'index_entry' => [
+              'fn',
+              1
+            ]
           },
           'info' => {
             'spaces_before_argument' => {
@@ -544,12 +536,10 @@ $result_trees{'index_nodes'} = {
           'cmdname' => 'cindex',
           'extra' => {
             'element_node' => {},
-            'index_entry' => {
-              'entry_element' => {},
-              'entry_number' => 4,
-              'in_code' => 0,
-              'index_name' => 'cp'
-            }
+            'index_entry' => [
+              'cp',
+              4
+            ]
           },
           'info' => {
             'spaces_before_argument' => {
@@ -1059,12 +1049,10 @@ $result_trees{'index_nodes'} = {
           'cmdname' => 'cindex',
           'extra' => {
             'element_node' => {},
-            'index_entry' => {
-              'entry_element' => {},
-              'entry_number' => 5,
-              'in_code' => 0,
-              'index_name' => 'cp'
-            }
+            'index_entry' => [
+              'cp',
+              5
+            ]
           },
           'info' => {
             'spaces_before_argument' => {
@@ -1098,12 +1086,10 @@ $result_trees{'index_nodes'} = {
           'cmdname' => 'findex',
           'extra' => {
             'element_node' => {},
-            'index_entry' => {
-              'entry_element' => {},
-              'entry_number' => 2,
-              'in_code' => 1,
-              'index_name' => 'fn'
-            }
+            'index_entry' => [
+              'fn',
+              2
+            ]
           },
           'info' => {
             'spaces_before_argument' => {
@@ -1137,12 +1123,10 @@ $result_trees{'index_nodes'} = {
           'cmdname' => 'cindex',
           'extra' => {
             'element_node' => {},
-            'index_entry' => {
-              'entry_element' => {},
-              'entry_number' => 6,
-              'in_code' => 0,
-              'index_name' => 'cp'
-            }
+            'index_entry' => [
+              'cp',
+              6
+            ]
           },
           'info' => {
             'spaces_before_argument' => {
@@ -1256,12 +1240,10 @@ $result_trees{'index_nodes'} = {
           'cmdname' => 'cindex',
           'extra' => {
             'element_node' => {},
-            'index_entry' => {
-              'entry_element' => {},
-              'entry_number' => 7,
-              'in_code' => 0,
-              'index_name' => 'cp'
-            }
+            'index_entry' => [
+              'cp',
+              7
+            ]
           },
           'info' => {
             'spaces_before_argument' => {
@@ -1339,12 +1321,10 @@ $result_trees{'index_nodes'} = {
           'cmdname' => 'findex',
           'extra' => {
             'element_node' => {},
-            'index_entry' => {
-              'entry_element' => {},
-              'entry_number' => 3,
-              'in_code' => 1,
-              'index_name' => 'fn'
-            }
+            'index_entry' => [
+              'fn',
+              3
+            ]
           },
           'info' => {
             'spaces_before_argument' => {
@@ -1378,12 +1358,10 @@ $result_trees{'index_nodes'} = {
           'cmdname' => 'cindex',
           'extra' => {
             'element_node' => {},
-            'index_entry' => {
-              'entry_element' => {},
-              'entry_number' => 8,
-              'in_code' => 0,
-              'index_name' => 'cp'
-            }
+            'index_entry' => [
+              'cp',
+              8
+            ]
           },
           'info' => {
             'spaces_before_argument' => {
@@ -1471,18 +1449,13 @@ $result_trees{'index_nodes'} = {
   'type' => 'document_root'
 };
 
$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]{'contents'}[1]{'extra'}{'node_content'}[0]
 = 
$result_trees{'index_nodes'}{'contents'}[1]{'contents'}[10]{'contents'}[0]{'contents'}[1]{'contents'}[0];
 
$result_trees{'index_nodes'}{'contents'}[2]{'args'}[2]{'extra'}{'node_content'}[0]
 = $result_trees{'index_nodes'}{'contents'}[2]{'args'}[2]{'contents'}[0];
 
$result_trees{'index_nodes'}{'contents'}[2]{'args'}[3]{'extra'}{'node_content'}[0]
 = $result_trees{'index_nodes'}{'contents'}[2]{'args'}[3]{'contents'}[0];
 
$result_trees{'index_nodes'}{'contents'}[2]{'contents'}[1]{'extra'}{'element_node'}
 = $result_trees{'index_nodes'}{'contents'}[2];
-$result_trees{'index_nodes'}{'contents'}[2]{'contents'}[1]{'extra'}{'index_entry'}{'entry_element'}
 = $result_trees{'index_nodes'}{'contents'}[2]{'contents'}[1];
 
$result_trees{'index_nodes'}{'contents'}[2]{'contents'}[2]{'extra'}{'element_node'}
 = $result_trees{'index_nodes'}{'contents'}[2];
-$result_trees{'index_nodes'}{'contents'}[2]{'contents'}[2]{'extra'}{'index_entry'}{'entry_element'}
 = $result_trees{'index_nodes'}{'contents'}[2]{'contents'}[2];
 
$result_trees{'index_nodes'}{'contents'}[2]{'contents'}[3]{'extra'}{'element_node'}
 = $result_trees{'index_nodes'}{'contents'}[2];
-$result_trees{'index_nodes'}{'contents'}[2]{'contents'}[3]{'extra'}{'index_entry'}{'entry_element'}
 = $result_trees{'index_nodes'}{'contents'}[2]{'contents'}[3];
 
$result_trees{'index_nodes'}{'contents'}[2]{'contents'}[4]{'extra'}{'element_node'}
 = $result_trees{'index_nodes'}{'contents'}[2];
-$result_trees{'index_nodes'}{'contents'}[2]{'contents'}[4]{'extra'}{'index_entry'}{'entry_element'}
 = $result_trees{'index_nodes'}{'contents'}[2]{'contents'}[4];
 
$result_trees{'index_nodes'}{'contents'}[2]{'contents'}[8]{'contents'}[0]{'contents'}[1]{'extra'}{'node_content'}[0]
 = 
$result_trees{'index_nodes'}{'contents'}[2]{'contents'}[8]{'contents'}[0]{'contents'}[1]{'contents'}[0];
 
$result_trees{'index_nodes'}{'contents'}[3]{'args'}[3]{'extra'}{'node_content'}[0]
 = $result_trees{'index_nodes'}{'contents'}[3]{'args'}[3]{'contents'}[0];
 
$result_trees{'index_nodes'}{'contents'}[3]{'contents'}[0]{'contents'}[0]{'contents'}[1]{'extra'}{'node_content'}[0]
 = 
$result_trees{'index_nodes'}{'contents'}[3]{'contents'}[0]{'contents'}[0]{'contents'}[1]{'contents'}[0];
@@ -1490,19 +1463,13 @@ 
$result_trees{'index_nodes'}{'contents'}[3]{'contents'}[0]{'contents'}[1]{'conte
 
$result_trees{'index_nodes'}{'contents'}[4]{'args'}[2]{'extra'}{'node_content'}[0]
 = $result_trees{'index_nodes'}{'contents'}[4]{'args'}[2]{'contents'}[0];
 
$result_trees{'index_nodes'}{'contents'}[4]{'args'}[3]{'extra'}{'node_content'}[0]
 = $result_trees{'index_nodes'}{'contents'}[4]{'args'}[3]{'contents'}[0];
 
$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'}{'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'}{'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'}[5]{'args'}[1]{'extra'}{'node_content'}[0]
 = $result_trees{'index_nodes'}{'contents'}[5]{'args'}[1]{'contents'}[0];
 
$result_trees{'index_nodes'}{'contents'}[5]{'args'}[3]{'extra'}{'node_content'}[0]
 = $result_trees{'index_nodes'}{'contents'}[5]{'args'}[3]{'contents'}[0];
 
$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'}{'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'}{'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_texis{'index_nodes'} = '\\input texinfo @c -*-texinfo-*-
 
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 38f70fbaf8..6f220fc046 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
@@ -70,12 +70,10 @@ $result_trees{'index_nodes_no_split_no_use_nodes'} = {
           'cmdname' => 'cindex',
           'extra' => {
             'element_node' => {},
-            'index_entry' => {
-              'entry_element' => {},
-              'entry_number' => 1,
-              'in_code' => 0,
-              'index_name' => 'cp'
-            }
+            'index_entry' => [
+              'cp',
+              1
+            ]
           },
           'info' => {
             'spaces_before_argument' => {
@@ -427,12 +425,10 @@ $result_trees{'index_nodes_no_split_no_use_nodes'} = {
           'cmdname' => 'cindex',
           'extra' => {
             'element_node' => {},
-            'index_entry' => {
-              'entry_element' => {},
-              'entry_number' => 2,
-              'in_code' => 0,
-              'index_name' => 'cp'
-            }
+            'index_entry' => [
+              'cp',
+              2
+            ]
           },
           'info' => {
             'spaces_before_argument' => {
@@ -466,12 +462,10 @@ $result_trees{'index_nodes_no_split_no_use_nodes'} = {
           'cmdname' => 'cindex',
           'extra' => {
             'element_node' => {},
-            'index_entry' => {
-              'entry_element' => {},
-              'entry_number' => 3,
-              'in_code' => 0,
-              'index_name' => 'cp'
-            }
+            'index_entry' => [
+              'cp',
+              3
+            ]
           },
           'info' => {
             'spaces_before_argument' => {
@@ -505,12 +499,10 @@ $result_trees{'index_nodes_no_split_no_use_nodes'} = {
           'cmdname' => 'findex',
           'extra' => {
             'element_node' => {},
-            'index_entry' => {
-              'entry_element' => {},
-              'entry_number' => 1,
-              'in_code' => 1,
-              'index_name' => 'fn'
-            }
+            'index_entry' => [
+              'fn',
+              1
+            ]
           },
           'info' => {
             'spaces_before_argument' => {
@@ -544,12 +536,10 @@ $result_trees{'index_nodes_no_split_no_use_nodes'} = {
           'cmdname' => 'cindex',
           'extra' => {
             'element_node' => {},
-            'index_entry' => {
-              'entry_element' => {},
-              'entry_number' => 4,
-              'in_code' => 0,
-              'index_name' => 'cp'
-            }
+            'index_entry' => [
+              'cp',
+              4
+            ]
           },
           'info' => {
             'spaces_before_argument' => {
@@ -1059,12 +1049,10 @@ $result_trees{'index_nodes_no_split_no_use_nodes'} = {
           'cmdname' => 'cindex',
           'extra' => {
             'element_node' => {},
-            'index_entry' => {
-              'entry_element' => {},
-              'entry_number' => 5,
-              'in_code' => 0,
-              'index_name' => 'cp'
-            }
+            'index_entry' => [
+              'cp',
+              5
+            ]
           },
           'info' => {
             'spaces_before_argument' => {
@@ -1098,12 +1086,10 @@ $result_trees{'index_nodes_no_split_no_use_nodes'} = {
           'cmdname' => 'findex',
           'extra' => {
             'element_node' => {},
-            'index_entry' => {
-              'entry_element' => {},
-              'entry_number' => 2,
-              'in_code' => 1,
-              'index_name' => 'fn'
-            }
+            'index_entry' => [
+              'fn',
+              2
+            ]
           },
           'info' => {
             'spaces_before_argument' => {
@@ -1137,12 +1123,10 @@ $result_trees{'index_nodes_no_split_no_use_nodes'} = {
           'cmdname' => 'cindex',
           'extra' => {
             'element_node' => {},
-            'index_entry' => {
-              'entry_element' => {},
-              'entry_number' => 6,
-              'in_code' => 0,
-              'index_name' => 'cp'
-            }
+            'index_entry' => [
+              'cp',
+              6
+            ]
           },
           'info' => {
             'spaces_before_argument' => {
@@ -1256,12 +1240,10 @@ $result_trees{'index_nodes_no_split_no_use_nodes'} = {
           'cmdname' => 'cindex',
           'extra' => {
             'element_node' => {},
-            'index_entry' => {
-              'entry_element' => {},
-              'entry_number' => 7,
-              'in_code' => 0,
-              'index_name' => 'cp'
-            }
+            'index_entry' => [
+              'cp',
+              7
+            ]
           },
           'info' => {
             'spaces_before_argument' => {
@@ -1339,12 +1321,10 @@ $result_trees{'index_nodes_no_split_no_use_nodes'} = {
           'cmdname' => 'findex',
           'extra' => {
             'element_node' => {},
-            'index_entry' => {
-              'entry_element' => {},
-              'entry_number' => 3,
-              'in_code' => 1,
-              'index_name' => 'fn'
-            }
+            'index_entry' => [
+              'fn',
+              3
+            ]
           },
           'info' => {
             'spaces_before_argument' => {
@@ -1378,12 +1358,10 @@ $result_trees{'index_nodes_no_split_no_use_nodes'} = {
           'cmdname' => 'cindex',
           'extra' => {
             'element_node' => {},
-            'index_entry' => {
-              'entry_element' => {},
-              'entry_number' => 8,
-              'in_code' => 0,
-              'index_name' => 'cp'
-            }
+            'index_entry' => [
+              'cp',
+              8
+            ]
           },
           'info' => {
             'spaces_before_argument' => {
@@ -1471,18 +1449,13 @@ $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'}{'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]{'contents'}[1]{'extra'}{'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'}[2]{'args'}[2]{'extra'}{'node_content'}[0]
 = 
$result_trees{'index_nodes_no_split_no_use_nodes'}{'contents'}[2]{'args'}[2]{'contents'}[0];
 
$result_trees{'index_nodes_no_split_no_use_nodes'}{'contents'}[2]{'args'}[3]{'extra'}{'node_content'}[0]
 = 
$result_trees{'index_nodes_no_split_no_use_nodes'}{'contents'}[2]{'args'}[3]{'contents'}[0];
 
$result_trees{'index_nodes_no_split_no_use_nodes'}{'contents'}[2]{'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'}[1]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'index_nodes_no_split_no_use_nodes'}{'contents'}[2]{'contents'}[1];
 
$result_trees{'index_nodes_no_split_no_use_nodes'}{'contents'}[2]{'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'}[2]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'index_nodes_no_split_no_use_nodes'}{'contents'}[2]{'contents'}[2];
 
$result_trees{'index_nodes_no_split_no_use_nodes'}{'contents'}[2]{'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'}[3]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'index_nodes_no_split_no_use_nodes'}{'contents'}[2]{'contents'}[3];
 
$result_trees{'index_nodes_no_split_no_use_nodes'}{'contents'}[2]{'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'}[4]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'index_nodes_no_split_no_use_nodes'}{'contents'}[2]{'contents'}[4];
 
$result_trees{'index_nodes_no_split_no_use_nodes'}{'contents'}[2]{'contents'}[8]{'contents'}[0]{'contents'}[1]{'extra'}{'node_content'}[0]
 = 
$result_trees{'index_nodes_no_split_no_use_nodes'}{'contents'}[2]{'contents'}[8]{'contents'}[0]{'contents'}[1]{'contents'}[0];
 
$result_trees{'index_nodes_no_split_no_use_nodes'}{'contents'}[3]{'args'}[3]{'extra'}{'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'}[3]{'contents'}[0]{'contents'}[0]{'contents'}[1]{'extra'}{'node_content'}[0]
 = 
$result_trees{'index_nodes_no_split_no_use_nodes'}{'contents'}[3]{'contents'}[0]{'contents'}[0]{'contents'}[1]{'contents'}[0];
@@ -1490,19 +1463,13 @@ 
$result_trees{'index_nodes_no_split_no_use_nodes'}{'contents'}[3]{'contents'}[0]
 
$result_trees{'index_nodes_no_split_no_use_nodes'}{'contents'}[4]{'args'}[2]{'extra'}{'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]{'args'}[3]{'extra'}{'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'}[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'}{'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'}{'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'}[5]{'args'}[1]{'extra'}{'node_content'}[0]
 = 
$result_trees{'index_nodes_no_split_no_use_nodes'}{'contents'}[5]{'args'}[1]{'contents'}[0];
 
$result_trees{'index_nodes_no_split_no_use_nodes'}{'contents'}[5]{'args'}[3]{'extra'}{'node_content'}[0]
 = 
$result_trees{'index_nodes_no_split_no_use_nodes'}{'contents'}[5]{'args'}[3]{'contents'}[0];
 
$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'}{'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'}{'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_texis{'index_nodes_no_split_no_use_nodes'} = '\\input texinfo @c 
-*-texinfo-*-
 
diff --git a/tp/t/results/indices/index_special_region.pl 
b/tp/t/results/indices/index_special_region.pl
index e837d297e7..d8b4b5e1aa 100644
--- a/tp/t/results/indices/index_special_region.pl
+++ b/tp/t/results/indices/index_special_region.pl
@@ -65,12 +65,10 @@ $result_trees{'index_special_region'} = {
                   'cmdname' => 'cindex',
                   'extra' => {
                     'element_region' => 'copying',
-                    'index_entry' => {
-                      'entry_element' => {},
-                      'entry_number' => 1,
-                      'in_code' => 0,
-                      'index_name' => 'cp'
-                    }
+                    'index_entry' => [
+                      'cp',
+                      1
+                    ]
                   },
                   'info' => {
                     'spaces_before_argument' => {
@@ -197,12 +195,10 @@ $result_trees{'index_special_region'} = {
                               'cmdname' => 'cindex',
                               'extra' => {
                                 'element_region' => 'copying',
-                                'index_entry' => {
-                                  'entry_element' => {},
-                                  'entry_number' => 2,
-                                  'in_code' => 0,
-                                  'index_name' => 'cp'
-                                }
+                                'index_entry' => [
+                                  'cp',
+                                  2
+                                ]
                               },
                               'info' => {
                                 'spaces_before_argument' => {
@@ -361,12 +357,10 @@ $result_trees{'index_special_region'} = {
                   'cmdname' => 'cindex',
                   'extra' => {
                     'element_region' => 'titlepage',
-                    'index_entry' => {
-                      'entry_element' => {},
-                      'entry_number' => 3,
-                      'in_code' => 0,
-                      'index_name' => 'cp'
-                    }
+                    'index_entry' => [
+                      'cp',
+                      3
+                    ]
                   },
                   'info' => {
                     'spaces_before_argument' => {
@@ -486,12 +480,10 @@ $result_trees{'index_special_region'} = {
                               'cmdname' => 'cindex',
                               'extra' => {
                                 'element_region' => 'titlepage',
-                                'index_entry' => {
-                                  'entry_element' => {},
-                                  'entry_number' => 4,
-                                  'in_code' => 0,
-                                  'index_name' => 'cp'
-                                }
+                                'index_entry' => [
+                                  'cp',
+                                  4
+                                ]
                               },
                               'info' => {
                                 'spaces_before_argument' => {
@@ -758,12 +750,10 @@ $result_trees{'index_special_region'} = {
           'cmdname' => 'findex',
           'extra' => {
             'element_node' => {},
-            'index_entry' => {
-              'entry_element' => {},
-              'entry_number' => 1,
-              'in_code' => 1,
-              'index_name' => 'fn'
-            }
+            'index_entry' => [
+              'fn',
+              1
+            ]
           },
           'info' => {
             'spaces_before_argument' => {
@@ -1097,12 +1087,10 @@ $result_trees{'index_special_region'} = {
                       'cmdname' => 'item',
                       'extra' => {
                         'element_node' => {},
-                        'index_entry' => {
-                          'entry_element' => {},
-                          'entry_number' => 2,
-                          'in_code' => 1,
-                          'index_name' => 'fn'
-                        }
+                        'index_entry' => [
+                          'fn',
+                          2
+                        ]
                       },
                       'info' => {
                         'spaces_before_argument' => {
@@ -1375,12 +1363,10 @@ $result_trees{'index_special_region'} = {
           'cmdname' => 'findex',
           'extra' => {
             'element_node' => {},
-            'index_entry' => {
-              'entry_element' => {},
-              'entry_number' => 3,
-              'in_code' => 1,
-              'index_name' => 'fn'
-            }
+            'index_entry' => [
+              'fn',
+              3
+            ]
           },
           'info' => {
             'spaces_before_argument' => {
@@ -1419,12 +1405,10 @@ $result_trees{'index_special_region'} = {
           'cmdname' => 'cindex',
           'extra' => {
             'element_node' => {},
-            'index_entry' => {
-              'entry_element' => {},
-              'entry_number' => 5,
-              'in_code' => 0,
-              'index_name' => 'cp'
-            }
+            'index_entry' => [
+              'cp',
+              5
+            ]
           },
           'info' => {
             'spaces_before_argument' => {
@@ -1709,25 +1693,17 @@ $result_trees{'index_special_region'} = {
   ],
   'type' => 'document_root'
 };
-$result_trees{'index_special_region'}{'contents'}[0]{'contents'}[1]{'contents'}[0]{'contents'}[1]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'index_special_region'}{'contents'}[0]{'contents'}[1]{'contents'}[0]{'contents'}[1];
-$result_trees{'index_special_region'}{'contents'}[0]{'contents'}[1]{'contents'}[0]{'contents'}[5]{'contents'}[2]{'args'}[0]{'contents'}[4]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'index_special_region'}{'contents'}[0]{'contents'}[1]{'contents'}[0]{'contents'}[5]{'contents'}[2]{'args'}[0]{'contents'}[4];
-$result_trees{'index_special_region'}{'contents'}[0]{'contents'}[1]{'contents'}[2]{'contents'}[1]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'index_special_region'}{'contents'}[0]{'contents'}[1]{'contents'}[2]{'contents'}[1];
-$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'}[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'}{'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]{'contents'}[1]{'extra'}{'node_content'}[0]
 = 
$result_trees{'index_special_region'}{'contents'}[3]{'contents'}[12]{'contents'}[0]{'contents'}[1]{'contents'}[0];
 
$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'}{'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]{'args'}[0]{'extra'}{'node_content'}[0]
 = 
$result_trees{'index_special_region'}{'contents'}[5]{'contents'}[7]{'contents'}[0]{'args'}[0]{'contents'}[0];
 
$result_trees{'index_special_region'}{'contents'}[5]{'contents'}[7]{'contents'}[2]{'args'}[0]{'extra'}{'node_content'}[0]
 = 
$result_trees{'index_special_region'}{'contents'}[5]{'contents'}[7]{'contents'}[2]{'args'}[0]{'contents'}[0];
 
$result_trees{'index_special_region'}{'contents'}[5]{'contents'}[9]{'contents'}[0]{'args'}[0]{'extra'}{'node_content'}[0]
 = 
$result_trees{'index_special_region'}{'contents'}[5]{'contents'}[9]{'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 09bb45dd9e..d100816d6a 100644
--- a/tp/t/results/indices/index_special_region_no_insertcopying.pl
+++ b/tp/t/results/indices/index_special_region_no_insertcopying.pl
@@ -65,12 +65,10 @@ $result_trees{'index_special_region_no_insertcopying'} = {
                   'cmdname' => 'cindex',
                   'extra' => {
                     'element_region' => 'copying',
-                    'index_entry' => {
-                      'entry_element' => {},
-                      'entry_number' => 1,
-                      'in_code' => 0,
-                      'index_name' => 'cp'
-                    }
+                    'index_entry' => [
+                      'cp',
+                      1
+                    ]
                   },
                   'info' => {
                     'spaces_before_argument' => {
@@ -197,12 +195,10 @@ $result_trees{'index_special_region_no_insertcopying'} = {
                               'cmdname' => 'cindex',
                               'extra' => {
                                 'element_region' => 'copying',
-                                'index_entry' => {
-                                  'entry_element' => {},
-                                  'entry_number' => 2,
-                                  'in_code' => 0,
-                                  'index_name' => 'cp'
-                                }
+                                'index_entry' => [
+                                  'cp',
+                                  2
+                                ]
                               },
                               'info' => {
                                 'spaces_before_argument' => {
@@ -361,12 +357,10 @@ $result_trees{'index_special_region_no_insertcopying'} = {
                   'cmdname' => 'cindex',
                   'extra' => {
                     'element_region' => 'titlepage',
-                    'index_entry' => {
-                      'entry_element' => {},
-                      'entry_number' => 3,
-                      'in_code' => 0,
-                      'index_name' => 'cp'
-                    }
+                    'index_entry' => [
+                      'cp',
+                      3
+                    ]
                   },
                   'info' => {
                     'spaces_before_argument' => {
@@ -486,12 +480,10 @@ $result_trees{'index_special_region_no_insertcopying'} = {
                               'cmdname' => 'cindex',
                               'extra' => {
                                 'element_region' => 'titlepage',
-                                'index_entry' => {
-                                  'entry_element' => {},
-                                  'entry_number' => 4,
-                                  'in_code' => 0,
-                                  'index_name' => 'cp'
-                                }
+                                'index_entry' => [
+                                  'cp',
+                                  4
+                                ]
                               },
                               'info' => {
                                 'spaces_before_argument' => {
@@ -753,12 +745,10 @@ $result_trees{'index_special_region_no_insertcopying'} = {
           'cmdname' => 'findex',
           'extra' => {
             'element_node' => {},
-            'index_entry' => {
-              'entry_element' => {},
-              'entry_number' => 1,
-              'in_code' => 1,
-              'index_name' => 'fn'
-            }
+            'index_entry' => [
+              'fn',
+              1
+            ]
           },
           'info' => {
             'spaces_before_argument' => {
@@ -1092,12 +1082,10 @@ $result_trees{'index_special_region_no_insertcopying'} 
= {
                       'cmdname' => 'item',
                       'extra' => {
                         'element_node' => {},
-                        'index_entry' => {
-                          'entry_element' => {},
-                          'entry_number' => 2,
-                          'in_code' => 1,
-                          'index_name' => 'fn'
-                        }
+                        'index_entry' => [
+                          'fn',
+                          2
+                        ]
                       },
                       'info' => {
                         'spaces_before_argument' => {
@@ -1370,12 +1358,10 @@ $result_trees{'index_special_region_no_insertcopying'} 
= {
           'cmdname' => 'findex',
           'extra' => {
             'element_node' => {},
-            'index_entry' => {
-              'entry_element' => {},
-              'entry_number' => 3,
-              'in_code' => 1,
-              'index_name' => 'fn'
-            }
+            'index_entry' => [
+              'fn',
+              3
+            ]
           },
           'info' => {
             'spaces_before_argument' => {
@@ -1414,12 +1400,10 @@ $result_trees{'index_special_region_no_insertcopying'} 
= {
           'cmdname' => 'cindex',
           'extra' => {
             'element_node' => {},
-            'index_entry' => {
-              'entry_element' => {},
-              'entry_number' => 5,
-              'in_code' => 0,
-              'index_name' => 'cp'
-            }
+            'index_entry' => [
+              'cp',
+              5
+            ]
           },
           'info' => {
             'spaces_before_argument' => {
@@ -1699,25 +1683,17 @@ $result_trees{'index_special_region_no_insertcopying'} 
= {
   ],
   'type' => 'document_root'
 };
-$result_trees{'index_special_region_no_insertcopying'}{'contents'}[0]{'contents'}[1]{'contents'}[0]{'contents'}[1]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'index_special_region_no_insertcopying'}{'contents'}[0]{'contents'}[1]{'contents'}[0]{'contents'}[1];
-$result_trees{'index_special_region_no_insertcopying'}{'contents'}[0]{'contents'}[1]{'contents'}[0]{'contents'}[5]{'contents'}[2]{'args'}[0]{'contents'}[4]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'index_special_region_no_insertcopying'}{'contents'}[0]{'contents'}[1]{'contents'}[0]{'contents'}[5]{'contents'}[2]{'args'}[0]{'contents'}[4];
-$result_trees{'index_special_region_no_insertcopying'}{'contents'}[0]{'contents'}[1]{'contents'}[2]{'contents'}[1]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'index_special_region_no_insertcopying'}{'contents'}[0]{'contents'}[1]{'contents'}[2]{'contents'}[1];
-$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'}[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'}{'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]{'contents'}[1]{'extra'}{'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'}[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'}{'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]{'args'}[0]{'extra'}{'node_content'}[0]
 = 
$result_trees{'index_special_region_no_insertcopying'}{'contents'}[5]{'contents'}[7]{'contents'}[0]{'args'}[0]{'contents'}[0];
 
$result_trees{'index_special_region_no_insertcopying'}{'contents'}[5]{'contents'}[7]{'contents'}[2]{'args'}[0]{'extra'}{'node_content'}[0]
 = 
$result_trees{'index_special_region_no_insertcopying'}{'contents'}[5]{'contents'}[7]{'contents'}[2]{'args'}[0]{'contents'}[0];
 
$result_trees{'index_special_region_no_insertcopying'}{'contents'}[5]{'contents'}[9]{'contents'}[0]{'args'}[0]{'extra'}{'node_content'}[0]
 = 
$result_trees{'index_special_region_no_insertcopying'}{'contents'}[5]{'contents'}[9]{'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 a02200ffcb..43ed589f9e 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
@@ -65,12 +65,10 @@ 
$result_trees{'index_special_region_no_insertcopying_no_titlepage_no_nodes'} = {
                   'cmdname' => 'cindex',
                   'extra' => {
                     'element_region' => 'copying',
-                    'index_entry' => {
-                      'entry_element' => {},
-                      'entry_number' => 1,
-                      'in_code' => 0,
-                      'index_name' => 'cp'
-                    }
+                    'index_entry' => [
+                      'cp',
+                      1
+                    ]
                   },
                   'info' => {
                     'spaces_before_argument' => {
@@ -197,12 +195,10 @@ 
$result_trees{'index_special_region_no_insertcopying_no_titlepage_no_nodes'} = {
                               'cmdname' => 'cindex',
                               'extra' => {
                                 'element_region' => 'copying',
-                                'index_entry' => {
-                                  'entry_element' => {},
-                                  'entry_number' => 2,
-                                  'in_code' => 0,
-                                  'index_name' => 'cp'
-                                }
+                                'index_entry' => [
+                                  'cp',
+                                  2
+                                ]
                               },
                               'info' => {
                                 'spaces_before_argument' => {
@@ -361,12 +357,10 @@ 
$result_trees{'index_special_region_no_insertcopying_no_titlepage_no_nodes'} = {
                   'cmdname' => 'cindex',
                   'extra' => {
                     'element_region' => 'titlepage',
-                    'index_entry' => {
-                      'entry_element' => {},
-                      'entry_number' => 3,
-                      'in_code' => 0,
-                      'index_name' => 'cp'
-                    }
+                    'index_entry' => [
+                      'cp',
+                      3
+                    ]
                   },
                   'info' => {
                     'spaces_before_argument' => {
@@ -486,12 +480,10 @@ 
$result_trees{'index_special_region_no_insertcopying_no_titlepage_no_nodes'} = {
                               'cmdname' => 'cindex',
                               'extra' => {
                                 'element_region' => 'titlepage',
-                                'index_entry' => {
-                                  'entry_element' => {},
-                                  'entry_number' => 4,
-                                  'in_code' => 0,
-                                  'index_name' => 'cp'
-                                }
+                                'index_entry' => [
+                                  'cp',
+                                  4
+                                ]
                               },
                               'info' => {
                                 'spaces_before_argument' => {
@@ -753,12 +745,10 @@ 
$result_trees{'index_special_region_no_insertcopying_no_titlepage_no_nodes'} = {
           'cmdname' => 'findex',
           'extra' => {
             'element_node' => {},
-            'index_entry' => {
-              'entry_element' => {},
-              'entry_number' => 1,
-              'in_code' => 1,
-              'index_name' => 'fn'
-            }
+            'index_entry' => [
+              'fn',
+              1
+            ]
           },
           'info' => {
             'spaces_before_argument' => {
@@ -1092,12 +1082,10 @@ 
$result_trees{'index_special_region_no_insertcopying_no_titlepage_no_nodes'} = {
                       'cmdname' => 'item',
                       'extra' => {
                         'element_node' => {},
-                        'index_entry' => {
-                          'entry_element' => {},
-                          'entry_number' => 2,
-                          'in_code' => 1,
-                          'index_name' => 'fn'
-                        }
+                        'index_entry' => [
+                          'fn',
+                          2
+                        ]
                       },
                       'info' => {
                         'spaces_before_argument' => {
@@ -1370,12 +1358,10 @@ 
$result_trees{'index_special_region_no_insertcopying_no_titlepage_no_nodes'} = {
           'cmdname' => 'findex',
           'extra' => {
             'element_node' => {},
-            'index_entry' => {
-              'entry_element' => {},
-              'entry_number' => 3,
-              'in_code' => 1,
-              'index_name' => 'fn'
-            }
+            'index_entry' => [
+              'fn',
+              3
+            ]
           },
           'info' => {
             'spaces_before_argument' => {
@@ -1414,12 +1400,10 @@ 
$result_trees{'index_special_region_no_insertcopying_no_titlepage_no_nodes'} = {
           'cmdname' => 'cindex',
           'extra' => {
             'element_node' => {},
-            'index_entry' => {
-              'entry_element' => {},
-              'entry_number' => 5,
-              'in_code' => 0,
-              'index_name' => 'cp'
-            }
+            'index_entry' => [
+              'cp',
+              5
+            ]
           },
           'info' => {
             'spaces_before_argument' => {
@@ -1699,25 +1683,17 @@ 
$result_trees{'index_special_region_no_insertcopying_no_titlepage_no_nodes'} = {
   ],
   'type' => 'document_root'
 };
-$result_trees{'index_special_region_no_insertcopying_no_titlepage_no_nodes'}{'contents'}[0]{'contents'}[1]{'contents'}[0]{'contents'}[1]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'index_special_region_no_insertcopying_no_titlepage_no_nodes'}{'contents'}[0]{'contents'}[1]{'contents'}[0]{'contents'}[1];
-$result_trees{'index_special_region_no_insertcopying_no_titlepage_no_nodes'}{'contents'}[0]{'contents'}[1]{'contents'}[0]{'contents'}[5]{'contents'}[2]{'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'}[0]{'contents'}[5]{'contents'}[2]{'args'}[0]{'contents'}[4];
-$result_trees{'index_special_region_no_insertcopying_no_titlepage_no_nodes'}{'contents'}[0]{'contents'}[1]{'contents'}[2]{'contents'}[1]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'index_special_region_no_insertcopying_no_titlepage_no_nodes'}{'contents'}[0]{'contents'}[1]{'contents'}[2]{'contents'}[1];
-$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'}[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'}{'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]{'contents'}[1]{'extra'}{'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'}[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'}{'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]{'args'}[0]{'extra'}{'node_content'}[0]
 = 
$result_trees{'index_special_region_no_insertcopying_no_titlepage_no_nodes'}{'contents'}[5]{'contents'}[7]{'contents'}[0]{'args'}[0]{'contents'}[0];
 
$result_trees{'index_special_region_no_insertcopying_no_titlepage_no_nodes'}{'contents'}[5]{'contents'}[7]{'contents'}[2]{'args'}[0]{'extra'}{'node_content'}[0]
 = 
$result_trees{'index_special_region_no_insertcopying_no_titlepage_no_nodes'}{'contents'}[5]{'contents'}[7]{'contents'}[2]{'args'}[0]{'contents'}[0];
 
$result_trees{'index_special_region_no_insertcopying_no_titlepage_no_nodes'}{'contents'}[5]{'contents'}[9]{'contents'}[0]{'args'}[0]{'extra'}{'node_content'}[0]
 = 
$result_trees{'index_special_region_no_insertcopying_no_titlepage_no_nodes'}{'contents'}[5]{'contents'}[9]{'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 f61dba8abf..bef83e58ad 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
@@ -65,12 +65,10 @@ 
$result_trees{'index_special_region_no_insertcopying_titlepage_no_nodes'} = {
                   'cmdname' => 'cindex',
                   'extra' => {
                     'element_region' => 'copying',
-                    'index_entry' => {
-                      'entry_element' => {},
-                      'entry_number' => 1,
-                      'in_code' => 0,
-                      'index_name' => 'cp'
-                    }
+                    'index_entry' => [
+                      'cp',
+                      1
+                    ]
                   },
                   'info' => {
                     'spaces_before_argument' => {
@@ -197,12 +195,10 @@ 
$result_trees{'index_special_region_no_insertcopying_titlepage_no_nodes'} = {
                               'cmdname' => 'cindex',
                               'extra' => {
                                 'element_region' => 'copying',
-                                'index_entry' => {
-                                  'entry_element' => {},
-                                  'entry_number' => 2,
-                                  'in_code' => 0,
-                                  'index_name' => 'cp'
-                                }
+                                'index_entry' => [
+                                  'cp',
+                                  2
+                                ]
                               },
                               'info' => {
                                 'spaces_before_argument' => {
@@ -361,12 +357,10 @@ 
$result_trees{'index_special_region_no_insertcopying_titlepage_no_nodes'} = {
                   'cmdname' => 'cindex',
                   'extra' => {
                     'element_region' => 'titlepage',
-                    'index_entry' => {
-                      'entry_element' => {},
-                      'entry_number' => 3,
-                      'in_code' => 0,
-                      'index_name' => 'cp'
-                    }
+                    'index_entry' => [
+                      'cp',
+                      3
+                    ]
                   },
                   'info' => {
                     'spaces_before_argument' => {
@@ -486,12 +480,10 @@ 
$result_trees{'index_special_region_no_insertcopying_titlepage_no_nodes'} = {
                               'cmdname' => 'cindex',
                               'extra' => {
                                 'element_region' => 'titlepage',
-                                'index_entry' => {
-                                  'entry_element' => {},
-                                  'entry_number' => 4,
-                                  'in_code' => 0,
-                                  'index_name' => 'cp'
-                                }
+                                'index_entry' => [
+                                  'cp',
+                                  4
+                                ]
                               },
                               'info' => {
                                 'spaces_before_argument' => {
@@ -753,12 +745,10 @@ 
$result_trees{'index_special_region_no_insertcopying_titlepage_no_nodes'} = {
           'cmdname' => 'findex',
           'extra' => {
             'element_node' => {},
-            'index_entry' => {
-              'entry_element' => {},
-              'entry_number' => 1,
-              'in_code' => 1,
-              'index_name' => 'fn'
-            }
+            'index_entry' => [
+              'fn',
+              1
+            ]
           },
           'info' => {
             'spaces_before_argument' => {
@@ -1092,12 +1082,10 @@ 
$result_trees{'index_special_region_no_insertcopying_titlepage_no_nodes'} = {
                       'cmdname' => 'item',
                       'extra' => {
                         'element_node' => {},
-                        'index_entry' => {
-                          'entry_element' => {},
-                          'entry_number' => 2,
-                          'in_code' => 1,
-                          'index_name' => 'fn'
-                        }
+                        'index_entry' => [
+                          'fn',
+                          2
+                        ]
                       },
                       'info' => {
                         'spaces_before_argument' => {
@@ -1370,12 +1358,10 @@ 
$result_trees{'index_special_region_no_insertcopying_titlepage_no_nodes'} = {
           'cmdname' => 'findex',
           'extra' => {
             'element_node' => {},
-            'index_entry' => {
-              'entry_element' => {},
-              'entry_number' => 3,
-              'in_code' => 1,
-              'index_name' => 'fn'
-            }
+            'index_entry' => [
+              'fn',
+              3
+            ]
           },
           'info' => {
             'spaces_before_argument' => {
@@ -1414,12 +1400,10 @@ 
$result_trees{'index_special_region_no_insertcopying_titlepage_no_nodes'} = {
           'cmdname' => 'cindex',
           'extra' => {
             'element_node' => {},
-            'index_entry' => {
-              'entry_element' => {},
-              'entry_number' => 5,
-              'in_code' => 0,
-              'index_name' => 'cp'
-            }
+            'index_entry' => [
+              'cp',
+              5
+            ]
           },
           'info' => {
             'spaces_before_argument' => {
@@ -1699,25 +1683,17 @@ 
$result_trees{'index_special_region_no_insertcopying_titlepage_no_nodes'} = {
   ],
   'type' => 'document_root'
 };
-$result_trees{'index_special_region_no_insertcopying_titlepage_no_nodes'}{'contents'}[0]{'contents'}[1]{'contents'}[0]{'contents'}[1]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'index_special_region_no_insertcopying_titlepage_no_nodes'}{'contents'}[0]{'contents'}[1]{'contents'}[0]{'contents'}[1];
-$result_trees{'index_special_region_no_insertcopying_titlepage_no_nodes'}{'contents'}[0]{'contents'}[1]{'contents'}[0]{'contents'}[5]{'contents'}[2]{'args'}[0]{'contents'}[4]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'index_special_region_no_insertcopying_titlepage_no_nodes'}{'contents'}[0]{'contents'}[1]{'contents'}[0]{'contents'}[5]{'contents'}[2]{'args'}[0]{'contents'}[4];
-$result_trees{'index_special_region_no_insertcopying_titlepage_no_nodes'}{'contents'}[0]{'contents'}[1]{'contents'}[2]{'contents'}[1]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'index_special_region_no_insertcopying_titlepage_no_nodes'}{'contents'}[0]{'contents'}[1]{'contents'}[2]{'contents'}[1];
-$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'}[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'}{'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]{'contents'}[1]{'extra'}{'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'}[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'}{'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]{'args'}[0]{'extra'}{'node_content'}[0]
 = 
$result_trees{'index_special_region_no_insertcopying_titlepage_no_nodes'}{'contents'}[5]{'contents'}[7]{'contents'}[0]{'args'}[0]{'contents'}[0];
 
$result_trees{'index_special_region_no_insertcopying_titlepage_no_nodes'}{'contents'}[5]{'contents'}[7]{'contents'}[2]{'args'}[0]{'extra'}{'node_content'}[0]
 = 
$result_trees{'index_special_region_no_insertcopying_titlepage_no_nodes'}{'contents'}[5]{'contents'}[7]{'contents'}[2]{'args'}[0]{'contents'}[0];
 
$result_trees{'index_special_region_no_insertcopying_titlepage_no_nodes'}{'contents'}[5]{'contents'}[9]{'contents'}[0]{'args'}[0]{'extra'}{'node_content'}[0]
 = 
$result_trees{'index_special_region_no_insertcopying_titlepage_no_nodes'}{'contents'}[5]{'contents'}[9]{'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 c2575f9830..52a7009495 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
@@ -65,12 +65,10 @@ 
$result_trees{'index_special_region_no_insertcopying_titlepage_no_nodes_footnote
                   'cmdname' => 'cindex',
                   'extra' => {
                     'element_region' => 'copying',
-                    'index_entry' => {
-                      'entry_element' => {},
-                      'entry_number' => 1,
-                      'in_code' => 0,
-                      'index_name' => 'cp'
-                    }
+                    'index_entry' => [
+                      'cp',
+                      1
+                    ]
                   },
                   'info' => {
                     'spaces_before_argument' => {
@@ -197,12 +195,10 @@ 
$result_trees{'index_special_region_no_insertcopying_titlepage_no_nodes_footnote
                               'cmdname' => 'cindex',
                               'extra' => {
                                 'element_region' => 'copying',
-                                'index_entry' => {
-                                  'entry_element' => {},
-                                  'entry_number' => 2,
-                                  'in_code' => 0,
-                                  'index_name' => 'cp'
-                                }
+                                'index_entry' => [
+                                  'cp',
+                                  2
+                                ]
                               },
                               'info' => {
                                 'spaces_before_argument' => {
@@ -361,12 +357,10 @@ 
$result_trees{'index_special_region_no_insertcopying_titlepage_no_nodes_footnote
                   'cmdname' => 'cindex',
                   'extra' => {
                     'element_region' => 'titlepage',
-                    'index_entry' => {
-                      'entry_element' => {},
-                      'entry_number' => 3,
-                      'in_code' => 0,
-                      'index_name' => 'cp'
-                    }
+                    'index_entry' => [
+                      'cp',
+                      3
+                    ]
                   },
                   'info' => {
                     'spaces_before_argument' => {
@@ -486,12 +480,10 @@ 
$result_trees{'index_special_region_no_insertcopying_titlepage_no_nodes_footnote
                               'cmdname' => 'cindex',
                               'extra' => {
                                 'element_region' => 'titlepage',
-                                'index_entry' => {
-                                  'entry_element' => {},
-                                  'entry_number' => 4,
-                                  'in_code' => 0,
-                                  'index_name' => 'cp'
-                                }
+                                'index_entry' => [
+                                  'cp',
+                                  4
+                                ]
                               },
                               'info' => {
                                 'spaces_before_argument' => {
@@ -753,12 +745,10 @@ 
$result_trees{'index_special_region_no_insertcopying_titlepage_no_nodes_footnote
           'cmdname' => 'findex',
           'extra' => {
             'element_node' => {},
-            'index_entry' => {
-              'entry_element' => {},
-              'entry_number' => 1,
-              'in_code' => 1,
-              'index_name' => 'fn'
-            }
+            'index_entry' => [
+              'fn',
+              1
+            ]
           },
           'info' => {
             'spaces_before_argument' => {
@@ -1092,12 +1082,10 @@ 
$result_trees{'index_special_region_no_insertcopying_titlepage_no_nodes_footnote
                       'cmdname' => 'item',
                       'extra' => {
                         'element_node' => {},
-                        'index_entry' => {
-                          'entry_element' => {},
-                          'entry_number' => 2,
-                          'in_code' => 1,
-                          'index_name' => 'fn'
-                        }
+                        'index_entry' => [
+                          'fn',
+                          2
+                        ]
                       },
                       'info' => {
                         'spaces_before_argument' => {
@@ -1370,12 +1358,10 @@ 
$result_trees{'index_special_region_no_insertcopying_titlepage_no_nodes_footnote
           'cmdname' => 'findex',
           'extra' => {
             'element_node' => {},
-            'index_entry' => {
-              'entry_element' => {},
-              'entry_number' => 3,
-              'in_code' => 1,
-              'index_name' => 'fn'
-            }
+            'index_entry' => [
+              'fn',
+              3
+            ]
           },
           'info' => {
             'spaces_before_argument' => {
@@ -1414,12 +1400,10 @@ 
$result_trees{'index_special_region_no_insertcopying_titlepage_no_nodes_footnote
           'cmdname' => 'cindex',
           'extra' => {
             'element_node' => {},
-            'index_entry' => {
-              'entry_element' => {},
-              'entry_number' => 5,
-              'in_code' => 0,
-              'index_name' => 'cp'
-            }
+            'index_entry' => [
+              'cp',
+              5
+            ]
           },
           'info' => {
             'spaces_before_argument' => {
@@ -1699,25 +1683,17 @@ 
$result_trees{'index_special_region_no_insertcopying_titlepage_no_nodes_footnote
   ],
   'type' => 'document_root'
 };
-$result_trees{'index_special_region_no_insertcopying_titlepage_no_nodes_footnotes_default'}{'contents'}[0]{'contents'}[1]{'contents'}[0]{'contents'}[1]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'index_special_region_no_insertcopying_titlepage_no_nodes_footnotes_default'}{'contents'}[0]{'contents'}[1]{'contents'}[0]{'contents'}[1];
-$result_trees{'index_special_region_no_insertcopying_titlepage_no_nodes_footnotes_default'}{'contents'}[0]{'contents'}[1]{'contents'}[0]{'contents'}[5]{'contents'}[2]{'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'}[0]{'contents'}[5]{'contents'}[2]{'args'}[0]{'contents'}[4];
-$result_trees{'index_special_region_no_insertcopying_titlepage_no_nodes_footnotes_default'}{'contents'}[0]{'contents'}[1]{'contents'}[2]{'contents'}[1]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'index_special_region_no_insertcopying_titlepage_no_nodes_footnotes_default'}{'contents'}[0]{'contents'}[1]{'contents'}[2]{'contents'}[1];
-$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'}[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'}{'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]{'contents'}[1]{'extra'}{'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'}[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'}{'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]{'args'}[0]{'extra'}{'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];
 
$result_trees{'index_special_region_no_insertcopying_titlepage_no_nodes_footnotes_default'}{'contents'}[5]{'contents'}[7]{'contents'}[2]{'args'}[0]{'extra'}{'node_content'}[0]
 = 
$result_trees{'index_special_region_no_insertcopying_titlepage_no_nodes_footnotes_default'}{'contents'}[5]{'contents'}[7]{'contents'}[2]{'args'}[0]{'contents'}[0];
 
$result_trees{'index_special_region_no_insertcopying_titlepage_no_nodes_footnotes_default'}{'contents'}[5]{'contents'}[9]{'contents'}[0]{'args'}[0]{'extra'}{'node_content'}[0]
 = 
$result_trees{'index_special_region_no_insertcopying_titlepage_no_nodes_footnotes_default'}{'contents'}[5]{'contents'}[9]{'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 5fbcda9945..02e78d9144 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
@@ -65,12 +65,10 @@ $result_trees{'index_special_region_no_titlepage_no_nodes'} 
= {
                   'cmdname' => 'cindex',
                   'extra' => {
                     'element_region' => 'copying',
-                    'index_entry' => {
-                      'entry_element' => {},
-                      'entry_number' => 1,
-                      'in_code' => 0,
-                      'index_name' => 'cp'
-                    }
+                    'index_entry' => [
+                      'cp',
+                      1
+                    ]
                   },
                   'info' => {
                     'spaces_before_argument' => {
@@ -197,12 +195,10 @@ 
$result_trees{'index_special_region_no_titlepage_no_nodes'} = {
                               'cmdname' => 'cindex',
                               'extra' => {
                                 'element_region' => 'copying',
-                                'index_entry' => {
-                                  'entry_element' => {},
-                                  'entry_number' => 2,
-                                  'in_code' => 0,
-                                  'index_name' => 'cp'
-                                }
+                                'index_entry' => [
+                                  'cp',
+                                  2
+                                ]
                               },
                               'info' => {
                                 'spaces_before_argument' => {
@@ -361,12 +357,10 @@ 
$result_trees{'index_special_region_no_titlepage_no_nodes'} = {
                   'cmdname' => 'cindex',
                   'extra' => {
                     'element_region' => 'titlepage',
-                    'index_entry' => {
-                      'entry_element' => {},
-                      'entry_number' => 3,
-                      'in_code' => 0,
-                      'index_name' => 'cp'
-                    }
+                    'index_entry' => [
+                      'cp',
+                      3
+                    ]
                   },
                   'info' => {
                     'spaces_before_argument' => {
@@ -486,12 +480,10 @@ 
$result_trees{'index_special_region_no_titlepage_no_nodes'} = {
                               'cmdname' => 'cindex',
                               'extra' => {
                                 'element_region' => 'titlepage',
-                                'index_entry' => {
-                                  'entry_element' => {},
-                                  'entry_number' => 4,
-                                  'in_code' => 0,
-                                  'index_name' => 'cp'
-                                }
+                                'index_entry' => [
+                                  'cp',
+                                  4
+                                ]
                               },
                               'info' => {
                                 'spaces_before_argument' => {
@@ -758,12 +750,10 @@ 
$result_trees{'index_special_region_no_titlepage_no_nodes'} = {
           'cmdname' => 'findex',
           'extra' => {
             'element_node' => {},
-            'index_entry' => {
-              'entry_element' => {},
-              'entry_number' => 1,
-              'in_code' => 1,
-              'index_name' => 'fn'
-            }
+            'index_entry' => [
+              'fn',
+              1
+            ]
           },
           'info' => {
             'spaces_before_argument' => {
@@ -1097,12 +1087,10 @@ 
$result_trees{'index_special_region_no_titlepage_no_nodes'} = {
                       'cmdname' => 'item',
                       'extra' => {
                         'element_node' => {},
-                        'index_entry' => {
-                          'entry_element' => {},
-                          'entry_number' => 2,
-                          'in_code' => 1,
-                          'index_name' => 'fn'
-                        }
+                        'index_entry' => [
+                          'fn',
+                          2
+                        ]
                       },
                       'info' => {
                         'spaces_before_argument' => {
@@ -1375,12 +1363,10 @@ 
$result_trees{'index_special_region_no_titlepage_no_nodes'} = {
           'cmdname' => 'findex',
           'extra' => {
             'element_node' => {},
-            'index_entry' => {
-              'entry_element' => {},
-              'entry_number' => 3,
-              'in_code' => 1,
-              'index_name' => 'fn'
-            }
+            'index_entry' => [
+              'fn',
+              3
+            ]
           },
           'info' => {
             'spaces_before_argument' => {
@@ -1419,12 +1405,10 @@ 
$result_trees{'index_special_region_no_titlepage_no_nodes'} = {
           'cmdname' => 'cindex',
           'extra' => {
             'element_node' => {},
-            'index_entry' => {
-              'entry_element' => {},
-              'entry_number' => 5,
-              'in_code' => 0,
-              'index_name' => 'cp'
-            }
+            'index_entry' => [
+              'cp',
+              5
+            ]
           },
           'info' => {
             'spaces_before_argument' => {
@@ -1709,25 +1693,17 @@ 
$result_trees{'index_special_region_no_titlepage_no_nodes'} = {
   ],
   'type' => 'document_root'
 };
-$result_trees{'index_special_region_no_titlepage_no_nodes'}{'contents'}[0]{'contents'}[1]{'contents'}[0]{'contents'}[1]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'index_special_region_no_titlepage_no_nodes'}{'contents'}[0]{'contents'}[1]{'contents'}[0]{'contents'}[1];
-$result_trees{'index_special_region_no_titlepage_no_nodes'}{'contents'}[0]{'contents'}[1]{'contents'}[0]{'contents'}[5]{'contents'}[2]{'args'}[0]{'contents'}[4]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'index_special_region_no_titlepage_no_nodes'}{'contents'}[0]{'contents'}[1]{'contents'}[0]{'contents'}[5]{'contents'}[2]{'args'}[0]{'contents'}[4];
-$result_trees{'index_special_region_no_titlepage_no_nodes'}{'contents'}[0]{'contents'}[1]{'contents'}[2]{'contents'}[1]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'index_special_region_no_titlepage_no_nodes'}{'contents'}[0]{'contents'}[1]{'contents'}[2]{'contents'}[1];
-$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'}[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'}{'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]{'contents'}[1]{'extra'}{'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'}[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'}{'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]{'args'}[0]{'extra'}{'node_content'}[0]
 = 
$result_trees{'index_special_region_no_titlepage_no_nodes'}{'contents'}[5]{'contents'}[7]{'contents'}[0]{'args'}[0]{'contents'}[0];
 
$result_trees{'index_special_region_no_titlepage_no_nodes'}{'contents'}[5]{'contents'}[7]{'contents'}[2]{'args'}[0]{'extra'}{'node_content'}[0]
 = 
$result_trees{'index_special_region_no_titlepage_no_nodes'}{'contents'}[5]{'contents'}[7]{'contents'}[2]{'args'}[0]{'contents'}[0];
 
$result_trees{'index_special_region_no_titlepage_no_nodes'}{'contents'}[5]{'contents'}[9]{'contents'}[0]{'args'}[0]{'extra'}{'node_content'}[0]
 = 
$result_trees{'index_special_region_no_titlepage_no_nodes'}{'contents'}[5]{'contents'}[9]{'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 54be8077bb..722ede16f7 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
@@ -65,12 +65,10 @@ $result_trees{'index_special_region_titlepage_no_nodes'} = {
                   'cmdname' => 'cindex',
                   'extra' => {
                     'element_region' => 'copying',
-                    'index_entry' => {
-                      'entry_element' => {},
-                      'entry_number' => 1,
-                      'in_code' => 0,
-                      'index_name' => 'cp'
-                    }
+                    'index_entry' => [
+                      'cp',
+                      1
+                    ]
                   },
                   'info' => {
                     'spaces_before_argument' => {
@@ -197,12 +195,10 @@ $result_trees{'index_special_region_titlepage_no_nodes'} 
= {
                               'cmdname' => 'cindex',
                               'extra' => {
                                 'element_region' => 'copying',
-                                'index_entry' => {
-                                  'entry_element' => {},
-                                  'entry_number' => 2,
-                                  'in_code' => 0,
-                                  'index_name' => 'cp'
-                                }
+                                'index_entry' => [
+                                  'cp',
+                                  2
+                                ]
                               },
                               'info' => {
                                 'spaces_before_argument' => {
@@ -361,12 +357,10 @@ $result_trees{'index_special_region_titlepage_no_nodes'} 
= {
                   'cmdname' => 'cindex',
                   'extra' => {
                     'element_region' => 'titlepage',
-                    'index_entry' => {
-                      'entry_element' => {},
-                      'entry_number' => 3,
-                      'in_code' => 0,
-                      'index_name' => 'cp'
-                    }
+                    'index_entry' => [
+                      'cp',
+                      3
+                    ]
                   },
                   'info' => {
                     'spaces_before_argument' => {
@@ -486,12 +480,10 @@ $result_trees{'index_special_region_titlepage_no_nodes'} 
= {
                               'cmdname' => 'cindex',
                               'extra' => {
                                 'element_region' => 'titlepage',
-                                'index_entry' => {
-                                  'entry_element' => {},
-                                  'entry_number' => 4,
-                                  'in_code' => 0,
-                                  'index_name' => 'cp'
-                                }
+                                'index_entry' => [
+                                  'cp',
+                                  4
+                                ]
                               },
                               'info' => {
                                 'spaces_before_argument' => {
@@ -758,12 +750,10 @@ $result_trees{'index_special_region_titlepage_no_nodes'} 
= {
           'cmdname' => 'findex',
           'extra' => {
             'element_node' => {},
-            'index_entry' => {
-              'entry_element' => {},
-              'entry_number' => 1,
-              'in_code' => 1,
-              'index_name' => 'fn'
-            }
+            'index_entry' => [
+              'fn',
+              1
+            ]
           },
           'info' => {
             'spaces_before_argument' => {
@@ -1097,12 +1087,10 @@ 
$result_trees{'index_special_region_titlepage_no_nodes'} = {
                       'cmdname' => 'item',
                       'extra' => {
                         'element_node' => {},
-                        'index_entry' => {
-                          'entry_element' => {},
-                          'entry_number' => 2,
-                          'in_code' => 1,
-                          'index_name' => 'fn'
-                        }
+                        'index_entry' => [
+                          'fn',
+                          2
+                        ]
                       },
                       'info' => {
                         'spaces_before_argument' => {
@@ -1375,12 +1363,10 @@ 
$result_trees{'index_special_region_titlepage_no_nodes'} = {
           'cmdname' => 'findex',
           'extra' => {
             'element_node' => {},
-            'index_entry' => {
-              'entry_element' => {},
-              'entry_number' => 3,
-              'in_code' => 1,
-              'index_name' => 'fn'
-            }
+            'index_entry' => [
+              'fn',
+              3
+            ]
           },
           'info' => {
             'spaces_before_argument' => {
@@ -1419,12 +1405,10 @@ 
$result_trees{'index_special_region_titlepage_no_nodes'} = {
           'cmdname' => 'cindex',
           'extra' => {
             'element_node' => {},
-            'index_entry' => {
-              'entry_element' => {},
-              'entry_number' => 5,
-              'in_code' => 0,
-              'index_name' => 'cp'
-            }
+            'index_entry' => [
+              'cp',
+              5
+            ]
           },
           'info' => {
             'spaces_before_argument' => {
@@ -1709,25 +1693,17 @@ 
$result_trees{'index_special_region_titlepage_no_nodes'} = {
   ],
   'type' => 'document_root'
 };
-$result_trees{'index_special_region_titlepage_no_nodes'}{'contents'}[0]{'contents'}[1]{'contents'}[0]{'contents'}[1]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'index_special_region_titlepage_no_nodes'}{'contents'}[0]{'contents'}[1]{'contents'}[0]{'contents'}[1];
-$result_trees{'index_special_region_titlepage_no_nodes'}{'contents'}[0]{'contents'}[1]{'contents'}[0]{'contents'}[5]{'contents'}[2]{'args'}[0]{'contents'}[4]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'index_special_region_titlepage_no_nodes'}{'contents'}[0]{'contents'}[1]{'contents'}[0]{'contents'}[5]{'contents'}[2]{'args'}[0]{'contents'}[4];
-$result_trees{'index_special_region_titlepage_no_nodes'}{'contents'}[0]{'contents'}[1]{'contents'}[2]{'contents'}[1]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'index_special_region_titlepage_no_nodes'}{'contents'}[0]{'contents'}[1]{'contents'}[2]{'contents'}[1];
-$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'}[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'}{'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]{'contents'}[1]{'extra'}{'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'}[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'}{'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]{'args'}[0]{'extra'}{'node_content'}[0]
 = 
$result_trees{'index_special_region_titlepage_no_nodes'}{'contents'}[5]{'contents'}[7]{'contents'}[0]{'args'}[0]{'contents'}[0];
 
$result_trees{'index_special_region_titlepage_no_nodes'}{'contents'}[5]{'contents'}[7]{'contents'}[2]{'args'}[0]{'extra'}{'node_content'}[0]
 = 
$result_trees{'index_special_region_titlepage_no_nodes'}{'contents'}[5]{'contents'}[7]{'contents'}[2]{'args'}[0]{'contents'}[0];
 
$result_trees{'index_special_region_titlepage_no_nodes'}{'contents'}[5]{'contents'}[9]{'contents'}[0]{'args'}[0]{'extra'}{'node_content'}[0]
 = 
$result_trees{'index_special_region_titlepage_no_nodes'}{'contents'}[5]{'contents'}[9]{'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 6c50fe1e7d..afc4ef939b 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
@@ -65,12 +65,10 @@ 
$result_trees{'index_special_region_titlepage_no_nodes_footnotes_default'} = {
                   'cmdname' => 'cindex',
                   'extra' => {
                     'element_region' => 'copying',
-                    'index_entry' => {
-                      'entry_element' => {},
-                      'entry_number' => 1,
-                      'in_code' => 0,
-                      'index_name' => 'cp'
-                    }
+                    'index_entry' => [
+                      'cp',
+                      1
+                    ]
                   },
                   'info' => {
                     'spaces_before_argument' => {
@@ -197,12 +195,10 @@ 
$result_trees{'index_special_region_titlepage_no_nodes_footnotes_default'} = {
                               'cmdname' => 'cindex',
                               'extra' => {
                                 'element_region' => 'copying',
-                                'index_entry' => {
-                                  'entry_element' => {},
-                                  'entry_number' => 2,
-                                  'in_code' => 0,
-                                  'index_name' => 'cp'
-                                }
+                                'index_entry' => [
+                                  'cp',
+                                  2
+                                ]
                               },
                               'info' => {
                                 'spaces_before_argument' => {
@@ -361,12 +357,10 @@ 
$result_trees{'index_special_region_titlepage_no_nodes_footnotes_default'} = {
                   'cmdname' => 'cindex',
                   'extra' => {
                     'element_region' => 'titlepage',
-                    'index_entry' => {
-                      'entry_element' => {},
-                      'entry_number' => 3,
-                      'in_code' => 0,
-                      'index_name' => 'cp'
-                    }
+                    'index_entry' => [
+                      'cp',
+                      3
+                    ]
                   },
                   'info' => {
                     'spaces_before_argument' => {
@@ -486,12 +480,10 @@ 
$result_trees{'index_special_region_titlepage_no_nodes_footnotes_default'} = {
                               'cmdname' => 'cindex',
                               'extra' => {
                                 'element_region' => 'titlepage',
-                                'index_entry' => {
-                                  'entry_element' => {},
-                                  'entry_number' => 4,
-                                  'in_code' => 0,
-                                  'index_name' => 'cp'
-                                }
+                                'index_entry' => [
+                                  'cp',
+                                  4
+                                ]
                               },
                               'info' => {
                                 'spaces_before_argument' => {
@@ -758,12 +750,10 @@ 
$result_trees{'index_special_region_titlepage_no_nodes_footnotes_default'} = {
           'cmdname' => 'findex',
           'extra' => {
             'element_node' => {},
-            'index_entry' => {
-              'entry_element' => {},
-              'entry_number' => 1,
-              'in_code' => 1,
-              'index_name' => 'fn'
-            }
+            'index_entry' => [
+              'fn',
+              1
+            ]
           },
           'info' => {
             'spaces_before_argument' => {
@@ -1097,12 +1087,10 @@ 
$result_trees{'index_special_region_titlepage_no_nodes_footnotes_default'} = {
                       'cmdname' => 'item',
                       'extra' => {
                         'element_node' => {},
-                        'index_entry' => {
-                          'entry_element' => {},
-                          'entry_number' => 2,
-                          'in_code' => 1,
-                          'index_name' => 'fn'
-                        }
+                        'index_entry' => [
+                          'fn',
+                          2
+                        ]
                       },
                       'info' => {
                         'spaces_before_argument' => {
@@ -1375,12 +1363,10 @@ 
$result_trees{'index_special_region_titlepage_no_nodes_footnotes_default'} = {
           'cmdname' => 'findex',
           'extra' => {
             'element_node' => {},
-            'index_entry' => {
-              'entry_element' => {},
-              'entry_number' => 3,
-              'in_code' => 1,
-              'index_name' => 'fn'
-            }
+            'index_entry' => [
+              'fn',
+              3
+            ]
           },
           'info' => {
             'spaces_before_argument' => {
@@ -1419,12 +1405,10 @@ 
$result_trees{'index_special_region_titlepage_no_nodes_footnotes_default'} = {
           'cmdname' => 'cindex',
           'extra' => {
             'element_node' => {},
-            'index_entry' => {
-              'entry_element' => {},
-              'entry_number' => 5,
-              'in_code' => 0,
-              'index_name' => 'cp'
-            }
+            'index_entry' => [
+              'cp',
+              5
+            ]
           },
           'info' => {
             'spaces_before_argument' => {
@@ -1709,25 +1693,17 @@ 
$result_trees{'index_special_region_titlepage_no_nodes_footnotes_default'} = {
   ],
   'type' => 'document_root'
 };
-$result_trees{'index_special_region_titlepage_no_nodes_footnotes_default'}{'contents'}[0]{'contents'}[1]{'contents'}[0]{'contents'}[1]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'index_special_region_titlepage_no_nodes_footnotes_default'}{'contents'}[0]{'contents'}[1]{'contents'}[0]{'contents'}[1];
-$result_trees{'index_special_region_titlepage_no_nodes_footnotes_default'}{'contents'}[0]{'contents'}[1]{'contents'}[0]{'contents'}[5]{'contents'}[2]{'args'}[0]{'contents'}[4]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'index_special_region_titlepage_no_nodes_footnotes_default'}{'contents'}[0]{'contents'}[1]{'contents'}[0]{'contents'}[5]{'contents'}[2]{'args'}[0]{'contents'}[4];
-$result_trees{'index_special_region_titlepage_no_nodes_footnotes_default'}{'contents'}[0]{'contents'}[1]{'contents'}[2]{'contents'}[1]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'index_special_region_titlepage_no_nodes_footnotes_default'}{'contents'}[0]{'contents'}[1]{'contents'}[2]{'contents'}[1];
-$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'}[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'}{'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]{'contents'}[1]{'extra'}{'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'}[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'}{'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]{'args'}[0]{'extra'}{'node_content'}[0]
 = 
$result_trees{'index_special_region_titlepage_no_nodes_footnotes_default'}{'contents'}[5]{'contents'}[7]{'contents'}[0]{'args'}[0]{'contents'}[0];
 
$result_trees{'index_special_region_titlepage_no_nodes_footnotes_default'}{'contents'}[5]{'contents'}[7]{'contents'}[2]{'args'}[0]{'extra'}{'node_content'}[0]
 = 
$result_trees{'index_special_region_titlepage_no_nodes_footnotes_default'}{'contents'}[5]{'contents'}[7]{'contents'}[2]{'args'}[0]{'contents'}[0];
 
$result_trees{'index_special_region_titlepage_no_nodes_footnotes_default'}{'contents'}[5]{'contents'}[9]{'contents'}[0]{'args'}[0]{'extra'}{'node_content'}[0]
 = 
$result_trees{'index_special_region_titlepage_no_nodes_footnotes_default'}{'contents'}[5]{'contents'}[9]{'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 16b5754ae2..243033b766 100644
--- a/tp/t/results/indices/index_split.pl
+++ b/tp/t/results/indices/index_split.pl
@@ -103,12 +103,10 @@ $result_trees{'index_split'} = {
           'cmdname' => 'cindex',
           'extra' => {
             'element_node' => {},
-            'index_entry' => {
-              'entry_element' => {},
-              'entry_number' => 1,
-              'in_code' => 0,
-              'index_name' => 'cp'
-            }
+            'index_entry' => [
+              'cp',
+              1
+            ]
           },
           'info' => {
             'spaces_before_argument' => {
@@ -520,12 +518,10 @@ $result_trees{'index_split'} = {
           'cmdname' => 'cindex',
           'extra' => {
             'element_node' => {},
-            'index_entry' => {
-              'entry_element' => {},
-              'entry_number' => 2,
-              'in_code' => 0,
-              'index_name' => 'cp'
-            }
+            'index_entry' => [
+              'cp',
+              2
+            ]
           },
           'info' => {
             'spaces_before_argument' => {
@@ -559,12 +555,10 @@ $result_trees{'index_split'} = {
           'cmdname' => 'cindex',
           'extra' => {
             'element_node' => {},
-            'index_entry' => {
-              'entry_element' => {},
-              'entry_number' => 3,
-              'in_code' => 0,
-              'index_name' => 'cp'
-            }
+            'index_entry' => [
+              'cp',
+              3
+            ]
           },
           'info' => {
             'spaces_before_argument' => {
@@ -598,12 +592,10 @@ $result_trees{'index_split'} = {
           'cmdname' => 'findex',
           'extra' => {
             'element_node' => {},
-            'index_entry' => {
-              'entry_element' => {},
-              'entry_number' => 1,
-              'in_code' => 1,
-              'index_name' => 'fn'
-            }
+            'index_entry' => [
+              'fn',
+              1
+            ]
           },
           'info' => {
             'spaces_before_argument' => {
@@ -637,12 +629,10 @@ $result_trees{'index_split'} = {
           'cmdname' => 'cindex',
           'extra' => {
             'element_node' => {},
-            'index_entry' => {
-              'entry_element' => {},
-              'entry_number' => 4,
-              'in_code' => 0,
-              'index_name' => 'cp'
-            }
+            'index_entry' => [
+              'cp',
+              4
+            ]
           },
           'info' => {
             'spaces_before_argument' => {
@@ -759,12 +749,10 @@ $result_trees{'index_split'} = {
           'cmdname' => 'cindex',
           'extra' => {
             'element_node' => {},
-            'index_entry' => {
-              'entry_element' => {},
-              'entry_number' => 5,
-              'in_code' => 0,
-              'index_name' => 'cp'
-            }
+            'index_entry' => [
+              'cp',
+              5
+            ]
           },
           'info' => {
             'spaces_before_argument' => {
@@ -838,12 +826,10 @@ $result_trees{'index_split'} = {
           'cmdname' => 'findex',
           'extra' => {
             'element_node' => {},
-            'index_entry' => {
-              'entry_element' => {},
-              'entry_number' => 2,
-              'in_code' => 1,
-              'index_name' => 'fn'
-            }
+            'index_entry' => [
+              'fn',
+              2
+            ]
           },
           'info' => {
             'spaces_before_argument' => {
@@ -877,12 +863,10 @@ $result_trees{'index_split'} = {
           'cmdname' => 'cindex',
           'extra' => {
             'element_node' => {},
-            'index_entry' => {
-              'entry_element' => {},
-              'entry_number' => 6,
-              'in_code' => 0,
-              'index_name' => 'cp'
-            }
+            'index_entry' => [
+              'cp',
+              6
+            ]
           },
           'info' => {
             'spaces_before_argument' => {
@@ -916,12 +900,10 @@ $result_trees{'index_split'} = {
           'cmdname' => 'findex',
           'extra' => {
             'element_node' => {},
-            'index_entry' => {
-              'entry_element' => {},
-              'entry_number' => 3,
-              'in_code' => 1,
-              'index_name' => 'fn'
-            }
+            'index_entry' => [
+              'fn',
+              3
+            ]
           },
           'info' => {
             'spaces_before_argument' => {
@@ -1364,12 +1346,10 @@ $result_trees{'index_split'} = {
           'cmdname' => 'cindex',
           'extra' => {
             'element_node' => {},
-            'index_entry' => {
-              'entry_element' => {},
-              'entry_number' => 7,
-              'in_code' => 0,
-              'index_name' => 'cp'
-            }
+            'index_entry' => [
+              'cp',
+              7
+            ]
           },
           'info' => {
             'spaces_before_argument' => {
@@ -1606,12 +1586,10 @@ $result_trees{'index_split'} = {
           'cmdname' => 'cindex',
           'extra' => {
             'element_node' => {},
-            'index_entry' => {
-              'entry_element' => {},
-              'entry_number' => 8,
-              'in_code' => 0,
-              'index_name' => 'cp'
-            }
+            'index_entry' => [
+              'cp',
+              8
+            ]
           },
           'info' => {
             'spaces_before_argument' => {
@@ -1817,12 +1795,10 @@ $result_trees{'index_split'} = {
           'cmdname' => 'cindex',
           'extra' => {
             'element_node' => {},
-            'index_entry' => {
-              'entry_element' => {},
-              'entry_number' => 9,
-              'in_code' => 0,
-              'index_name' => 'cp'
-            }
+            'index_entry' => [
+              'cp',
+              9
+            ]
           },
           'info' => {
             'spaces_before_argument' => {
@@ -1900,12 +1876,10 @@ $result_trees{'index_split'} = {
           'cmdname' => 'cindex',
           'extra' => {
             'element_node' => {},
-            'index_entry' => {
-              'entry_element' => {},
-              'entry_number' => 10,
-              'in_code' => 0,
-              'index_name' => 'cp'
-            }
+            'index_entry' => [
+              'cp',
+              10
+            ]
           },
           'info' => {
             'spaces_before_argument' => {
@@ -2097,12 +2071,10 @@ $result_trees{'index_split'} = {
           'cmdname' => 'cindex',
           'extra' => {
             'element_node' => {},
-            'index_entry' => {
-              'entry_element' => {},
-              'entry_number' => 11,
-              'in_code' => 0,
-              'index_name' => 'cp'
-            }
+            'index_entry' => [
+              'cp',
+              11
+            ]
           },
           'info' => {
             'spaces_before_argument' => {
@@ -2248,12 +2220,10 @@ $result_trees{'index_split'} = {
           'cmdname' => 'cindex',
           'extra' => {
             'element_node' => {},
-            'index_entry' => {
-              'entry_element' => {},
-              'entry_number' => 12,
-              'in_code' => 0,
-              'index_name' => 'cp'
-            }
+            'index_entry' => [
+              'cp',
+              12
+            ]
           },
           'info' => {
             'spaces_before_argument' => {
@@ -2360,12 +2330,10 @@ $result_trees{'index_split'} = {
           'cmdname' => 'cindex',
           'extra' => {
             'element_node' => {},
-            'index_entry' => {
-              'entry_element' => {},
-              'entry_number' => 13,
-              'in_code' => 0,
-              'index_name' => 'cp'
-            }
+            'index_entry' => [
+              'cp',
+              13
+            ]
           },
           'info' => {
             'spaces_before_argument' => {
@@ -2452,12 +2420,10 @@ $result_trees{'index_split'} = {
           'cmdname' => 'cindex',
           'extra' => {
             'element_node' => {},
-            'index_entry' => {
-              'entry_element' => {},
-              'entry_number' => 14,
-              'in_code' => 0,
-              'index_name' => 'cp'
-            }
+            'index_entry' => [
+              'cp',
+              14
+            ]
           },
           'info' => {
             'spaces_before_argument' => {
@@ -2535,12 +2501,10 @@ $result_trees{'index_split'} = {
           'cmdname' => 'cindex',
           'extra' => {
             'element_node' => {},
-            'index_entry' => {
-              'entry_element' => {},
-              'entry_number' => 15,
-              'in_code' => 0,
-              'index_name' => 'cp'
-            }
+            'index_entry' => [
+              'cp',
+              15
+            ]
           },
           'info' => {
             'spaces_before_argument' => {
@@ -2639,12 +2603,10 @@ $result_trees{'index_split'} = {
           'cmdname' => 'cindex',
           'extra' => {
             'element_node' => {},
-            'index_entry' => {
-              'entry_element' => {},
-              'entry_number' => 16,
-              'in_code' => 0,
-              'index_name' => 'cp'
-            }
+            'index_entry' => [
+              'cp',
+              16
+            ]
           },
           'info' => {
             'spaces_before_argument' => {
@@ -2775,26 +2737,17 @@ $result_trees{'index_split'} = {
   'type' => 'document_root'
 };
 
$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]{'contents'}[1]{'extra'}{'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]{'contents'}[1]{'extra'}{'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]{'contents'}[1]{'extra'}{'node_content'}[0]
 = 
$result_trees{'index_split'}{'contents'}[2]{'contents'}[10]{'contents'}[2]{'contents'}[1]{'contents'}[0];
 
$result_trees{'index_split'}{'contents'}[3]{'contents'}[2]{'extra'}{'element_node'}
 = $result_trees{'index_split'}{'contents'}[3];
-$result_trees{'index_split'}{'contents'}[3]{'contents'}[2]{'extra'}{'index_entry'}{'entry_element'}
 = $result_trees{'index_split'}{'contents'}[3]{'contents'}[2];
 
$result_trees{'index_split'}{'contents'}[3]{'contents'}[3]{'extra'}{'element_node'}
 = $result_trees{'index_split'}{'contents'}[3];
-$result_trees{'index_split'}{'contents'}[3]{'contents'}[3]{'extra'}{'index_entry'}{'entry_element'}
 = $result_trees{'index_split'}{'contents'}[3]{'contents'}[3];
 
$result_trees{'index_split'}{'contents'}[3]{'contents'}[4]{'extra'}{'element_node'}
 = $result_trees{'index_split'}{'contents'}[3];
-$result_trees{'index_split'}{'contents'}[3]{'contents'}[4]{'extra'}{'index_entry'}{'entry_element'}
 = $result_trees{'index_split'}{'contents'}[3]{'contents'}[4];
 
$result_trees{'index_split'}{'contents'}[3]{'contents'}[5]{'extra'}{'element_node'}
 = $result_trees{'index_split'}{'contents'}[3];
-$result_trees{'index_split'}{'contents'}[3]{'contents'}[5]{'extra'}{'index_entry'}{'entry_element'}
 = $result_trees{'index_split'}{'contents'}[3]{'contents'}[5];
 
$result_trees{'index_split'}{'contents'}[3]{'contents'}[11]{'extra'}{'element_node'}
 = $result_trees{'index_split'}{'contents'}[3];
-$result_trees{'index_split'}{'contents'}[3]{'contents'}[11]{'extra'}{'index_entry'}{'entry_element'}
 = $result_trees{'index_split'}{'contents'}[3]{'contents'}[11];
 
$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'}{'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'}{'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]{'contents'}[1]{'extra'}{'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]{'contents'}[1]{'extra'}{'node_content'}[0]
 = 
$result_trees{'index_split'}{'contents'}[4]{'contents'}[4]{'contents'}[1]{'contents'}[1]{'contents'}[0];
 
$result_trees{'index_split'}{'contents'}[4]{'contents'}[4]{'contents'}[2]{'contents'}[1]{'extra'}{'node_content'}[0]
 = 
$result_trees{'index_split'}{'contents'}[4]{'contents'}[4]{'contents'}[2]{'contents'}[1]{'contents'}[0];
@@ -2802,31 +2755,21 @@ 
$result_trees{'index_split'}{'contents'}[4]{'contents'}[4]{'contents'}[3]{'conte
 
$result_trees{'index_split'}{'contents'}[4]{'contents'}[4]{'contents'}[4]{'contents'}[1]{'extra'}{'node_content'}[0]
 = 
$result_trees{'index_split'}{'contents'}[4]{'contents'}[4]{'contents'}[4]{'contents'}[1]{'contents'}[0];
 
$result_trees{'index_split'}{'contents'}[4]{'contents'}[4]{'contents'}[5]{'contents'}[1]{'extra'}{'node_content'}[0]
 = 
$result_trees{'index_split'}{'contents'}[4]{'contents'}[4]{'contents'}[5]{'contents'}[1]{'contents'}[0];
 
$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]{'contents'}[1]{'extra'}{'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]{'contents'}[1]{'extra'}{'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'}{'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'}[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'}{'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'}[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]{'args'}[2]{'extra'}{'node_content'}[0]
 = $result_trees{'index_split'}{'contents'}[15]{'args'}[2]{'contents'}[0];
 
$result_trees{'index_split'}{'contents'}[15]{'args'}[3]{'extra'}{'node_content'}[0]
 = $result_trees{'index_split'}{'contents'}[15]{'args'}[3]{'contents'}[0];
 
$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'}[16]{'args'}[3]{'extra'}{'node_content'}[0]
 = $result_trees{'index_split'}{'contents'}[16]{'args'}[3]{'contents'}[0];
 
$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'}{'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'}{'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'}[17]{'args'}[3]{'extra'}{'node_content'}[0]
 = $result_trees{'index_split'}{'contents'}[17]{'args'}[3]{'contents'}[0];
 
$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_texis{'index_split'} = '\\input texinfo @c -*-texinfo-*-
 
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 b427a55de2..1827e73b32 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
@@ -103,12 +103,10 @@ $result_trees{'index_split_split_chapter_no_nodes'} = {
           'cmdname' => 'cindex',
           'extra' => {
             'element_node' => {},
-            'index_entry' => {
-              'entry_element' => {},
-              'entry_number' => 1,
-              'in_code' => 0,
-              'index_name' => 'cp'
-            }
+            'index_entry' => [
+              'cp',
+              1
+            ]
           },
           'info' => {
             'spaces_before_argument' => {
@@ -520,12 +518,10 @@ $result_trees{'index_split_split_chapter_no_nodes'} = {
           'cmdname' => 'cindex',
           'extra' => {
             'element_node' => {},
-            'index_entry' => {
-              'entry_element' => {},
-              'entry_number' => 2,
-              'in_code' => 0,
-              'index_name' => 'cp'
-            }
+            'index_entry' => [
+              'cp',
+              2
+            ]
           },
           'info' => {
             'spaces_before_argument' => {
@@ -559,12 +555,10 @@ $result_trees{'index_split_split_chapter_no_nodes'} = {
           'cmdname' => 'cindex',
           'extra' => {
             'element_node' => {},
-            'index_entry' => {
-              'entry_element' => {},
-              'entry_number' => 3,
-              'in_code' => 0,
-              'index_name' => 'cp'
-            }
+            'index_entry' => [
+              'cp',
+              3
+            ]
           },
           'info' => {
             'spaces_before_argument' => {
@@ -598,12 +592,10 @@ $result_trees{'index_split_split_chapter_no_nodes'} = {
           'cmdname' => 'findex',
           'extra' => {
             'element_node' => {},
-            'index_entry' => {
-              'entry_element' => {},
-              'entry_number' => 1,
-              'in_code' => 1,
-              'index_name' => 'fn'
-            }
+            'index_entry' => [
+              'fn',
+              1
+            ]
           },
           'info' => {
             'spaces_before_argument' => {
@@ -637,12 +629,10 @@ $result_trees{'index_split_split_chapter_no_nodes'} = {
           'cmdname' => 'cindex',
           'extra' => {
             'element_node' => {},
-            'index_entry' => {
-              'entry_element' => {},
-              'entry_number' => 4,
-              'in_code' => 0,
-              'index_name' => 'cp'
-            }
+            'index_entry' => [
+              'cp',
+              4
+            ]
           },
           'info' => {
             'spaces_before_argument' => {
@@ -759,12 +749,10 @@ $result_trees{'index_split_split_chapter_no_nodes'} = {
           'cmdname' => 'cindex',
           'extra' => {
             'element_node' => {},
-            'index_entry' => {
-              'entry_element' => {},
-              'entry_number' => 5,
-              'in_code' => 0,
-              'index_name' => 'cp'
-            }
+            'index_entry' => [
+              'cp',
+              5
+            ]
           },
           'info' => {
             'spaces_before_argument' => {
@@ -838,12 +826,10 @@ $result_trees{'index_split_split_chapter_no_nodes'} = {
           'cmdname' => 'findex',
           'extra' => {
             'element_node' => {},
-            'index_entry' => {
-              'entry_element' => {},
-              'entry_number' => 2,
-              'in_code' => 1,
-              'index_name' => 'fn'
-            }
+            'index_entry' => [
+              'fn',
+              2
+            ]
           },
           'info' => {
             'spaces_before_argument' => {
@@ -877,12 +863,10 @@ $result_trees{'index_split_split_chapter_no_nodes'} = {
           'cmdname' => 'cindex',
           'extra' => {
             'element_node' => {},
-            'index_entry' => {
-              'entry_element' => {},
-              'entry_number' => 6,
-              'in_code' => 0,
-              'index_name' => 'cp'
-            }
+            'index_entry' => [
+              'cp',
+              6
+            ]
           },
           'info' => {
             'spaces_before_argument' => {
@@ -916,12 +900,10 @@ $result_trees{'index_split_split_chapter_no_nodes'} = {
           'cmdname' => 'findex',
           'extra' => {
             'element_node' => {},
-            'index_entry' => {
-              'entry_element' => {},
-              'entry_number' => 3,
-              'in_code' => 1,
-              'index_name' => 'fn'
-            }
+            'index_entry' => [
+              'fn',
+              3
+            ]
           },
           'info' => {
             'spaces_before_argument' => {
@@ -1364,12 +1346,10 @@ $result_trees{'index_split_split_chapter_no_nodes'} = {
           'cmdname' => 'cindex',
           'extra' => {
             'element_node' => {},
-            'index_entry' => {
-              'entry_element' => {},
-              'entry_number' => 7,
-              'in_code' => 0,
-              'index_name' => 'cp'
-            }
+            'index_entry' => [
+              'cp',
+              7
+            ]
           },
           'info' => {
             'spaces_before_argument' => {
@@ -1606,12 +1586,10 @@ $result_trees{'index_split_split_chapter_no_nodes'} = {
           'cmdname' => 'cindex',
           'extra' => {
             'element_node' => {},
-            'index_entry' => {
-              'entry_element' => {},
-              'entry_number' => 8,
-              'in_code' => 0,
-              'index_name' => 'cp'
-            }
+            'index_entry' => [
+              'cp',
+              8
+            ]
           },
           'info' => {
             'spaces_before_argument' => {
@@ -1817,12 +1795,10 @@ $result_trees{'index_split_split_chapter_no_nodes'} = {
           'cmdname' => 'cindex',
           'extra' => {
             'element_node' => {},
-            'index_entry' => {
-              'entry_element' => {},
-              'entry_number' => 9,
-              'in_code' => 0,
-              'index_name' => 'cp'
-            }
+            'index_entry' => [
+              'cp',
+              9
+            ]
           },
           'info' => {
             'spaces_before_argument' => {
@@ -1900,12 +1876,10 @@ $result_trees{'index_split_split_chapter_no_nodes'} = {
           'cmdname' => 'cindex',
           'extra' => {
             'element_node' => {},
-            'index_entry' => {
-              'entry_element' => {},
-              'entry_number' => 10,
-              'in_code' => 0,
-              'index_name' => 'cp'
-            }
+            'index_entry' => [
+              'cp',
+              10
+            ]
           },
           'info' => {
             'spaces_before_argument' => {
@@ -2097,12 +2071,10 @@ $result_trees{'index_split_split_chapter_no_nodes'} = {
           'cmdname' => 'cindex',
           'extra' => {
             'element_node' => {},
-            'index_entry' => {
-              'entry_element' => {},
-              'entry_number' => 11,
-              'in_code' => 0,
-              'index_name' => 'cp'
-            }
+            'index_entry' => [
+              'cp',
+              11
+            ]
           },
           'info' => {
             'spaces_before_argument' => {
@@ -2248,12 +2220,10 @@ $result_trees{'index_split_split_chapter_no_nodes'} = {
           'cmdname' => 'cindex',
           'extra' => {
             'element_node' => {},
-            'index_entry' => {
-              'entry_element' => {},
-              'entry_number' => 12,
-              'in_code' => 0,
-              'index_name' => 'cp'
-            }
+            'index_entry' => [
+              'cp',
+              12
+            ]
           },
           'info' => {
             'spaces_before_argument' => {
@@ -2360,12 +2330,10 @@ $result_trees{'index_split_split_chapter_no_nodes'} = {
           'cmdname' => 'cindex',
           'extra' => {
             'element_node' => {},
-            'index_entry' => {
-              'entry_element' => {},
-              'entry_number' => 13,
-              'in_code' => 0,
-              'index_name' => 'cp'
-            }
+            'index_entry' => [
+              'cp',
+              13
+            ]
           },
           'info' => {
             'spaces_before_argument' => {
@@ -2452,12 +2420,10 @@ $result_trees{'index_split_split_chapter_no_nodes'} = {
           'cmdname' => 'cindex',
           'extra' => {
             'element_node' => {},
-            'index_entry' => {
-              'entry_element' => {},
-              'entry_number' => 14,
-              'in_code' => 0,
-              'index_name' => 'cp'
-            }
+            'index_entry' => [
+              'cp',
+              14
+            ]
           },
           'info' => {
             'spaces_before_argument' => {
@@ -2535,12 +2501,10 @@ $result_trees{'index_split_split_chapter_no_nodes'} = {
           'cmdname' => 'cindex',
           'extra' => {
             'element_node' => {},
-            'index_entry' => {
-              'entry_element' => {},
-              'entry_number' => 15,
-              'in_code' => 0,
-              'index_name' => 'cp'
-            }
+            'index_entry' => [
+              'cp',
+              15
+            ]
           },
           'info' => {
             'spaces_before_argument' => {
@@ -2639,12 +2603,10 @@ $result_trees{'index_split_split_chapter_no_nodes'} = {
           'cmdname' => 'cindex',
           'extra' => {
             'element_node' => {},
-            'index_entry' => {
-              'entry_element' => {},
-              'entry_number' => 16,
-              'in_code' => 0,
-              'index_name' => 'cp'
-            }
+            'index_entry' => [
+              'cp',
+              16
+            ]
           },
           'info' => {
             'spaces_before_argument' => {
@@ -2775,26 +2737,17 @@ $result_trees{'index_split_split_chapter_no_nodes'} = {
   'type' => 'document_root'
 };
 
$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]{'contents'}[1]{'extra'}{'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]{'contents'}[1]{'extra'}{'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]{'contents'}[1]{'extra'}{'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'}[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'}[2]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'index_split_split_chapter_no_nodes'}{'contents'}[3]{'contents'}[2];
 
$result_trees{'index_split_split_chapter_no_nodes'}{'contents'}[3]{'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'}[3]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'index_split_split_chapter_no_nodes'}{'contents'}[3]{'contents'}[3];
 
$result_trees{'index_split_split_chapter_no_nodes'}{'contents'}[3]{'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'}[4]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'index_split_split_chapter_no_nodes'}{'contents'}[3]{'contents'}[4];
 
$result_trees{'index_split_split_chapter_no_nodes'}{'contents'}[3]{'contents'}[5]{'extra'}{'element_node'}
 = $result_trees{'index_split_split_chapter_no_nodes'}{'contents'}[3];
-$result_trees{'index_split_split_chapter_no_nodes'}{'contents'}[3]{'contents'}[5]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'index_split_split_chapter_no_nodes'}{'contents'}[3]{'contents'}[5];
 
$result_trees{'index_split_split_chapter_no_nodes'}{'contents'}[3]{'contents'}[11]{'extra'}{'element_node'}
 = $result_trees{'index_split_split_chapter_no_nodes'}{'contents'}[3];
-$result_trees{'index_split_split_chapter_no_nodes'}{'contents'}[3]{'contents'}[11]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'index_split_split_chapter_no_nodes'}{'contents'}[3]{'contents'}[11];
 
$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'}{'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'}{'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]{'contents'}[1]{'extra'}{'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]{'contents'}[1]{'extra'}{'node_content'}[0]
 = 
$result_trees{'index_split_split_chapter_no_nodes'}{'contents'}[4]{'contents'}[4]{'contents'}[1]{'contents'}[1]{'contents'}[0];
 
$result_trees{'index_split_split_chapter_no_nodes'}{'contents'}[4]{'contents'}[4]{'contents'}[2]{'contents'}[1]{'extra'}{'node_content'}[0]
 = 
$result_trees{'index_split_split_chapter_no_nodes'}{'contents'}[4]{'contents'}[4]{'contents'}[2]{'contents'}[1]{'contents'}[0];
@@ -2802,31 +2755,21 @@ 
$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'}[4]{'contents'}[1]{'extra'}{'node_content'}[0]
 = 
$result_trees{'index_split_split_chapter_no_nodes'}{'contents'}[4]{'contents'}[4]{'contents'}[4]{'contents'}[1]{'contents'}[0];
 
$result_trees{'index_split_split_chapter_no_nodes'}{'contents'}[4]{'contents'}[4]{'contents'}[5]{'contents'}[1]{'extra'}{'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'}[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]{'contents'}[1]{'extra'}{'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]{'contents'}[1]{'extra'}{'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'}{'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'}[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'}{'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'}[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]{'args'}[2]{'extra'}{'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]{'args'}[3]{'extra'}{'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'}[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'}[16]{'args'}[3]{'extra'}{'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'}[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'}{'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'}{'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'}[17]{'args'}[3]{'extra'}{'node_content'}[0]
 = 
$result_trees{'index_split_split_chapter_no_nodes'}{'contents'}[17]{'args'}[3]{'contents'}[0];
 
$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_texis{'index_split_split_chapter_no_nodes'} = '\\input texinfo @c 
-*-texinfo-*-
 
diff --git a/tp/t/results/indices/index_table.pl 
b/tp/t/results/indices/index_table.pl
index 38c2ed372a..eaf0a4fc35 100644
--- a/tp/t/results/indices/index_table.pl
+++ b/tp/t/results/indices/index_table.pl
@@ -367,12 +367,10 @@ $result_trees{'index_table'} = {
           'cmdname' => 'cindex',
           'extra' => {
             'element_node' => {},
-            'index_entry' => {
-              'entry_element' => {},
-              'entry_number' => 1,
-              'in_code' => 0,
-              'index_name' => 'cp'
-            }
+            'index_entry' => [
+              'cp',
+              1
+            ]
           },
           'info' => {
             'spaces_before_argument' => {
@@ -420,12 +418,10 @@ $result_trees{'index_table'} = {
           'cmdname' => 'cindex',
           'extra' => {
             'element_node' => {},
-            'index_entry' => {
-              'entry_element' => {},
-              'entry_number' => 2,
-              'in_code' => 0,
-              'index_name' => 'cp'
-            }
+            'index_entry' => [
+              'cp',
+              2
+            ]
           },
           'info' => {
             'spaces_before_argument' => {
@@ -507,12 +503,10 @@ $result_trees{'index_table'} = {
                       'cmdname' => 'item',
                       'extra' => {
                         'element_node' => {},
-                        'index_entry' => {
-                          'entry_element' => {},
-                          'entry_number' => 1,
-                          'in_code' => 1,
-                          'index_name' => 'vr'
-                        }
+                        'index_entry' => [
+                          'vr',
+                          1
+                        ]
                       },
                       'info' => {
                         'spaces_before_argument' => {
@@ -545,12 +539,10 @@ $result_trees{'index_table'} = {
                       'cmdname' => 'itemx',
                       'extra' => {
                         'element_node' => {},
-                        'index_entry' => {
-                          'entry_element' => {},
-                          'entry_number' => 2,
-                          'in_code' => 1,
-                          'index_name' => 'vr'
-                        }
+                        'index_entry' => [
+                          'vr',
+                          2
+                        ]
                       },
                       'info' => {
                         'spaces_before_argument' => {
@@ -697,12 +689,10 @@ $result_trees{'index_table'} = {
                       'cmdname' => 'item',
                       'extra' => {
                         'element_node' => {},
-                        'index_entry' => {
-                          'entry_element' => {},
-                          'entry_number' => 1,
-                          'in_code' => 1,
-                          'index_name' => 'fn'
-                        }
+                        'index_entry' => [
+                          'fn',
+                          1
+                        ]
                       },
                       'info' => {
                         'spaces_before_argument' => {
@@ -735,12 +725,10 @@ $result_trees{'index_table'} = {
                       'cmdname' => 'itemx',
                       'extra' => {
                         'element_node' => {},
-                        'index_entry' => {
-                          'entry_element' => {},
-                          'entry_number' => 2,
-                          'in_code' => 1,
-                          'index_name' => 'fn'
-                        }
+                        'index_entry' => [
+                          'fn',
+                          2
+                        ]
                       },
                       'info' => {
                         'spaces_before_argument' => {
@@ -797,12 +785,10 @@ $result_trees{'index_table'} = {
                       'cmdname' => 'item',
                       'extra' => {
                         'element_node' => {},
-                        'index_entry' => {
-                          'entry_element' => {},
-                          'entry_number' => 3,
-                          'in_code' => 1,
-                          'index_name' => 'fn'
-                        }
+                        'index_entry' => [
+                          'fn',
+                          3
+                        ]
                       },
                       'info' => {
                         'spaces_before_argument' => {
@@ -1248,12 +1234,10 @@ $result_trees{'index_table'} = {
           'cmdname' => 'cindex',
           'extra' => {
             'element_node' => {},
-            'index_entry' => {
-              'entry_element' => {},
-              'entry_number' => 3,
-              'in_code' => 0,
-              'index_name' => 'cp'
-            }
+            'index_entry' => [
+              'cp',
+              3
+            ]
           },
           'info' => {
             'spaces_before_argument' => {
@@ -1287,12 +1271,10 @@ $result_trees{'index_table'} = {
           'cmdname' => 'cindex',
           'extra' => {
             'element_node' => {},
-            'index_entry' => {
-              'entry_element' => {},
-              'entry_number' => 4,
-              'in_code' => 0,
-              'index_name' => 'cp'
-            }
+            'index_entry' => [
+              'cp',
+              4
+            ]
           },
           'info' => {
             'spaces_before_argument' => {
@@ -1326,12 +1308,10 @@ $result_trees{'index_table'} = {
           'cmdname' => 'cindex',
           'extra' => {
             'element_node' => {},
-            'index_entry' => {
-              'entry_element' => {},
-              'entry_number' => 5,
-              'in_code' => 0,
-              'index_name' => 'cp'
-            }
+            'index_entry' => [
+              'cp',
+              5
+            ]
           },
           'info' => {
             'spaces_before_argument' => {
@@ -1365,12 +1345,10 @@ $result_trees{'index_table'} = {
           'cmdname' => 'cindex',
           'extra' => {
             'element_node' => {},
-            'index_entry' => {
-              'entry_element' => {},
-              'entry_number' => 6,
-              'in_code' => 0,
-              'index_name' => 'cp'
-            }
+            'index_entry' => [
+              'cp',
+              6
+            ]
           },
           'info' => {
             'spaces_before_argument' => {
@@ -1404,12 +1382,10 @@ $result_trees{'index_table'} = {
           'cmdname' => 'cindex',
           'extra' => {
             'element_node' => {},
-            'index_entry' => {
-              'entry_element' => {},
-              'entry_number' => 7,
-              'in_code' => 0,
-              'index_name' => 'cp'
-            }
+            'index_entry' => [
+              'cp',
+              7
+            ]
           },
           'info' => {
             'spaces_before_argument' => {
@@ -1443,12 +1419,10 @@ $result_trees{'index_table'} = {
           'cmdname' => 'cindex',
           'extra' => {
             'element_node' => {},
-            'index_entry' => {
-              'entry_element' => {},
-              'entry_number' => 8,
-              'in_code' => 0,
-              'index_name' => 'cp'
-            }
+            'index_entry' => [
+              'cp',
+              8
+            ]
           },
           'info' => {
             'spaces_before_argument' => {
@@ -1482,12 +1456,10 @@ $result_trees{'index_table'} = {
           'cmdname' => 'cindex',
           'extra' => {
             'element_node' => {},
-            'index_entry' => {
-              'entry_element' => {},
-              'entry_number' => 9,
-              'in_code' => 0,
-              'index_name' => 'cp'
-            }
+            'index_entry' => [
+              'cp',
+              9
+            ]
           },
           'info' => {
             'spaces_before_argument' => {
@@ -1521,12 +1493,10 @@ $result_trees{'index_table'} = {
           'cmdname' => 'cindex',
           'extra' => {
             'element_node' => {},
-            'index_entry' => {
-              'entry_element' => {},
-              'entry_number' => 10,
-              'in_code' => 0,
-              'index_name' => 'cp'
-            }
+            'index_entry' => [
+              'cp',
+              10
+            ]
           },
           'info' => {
             'spaces_before_argument' => {
@@ -1560,12 +1530,10 @@ $result_trees{'index_table'} = {
           'cmdname' => 'cindex',
           'extra' => {
             'element_node' => {},
-            'index_entry' => {
-              'entry_element' => {},
-              'entry_number' => 11,
-              'in_code' => 0,
-              'index_name' => 'cp'
-            }
+            'index_entry' => [
+              'cp',
+              11
+            ]
           },
           'info' => {
             'spaces_before_argument' => {
@@ -1599,12 +1567,10 @@ $result_trees{'index_table'} = {
           'cmdname' => 'cindex',
           'extra' => {
             'element_node' => {},
-            'index_entry' => {
-              'entry_element' => {},
-              'entry_number' => 12,
-              'in_code' => 0,
-              'index_name' => 'cp'
-            }
+            'index_entry' => [
+              'cp',
+              12
+            ]
           },
           'info' => {
             'spaces_before_argument' => {
@@ -1638,12 +1604,10 @@ $result_trees{'index_table'} = {
           'cmdname' => 'cindex',
           'extra' => {
             'element_node' => {},
-            'index_entry' => {
-              'entry_element' => {},
-              'entry_number' => 13,
-              'in_code' => 0,
-              'index_name' => 'cp'
-            }
+            'index_entry' => [
+              'cp',
+              13
+            ]
           },
           'info' => {
             'spaces_before_argument' => {
@@ -1677,12 +1641,10 @@ $result_trees{'index_table'} = {
           'cmdname' => 'cindex',
           'extra' => {
             'element_node' => {},
-            'index_entry' => {
-              'entry_element' => {},
-              'entry_number' => 14,
-              'in_code' => 0,
-              'index_name' => 'cp'
-            }
+            'index_entry' => [
+              'cp',
+              14
+            ]
           },
           'info' => {
             'spaces_before_argument' => {
@@ -1716,12 +1678,10 @@ $result_trees{'index_table'} = {
           'cmdname' => 'cindex',
           'extra' => {
             'element_node' => {},
-            'index_entry' => {
-              'entry_element' => {},
-              'entry_number' => 15,
-              'in_code' => 0,
-              'index_name' => 'cp'
-            }
+            'index_entry' => [
+              'cp',
+              15
+            ]
           },
           'info' => {
             'spaces_before_argument' => {
@@ -1755,12 +1715,10 @@ $result_trees{'index_table'} = {
           'cmdname' => 'cindex',
           'extra' => {
             'element_node' => {},
-            'index_entry' => {
-              'entry_element' => {},
-              'entry_number' => 16,
-              'in_code' => 0,
-              'index_name' => 'cp'
-            }
+            'index_entry' => [
+              'cp',
+              16
+            ]
           },
           'info' => {
             'spaces_before_argument' => {
@@ -1794,12 +1752,10 @@ $result_trees{'index_table'} = {
           'cmdname' => 'cindex',
           'extra' => {
             'element_node' => {},
-            'index_entry' => {
-              'entry_element' => {},
-              'entry_number' => 17,
-              'in_code' => 0,
-              'index_name' => 'cp'
-            }
+            'index_entry' => [
+              'cp',
+              17
+            ]
           },
           'info' => {
             'spaces_before_argument' => {
@@ -1833,12 +1789,10 @@ $result_trees{'index_table'} = {
           'cmdname' => 'cindex',
           'extra' => {
             'element_node' => {},
-            'index_entry' => {
-              'entry_element' => {},
-              'entry_number' => 18,
-              'in_code' => 0,
-              'index_name' => 'cp'
-            }
+            'index_entry' => [
+              'cp',
+              18
+            ]
           },
           'info' => {
             'spaces_before_argument' => {
@@ -1872,12 +1826,10 @@ $result_trees{'index_table'} = {
           'cmdname' => 'cindex',
           'extra' => {
             'element_node' => {},
-            'index_entry' => {
-              'entry_element' => {},
-              'entry_number' => 19,
-              'in_code' => 0,
-              'index_name' => 'cp'
-            }
+            'index_entry' => [
+              'cp',
+              19
+            ]
           },
           'info' => {
             'spaces_before_argument' => {
@@ -1911,12 +1863,10 @@ $result_trees{'index_table'} = {
           'cmdname' => 'cindex',
           'extra' => {
             'element_node' => {},
-            'index_entry' => {
-              'entry_element' => {},
-              'entry_number' => 20,
-              'in_code' => 0,
-              'index_name' => 'cp'
-            }
+            'index_entry' => [
+              'cp',
+              20
+            ]
           },
           'info' => {
             'spaces_before_argument' => {
@@ -1950,12 +1900,10 @@ $result_trees{'index_table'} = {
           'cmdname' => 'cindex',
           'extra' => {
             'element_node' => {},
-            'index_entry' => {
-              'entry_element' => {},
-              'entry_number' => 21,
-              'in_code' => 0,
-              'index_name' => 'cp'
-            }
+            'index_entry' => [
+              'cp',
+              21
+            ]
           },
           'info' => {
             'spaces_before_argument' => {
@@ -1989,12 +1937,10 @@ $result_trees{'index_table'} = {
           'cmdname' => 'cindex',
           'extra' => {
             'element_node' => {},
-            'index_entry' => {
-              'entry_element' => {},
-              'entry_number' => 22,
-              'in_code' => 0,
-              'index_name' => 'cp'
-            }
+            'index_entry' => [
+              'cp',
+              22
+            ]
           },
           'info' => {
             'spaces_before_argument' => {
@@ -2028,12 +1974,10 @@ $result_trees{'index_table'} = {
           'cmdname' => 'cindex',
           'extra' => {
             'element_node' => {},
-            'index_entry' => {
-              'entry_element' => {},
-              'entry_number' => 23,
-              'in_code' => 0,
-              'index_name' => 'cp'
-            }
+            'index_entry' => [
+              'cp',
+              23
+            ]
           },
           'info' => {
             'spaces_before_argument' => {
@@ -2067,12 +2011,10 @@ $result_trees{'index_table'} = {
           'cmdname' => 'cindex',
           'extra' => {
             'element_node' => {},
-            'index_entry' => {
-              'entry_element' => {},
-              'entry_number' => 24,
-              'in_code' => 0,
-              'index_name' => 'cp'
-            }
+            'index_entry' => [
+              'cp',
+              24
+            ]
           },
           'info' => {
             'spaces_before_argument' => {
@@ -2106,12 +2048,10 @@ $result_trees{'index_table'} = {
           'cmdname' => 'cindex',
           'extra' => {
             'element_node' => {},
-            'index_entry' => {
-              'entry_element' => {},
-              'entry_number' => 25,
-              'in_code' => 0,
-              'index_name' => 'cp'
-            }
+            'index_entry' => [
+              'cp',
+              25
+            ]
           },
           'info' => {
             'spaces_before_argument' => {
@@ -2145,12 +2085,10 @@ $result_trees{'index_table'} = {
           'cmdname' => 'cindex',
           'extra' => {
             'element_node' => {},
-            'index_entry' => {
-              'entry_element' => {},
-              'entry_number' => 26,
-              'in_code' => 0,
-              'index_name' => 'cp'
-            }
+            'index_entry' => [
+              'cp',
+              26
+            ]
           },
           'info' => {
             'spaces_before_argument' => {
@@ -2184,12 +2122,10 @@ $result_trees{'index_table'} = {
           'cmdname' => 'cindex',
           'extra' => {
             'element_node' => {},
-            'index_entry' => {
-              'entry_element' => {},
-              'entry_number' => 27,
-              'in_code' => 0,
-              'index_name' => 'cp'
-            }
+            'index_entry' => [
+              'cp',
+              27
+            ]
           },
           'info' => {
             'spaces_before_argument' => {
@@ -2223,12 +2159,10 @@ $result_trees{'index_table'} = {
           'cmdname' => 'cindex',
           'extra' => {
             'element_node' => {},
-            'index_entry' => {
-              'entry_element' => {},
-              'entry_number' => 28,
-              'in_code' => 0,
-              'index_name' => 'cp'
-            }
+            'index_entry' => [
+              'cp',
+              28
+            ]
           },
           'info' => {
             'spaces_before_argument' => {
@@ -2262,12 +2196,10 @@ $result_trees{'index_table'} = {
           'cmdname' => 'cindex',
           'extra' => {
             'element_node' => {},
-            'index_entry' => {
-              'entry_element' => {},
-              'entry_number' => 29,
-              'in_code' => 0,
-              'index_name' => 'cp'
-            }
+            'index_entry' => [
+              'cp',
+              29
+            ]
           },
           'info' => {
             'spaces_before_argument' => {
@@ -2301,12 +2233,10 @@ $result_trees{'index_table'} = {
           'cmdname' => 'cindex',
           'extra' => {
             'element_node' => {},
-            'index_entry' => {
-              'entry_element' => {},
-              'entry_number' => 30,
-              'in_code' => 0,
-              'index_name' => 'cp'
-            }
+            'index_entry' => [
+              'cp',
+              30
+            ]
           },
           'info' => {
             'spaces_before_argument' => {
@@ -2340,12 +2270,10 @@ $result_trees{'index_table'} = {
           'cmdname' => 'cindex',
           'extra' => {
             'element_node' => {},
-            'index_entry' => {
-              'entry_element' => {},
-              'entry_number' => 31,
-              'in_code' => 0,
-              'index_name' => 'cp'
-            }
+            'index_entry' => [
+              'cp',
+              31
+            ]
           },
           'info' => {
             'spaces_before_argument' => {
@@ -2379,12 +2307,10 @@ $result_trees{'index_table'} = {
           'cmdname' => 'cindex',
           'extra' => {
             'element_node' => {},
-            'index_entry' => {
-              'entry_element' => {},
-              'entry_number' => 32,
-              'in_code' => 0,
-              'index_name' => 'cp'
-            }
+            'index_entry' => [
+              'cp',
+              32
+            ]
           },
           'info' => {
             'spaces_before_argument' => {
@@ -2418,12 +2344,10 @@ $result_trees{'index_table'} = {
           'cmdname' => 'cindex',
           'extra' => {
             'element_node' => {},
-            'index_entry' => {
-              'entry_element' => {},
-              'entry_number' => 33,
-              'in_code' => 0,
-              'index_name' => 'cp'
-            }
+            'index_entry' => [
+              'cp',
+              33
+            ]
           },
           'info' => {
             'spaces_before_argument' => {
@@ -2457,12 +2381,10 @@ $result_trees{'index_table'} = {
           'cmdname' => 'cindex',
           'extra' => {
             'element_node' => {},
-            'index_entry' => {
-              'entry_element' => {},
-              'entry_number' => 34,
-              'in_code' => 0,
-              'index_name' => 'cp'
-            }
+            'index_entry' => [
+              'cp',
+              34
+            ]
           },
           'info' => {
             'spaces_before_argument' => {
@@ -2496,12 +2418,10 @@ $result_trees{'index_table'} = {
           'cmdname' => 'cindex',
           'extra' => {
             'element_node' => {},
-            'index_entry' => {
-              'entry_element' => {},
-              'entry_number' => 35,
-              'in_code' => 0,
-              'index_name' => 'cp'
-            }
+            'index_entry' => [
+              'cp',
+              35
+            ]
           },
           'info' => {
             'spaces_before_argument' => {
@@ -2535,12 +2455,10 @@ $result_trees{'index_table'} = {
           'cmdname' => 'cindex',
           'extra' => {
             'element_node' => {},
-            'index_entry' => {
-              'entry_element' => {},
-              'entry_number' => 36,
-              'in_code' => 0,
-              'index_name' => 'cp'
-            }
+            'index_entry' => [
+              'cp',
+              36
+            ]
           },
           'info' => {
             'spaces_before_argument' => {
@@ -2574,12 +2492,10 @@ $result_trees{'index_table'} = {
           'cmdname' => 'cindex',
           'extra' => {
             'element_node' => {},
-            'index_entry' => {
-              'entry_element' => {},
-              'entry_number' => 37,
-              'in_code' => 0,
-              'index_name' => 'cp'
-            }
+            'index_entry' => [
+              'cp',
+              37
+            ]
           },
           'info' => {
             'spaces_before_argument' => {
@@ -2613,12 +2529,10 @@ $result_trees{'index_table'} = {
           'cmdname' => 'cindex',
           'extra' => {
             'element_node' => {},
-            'index_entry' => {
-              'entry_element' => {},
-              'entry_number' => 38,
-              'in_code' => 0,
-              'index_name' => 'cp'
-            }
+            'index_entry' => [
+              'cp',
+              38
+            ]
           },
           'info' => {
             'spaces_before_argument' => {
@@ -2652,12 +2566,10 @@ $result_trees{'index_table'} = {
           'cmdname' => 'cindex',
           'extra' => {
             'element_node' => {},
-            'index_entry' => {
-              'entry_element' => {},
-              'entry_number' => 39,
-              'in_code' => 0,
-              'index_name' => 'cp'
-            }
+            'index_entry' => [
+              'cp',
+              39
+            ]
           },
           'info' => {
             'spaces_before_argument' => {
@@ -2691,12 +2603,10 @@ $result_trees{'index_table'} = {
           'cmdname' => 'cindex',
           'extra' => {
             'element_node' => {},
-            'index_entry' => {
-              'entry_element' => {},
-              'entry_number' => 40,
-              'in_code' => 0,
-              'index_name' => 'cp'
-            }
+            'index_entry' => [
+              'cp',
+              40
+            ]
           },
           'info' => {
             'spaces_before_argument' => {
@@ -2730,12 +2640,10 @@ $result_trees{'index_table'} = {
           'cmdname' => 'cindex',
           'extra' => {
             'element_node' => {},
-            'index_entry' => {
-              'entry_element' => {},
-              'entry_number' => 41,
-              'in_code' => 0,
-              'index_name' => 'cp'
-            }
+            'index_entry' => [
+              'cp',
+              41
+            ]
           },
           'info' => {
             'spaces_before_argument' => {
@@ -2769,12 +2677,10 @@ $result_trees{'index_table'} = {
           'cmdname' => 'cindex',
           'extra' => {
             'element_node' => {},
-            'index_entry' => {
-              'entry_element' => {},
-              'entry_number' => 42,
-              'in_code' => 0,
-              'index_name' => 'cp'
-            }
+            'index_entry' => [
+              'cp',
+              42
+            ]
           },
           'info' => {
             'spaces_before_argument' => {
@@ -2808,12 +2714,10 @@ $result_trees{'index_table'} = {
           'cmdname' => 'cindex',
           'extra' => {
             'element_node' => {},
-            'index_entry' => {
-              'entry_element' => {},
-              'entry_number' => 43,
-              'in_code' => 0,
-              'index_name' => 'cp'
-            }
+            'index_entry' => [
+              'cp',
+              43
+            ]
           },
           'info' => {
             'spaces_before_argument' => {
@@ -2847,12 +2751,10 @@ $result_trees{'index_table'} = {
           'cmdname' => 'cindex',
           'extra' => {
             'element_node' => {},
-            'index_entry' => {
-              'entry_element' => {},
-              'entry_number' => 44,
-              'in_code' => 0,
-              'index_name' => 'cp'
-            }
+            'index_entry' => [
+              'cp',
+              44
+            ]
           },
           'info' => {
             'spaces_before_argument' => {
@@ -2886,12 +2788,10 @@ $result_trees{'index_table'} = {
           'cmdname' => 'cindex',
           'extra' => {
             'element_node' => {},
-            'index_entry' => {
-              'entry_element' => {},
-              'entry_number' => 45,
-              'in_code' => 0,
-              'index_name' => 'cp'
-            }
+            'index_entry' => [
+              'cp',
+              45
+            ]
           },
           'info' => {
             'spaces_before_argument' => {
@@ -2925,12 +2825,10 @@ $result_trees{'index_table'} = {
           'cmdname' => 'cindex',
           'extra' => {
             'element_node' => {},
-            'index_entry' => {
-              'entry_element' => {},
-              'entry_number' => 46,
-              'in_code' => 0,
-              'index_name' => 'cp'
-            }
+            'index_entry' => [
+              'cp',
+              46
+            ]
           },
           'info' => {
             'spaces_before_argument' => {
@@ -2964,12 +2862,10 @@ $result_trees{'index_table'} = {
           'cmdname' => 'cindex',
           'extra' => {
             'element_node' => {},
-            'index_entry' => {
-              'entry_element' => {},
-              'entry_number' => 47,
-              'in_code' => 0,
-              'index_name' => 'cp'
-            }
+            'index_entry' => [
+              'cp',
+              47
+            ]
           },
           'info' => {
             'spaces_before_argument' => {
@@ -3003,12 +2899,10 @@ $result_trees{'index_table'} = {
           'cmdname' => 'cindex',
           'extra' => {
             'element_node' => {},
-            'index_entry' => {
-              'entry_element' => {},
-              'entry_number' => 48,
-              'in_code' => 0,
-              'index_name' => 'cp'
-            }
+            'index_entry' => [
+              'cp',
+              48
+            ]
           },
           'info' => {
             'spaces_before_argument' => {
@@ -3042,12 +2936,10 @@ $result_trees{'index_table'} = {
           'cmdname' => 'cindex',
           'extra' => {
             'element_node' => {},
-            'index_entry' => {
-              'entry_element' => {},
-              'entry_number' => 49,
-              'in_code' => 0,
-              'index_name' => 'cp'
-            }
+            'index_entry' => [
+              'cp',
+              49
+            ]
           },
           'info' => {
             'spaces_before_argument' => {
@@ -3081,12 +2973,10 @@ $result_trees{'index_table'} = {
           'cmdname' => 'cindex',
           'extra' => {
             'element_node' => {},
-            'index_entry' => {
-              'entry_element' => {},
-              'entry_number' => 50,
-              'in_code' => 0,
-              'index_name' => 'cp'
-            }
+            'index_entry' => [
+              'cp',
+              50
+            ]
           },
           'info' => {
             'spaces_before_argument' => {
@@ -3120,12 +3010,10 @@ $result_trees{'index_table'} = {
           'cmdname' => 'cindex',
           'extra' => {
             'element_node' => {},
-            'index_entry' => {
-              'entry_element' => {},
-              'entry_number' => 51,
-              'in_code' => 0,
-              'index_name' => 'cp'
-            }
+            'index_entry' => [
+              'cp',
+              51
+            ]
           },
           'info' => {
             'spaces_before_argument' => {
@@ -3159,12 +3047,10 @@ $result_trees{'index_table'} = {
           'cmdname' => 'cindex',
           'extra' => {
             'element_node' => {},
-            'index_entry' => {
-              'entry_element' => {},
-              'entry_number' => 52,
-              'in_code' => 0,
-              'index_name' => 'cp'
-            }
+            'index_entry' => [
+              'cp',
+              52
+            ]
           },
           'info' => {
             'spaces_before_argument' => {
@@ -3198,12 +3084,10 @@ $result_trees{'index_table'} = {
           'cmdname' => 'cindex',
           'extra' => {
             'element_node' => {},
-            'index_entry' => {
-              'entry_element' => {},
-              'entry_number' => 53,
-              'in_code' => 0,
-              'index_name' => 'cp'
-            }
+            'index_entry' => [
+              'cp',
+              53
+            ]
           },
           'info' => {
             'spaces_before_argument' => {
@@ -3237,12 +3121,10 @@ $result_trees{'index_table'} = {
           'cmdname' => 'cindex',
           'extra' => {
             'element_node' => {},
-            'index_entry' => {
-              'entry_element' => {},
-              'entry_number' => 54,
-              'in_code' => 0,
-              'index_name' => 'cp'
-            }
+            'index_entry' => [
+              'cp',
+              54
+            ]
           },
           'info' => {
             'spaces_before_argument' => {
@@ -3276,12 +3158,10 @@ $result_trees{'index_table'} = {
           'cmdname' => 'cindex',
           'extra' => {
             'element_node' => {},
-            'index_entry' => {
-              'entry_element' => {},
-              'entry_number' => 55,
-              'in_code' => 0,
-              'index_name' => 'cp'
-            }
+            'index_entry' => [
+              'cp',
+              55
+            ]
           },
           'info' => {
             'spaces_before_argument' => {
@@ -3315,12 +3195,10 @@ $result_trees{'index_table'} = {
           'cmdname' => 'cindex',
           'extra' => {
             'element_node' => {},
-            'index_entry' => {
-              'entry_element' => {},
-              'entry_number' => 56,
-              'in_code' => 0,
-              'index_name' => 'cp'
-            }
+            'index_entry' => [
+              'cp',
+              56
+            ]
           },
           'info' => {
             'spaces_before_argument' => {
@@ -3354,12 +3232,10 @@ $result_trees{'index_table'} = {
           'cmdname' => 'cindex',
           'extra' => {
             'element_node' => {},
-            'index_entry' => {
-              'entry_element' => {},
-              'entry_number' => 57,
-              'in_code' => 0,
-              'index_name' => 'cp'
-            }
+            'index_entry' => [
+              'cp',
+              57
+            ]
           },
           'info' => {
             'spaces_before_argument' => {
@@ -3393,12 +3269,10 @@ $result_trees{'index_table'} = {
           'cmdname' => 'cindex',
           'extra' => {
             'element_node' => {},
-            'index_entry' => {
-              'entry_element' => {},
-              'entry_number' => 58,
-              'in_code' => 0,
-              'index_name' => 'cp'
-            }
+            'index_entry' => [
+              'cp',
+              58
+            ]
           },
           'info' => {
             'spaces_before_argument' => {
@@ -3432,12 +3306,10 @@ $result_trees{'index_table'} = {
           'cmdname' => 'cindex',
           'extra' => {
             'element_node' => {},
-            'index_entry' => {
-              'entry_element' => {},
-              'entry_number' => 59,
-              'in_code' => 0,
-              'index_name' => 'cp'
-            }
+            'index_entry' => [
+              'cp',
+              59
+            ]
           },
           'info' => {
             'spaces_before_argument' => {
@@ -3471,12 +3343,10 @@ $result_trees{'index_table'} = {
           'cmdname' => 'cindex',
           'extra' => {
             'element_node' => {},
-            'index_entry' => {
-              'entry_element' => {},
-              'entry_number' => 60,
-              'in_code' => 0,
-              'index_name' => 'cp'
-            }
+            'index_entry' => [
+              'cp',
+              60
+            ]
           },
           'info' => {
             'spaces_before_argument' => {
@@ -3510,12 +3380,10 @@ $result_trees{'index_table'} = {
           'cmdname' => 'cindex',
           'extra' => {
             'element_node' => {},
-            'index_entry' => {
-              'entry_element' => {},
-              'entry_number' => 61,
-              'in_code' => 0,
-              'index_name' => 'cp'
-            }
+            'index_entry' => [
+              'cp',
+              61
+            ]
           },
           'info' => {
             'spaces_before_argument' => {
@@ -3549,12 +3417,10 @@ $result_trees{'index_table'} = {
           'cmdname' => 'cindex',
           'extra' => {
             'element_node' => {},
-            'index_entry' => {
-              'entry_element' => {},
-              'entry_number' => 62,
-              'in_code' => 0,
-              'index_name' => 'cp'
-            }
+            'index_entry' => [
+              'cp',
+              62
+            ]
           },
           'info' => {
             'spaces_before_argument' => {
@@ -3588,12 +3454,10 @@ $result_trees{'index_table'} = {
           'cmdname' => 'cindex',
           'extra' => {
             'element_node' => {},
-            'index_entry' => {
-              'entry_element' => {},
-              'entry_number' => 63,
-              'in_code' => 0,
-              'index_name' => 'cp'
-            }
+            'index_entry' => [
+              'cp',
+              63
+            ]
           },
           'info' => {
             'spaces_before_argument' => {
@@ -3627,12 +3491,10 @@ $result_trees{'index_table'} = {
           'cmdname' => 'cindex',
           'extra' => {
             'element_node' => {},
-            'index_entry' => {
-              'entry_element' => {},
-              'entry_number' => 64,
-              'in_code' => 0,
-              'index_name' => 'cp'
-            }
+            'index_entry' => [
+              'cp',
+              64
+            ]
           },
           'info' => {
             'spaces_before_argument' => {
@@ -3666,12 +3528,10 @@ $result_trees{'index_table'} = {
           'cmdname' => 'cindex',
           'extra' => {
             'element_node' => {},
-            'index_entry' => {
-              'entry_element' => {},
-              'entry_number' => 65,
-              'in_code' => 0,
-              'index_name' => 'cp'
-            }
+            'index_entry' => [
+              'cp',
+              65
+            ]
           },
           'info' => {
             'spaces_before_argument' => {
@@ -3705,12 +3565,10 @@ $result_trees{'index_table'} = {
           'cmdname' => 'cindex',
           'extra' => {
             'element_node' => {},
-            'index_entry' => {
-              'entry_element' => {},
-              'entry_number' => 66,
-              'in_code' => 0,
-              'index_name' => 'cp'
-            }
+            'index_entry' => [
+              'cp',
+              66
+            ]
           },
           'info' => {
             'spaces_before_argument' => {
@@ -3744,12 +3602,10 @@ $result_trees{'index_table'} = {
           'cmdname' => 'cindex',
           'extra' => {
             'element_node' => {},
-            'index_entry' => {
-              'entry_element' => {},
-              'entry_number' => 67,
-              'in_code' => 0,
-              'index_name' => 'cp'
-            }
+            'index_entry' => [
+              'cp',
+              67
+            ]
           },
           'info' => {
             'spaces_before_argument' => {
@@ -3783,12 +3639,10 @@ $result_trees{'index_table'} = {
           'cmdname' => 'cindex',
           'extra' => {
             'element_node' => {},
-            'index_entry' => {
-              'entry_element' => {},
-              'entry_number' => 68,
-              'in_code' => 0,
-              'index_name' => 'cp'
-            }
+            'index_entry' => [
+              'cp',
+              68
+            ]
           },
           'info' => {
             'spaces_before_argument' => {
@@ -3822,12 +3676,10 @@ $result_trees{'index_table'} = {
           'cmdname' => 'cindex',
           'extra' => {
             'element_node' => {},
-            'index_entry' => {
-              'entry_element' => {},
-              'entry_number' => 69,
-              'in_code' => 0,
-              'index_name' => 'cp'
-            }
+            'index_entry' => [
+              'cp',
+              69
+            ]
           },
           'info' => {
             'spaces_before_argument' => {
@@ -3861,12 +3713,10 @@ $result_trees{'index_table'} = {
           'cmdname' => 'cindex',
           'extra' => {
             'element_node' => {},
-            'index_entry' => {
-              'entry_element' => {},
-              'entry_number' => 70,
-              'in_code' => 0,
-              'index_name' => 'cp'
-            }
+            'index_entry' => [
+              'cp',
+              70
+            ]
           },
           'info' => {
             'spaces_before_argument' => {
@@ -3900,12 +3750,10 @@ $result_trees{'index_table'} = {
           'cmdname' => 'cindex',
           'extra' => {
             'element_node' => {},
-            'index_entry' => {
-              'entry_element' => {},
-              'entry_number' => 71,
-              'in_code' => 0,
-              'index_name' => 'cp'
-            }
+            'index_entry' => [
+              'cp',
+              71
+            ]
           },
           'info' => {
             'spaces_before_argument' => {
@@ -3939,12 +3787,10 @@ $result_trees{'index_table'} = {
           'cmdname' => 'cindex',
           'extra' => {
             'element_node' => {},
-            'index_entry' => {
-              'entry_element' => {},
-              'entry_number' => 72,
-              'in_code' => 0,
-              'index_name' => 'cp'
-            }
+            'index_entry' => [
+              'cp',
+              72
+            ]
           },
           'info' => {
             'spaces_before_argument' => {
@@ -3978,12 +3824,10 @@ $result_trees{'index_table'} = {
           'cmdname' => 'cindex',
           'extra' => {
             'element_node' => {},
-            'index_entry' => {
-              'entry_element' => {},
-              'entry_number' => 73,
-              'in_code' => 0,
-              'index_name' => 'cp'
-            }
+            'index_entry' => [
+              'cp',
+              73
+            ]
           },
           'info' => {
             'spaces_before_argument' => {
@@ -4017,12 +3861,10 @@ $result_trees{'index_table'} = {
           'cmdname' => 'cindex',
           'extra' => {
             'element_node' => {},
-            'index_entry' => {
-              'entry_element' => {},
-              'entry_number' => 74,
-              'in_code' => 0,
-              'index_name' => 'cp'
-            }
+            'index_entry' => [
+              'cp',
+              74
+            ]
           },
           'info' => {
             'spaces_before_argument' => {
@@ -4056,12 +3898,10 @@ $result_trees{'index_table'} = {
           'cmdname' => 'cindex',
           'extra' => {
             'element_node' => {},
-            'index_entry' => {
-              'entry_element' => {},
-              'entry_number' => 75,
-              'in_code' => 0,
-              'index_name' => 'cp'
-            }
+            'index_entry' => [
+              'cp',
+              75
+            ]
           },
           'info' => {
             'spaces_before_argument' => {
@@ -4095,12 +3935,10 @@ $result_trees{'index_table'} = {
           'cmdname' => 'cindex',
           'extra' => {
             'element_node' => {},
-            'index_entry' => {
-              'entry_element' => {},
-              'entry_number' => 76,
-              'in_code' => 0,
-              'index_name' => 'cp'
-            }
+            'index_entry' => [
+              'cp',
+              76
+            ]
           },
           'info' => {
             'spaces_before_argument' => {
@@ -4134,12 +3972,10 @@ $result_trees{'index_table'} = {
           'cmdname' => 'cindex',
           'extra' => {
             'element_node' => {},
-            'index_entry' => {
-              'entry_element' => {},
-              'entry_number' => 77,
-              'in_code' => 0,
-              'index_name' => 'cp'
-            }
+            'index_entry' => [
+              'cp',
+              77
+            ]
           },
           'info' => {
             'spaces_before_argument' => {
@@ -4173,12 +4009,10 @@ $result_trees{'index_table'} = {
           'cmdname' => 'cindex',
           'extra' => {
             'element_node' => {},
-            'index_entry' => {
-              'entry_element' => {},
-              'entry_number' => 78,
-              'in_code' => 0,
-              'index_name' => 'cp'
-            }
+            'index_entry' => [
+              'cp',
+              78
+            ]
           },
           'info' => {
             'spaces_before_argument' => {
@@ -4212,12 +4046,10 @@ $result_trees{'index_table'} = {
           'cmdname' => 'cindex',
           'extra' => {
             'element_node' => {},
-            'index_entry' => {
-              'entry_element' => {},
-              'entry_number' => 79,
-              'in_code' => 0,
-              'index_name' => 'cp'
-            }
+            'index_entry' => [
+              'cp',
+              79
+            ]
           },
           'info' => {
             'spaces_before_argument' => {
@@ -4251,12 +4083,10 @@ $result_trees{'index_table'} = {
           'cmdname' => 'cindex',
           'extra' => {
             'element_node' => {},
-            'index_entry' => {
-              'entry_element' => {},
-              'entry_number' => 80,
-              'in_code' => 0,
-              'index_name' => 'cp'
-            }
+            'index_entry' => [
+              'cp',
+              80
+            ]
           },
           'info' => {
             'spaces_before_argument' => {
@@ -4290,12 +4120,10 @@ $result_trees{'index_table'} = {
           'cmdname' => 'cindex',
           'extra' => {
             'element_node' => {},
-            'index_entry' => {
-              'entry_element' => {},
-              'entry_number' => 81,
-              'in_code' => 0,
-              'index_name' => 'cp'
-            }
+            'index_entry' => [
+              'cp',
+              81
+            ]
           },
           'info' => {
             'spaces_before_argument' => {
@@ -4329,12 +4157,10 @@ $result_trees{'index_table'} = {
           'cmdname' => 'cindex',
           'extra' => {
             'element_node' => {},
-            'index_entry' => {
-              'entry_element' => {},
-              'entry_number' => 82,
-              'in_code' => 0,
-              'index_name' => 'cp'
-            }
+            'index_entry' => [
+              'cp',
+              82
+            ]
           },
           'info' => {
             'spaces_before_argument' => {
@@ -4368,12 +4194,10 @@ $result_trees{'index_table'} = {
           'cmdname' => 'cindex',
           'extra' => {
             'element_node' => {},
-            'index_entry' => {
-              'entry_element' => {},
-              'entry_number' => 83,
-              'in_code' => 0,
-              'index_name' => 'cp'
-            }
+            'index_entry' => [
+              'cp',
+              83
+            ]
           },
           'info' => {
             'spaces_before_argument' => {
@@ -4407,12 +4231,10 @@ $result_trees{'index_table'} = {
           'cmdname' => 'cindex',
           'extra' => {
             'element_node' => {},
-            'index_entry' => {
-              'entry_element' => {},
-              'entry_number' => 84,
-              'in_code' => 0,
-              'index_name' => 'cp'
-            }
+            'index_entry' => [
+              'cp',
+              84
+            ]
           },
           'info' => {
             'spaces_before_argument' => {
@@ -4446,12 +4268,10 @@ $result_trees{'index_table'} = {
           'cmdname' => 'cindex',
           'extra' => {
             'element_node' => {},
-            'index_entry' => {
-              'entry_element' => {},
-              'entry_number' => 85,
-              'in_code' => 0,
-              'index_name' => 'cp'
-            }
+            'index_entry' => [
+              'cp',
+              85
+            ]
           },
           'info' => {
             'spaces_before_argument' => {
@@ -4485,12 +4305,10 @@ $result_trees{'index_table'} = {
           'cmdname' => 'cindex',
           'extra' => {
             'element_node' => {},
-            'index_entry' => {
-              'entry_element' => {},
-              'entry_number' => 86,
-              'in_code' => 0,
-              'index_name' => 'cp'
-            }
+            'index_entry' => [
+              'cp',
+              86
+            ]
           },
           'info' => {
             'spaces_before_argument' => {
@@ -4524,12 +4342,10 @@ $result_trees{'index_table'} = {
           'cmdname' => 'cindex',
           'extra' => {
             'element_node' => {},
-            'index_entry' => {
-              'entry_element' => {},
-              'entry_number' => 87,
-              'in_code' => 0,
-              'index_name' => 'cp'
-            }
+            'index_entry' => [
+              'cp',
+              87
+            ]
           },
           'info' => {
             'spaces_before_argument' => {
@@ -4563,12 +4379,10 @@ $result_trees{'index_table'} = {
           'cmdname' => 'cindex',
           'extra' => {
             'element_node' => {},
-            'index_entry' => {
-              'entry_element' => {},
-              'entry_number' => 88,
-              'in_code' => 0,
-              'index_name' => 'cp'
-            }
+            'index_entry' => [
+              'cp',
+              88
+            ]
           },
           'info' => {
             'spaces_before_argument' => {
@@ -4602,12 +4416,10 @@ $result_trees{'index_table'} = {
           'cmdname' => 'cindex',
           'extra' => {
             'element_node' => {},
-            'index_entry' => {
-              'entry_element' => {},
-              'entry_number' => 89,
-              'in_code' => 0,
-              'index_name' => 'cp'
-            }
+            'index_entry' => [
+              'cp',
+              89
+            ]
           },
           'info' => {
             'spaces_before_argument' => {
@@ -4641,12 +4453,10 @@ $result_trees{'index_table'} = {
           'cmdname' => 'cindex',
           'extra' => {
             'element_node' => {},
-            'index_entry' => {
-              'entry_element' => {},
-              'entry_number' => 90,
-              'in_code' => 0,
-              'index_name' => 'cp'
-            }
+            'index_entry' => [
+              'cp',
+              90
+            ]
           },
           'info' => {
             'spaces_before_argument' => {
@@ -4680,12 +4490,10 @@ $result_trees{'index_table'} = {
           'cmdname' => 'cindex',
           'extra' => {
             'element_node' => {},
-            'index_entry' => {
-              'entry_element' => {},
-              'entry_number' => 91,
-              'in_code' => 0,
-              'index_name' => 'cp'
-            }
+            'index_entry' => [
+              'cp',
+              91
+            ]
           },
           'info' => {
             'spaces_before_argument' => {
@@ -4719,12 +4527,10 @@ $result_trees{'index_table'} = {
           'cmdname' => 'cindex',
           'extra' => {
             'element_node' => {},
-            'index_entry' => {
-              'entry_element' => {},
-              'entry_number' => 92,
-              'in_code' => 0,
-              'index_name' => 'cp'
-            }
+            'index_entry' => [
+              'cp',
+              92
+            ]
           },
           'info' => {
             'spaces_before_argument' => {
@@ -4758,12 +4564,10 @@ $result_trees{'index_table'} = {
           'cmdname' => 'cindex',
           'extra' => {
             'element_node' => {},
-            'index_entry' => {
-              'entry_element' => {},
-              'entry_number' => 93,
-              'in_code' => 0,
-              'index_name' => 'cp'
-            }
+            'index_entry' => [
+              'cp',
+              93
+            ]
           },
           'info' => {
             'spaces_before_argument' => {
@@ -4797,12 +4601,10 @@ $result_trees{'index_table'} = {
           'cmdname' => 'cindex',
           'extra' => {
             'element_node' => {},
-            'index_entry' => {
-              'entry_element' => {},
-              'entry_number' => 94,
-              'in_code' => 0,
-              'index_name' => 'cp'
-            }
+            'index_entry' => [
+              'cp',
+              94
+            ]
           },
           'info' => {
             'spaces_before_argument' => {
@@ -4836,12 +4638,10 @@ $result_trees{'index_table'} = {
           'cmdname' => 'cindex',
           'extra' => {
             'element_node' => {},
-            'index_entry' => {
-              'entry_element' => {},
-              'entry_number' => 95,
-              'in_code' => 0,
-              'index_name' => 'cp'
-            }
+            'index_entry' => [
+              'cp',
+              95
+            ]
           },
           'info' => {
             'spaces_before_argument' => {
@@ -4875,12 +4675,10 @@ $result_trees{'index_table'} = {
           'cmdname' => 'cindex',
           'extra' => {
             'element_node' => {},
-            'index_entry' => {
-              'entry_element' => {},
-              'entry_number' => 96,
-              'in_code' => 0,
-              'index_name' => 'cp'
-            }
+            'index_entry' => [
+              'cp',
+              96
+            ]
           },
           'info' => {
             'spaces_before_argument' => {
@@ -4914,12 +4712,10 @@ $result_trees{'index_table'} = {
           'cmdname' => 'cindex',
           'extra' => {
             'element_node' => {},
-            'index_entry' => {
-              'entry_element' => {},
-              'entry_number' => 97,
-              'in_code' => 0,
-              'index_name' => 'cp'
-            }
+            'index_entry' => [
+              'cp',
+              97
+            ]
           },
           'info' => {
             'spaces_before_argument' => {
@@ -4953,12 +4749,10 @@ $result_trees{'index_table'} = {
           'cmdname' => 'cindex',
           'extra' => {
             'element_node' => {},
-            'index_entry' => {
-              'entry_element' => {},
-              'entry_number' => 98,
-              'in_code' => 0,
-              'index_name' => 'cp'
-            }
+            'index_entry' => [
+              'cp',
+              98
+            ]
           },
           'info' => {
             'spaces_before_argument' => {
@@ -4992,12 +4786,10 @@ $result_trees{'index_table'} = {
           'cmdname' => 'cindex',
           'extra' => {
             'element_node' => {},
-            'index_entry' => {
-              'entry_element' => {},
-              'entry_number' => 99,
-              'in_code' => 0,
-              'index_name' => 'cp'
-            }
+            'index_entry' => [
+              'cp',
+              99
+            ]
           },
           'info' => {
             'spaces_before_argument' => {
@@ -5031,12 +4823,10 @@ $result_trees{'index_table'} = {
           'cmdname' => 'cindex',
           'extra' => {
             'element_node' => {},
-            'index_entry' => {
-              'entry_element' => {},
-              'entry_number' => 100,
-              'in_code' => 0,
-              'index_name' => 'cp'
-            }
+            'index_entry' => [
+              'cp',
+              100
+            ]
           },
           'info' => {
             'spaces_before_argument' => {
@@ -5070,12 +4860,10 @@ $result_trees{'index_table'} = {
           'cmdname' => 'cindex',
           'extra' => {
             'element_node' => {},
-            'index_entry' => {
-              'entry_element' => {},
-              'entry_number' => 101,
-              'in_code' => 0,
-              'index_name' => 'cp'
-            }
+            'index_entry' => [
+              'cp',
+              101
+            ]
           },
           'info' => {
             'spaces_before_argument' => {
@@ -5109,12 +4897,10 @@ $result_trees{'index_table'} = {
           'cmdname' => 'cindex',
           'extra' => {
             'element_node' => {},
-            'index_entry' => {
-              'entry_element' => {},
-              'entry_number' => 102,
-              'in_code' => 0,
-              'index_name' => 'cp'
-            }
+            'index_entry' => [
+              'cp',
+              102
+            ]
           },
           'info' => {
             'spaces_before_argument' => {
@@ -5148,12 +4934,10 @@ $result_trees{'index_table'} = {
           'cmdname' => 'cindex',
           'extra' => {
             'element_node' => {},
-            'index_entry' => {
-              'entry_element' => {},
-              'entry_number' => 103,
-              'in_code' => 0,
-              'index_name' => 'cp'
-            }
+            'index_entry' => [
+              'cp',
+              103
+            ]
           },
           'info' => {
             'spaces_before_argument' => {
@@ -5187,12 +4971,10 @@ $result_trees{'index_table'} = {
           'cmdname' => 'cindex',
           'extra' => {
             'element_node' => {},
-            'index_entry' => {
-              'entry_element' => {},
-              'entry_number' => 104,
-              'in_code' => 0,
-              'index_name' => 'cp'
-            }
+            'index_entry' => [
+              'cp',
+              104
+            ]
           },
           'info' => {
             'spaces_before_argument' => {
@@ -5226,12 +5008,10 @@ $result_trees{'index_table'} = {
           'cmdname' => 'cindex',
           'extra' => {
             'element_node' => {},
-            'index_entry' => {
-              'entry_element' => {},
-              'entry_number' => 105,
-              'in_code' => 0,
-              'index_name' => 'cp'
-            }
+            'index_entry' => [
+              'cp',
+              105
+            ]
           },
           'info' => {
             'spaces_before_argument' => {
@@ -5265,12 +5045,10 @@ $result_trees{'index_table'} = {
           'cmdname' => 'cindex',
           'extra' => {
             'element_node' => {},
-            'index_entry' => {
-              'entry_element' => {},
-              'entry_number' => 106,
-              'in_code' => 0,
-              'index_name' => 'cp'
-            }
+            'index_entry' => [
+              'cp',
+              106
+            ]
           },
           'info' => {
             'spaces_before_argument' => {
@@ -5304,12 +5082,10 @@ $result_trees{'index_table'} = {
           'cmdname' => 'cindex',
           'extra' => {
             'element_node' => {},
-            'index_entry' => {
-              'entry_element' => {},
-              'entry_number' => 107,
-              'in_code' => 0,
-              'index_name' => 'cp'
-            }
+            'index_entry' => [
+              'cp',
+              107
+            ]
           },
           'info' => {
             'spaces_before_argument' => {
@@ -5343,12 +5119,10 @@ $result_trees{'index_table'} = {
           'cmdname' => 'cindex',
           'extra' => {
             'element_node' => {},
-            'index_entry' => {
-              'entry_element' => {},
-              'entry_number' => 108,
-              'in_code' => 0,
-              'index_name' => 'cp'
-            }
+            'index_entry' => [
+              'cp',
+              108
+            ]
           },
           'info' => {
             'spaces_before_argument' => {
@@ -5382,12 +5156,10 @@ $result_trees{'index_table'} = {
           'cmdname' => 'cindex',
           'extra' => {
             'element_node' => {},
-            'index_entry' => {
-              'entry_element' => {},
-              'entry_number' => 109,
-              'in_code' => 0,
-              'index_name' => 'cp'
-            }
+            'index_entry' => [
+              'cp',
+              109
+            ]
           },
           'info' => {
             'spaces_before_argument' => {
@@ -5421,12 +5193,10 @@ $result_trees{'index_table'} = {
           'cmdname' => 'cindex',
           'extra' => {
             'element_node' => {},
-            'index_entry' => {
-              'entry_element' => {},
-              'entry_number' => 110,
-              'in_code' => 0,
-              'index_name' => 'cp'
-            }
+            'index_entry' => [
+              'cp',
+              110
+            ]
           },
           'info' => {
             'spaces_before_argument' => {
@@ -5460,12 +5230,10 @@ $result_trees{'index_table'} = {
           'cmdname' => 'cindex',
           'extra' => {
             'element_node' => {},
-            'index_entry' => {
-              'entry_element' => {},
-              'entry_number' => 111,
-              'in_code' => 0,
-              'index_name' => 'cp'
-            }
+            'index_entry' => [
+              'cp',
+              111
+            ]
           },
           'info' => {
             'spaces_before_argument' => {
@@ -5499,12 +5267,10 @@ $result_trees{'index_table'} = {
           'cmdname' => 'cindex',
           'extra' => {
             'element_node' => {},
-            'index_entry' => {
-              'entry_element' => {},
-              'entry_number' => 112,
-              'in_code' => 0,
-              'index_name' => 'cp'
-            }
+            'index_entry' => [
+              'cp',
+              112
+            ]
           },
           'info' => {
             'spaces_before_argument' => {
@@ -5538,12 +5304,10 @@ $result_trees{'index_table'} = {
           'cmdname' => 'cindex',
           'extra' => {
             'element_node' => {},
-            'index_entry' => {
-              'entry_element' => {},
-              'entry_number' => 113,
-              'in_code' => 0,
-              'index_name' => 'cp'
-            }
+            'index_entry' => [
+              'cp',
+              113
+            ]
           },
           'info' => {
             'spaces_before_argument' => {
@@ -5577,12 +5341,10 @@ $result_trees{'index_table'} = {
           'cmdname' => 'cindex',
           'extra' => {
             'element_node' => {},
-            'index_entry' => {
-              'entry_element' => {},
-              'entry_number' => 114,
-              'in_code' => 0,
-              'index_name' => 'cp'
-            }
+            'index_entry' => [
+              'cp',
+              114
+            ]
           },
           'info' => {
             'spaces_before_argument' => {
@@ -5616,12 +5378,10 @@ $result_trees{'index_table'} = {
           'cmdname' => 'cindex',
           'extra' => {
             'element_node' => {},
-            'index_entry' => {
-              'entry_element' => {},
-              'entry_number' => 115,
-              'in_code' => 0,
-              'index_name' => 'cp'
-            }
+            'index_entry' => [
+              'cp',
+              115
+            ]
           },
           'info' => {
             'spaces_before_argument' => {
@@ -5655,12 +5415,10 @@ $result_trees{'index_table'} = {
           'cmdname' => 'cindex',
           'extra' => {
             'element_node' => {},
-            'index_entry' => {
-              'entry_element' => {},
-              'entry_number' => 116,
-              'in_code' => 0,
-              'index_name' => 'cp'
-            }
+            'index_entry' => [
+              'cp',
+              116
+            ]
           },
           'info' => {
             'spaces_before_argument' => {
@@ -5694,12 +5452,10 @@ $result_trees{'index_table'} = {
           'cmdname' => 'cindex',
           'extra' => {
             'element_node' => {},
-            'index_entry' => {
-              'entry_element' => {},
-              'entry_number' => 117,
-              'in_code' => 0,
-              'index_name' => 'cp'
-            }
+            'index_entry' => [
+              'cp',
+              117
+            ]
           },
           'info' => {
             'spaces_before_argument' => {
@@ -5733,12 +5489,10 @@ $result_trees{'index_table'} = {
           'cmdname' => 'cindex',
           'extra' => {
             'element_node' => {},
-            'index_entry' => {
-              'entry_element' => {},
-              'entry_number' => 118,
-              'in_code' => 0,
-              'index_name' => 'cp'
-            }
+            'index_entry' => [
+              'cp',
+              118
+            ]
           },
           'info' => {
             'spaces_before_argument' => {
@@ -5772,12 +5526,10 @@ $result_trees{'index_table'} = {
           'cmdname' => 'cindex',
           'extra' => {
             'element_node' => {},
-            'index_entry' => {
-              'entry_element' => {},
-              'entry_number' => 119,
-              'in_code' => 0,
-              'index_name' => 'cp'
-            }
+            'index_entry' => [
+              'cp',
+              119
+            ]
           },
           'info' => {
             'spaces_before_argument' => {
@@ -5811,12 +5563,10 @@ $result_trees{'index_table'} = {
           'cmdname' => 'cindex',
           'extra' => {
             'element_node' => {},
-            'index_entry' => {
-              'entry_element' => {},
-              'entry_number' => 120,
-              'in_code' => 0,
-              'index_name' => 'cp'
-            }
+            'index_entry' => [
+              'cp',
+              120
+            ]
           },
           'info' => {
             'spaces_before_argument' => {
@@ -5850,12 +5600,10 @@ $result_trees{'index_table'} = {
           'cmdname' => 'cindex',
           'extra' => {
             'element_node' => {},
-            'index_entry' => {
-              'entry_element' => {},
-              'entry_number' => 121,
-              'in_code' => 0,
-              'index_name' => 'cp'
-            }
+            'index_entry' => [
+              'cp',
+              121
+            ]
           },
           'info' => {
             'spaces_before_argument' => {
@@ -5889,12 +5637,10 @@ $result_trees{'index_table'} = {
           'cmdname' => 'cindex',
           'extra' => {
             'element_node' => {},
-            'index_entry' => {
-              'entry_element' => {},
-              'entry_number' => 122,
-              'in_code' => 0,
-              'index_name' => 'cp'
-            }
+            'index_entry' => [
+              'cp',
+              122
+            ]
           },
           'info' => {
             'spaces_before_argument' => {
@@ -5928,12 +5674,10 @@ $result_trees{'index_table'} = {
           'cmdname' => 'cindex',
           'extra' => {
             'element_node' => {},
-            'index_entry' => {
-              'entry_element' => {},
-              'entry_number' => 123,
-              'in_code' => 0,
-              'index_name' => 'cp'
-            }
+            'index_entry' => [
+              'cp',
+              123
+            ]
           },
           'info' => {
             'spaces_before_argument' => {
@@ -5967,12 +5711,10 @@ $result_trees{'index_table'} = {
           'cmdname' => 'cindex',
           'extra' => {
             'element_node' => {},
-            'index_entry' => {
-              'entry_element' => {},
-              'entry_number' => 124,
-              'in_code' => 0,
-              'index_name' => 'cp'
-            }
+            'index_entry' => [
+              'cp',
+              124
+            ]
           },
           'info' => {
             'spaces_before_argument' => {
@@ -6006,12 +5748,10 @@ $result_trees{'index_table'} = {
           'cmdname' => 'cindex',
           'extra' => {
             'element_node' => {},
-            'index_entry' => {
-              'entry_element' => {},
-              'entry_number' => 125,
-              'in_code' => 0,
-              'index_name' => 'cp'
-            }
+            'index_entry' => [
+              'cp',
+              125
+            ]
           },
           'info' => {
             'spaces_before_argument' => {
@@ -6045,12 +5785,10 @@ $result_trees{'index_table'} = {
           'cmdname' => 'cindex',
           'extra' => {
             'element_node' => {},
-            'index_entry' => {
-              'entry_element' => {},
-              'entry_number' => 126,
-              'in_code' => 0,
-              'index_name' => 'cp'
-            }
+            'index_entry' => [
+              'cp',
+              126
+            ]
           },
           'info' => {
             'spaces_before_argument' => {
@@ -6084,12 +5822,10 @@ $result_trees{'index_table'} = {
           'cmdname' => 'cindex',
           'extra' => {
             'element_node' => {},
-            'index_entry' => {
-              'entry_element' => {},
-              'entry_number' => 127,
-              'in_code' => 0,
-              'index_name' => 'cp'
-            }
+            'index_entry' => [
+              'cp',
+              127
+            ]
           },
           'info' => {
             'spaces_before_argument' => {
@@ -6123,12 +5859,10 @@ $result_trees{'index_table'} = {
           'cmdname' => 'cindex',
           'extra' => {
             'element_node' => {},
-            'index_entry' => {
-              'entry_element' => {},
-              'entry_number' => 128,
-              'in_code' => 0,
-              'index_name' => 'cp'
-            }
+            'index_entry' => [
+              'cp',
+              128
+            ]
           },
           'info' => {
             'spaces_before_argument' => {
@@ -6162,12 +5896,10 @@ $result_trees{'index_table'} = {
           'cmdname' => 'cindex',
           'extra' => {
             'element_node' => {},
-            'index_entry' => {
-              'entry_element' => {},
-              'entry_number' => 129,
-              'in_code' => 0,
-              'index_name' => 'cp'
-            }
+            'index_entry' => [
+              'cp',
+              129
+            ]
           },
           'info' => {
             'spaces_before_argument' => {
@@ -6201,12 +5933,10 @@ $result_trees{'index_table'} = {
           'cmdname' => 'cindex',
           'extra' => {
             'element_node' => {},
-            'index_entry' => {
-              'entry_element' => {},
-              'entry_number' => 130,
-              'in_code' => 0,
-              'index_name' => 'cp'
-            }
+            'index_entry' => [
+              'cp',
+              130
+            ]
           },
           'info' => {
             'spaces_before_argument' => {
@@ -6421,278 +6151,143 @@ 
$result_trees{'index_table'}{'contents'}[2]{'contents'}[0]{'contents'}[0]{'conte
 
$result_trees{'index_table'}{'contents'}[2]{'contents'}[0]{'contents'}[1]{'contents'}[1]{'extra'}{'node_content'}[0]
 = 
$result_trees{'index_table'}{'contents'}[2]{'contents'}[0]{'contents'}[1]{'contents'}[1]{'contents'}[0];
 
$result_trees{'index_table'}{'contents'}[2]{'contents'}[0]{'contents'}[2]{'contents'}[1]{'extra'}{'node_content'}[0]
 = 
$result_trees{'index_table'}{'contents'}[2]{'contents'}[0]{'contents'}[2]{'contents'}[1]{'contents'}[0];
 
$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'}[4]{'extra'}{'element_node'}
 = $result_trees{'index_table'}{'contents'}[3];
-$result_trees{'index_table'}{'contents'}[4]{'contents'}[4]{'extra'}{'index_entry'}{'entry_element'}
 = $result_trees{'index_table'}{'contents'}[4]{'contents'}[4];
 
$result_trees{'index_table'}{'contents'}[4]{'contents'}[8]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'extra'}{'element_node'}
 = $result_trees{'index_table'}{'contents'}[3];
-$result_trees{'index_table'}{'contents'}[4]{'contents'}[8]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'index_table'}{'contents'}[4]{'contents'}[8]{'contents'}[0]{'contents'}[0]{'contents'}[0];
 
$result_trees{'index_table'}{'contents'}[4]{'contents'}[8]{'contents'}[0]{'contents'}[0]{'contents'}[1]{'extra'}{'element_node'}
 = $result_trees{'index_table'}{'contents'}[3];
-$result_trees{'index_table'}{'contents'}[4]{'contents'}[8]{'contents'}[0]{'contents'}[0]{'contents'}[1]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'index_table'}{'contents'}[4]{'contents'}[8]{'contents'}[0]{'contents'}[0]{'contents'}[1];
 
$result_trees{'index_table'}{'contents'}[4]{'contents'}[8]{'extra'}{'command_as_argument'}
 = $result_trees{'index_table'}{'contents'}[4]{'contents'}[8]{'args'}[0];
 
$result_trees{'index_table'}{'contents'}[4]{'contents'}[11]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'extra'}{'element_node'}
 = $result_trees{'index_table'}{'contents'}[3];
-$result_trees{'index_table'}{'contents'}[4]{'contents'}[11]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'index_table'}{'contents'}[4]{'contents'}[11]{'contents'}[0]{'contents'}[0]{'contents'}[0];
 
$result_trees{'index_table'}{'contents'}[4]{'contents'}[11]{'contents'}[0]{'contents'}[0]{'contents'}[1]{'extra'}{'element_node'}
 = $result_trees{'index_table'}{'contents'}[3];
-$result_trees{'index_table'}{'contents'}[4]{'contents'}[11]{'contents'}[0]{'contents'}[0]{'contents'}[1]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'index_table'}{'contents'}[4]{'contents'}[11]{'contents'}[0]{'contents'}[0]{'contents'}[1];
 
$result_trees{'index_table'}{'contents'}[4]{'contents'}[11]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'extra'}{'element_node'}
 = $result_trees{'index_table'}{'contents'}[3];
-$result_trees{'index_table'}{'contents'}[4]{'contents'}[11]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'index_table'}{'contents'}[4]{'contents'}[11]{'contents'}[1]{'contents'}[0]{'contents'}[0];
 
$result_trees{'index_table'}{'contents'}[4]{'contents'}[11]{'extra'}{'command_as_argument'}
 = $result_trees{'index_table'}{'contents'}[4]{'contents'}[11]{'args'}[0];
 
$result_trees{'index_table'}{'contents'}[8]{'contents'}[0]{'contents'}[0]{'contents'}[1]{'extra'}{'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'}{'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'}{'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'}{'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'}{'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'}{'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'}{'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'}{'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'}{'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'}{'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'}{'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'}{'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'}{'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'}{'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'}{'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'}{'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'}{'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'}{'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'}{'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'}{'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'}{'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'}{'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'}{'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'}{'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'}{'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'}{'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'}{'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'}{'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'}{'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'}{'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'}{'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'}{'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'}{'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'}{'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'}{'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'}{'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'}{'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'}{'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'}{'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'}{'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'}{'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'}{'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'}{'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'}{'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'}{'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'}{'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'}{'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'}{'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'}{'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'}{'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'}{'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'}{'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'}{'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'}{'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'}{'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'}{'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'}{'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'}{'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'}{'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'}{'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'}{'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'}{'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'}{'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'}{'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'}{'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'}{'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'}{'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'}{'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'}{'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'}{'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'}{'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'}{'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'}{'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'}{'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'}{'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'}{'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'}{'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'}{'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'}{'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'}{'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'}{'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'}{'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'}{'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'}{'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'}{'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'}{'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'}{'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'}{'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'}{'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'}{'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'}{'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'}{'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'}{'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'}{'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'}{'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'}{'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'}{'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'}{'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'}{'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'}{'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'}{'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'}{'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'}{'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'}{'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'}{'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'}{'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'}{'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'}{'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'}{'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'}{'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'}{'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'}{'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'}{'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'}{'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'}{'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'}{'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'}{'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'}{'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'}{'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'}{'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'}{'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'}{'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'}{'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'}{'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'}{'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'}{'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'}{'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'}{'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'}{'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_texis{'index_table'} = '\\input texinfo @c -*-texinfo-*-
 
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 db281c53cc..98ce146743 100644
--- a/tp/t/results/indices/index_table_chapter_no_node.pl
+++ b/tp/t/results/indices/index_table_chapter_no_node.pl
@@ -367,12 +367,10 @@ $result_trees{'index_table_chapter_no_node'} = {
           'cmdname' => 'cindex',
           'extra' => {
             'element_node' => {},
-            'index_entry' => {
-              'entry_element' => {},
-              'entry_number' => 1,
-              'in_code' => 0,
-              'index_name' => 'cp'
-            }
+            'index_entry' => [
+              'cp',
+              1
+            ]
           },
           'info' => {
             'spaces_before_argument' => {
@@ -420,12 +418,10 @@ $result_trees{'index_table_chapter_no_node'} = {
           'cmdname' => 'cindex',
           'extra' => {
             'element_node' => {},
-            'index_entry' => {
-              'entry_element' => {},
-              'entry_number' => 2,
-              'in_code' => 0,
-              'index_name' => 'cp'
-            }
+            'index_entry' => [
+              'cp',
+              2
+            ]
           },
           'info' => {
             'spaces_before_argument' => {
@@ -507,12 +503,10 @@ $result_trees{'index_table_chapter_no_node'} = {
                       'cmdname' => 'item',
                       'extra' => {
                         'element_node' => {},
-                        'index_entry' => {
-                          'entry_element' => {},
-                          'entry_number' => 1,
-                          'in_code' => 1,
-                          'index_name' => 'vr'
-                        }
+                        'index_entry' => [
+                          'vr',
+                          1
+                        ]
                       },
                       'info' => {
                         'spaces_before_argument' => {
@@ -545,12 +539,10 @@ $result_trees{'index_table_chapter_no_node'} = {
                       'cmdname' => 'itemx',
                       'extra' => {
                         'element_node' => {},
-                        'index_entry' => {
-                          'entry_element' => {},
-                          'entry_number' => 2,
-                          'in_code' => 1,
-                          'index_name' => 'vr'
-                        }
+                        'index_entry' => [
+                          'vr',
+                          2
+                        ]
                       },
                       'info' => {
                         'spaces_before_argument' => {
@@ -697,12 +689,10 @@ $result_trees{'index_table_chapter_no_node'} = {
                       'cmdname' => 'item',
                       'extra' => {
                         'element_node' => {},
-                        'index_entry' => {
-                          'entry_element' => {},
-                          'entry_number' => 1,
-                          'in_code' => 1,
-                          'index_name' => 'fn'
-                        }
+                        'index_entry' => [
+                          'fn',
+                          1
+                        ]
                       },
                       'info' => {
                         'spaces_before_argument' => {
@@ -735,12 +725,10 @@ $result_trees{'index_table_chapter_no_node'} = {
                       'cmdname' => 'itemx',
                       'extra' => {
                         'element_node' => {},
-                        'index_entry' => {
-                          'entry_element' => {},
-                          'entry_number' => 2,
-                          'in_code' => 1,
-                          'index_name' => 'fn'
-                        }
+                        'index_entry' => [
+                          'fn',
+                          2
+                        ]
                       },
                       'info' => {
                         'spaces_before_argument' => {
@@ -797,12 +785,10 @@ $result_trees{'index_table_chapter_no_node'} = {
                       'cmdname' => 'item',
                       'extra' => {
                         'element_node' => {},
-                        'index_entry' => {
-                          'entry_element' => {},
-                          'entry_number' => 3,
-                          'in_code' => 1,
-                          'index_name' => 'fn'
-                        }
+                        'index_entry' => [
+                          'fn',
+                          3
+                        ]
                       },
                       'info' => {
                         'spaces_before_argument' => {
@@ -1248,12 +1234,10 @@ $result_trees{'index_table_chapter_no_node'} = {
           'cmdname' => 'cindex',
           'extra' => {
             'element_node' => {},
-            'index_entry' => {
-              'entry_element' => {},
-              'entry_number' => 3,
-              'in_code' => 0,
-              'index_name' => 'cp'
-            }
+            'index_entry' => [
+              'cp',
+              3
+            ]
           },
           'info' => {
             'spaces_before_argument' => {
@@ -1287,12 +1271,10 @@ $result_trees{'index_table_chapter_no_node'} = {
           'cmdname' => 'cindex',
           'extra' => {
             'element_node' => {},
-            'index_entry' => {
-              'entry_element' => {},
-              'entry_number' => 4,
-              'in_code' => 0,
-              'index_name' => 'cp'
-            }
+            'index_entry' => [
+              'cp',
+              4
+            ]
           },
           'info' => {
             'spaces_before_argument' => {
@@ -1326,12 +1308,10 @@ $result_trees{'index_table_chapter_no_node'} = {
           'cmdname' => 'cindex',
           'extra' => {
             'element_node' => {},
-            'index_entry' => {
-              'entry_element' => {},
-              'entry_number' => 5,
-              'in_code' => 0,
-              'index_name' => 'cp'
-            }
+            'index_entry' => [
+              'cp',
+              5
+            ]
           },
           'info' => {
             'spaces_before_argument' => {
@@ -1365,12 +1345,10 @@ $result_trees{'index_table_chapter_no_node'} = {
           'cmdname' => 'cindex',
           'extra' => {
             'element_node' => {},
-            'index_entry' => {
-              'entry_element' => {},
-              'entry_number' => 6,
-              'in_code' => 0,
-              'index_name' => 'cp'
-            }
+            'index_entry' => [
+              'cp',
+              6
+            ]
           },
           'info' => {
             'spaces_before_argument' => {
@@ -1404,12 +1382,10 @@ $result_trees{'index_table_chapter_no_node'} = {
           'cmdname' => 'cindex',
           'extra' => {
             'element_node' => {},
-            'index_entry' => {
-              'entry_element' => {},
-              'entry_number' => 7,
-              'in_code' => 0,
-              'index_name' => 'cp'
-            }
+            'index_entry' => [
+              'cp',
+              7
+            ]
           },
           'info' => {
             'spaces_before_argument' => {
@@ -1443,12 +1419,10 @@ $result_trees{'index_table_chapter_no_node'} = {
           'cmdname' => 'cindex',
           'extra' => {
             'element_node' => {},
-            'index_entry' => {
-              'entry_element' => {},
-              'entry_number' => 8,
-              'in_code' => 0,
-              'index_name' => 'cp'
-            }
+            'index_entry' => [
+              'cp',
+              8
+            ]
           },
           'info' => {
             'spaces_before_argument' => {
@@ -1482,12 +1456,10 @@ $result_trees{'index_table_chapter_no_node'} = {
           'cmdname' => 'cindex',
           'extra' => {
             'element_node' => {},
-            'index_entry' => {
-              'entry_element' => {},
-              'entry_number' => 9,
-              'in_code' => 0,
-              'index_name' => 'cp'
-            }
+            'index_entry' => [
+              'cp',
+              9
+            ]
           },
           'info' => {
             'spaces_before_argument' => {
@@ -1521,12 +1493,10 @@ $result_trees{'index_table_chapter_no_node'} = {
           'cmdname' => 'cindex',
           'extra' => {
             'element_node' => {},
-            'index_entry' => {
-              'entry_element' => {},
-              'entry_number' => 10,
-              'in_code' => 0,
-              'index_name' => 'cp'
-            }
+            'index_entry' => [
+              'cp',
+              10
+            ]
           },
           'info' => {
             'spaces_before_argument' => {
@@ -1560,12 +1530,10 @@ $result_trees{'index_table_chapter_no_node'} = {
           'cmdname' => 'cindex',
           'extra' => {
             'element_node' => {},
-            'index_entry' => {
-              'entry_element' => {},
-              'entry_number' => 11,
-              'in_code' => 0,
-              'index_name' => 'cp'
-            }
+            'index_entry' => [
+              'cp',
+              11
+            ]
           },
           'info' => {
             'spaces_before_argument' => {
@@ -1599,12 +1567,10 @@ $result_trees{'index_table_chapter_no_node'} = {
           'cmdname' => 'cindex',
           'extra' => {
             'element_node' => {},
-            'index_entry' => {
-              'entry_element' => {},
-              'entry_number' => 12,
-              'in_code' => 0,
-              'index_name' => 'cp'
-            }
+            'index_entry' => [
+              'cp',
+              12
+            ]
           },
           'info' => {
             'spaces_before_argument' => {
@@ -1638,12 +1604,10 @@ $result_trees{'index_table_chapter_no_node'} = {
           'cmdname' => 'cindex',
           'extra' => {
             'element_node' => {},
-            'index_entry' => {
-              'entry_element' => {},
-              'entry_number' => 13,
-              'in_code' => 0,
-              'index_name' => 'cp'
-            }
+            'index_entry' => [
+              'cp',
+              13
+            ]
           },
           'info' => {
             'spaces_before_argument' => {
@@ -1677,12 +1641,10 @@ $result_trees{'index_table_chapter_no_node'} = {
           'cmdname' => 'cindex',
           'extra' => {
             'element_node' => {},
-            'index_entry' => {
-              'entry_element' => {},
-              'entry_number' => 14,
-              'in_code' => 0,
-              'index_name' => 'cp'
-            }
+            'index_entry' => [
+              'cp',
+              14
+            ]
           },
           'info' => {
             'spaces_before_argument' => {
@@ -1716,12 +1678,10 @@ $result_trees{'index_table_chapter_no_node'} = {
           'cmdname' => 'cindex',
           'extra' => {
             'element_node' => {},
-            'index_entry' => {
-              'entry_element' => {},
-              'entry_number' => 15,
-              'in_code' => 0,
-              'index_name' => 'cp'
-            }
+            'index_entry' => [
+              'cp',
+              15
+            ]
           },
           'info' => {
             'spaces_before_argument' => {
@@ -1755,12 +1715,10 @@ $result_trees{'index_table_chapter_no_node'} = {
           'cmdname' => 'cindex',
           'extra' => {
             'element_node' => {},
-            'index_entry' => {
-              'entry_element' => {},
-              'entry_number' => 16,
-              'in_code' => 0,
-              'index_name' => 'cp'
-            }
+            'index_entry' => [
+              'cp',
+              16
+            ]
           },
           'info' => {
             'spaces_before_argument' => {
@@ -1794,12 +1752,10 @@ $result_trees{'index_table_chapter_no_node'} = {
           'cmdname' => 'cindex',
           'extra' => {
             'element_node' => {},
-            'index_entry' => {
-              'entry_element' => {},
-              'entry_number' => 17,
-              'in_code' => 0,
-              'index_name' => 'cp'
-            }
+            'index_entry' => [
+              'cp',
+              17
+            ]
           },
           'info' => {
             'spaces_before_argument' => {
@@ -1833,12 +1789,10 @@ $result_trees{'index_table_chapter_no_node'} = {
           'cmdname' => 'cindex',
           'extra' => {
             'element_node' => {},
-            'index_entry' => {
-              'entry_element' => {},
-              'entry_number' => 18,
-              'in_code' => 0,
-              'index_name' => 'cp'
-            }
+            'index_entry' => [
+              'cp',
+              18
+            ]
           },
           'info' => {
             'spaces_before_argument' => {
@@ -1872,12 +1826,10 @@ $result_trees{'index_table_chapter_no_node'} = {
           'cmdname' => 'cindex',
           'extra' => {
             'element_node' => {},
-            'index_entry' => {
-              'entry_element' => {},
-              'entry_number' => 19,
-              'in_code' => 0,
-              'index_name' => 'cp'
-            }
+            'index_entry' => [
+              'cp',
+              19
+            ]
           },
           'info' => {
             'spaces_before_argument' => {
@@ -1911,12 +1863,10 @@ $result_trees{'index_table_chapter_no_node'} = {
           'cmdname' => 'cindex',
           'extra' => {
             'element_node' => {},
-            'index_entry' => {
-              'entry_element' => {},
-              'entry_number' => 20,
-              'in_code' => 0,
-              'index_name' => 'cp'
-            }
+            'index_entry' => [
+              'cp',
+              20
+            ]
           },
           'info' => {
             'spaces_before_argument' => {
@@ -1950,12 +1900,10 @@ $result_trees{'index_table_chapter_no_node'} = {
           'cmdname' => 'cindex',
           'extra' => {
             'element_node' => {},
-            'index_entry' => {
-              'entry_element' => {},
-              'entry_number' => 21,
-              'in_code' => 0,
-              'index_name' => 'cp'
-            }
+            'index_entry' => [
+              'cp',
+              21
+            ]
           },
           'info' => {
             'spaces_before_argument' => {
@@ -1989,12 +1937,10 @@ $result_trees{'index_table_chapter_no_node'} = {
           'cmdname' => 'cindex',
           'extra' => {
             'element_node' => {},
-            'index_entry' => {
-              'entry_element' => {},
-              'entry_number' => 22,
-              'in_code' => 0,
-              'index_name' => 'cp'
-            }
+            'index_entry' => [
+              'cp',
+              22
+            ]
           },
           'info' => {
             'spaces_before_argument' => {
@@ -2028,12 +1974,10 @@ $result_trees{'index_table_chapter_no_node'} = {
           'cmdname' => 'cindex',
           'extra' => {
             'element_node' => {},
-            'index_entry' => {
-              'entry_element' => {},
-              'entry_number' => 23,
-              'in_code' => 0,
-              'index_name' => 'cp'
-            }
+            'index_entry' => [
+              'cp',
+              23
+            ]
           },
           'info' => {
             'spaces_before_argument' => {
@@ -2067,12 +2011,10 @@ $result_trees{'index_table_chapter_no_node'} = {
           'cmdname' => 'cindex',
           'extra' => {
             'element_node' => {},
-            'index_entry' => {
-              'entry_element' => {},
-              'entry_number' => 24,
-              'in_code' => 0,
-              'index_name' => 'cp'
-            }
+            'index_entry' => [
+              'cp',
+              24
+            ]
           },
           'info' => {
             'spaces_before_argument' => {
@@ -2106,12 +2048,10 @@ $result_trees{'index_table_chapter_no_node'} = {
           'cmdname' => 'cindex',
           'extra' => {
             'element_node' => {},
-            'index_entry' => {
-              'entry_element' => {},
-              'entry_number' => 25,
-              'in_code' => 0,
-              'index_name' => 'cp'
-            }
+            'index_entry' => [
+              'cp',
+              25
+            ]
           },
           'info' => {
             'spaces_before_argument' => {
@@ -2145,12 +2085,10 @@ $result_trees{'index_table_chapter_no_node'} = {
           'cmdname' => 'cindex',
           'extra' => {
             'element_node' => {},
-            'index_entry' => {
-              'entry_element' => {},
-              'entry_number' => 26,
-              'in_code' => 0,
-              'index_name' => 'cp'
-            }
+            'index_entry' => [
+              'cp',
+              26
+            ]
           },
           'info' => {
             'spaces_before_argument' => {
@@ -2184,12 +2122,10 @@ $result_trees{'index_table_chapter_no_node'} = {
           'cmdname' => 'cindex',
           'extra' => {
             'element_node' => {},
-            'index_entry' => {
-              'entry_element' => {},
-              'entry_number' => 27,
-              'in_code' => 0,
-              'index_name' => 'cp'
-            }
+            'index_entry' => [
+              'cp',
+              27
+            ]
           },
           'info' => {
             'spaces_before_argument' => {
@@ -2223,12 +2159,10 @@ $result_trees{'index_table_chapter_no_node'} = {
           'cmdname' => 'cindex',
           'extra' => {
             'element_node' => {},
-            'index_entry' => {
-              'entry_element' => {},
-              'entry_number' => 28,
-              'in_code' => 0,
-              'index_name' => 'cp'
-            }
+            'index_entry' => [
+              'cp',
+              28
+            ]
           },
           'info' => {
             'spaces_before_argument' => {
@@ -2262,12 +2196,10 @@ $result_trees{'index_table_chapter_no_node'} = {
           'cmdname' => 'cindex',
           'extra' => {
             'element_node' => {},
-            'index_entry' => {
-              'entry_element' => {},
-              'entry_number' => 29,
-              'in_code' => 0,
-              'index_name' => 'cp'
-            }
+            'index_entry' => [
+              'cp',
+              29
+            ]
           },
           'info' => {
             'spaces_before_argument' => {
@@ -2301,12 +2233,10 @@ $result_trees{'index_table_chapter_no_node'} = {
           'cmdname' => 'cindex',
           'extra' => {
             'element_node' => {},
-            'index_entry' => {
-              'entry_element' => {},
-              'entry_number' => 30,
-              'in_code' => 0,
-              'index_name' => 'cp'
-            }
+            'index_entry' => [
+              'cp',
+              30
+            ]
           },
           'info' => {
             'spaces_before_argument' => {
@@ -2340,12 +2270,10 @@ $result_trees{'index_table_chapter_no_node'} = {
           'cmdname' => 'cindex',
           'extra' => {
             'element_node' => {},
-            'index_entry' => {
-              'entry_element' => {},
-              'entry_number' => 31,
-              'in_code' => 0,
-              'index_name' => 'cp'
-            }
+            'index_entry' => [
+              'cp',
+              31
+            ]
           },
           'info' => {
             'spaces_before_argument' => {
@@ -2379,12 +2307,10 @@ $result_trees{'index_table_chapter_no_node'} = {
           'cmdname' => 'cindex',
           'extra' => {
             'element_node' => {},
-            'index_entry' => {
-              'entry_element' => {},
-              'entry_number' => 32,
-              'in_code' => 0,
-              'index_name' => 'cp'
-            }
+            'index_entry' => [
+              'cp',
+              32
+            ]
           },
           'info' => {
             'spaces_before_argument' => {
@@ -2418,12 +2344,10 @@ $result_trees{'index_table_chapter_no_node'} = {
           'cmdname' => 'cindex',
           'extra' => {
             'element_node' => {},
-            'index_entry' => {
-              'entry_element' => {},
-              'entry_number' => 33,
-              'in_code' => 0,
-              'index_name' => 'cp'
-            }
+            'index_entry' => [
+              'cp',
+              33
+            ]
           },
           'info' => {
             'spaces_before_argument' => {
@@ -2457,12 +2381,10 @@ $result_trees{'index_table_chapter_no_node'} = {
           'cmdname' => 'cindex',
           'extra' => {
             'element_node' => {},
-            'index_entry' => {
-              'entry_element' => {},
-              'entry_number' => 34,
-              'in_code' => 0,
-              'index_name' => 'cp'
-            }
+            'index_entry' => [
+              'cp',
+              34
+            ]
           },
           'info' => {
             'spaces_before_argument' => {
@@ -2496,12 +2418,10 @@ $result_trees{'index_table_chapter_no_node'} = {
           'cmdname' => 'cindex',
           'extra' => {
             'element_node' => {},
-            'index_entry' => {
-              'entry_element' => {},
-              'entry_number' => 35,
-              'in_code' => 0,
-              'index_name' => 'cp'
-            }
+            'index_entry' => [
+              'cp',
+              35
+            ]
           },
           'info' => {
             'spaces_before_argument' => {
@@ -2535,12 +2455,10 @@ $result_trees{'index_table_chapter_no_node'} = {
           'cmdname' => 'cindex',
           'extra' => {
             'element_node' => {},
-            'index_entry' => {
-              'entry_element' => {},
-              'entry_number' => 36,
-              'in_code' => 0,
-              'index_name' => 'cp'
-            }
+            'index_entry' => [
+              'cp',
+              36
+            ]
           },
           'info' => {
             'spaces_before_argument' => {
@@ -2574,12 +2492,10 @@ $result_trees{'index_table_chapter_no_node'} = {
           'cmdname' => 'cindex',
           'extra' => {
             'element_node' => {},
-            'index_entry' => {
-              'entry_element' => {},
-              'entry_number' => 37,
-              'in_code' => 0,
-              'index_name' => 'cp'
-            }
+            'index_entry' => [
+              'cp',
+              37
+            ]
           },
           'info' => {
             'spaces_before_argument' => {
@@ -2613,12 +2529,10 @@ $result_trees{'index_table_chapter_no_node'} = {
           'cmdname' => 'cindex',
           'extra' => {
             'element_node' => {},
-            'index_entry' => {
-              'entry_element' => {},
-              'entry_number' => 38,
-              'in_code' => 0,
-              'index_name' => 'cp'
-            }
+            'index_entry' => [
+              'cp',
+              38
+            ]
           },
           'info' => {
             'spaces_before_argument' => {
@@ -2652,12 +2566,10 @@ $result_trees{'index_table_chapter_no_node'} = {
           'cmdname' => 'cindex',
           'extra' => {
             'element_node' => {},
-            'index_entry' => {
-              'entry_element' => {},
-              'entry_number' => 39,
-              'in_code' => 0,
-              'index_name' => 'cp'
-            }
+            'index_entry' => [
+              'cp',
+              39
+            ]
           },
           'info' => {
             'spaces_before_argument' => {
@@ -2691,12 +2603,10 @@ $result_trees{'index_table_chapter_no_node'} = {
           'cmdname' => 'cindex',
           'extra' => {
             'element_node' => {},
-            'index_entry' => {
-              'entry_element' => {},
-              'entry_number' => 40,
-              'in_code' => 0,
-              'index_name' => 'cp'
-            }
+            'index_entry' => [
+              'cp',
+              40
+            ]
           },
           'info' => {
             'spaces_before_argument' => {
@@ -2730,12 +2640,10 @@ $result_trees{'index_table_chapter_no_node'} = {
           'cmdname' => 'cindex',
           'extra' => {
             'element_node' => {},
-            'index_entry' => {
-              'entry_element' => {},
-              'entry_number' => 41,
-              'in_code' => 0,
-              'index_name' => 'cp'
-            }
+            'index_entry' => [
+              'cp',
+              41
+            ]
           },
           'info' => {
             'spaces_before_argument' => {
@@ -2769,12 +2677,10 @@ $result_trees{'index_table_chapter_no_node'} = {
           'cmdname' => 'cindex',
           'extra' => {
             'element_node' => {},
-            'index_entry' => {
-              'entry_element' => {},
-              'entry_number' => 42,
-              'in_code' => 0,
-              'index_name' => 'cp'
-            }
+            'index_entry' => [
+              'cp',
+              42
+            ]
           },
           'info' => {
             'spaces_before_argument' => {
@@ -2808,12 +2714,10 @@ $result_trees{'index_table_chapter_no_node'} = {
           'cmdname' => 'cindex',
           'extra' => {
             'element_node' => {},
-            'index_entry' => {
-              'entry_element' => {},
-              'entry_number' => 43,
-              'in_code' => 0,
-              'index_name' => 'cp'
-            }
+            'index_entry' => [
+              'cp',
+              43
+            ]
           },
           'info' => {
             'spaces_before_argument' => {
@@ -2847,12 +2751,10 @@ $result_trees{'index_table_chapter_no_node'} = {
           'cmdname' => 'cindex',
           'extra' => {
             'element_node' => {},
-            'index_entry' => {
-              'entry_element' => {},
-              'entry_number' => 44,
-              'in_code' => 0,
-              'index_name' => 'cp'
-            }
+            'index_entry' => [
+              'cp',
+              44
+            ]
           },
           'info' => {
             'spaces_before_argument' => {
@@ -2886,12 +2788,10 @@ $result_trees{'index_table_chapter_no_node'} = {
           'cmdname' => 'cindex',
           'extra' => {
             'element_node' => {},
-            'index_entry' => {
-              'entry_element' => {},
-              'entry_number' => 45,
-              'in_code' => 0,
-              'index_name' => 'cp'
-            }
+            'index_entry' => [
+              'cp',
+              45
+            ]
           },
           'info' => {
             'spaces_before_argument' => {
@@ -2925,12 +2825,10 @@ $result_trees{'index_table_chapter_no_node'} = {
           'cmdname' => 'cindex',
           'extra' => {
             'element_node' => {},
-            'index_entry' => {
-              'entry_element' => {},
-              'entry_number' => 46,
-              'in_code' => 0,
-              'index_name' => 'cp'
-            }
+            'index_entry' => [
+              'cp',
+              46
+            ]
           },
           'info' => {
             'spaces_before_argument' => {
@@ -2964,12 +2862,10 @@ $result_trees{'index_table_chapter_no_node'} = {
           'cmdname' => 'cindex',
           'extra' => {
             'element_node' => {},
-            'index_entry' => {
-              'entry_element' => {},
-              'entry_number' => 47,
-              'in_code' => 0,
-              'index_name' => 'cp'
-            }
+            'index_entry' => [
+              'cp',
+              47
+            ]
           },
           'info' => {
             'spaces_before_argument' => {
@@ -3003,12 +2899,10 @@ $result_trees{'index_table_chapter_no_node'} = {
           'cmdname' => 'cindex',
           'extra' => {
             'element_node' => {},
-            'index_entry' => {
-              'entry_element' => {},
-              'entry_number' => 48,
-              'in_code' => 0,
-              'index_name' => 'cp'
-            }
+            'index_entry' => [
+              'cp',
+              48
+            ]
           },
           'info' => {
             'spaces_before_argument' => {
@@ -3042,12 +2936,10 @@ $result_trees{'index_table_chapter_no_node'} = {
           'cmdname' => 'cindex',
           'extra' => {
             'element_node' => {},
-            'index_entry' => {
-              'entry_element' => {},
-              'entry_number' => 49,
-              'in_code' => 0,
-              'index_name' => 'cp'
-            }
+            'index_entry' => [
+              'cp',
+              49
+            ]
           },
           'info' => {
             'spaces_before_argument' => {
@@ -3081,12 +2973,10 @@ $result_trees{'index_table_chapter_no_node'} = {
           'cmdname' => 'cindex',
           'extra' => {
             'element_node' => {},
-            'index_entry' => {
-              'entry_element' => {},
-              'entry_number' => 50,
-              'in_code' => 0,
-              'index_name' => 'cp'
-            }
+            'index_entry' => [
+              'cp',
+              50
+            ]
           },
           'info' => {
             'spaces_before_argument' => {
@@ -3120,12 +3010,10 @@ $result_trees{'index_table_chapter_no_node'} = {
           'cmdname' => 'cindex',
           'extra' => {
             'element_node' => {},
-            'index_entry' => {
-              'entry_element' => {},
-              'entry_number' => 51,
-              'in_code' => 0,
-              'index_name' => 'cp'
-            }
+            'index_entry' => [
+              'cp',
+              51
+            ]
           },
           'info' => {
             'spaces_before_argument' => {
@@ -3159,12 +3047,10 @@ $result_trees{'index_table_chapter_no_node'} = {
           'cmdname' => 'cindex',
           'extra' => {
             'element_node' => {},
-            'index_entry' => {
-              'entry_element' => {},
-              'entry_number' => 52,
-              'in_code' => 0,
-              'index_name' => 'cp'
-            }
+            'index_entry' => [
+              'cp',
+              52
+            ]
           },
           'info' => {
             'spaces_before_argument' => {
@@ -3198,12 +3084,10 @@ $result_trees{'index_table_chapter_no_node'} = {
           'cmdname' => 'cindex',
           'extra' => {
             'element_node' => {},
-            'index_entry' => {
-              'entry_element' => {},
-              'entry_number' => 53,
-              'in_code' => 0,
-              'index_name' => 'cp'
-            }
+            'index_entry' => [
+              'cp',
+              53
+            ]
           },
           'info' => {
             'spaces_before_argument' => {
@@ -3237,12 +3121,10 @@ $result_trees{'index_table_chapter_no_node'} = {
           'cmdname' => 'cindex',
           'extra' => {
             'element_node' => {},
-            'index_entry' => {
-              'entry_element' => {},
-              'entry_number' => 54,
-              'in_code' => 0,
-              'index_name' => 'cp'
-            }
+            'index_entry' => [
+              'cp',
+              54
+            ]
           },
           'info' => {
             'spaces_before_argument' => {
@@ -3276,12 +3158,10 @@ $result_trees{'index_table_chapter_no_node'} = {
           'cmdname' => 'cindex',
           'extra' => {
             'element_node' => {},
-            'index_entry' => {
-              'entry_element' => {},
-              'entry_number' => 55,
-              'in_code' => 0,
-              'index_name' => 'cp'
-            }
+            'index_entry' => [
+              'cp',
+              55
+            ]
           },
           'info' => {
             'spaces_before_argument' => {
@@ -3315,12 +3195,10 @@ $result_trees{'index_table_chapter_no_node'} = {
           'cmdname' => 'cindex',
           'extra' => {
             'element_node' => {},
-            'index_entry' => {
-              'entry_element' => {},
-              'entry_number' => 56,
-              'in_code' => 0,
-              'index_name' => 'cp'
-            }
+            'index_entry' => [
+              'cp',
+              56
+            ]
           },
           'info' => {
             'spaces_before_argument' => {
@@ -3354,12 +3232,10 @@ $result_trees{'index_table_chapter_no_node'} = {
           'cmdname' => 'cindex',
           'extra' => {
             'element_node' => {},
-            'index_entry' => {
-              'entry_element' => {},
-              'entry_number' => 57,
-              'in_code' => 0,
-              'index_name' => 'cp'
-            }
+            'index_entry' => [
+              'cp',
+              57
+            ]
           },
           'info' => {
             'spaces_before_argument' => {
@@ -3393,12 +3269,10 @@ $result_trees{'index_table_chapter_no_node'} = {
           'cmdname' => 'cindex',
           'extra' => {
             'element_node' => {},
-            'index_entry' => {
-              'entry_element' => {},
-              'entry_number' => 58,
-              'in_code' => 0,
-              'index_name' => 'cp'
-            }
+            'index_entry' => [
+              'cp',
+              58
+            ]
           },
           'info' => {
             'spaces_before_argument' => {
@@ -3432,12 +3306,10 @@ $result_trees{'index_table_chapter_no_node'} = {
           'cmdname' => 'cindex',
           'extra' => {
             'element_node' => {},
-            'index_entry' => {
-              'entry_element' => {},
-              'entry_number' => 59,
-              'in_code' => 0,
-              'index_name' => 'cp'
-            }
+            'index_entry' => [
+              'cp',
+              59
+            ]
           },
           'info' => {
             'spaces_before_argument' => {
@@ -3471,12 +3343,10 @@ $result_trees{'index_table_chapter_no_node'} = {
           'cmdname' => 'cindex',
           'extra' => {
             'element_node' => {},
-            'index_entry' => {
-              'entry_element' => {},
-              'entry_number' => 60,
-              'in_code' => 0,
-              'index_name' => 'cp'
-            }
+            'index_entry' => [
+              'cp',
+              60
+            ]
           },
           'info' => {
             'spaces_before_argument' => {
@@ -3510,12 +3380,10 @@ $result_trees{'index_table_chapter_no_node'} = {
           'cmdname' => 'cindex',
           'extra' => {
             'element_node' => {},
-            'index_entry' => {
-              'entry_element' => {},
-              'entry_number' => 61,
-              'in_code' => 0,
-              'index_name' => 'cp'
-            }
+            'index_entry' => [
+              'cp',
+              61
+            ]
           },
           'info' => {
             'spaces_before_argument' => {
@@ -3549,12 +3417,10 @@ $result_trees{'index_table_chapter_no_node'} = {
           'cmdname' => 'cindex',
           'extra' => {
             'element_node' => {},
-            'index_entry' => {
-              'entry_element' => {},
-              'entry_number' => 62,
-              'in_code' => 0,
-              'index_name' => 'cp'
-            }
+            'index_entry' => [
+              'cp',
+              62
+            ]
           },
           'info' => {
             'spaces_before_argument' => {
@@ -3588,12 +3454,10 @@ $result_trees{'index_table_chapter_no_node'} = {
           'cmdname' => 'cindex',
           'extra' => {
             'element_node' => {},
-            'index_entry' => {
-              'entry_element' => {},
-              'entry_number' => 63,
-              'in_code' => 0,
-              'index_name' => 'cp'
-            }
+            'index_entry' => [
+              'cp',
+              63
+            ]
           },
           'info' => {
             'spaces_before_argument' => {
@@ -3627,12 +3491,10 @@ $result_trees{'index_table_chapter_no_node'} = {
           'cmdname' => 'cindex',
           'extra' => {
             'element_node' => {},
-            'index_entry' => {
-              'entry_element' => {},
-              'entry_number' => 64,
-              'in_code' => 0,
-              'index_name' => 'cp'
-            }
+            'index_entry' => [
+              'cp',
+              64
+            ]
           },
           'info' => {
             'spaces_before_argument' => {
@@ -3666,12 +3528,10 @@ $result_trees{'index_table_chapter_no_node'} = {
           'cmdname' => 'cindex',
           'extra' => {
             'element_node' => {},
-            'index_entry' => {
-              'entry_element' => {},
-              'entry_number' => 65,
-              'in_code' => 0,
-              'index_name' => 'cp'
-            }
+            'index_entry' => [
+              'cp',
+              65
+            ]
           },
           'info' => {
             'spaces_before_argument' => {
@@ -3705,12 +3565,10 @@ $result_trees{'index_table_chapter_no_node'} = {
           'cmdname' => 'cindex',
           'extra' => {
             'element_node' => {},
-            'index_entry' => {
-              'entry_element' => {},
-              'entry_number' => 66,
-              'in_code' => 0,
-              'index_name' => 'cp'
-            }
+            'index_entry' => [
+              'cp',
+              66
+            ]
           },
           'info' => {
             'spaces_before_argument' => {
@@ -3744,12 +3602,10 @@ $result_trees{'index_table_chapter_no_node'} = {
           'cmdname' => 'cindex',
           'extra' => {
             'element_node' => {},
-            'index_entry' => {
-              'entry_element' => {},
-              'entry_number' => 67,
-              'in_code' => 0,
-              'index_name' => 'cp'
-            }
+            'index_entry' => [
+              'cp',
+              67
+            ]
           },
           'info' => {
             'spaces_before_argument' => {
@@ -3783,12 +3639,10 @@ $result_trees{'index_table_chapter_no_node'} = {
           'cmdname' => 'cindex',
           'extra' => {
             'element_node' => {},
-            'index_entry' => {
-              'entry_element' => {},
-              'entry_number' => 68,
-              'in_code' => 0,
-              'index_name' => 'cp'
-            }
+            'index_entry' => [
+              'cp',
+              68
+            ]
           },
           'info' => {
             'spaces_before_argument' => {
@@ -3822,12 +3676,10 @@ $result_trees{'index_table_chapter_no_node'} = {
           'cmdname' => 'cindex',
           'extra' => {
             'element_node' => {},
-            'index_entry' => {
-              'entry_element' => {},
-              'entry_number' => 69,
-              'in_code' => 0,
-              'index_name' => 'cp'
-            }
+            'index_entry' => [
+              'cp',
+              69
+            ]
           },
           'info' => {
             'spaces_before_argument' => {
@@ -3861,12 +3713,10 @@ $result_trees{'index_table_chapter_no_node'} = {
           'cmdname' => 'cindex',
           'extra' => {
             'element_node' => {},
-            'index_entry' => {
-              'entry_element' => {},
-              'entry_number' => 70,
-              'in_code' => 0,
-              'index_name' => 'cp'
-            }
+            'index_entry' => [
+              'cp',
+              70
+            ]
           },
           'info' => {
             'spaces_before_argument' => {
@@ -3900,12 +3750,10 @@ $result_trees{'index_table_chapter_no_node'} = {
           'cmdname' => 'cindex',
           'extra' => {
             'element_node' => {},
-            'index_entry' => {
-              'entry_element' => {},
-              'entry_number' => 71,
-              'in_code' => 0,
-              'index_name' => 'cp'
-            }
+            'index_entry' => [
+              'cp',
+              71
+            ]
           },
           'info' => {
             'spaces_before_argument' => {
@@ -3939,12 +3787,10 @@ $result_trees{'index_table_chapter_no_node'} = {
           'cmdname' => 'cindex',
           'extra' => {
             'element_node' => {},
-            'index_entry' => {
-              'entry_element' => {},
-              'entry_number' => 72,
-              'in_code' => 0,
-              'index_name' => 'cp'
-            }
+            'index_entry' => [
+              'cp',
+              72
+            ]
           },
           'info' => {
             'spaces_before_argument' => {
@@ -3978,12 +3824,10 @@ $result_trees{'index_table_chapter_no_node'} = {
           'cmdname' => 'cindex',
           'extra' => {
             'element_node' => {},
-            'index_entry' => {
-              'entry_element' => {},
-              'entry_number' => 73,
-              'in_code' => 0,
-              'index_name' => 'cp'
-            }
+            'index_entry' => [
+              'cp',
+              73
+            ]
           },
           'info' => {
             'spaces_before_argument' => {
@@ -4017,12 +3861,10 @@ $result_trees{'index_table_chapter_no_node'} = {
           'cmdname' => 'cindex',
           'extra' => {
             'element_node' => {},
-            'index_entry' => {
-              'entry_element' => {},
-              'entry_number' => 74,
-              'in_code' => 0,
-              'index_name' => 'cp'
-            }
+            'index_entry' => [
+              'cp',
+              74
+            ]
           },
           'info' => {
             'spaces_before_argument' => {
@@ -4056,12 +3898,10 @@ $result_trees{'index_table_chapter_no_node'} = {
           'cmdname' => 'cindex',
           'extra' => {
             'element_node' => {},
-            'index_entry' => {
-              'entry_element' => {},
-              'entry_number' => 75,
-              'in_code' => 0,
-              'index_name' => 'cp'
-            }
+            'index_entry' => [
+              'cp',
+              75
+            ]
           },
           'info' => {
             'spaces_before_argument' => {
@@ -4095,12 +3935,10 @@ $result_trees{'index_table_chapter_no_node'} = {
           'cmdname' => 'cindex',
           'extra' => {
             'element_node' => {},
-            'index_entry' => {
-              'entry_element' => {},
-              'entry_number' => 76,
-              'in_code' => 0,
-              'index_name' => 'cp'
-            }
+            'index_entry' => [
+              'cp',
+              76
+            ]
           },
           'info' => {
             'spaces_before_argument' => {
@@ -4134,12 +3972,10 @@ $result_trees{'index_table_chapter_no_node'} = {
           'cmdname' => 'cindex',
           'extra' => {
             'element_node' => {},
-            'index_entry' => {
-              'entry_element' => {},
-              'entry_number' => 77,
-              'in_code' => 0,
-              'index_name' => 'cp'
-            }
+            'index_entry' => [
+              'cp',
+              77
+            ]
           },
           'info' => {
             'spaces_before_argument' => {
@@ -4173,12 +4009,10 @@ $result_trees{'index_table_chapter_no_node'} = {
           'cmdname' => 'cindex',
           'extra' => {
             'element_node' => {},
-            'index_entry' => {
-              'entry_element' => {},
-              'entry_number' => 78,
-              'in_code' => 0,
-              'index_name' => 'cp'
-            }
+            'index_entry' => [
+              'cp',
+              78
+            ]
           },
           'info' => {
             'spaces_before_argument' => {
@@ -4212,12 +4046,10 @@ $result_trees{'index_table_chapter_no_node'} = {
           'cmdname' => 'cindex',
           'extra' => {
             'element_node' => {},
-            'index_entry' => {
-              'entry_element' => {},
-              'entry_number' => 79,
-              'in_code' => 0,
-              'index_name' => 'cp'
-            }
+            'index_entry' => [
+              'cp',
+              79
+            ]
           },
           'info' => {
             'spaces_before_argument' => {
@@ -4251,12 +4083,10 @@ $result_trees{'index_table_chapter_no_node'} = {
           'cmdname' => 'cindex',
           'extra' => {
             'element_node' => {},
-            'index_entry' => {
-              'entry_element' => {},
-              'entry_number' => 80,
-              'in_code' => 0,
-              'index_name' => 'cp'
-            }
+            'index_entry' => [
+              'cp',
+              80
+            ]
           },
           'info' => {
             'spaces_before_argument' => {
@@ -4290,12 +4120,10 @@ $result_trees{'index_table_chapter_no_node'} = {
           'cmdname' => 'cindex',
           'extra' => {
             'element_node' => {},
-            'index_entry' => {
-              'entry_element' => {},
-              'entry_number' => 81,
-              'in_code' => 0,
-              'index_name' => 'cp'
-            }
+            'index_entry' => [
+              'cp',
+              81
+            ]
           },
           'info' => {
             'spaces_before_argument' => {
@@ -4329,12 +4157,10 @@ $result_trees{'index_table_chapter_no_node'} = {
           'cmdname' => 'cindex',
           'extra' => {
             'element_node' => {},
-            'index_entry' => {
-              'entry_element' => {},
-              'entry_number' => 82,
-              'in_code' => 0,
-              'index_name' => 'cp'
-            }
+            'index_entry' => [
+              'cp',
+              82
+            ]
           },
           'info' => {
             'spaces_before_argument' => {
@@ -4368,12 +4194,10 @@ $result_trees{'index_table_chapter_no_node'} = {
           'cmdname' => 'cindex',
           'extra' => {
             'element_node' => {},
-            'index_entry' => {
-              'entry_element' => {},
-              'entry_number' => 83,
-              'in_code' => 0,
-              'index_name' => 'cp'
-            }
+            'index_entry' => [
+              'cp',
+              83
+            ]
           },
           'info' => {
             'spaces_before_argument' => {
@@ -4407,12 +4231,10 @@ $result_trees{'index_table_chapter_no_node'} = {
           'cmdname' => 'cindex',
           'extra' => {
             'element_node' => {},
-            'index_entry' => {
-              'entry_element' => {},
-              'entry_number' => 84,
-              'in_code' => 0,
-              'index_name' => 'cp'
-            }
+            'index_entry' => [
+              'cp',
+              84
+            ]
           },
           'info' => {
             'spaces_before_argument' => {
@@ -4446,12 +4268,10 @@ $result_trees{'index_table_chapter_no_node'} = {
           'cmdname' => 'cindex',
           'extra' => {
             'element_node' => {},
-            'index_entry' => {
-              'entry_element' => {},
-              'entry_number' => 85,
-              'in_code' => 0,
-              'index_name' => 'cp'
-            }
+            'index_entry' => [
+              'cp',
+              85
+            ]
           },
           'info' => {
             'spaces_before_argument' => {
@@ -4485,12 +4305,10 @@ $result_trees{'index_table_chapter_no_node'} = {
           'cmdname' => 'cindex',
           'extra' => {
             'element_node' => {},
-            'index_entry' => {
-              'entry_element' => {},
-              'entry_number' => 86,
-              'in_code' => 0,
-              'index_name' => 'cp'
-            }
+            'index_entry' => [
+              'cp',
+              86
+            ]
           },
           'info' => {
             'spaces_before_argument' => {
@@ -4524,12 +4342,10 @@ $result_trees{'index_table_chapter_no_node'} = {
           'cmdname' => 'cindex',
           'extra' => {
             'element_node' => {},
-            'index_entry' => {
-              'entry_element' => {},
-              'entry_number' => 87,
-              'in_code' => 0,
-              'index_name' => 'cp'
-            }
+            'index_entry' => [
+              'cp',
+              87
+            ]
           },
           'info' => {
             'spaces_before_argument' => {
@@ -4563,12 +4379,10 @@ $result_trees{'index_table_chapter_no_node'} = {
           'cmdname' => 'cindex',
           'extra' => {
             'element_node' => {},
-            'index_entry' => {
-              'entry_element' => {},
-              'entry_number' => 88,
-              'in_code' => 0,
-              'index_name' => 'cp'
-            }
+            'index_entry' => [
+              'cp',
+              88
+            ]
           },
           'info' => {
             'spaces_before_argument' => {
@@ -4602,12 +4416,10 @@ $result_trees{'index_table_chapter_no_node'} = {
           'cmdname' => 'cindex',
           'extra' => {
             'element_node' => {},
-            'index_entry' => {
-              'entry_element' => {},
-              'entry_number' => 89,
-              'in_code' => 0,
-              'index_name' => 'cp'
-            }
+            'index_entry' => [
+              'cp',
+              89
+            ]
           },
           'info' => {
             'spaces_before_argument' => {
@@ -4641,12 +4453,10 @@ $result_trees{'index_table_chapter_no_node'} = {
           'cmdname' => 'cindex',
           'extra' => {
             'element_node' => {},
-            'index_entry' => {
-              'entry_element' => {},
-              'entry_number' => 90,
-              'in_code' => 0,
-              'index_name' => 'cp'
-            }
+            'index_entry' => [
+              'cp',
+              90
+            ]
           },
           'info' => {
             'spaces_before_argument' => {
@@ -4680,12 +4490,10 @@ $result_trees{'index_table_chapter_no_node'} = {
           'cmdname' => 'cindex',
           'extra' => {
             'element_node' => {},
-            'index_entry' => {
-              'entry_element' => {},
-              'entry_number' => 91,
-              'in_code' => 0,
-              'index_name' => 'cp'
-            }
+            'index_entry' => [
+              'cp',
+              91
+            ]
           },
           'info' => {
             'spaces_before_argument' => {
@@ -4719,12 +4527,10 @@ $result_trees{'index_table_chapter_no_node'} = {
           'cmdname' => 'cindex',
           'extra' => {
             'element_node' => {},
-            'index_entry' => {
-              'entry_element' => {},
-              'entry_number' => 92,
-              'in_code' => 0,
-              'index_name' => 'cp'
-            }
+            'index_entry' => [
+              'cp',
+              92
+            ]
           },
           'info' => {
             'spaces_before_argument' => {
@@ -4758,12 +4564,10 @@ $result_trees{'index_table_chapter_no_node'} = {
           'cmdname' => 'cindex',
           'extra' => {
             'element_node' => {},
-            'index_entry' => {
-              'entry_element' => {},
-              'entry_number' => 93,
-              'in_code' => 0,
-              'index_name' => 'cp'
-            }
+            'index_entry' => [
+              'cp',
+              93
+            ]
           },
           'info' => {
             'spaces_before_argument' => {
@@ -4797,12 +4601,10 @@ $result_trees{'index_table_chapter_no_node'} = {
           'cmdname' => 'cindex',
           'extra' => {
             'element_node' => {},
-            'index_entry' => {
-              'entry_element' => {},
-              'entry_number' => 94,
-              'in_code' => 0,
-              'index_name' => 'cp'
-            }
+            'index_entry' => [
+              'cp',
+              94
+            ]
           },
           'info' => {
             'spaces_before_argument' => {
@@ -4836,12 +4638,10 @@ $result_trees{'index_table_chapter_no_node'} = {
           'cmdname' => 'cindex',
           'extra' => {
             'element_node' => {},
-            'index_entry' => {
-              'entry_element' => {},
-              'entry_number' => 95,
-              'in_code' => 0,
-              'index_name' => 'cp'
-            }
+            'index_entry' => [
+              'cp',
+              95
+            ]
           },
           'info' => {
             'spaces_before_argument' => {
@@ -4875,12 +4675,10 @@ $result_trees{'index_table_chapter_no_node'} = {
           'cmdname' => 'cindex',
           'extra' => {
             'element_node' => {},
-            'index_entry' => {
-              'entry_element' => {},
-              'entry_number' => 96,
-              'in_code' => 0,
-              'index_name' => 'cp'
-            }
+            'index_entry' => [
+              'cp',
+              96
+            ]
           },
           'info' => {
             'spaces_before_argument' => {
@@ -4914,12 +4712,10 @@ $result_trees{'index_table_chapter_no_node'} = {
           'cmdname' => 'cindex',
           'extra' => {
             'element_node' => {},
-            'index_entry' => {
-              'entry_element' => {},
-              'entry_number' => 97,
-              'in_code' => 0,
-              'index_name' => 'cp'
-            }
+            'index_entry' => [
+              'cp',
+              97
+            ]
           },
           'info' => {
             'spaces_before_argument' => {
@@ -4953,12 +4749,10 @@ $result_trees{'index_table_chapter_no_node'} = {
           'cmdname' => 'cindex',
           'extra' => {
             'element_node' => {},
-            'index_entry' => {
-              'entry_element' => {},
-              'entry_number' => 98,
-              'in_code' => 0,
-              'index_name' => 'cp'
-            }
+            'index_entry' => [
+              'cp',
+              98
+            ]
           },
           'info' => {
             'spaces_before_argument' => {
@@ -4992,12 +4786,10 @@ $result_trees{'index_table_chapter_no_node'} = {
           'cmdname' => 'cindex',
           'extra' => {
             'element_node' => {},
-            'index_entry' => {
-              'entry_element' => {},
-              'entry_number' => 99,
-              'in_code' => 0,
-              'index_name' => 'cp'
-            }
+            'index_entry' => [
+              'cp',
+              99
+            ]
           },
           'info' => {
             'spaces_before_argument' => {
@@ -5031,12 +4823,10 @@ $result_trees{'index_table_chapter_no_node'} = {
           'cmdname' => 'cindex',
           'extra' => {
             'element_node' => {},
-            'index_entry' => {
-              'entry_element' => {},
-              'entry_number' => 100,
-              'in_code' => 0,
-              'index_name' => 'cp'
-            }
+            'index_entry' => [
+              'cp',
+              100
+            ]
           },
           'info' => {
             'spaces_before_argument' => {
@@ -5070,12 +4860,10 @@ $result_trees{'index_table_chapter_no_node'} = {
           'cmdname' => 'cindex',
           'extra' => {
             'element_node' => {},
-            'index_entry' => {
-              'entry_element' => {},
-              'entry_number' => 101,
-              'in_code' => 0,
-              'index_name' => 'cp'
-            }
+            'index_entry' => [
+              'cp',
+              101
+            ]
           },
           'info' => {
             'spaces_before_argument' => {
@@ -5109,12 +4897,10 @@ $result_trees{'index_table_chapter_no_node'} = {
           'cmdname' => 'cindex',
           'extra' => {
             'element_node' => {},
-            'index_entry' => {
-              'entry_element' => {},
-              'entry_number' => 102,
-              'in_code' => 0,
-              'index_name' => 'cp'
-            }
+            'index_entry' => [
+              'cp',
+              102
+            ]
           },
           'info' => {
             'spaces_before_argument' => {
@@ -5148,12 +4934,10 @@ $result_trees{'index_table_chapter_no_node'} = {
           'cmdname' => 'cindex',
           'extra' => {
             'element_node' => {},
-            'index_entry' => {
-              'entry_element' => {},
-              'entry_number' => 103,
-              'in_code' => 0,
-              'index_name' => 'cp'
-            }
+            'index_entry' => [
+              'cp',
+              103
+            ]
           },
           'info' => {
             'spaces_before_argument' => {
@@ -5187,12 +4971,10 @@ $result_trees{'index_table_chapter_no_node'} = {
           'cmdname' => 'cindex',
           'extra' => {
             'element_node' => {},
-            'index_entry' => {
-              'entry_element' => {},
-              'entry_number' => 104,
-              'in_code' => 0,
-              'index_name' => 'cp'
-            }
+            'index_entry' => [
+              'cp',
+              104
+            ]
           },
           'info' => {
             'spaces_before_argument' => {
@@ -5226,12 +5008,10 @@ $result_trees{'index_table_chapter_no_node'} = {
           'cmdname' => 'cindex',
           'extra' => {
             'element_node' => {},
-            'index_entry' => {
-              'entry_element' => {},
-              'entry_number' => 105,
-              'in_code' => 0,
-              'index_name' => 'cp'
-            }
+            'index_entry' => [
+              'cp',
+              105
+            ]
           },
           'info' => {
             'spaces_before_argument' => {
@@ -5265,12 +5045,10 @@ $result_trees{'index_table_chapter_no_node'} = {
           'cmdname' => 'cindex',
           'extra' => {
             'element_node' => {},
-            'index_entry' => {
-              'entry_element' => {},
-              'entry_number' => 106,
-              'in_code' => 0,
-              'index_name' => 'cp'
-            }
+            'index_entry' => [
+              'cp',
+              106
+            ]
           },
           'info' => {
             'spaces_before_argument' => {
@@ -5304,12 +5082,10 @@ $result_trees{'index_table_chapter_no_node'} = {
           'cmdname' => 'cindex',
           'extra' => {
             'element_node' => {},
-            'index_entry' => {
-              'entry_element' => {},
-              'entry_number' => 107,
-              'in_code' => 0,
-              'index_name' => 'cp'
-            }
+            'index_entry' => [
+              'cp',
+              107
+            ]
           },
           'info' => {
             'spaces_before_argument' => {
@@ -5343,12 +5119,10 @@ $result_trees{'index_table_chapter_no_node'} = {
           'cmdname' => 'cindex',
           'extra' => {
             'element_node' => {},
-            'index_entry' => {
-              'entry_element' => {},
-              'entry_number' => 108,
-              'in_code' => 0,
-              'index_name' => 'cp'
-            }
+            'index_entry' => [
+              'cp',
+              108
+            ]
           },
           'info' => {
             'spaces_before_argument' => {
@@ -5382,12 +5156,10 @@ $result_trees{'index_table_chapter_no_node'} = {
           'cmdname' => 'cindex',
           'extra' => {
             'element_node' => {},
-            'index_entry' => {
-              'entry_element' => {},
-              'entry_number' => 109,
-              'in_code' => 0,
-              'index_name' => 'cp'
-            }
+            'index_entry' => [
+              'cp',
+              109
+            ]
           },
           'info' => {
             'spaces_before_argument' => {
@@ -5421,12 +5193,10 @@ $result_trees{'index_table_chapter_no_node'} = {
           'cmdname' => 'cindex',
           'extra' => {
             'element_node' => {},
-            'index_entry' => {
-              'entry_element' => {},
-              'entry_number' => 110,
-              'in_code' => 0,
-              'index_name' => 'cp'
-            }
+            'index_entry' => [
+              'cp',
+              110
+            ]
           },
           'info' => {
             'spaces_before_argument' => {
@@ -5460,12 +5230,10 @@ $result_trees{'index_table_chapter_no_node'} = {
           'cmdname' => 'cindex',
           'extra' => {
             'element_node' => {},
-            'index_entry' => {
-              'entry_element' => {},
-              'entry_number' => 111,
-              'in_code' => 0,
-              'index_name' => 'cp'
-            }
+            'index_entry' => [
+              'cp',
+              111
+            ]
           },
           'info' => {
             'spaces_before_argument' => {
@@ -5499,12 +5267,10 @@ $result_trees{'index_table_chapter_no_node'} = {
           'cmdname' => 'cindex',
           'extra' => {
             'element_node' => {},
-            'index_entry' => {
-              'entry_element' => {},
-              'entry_number' => 112,
-              'in_code' => 0,
-              'index_name' => 'cp'
-            }
+            'index_entry' => [
+              'cp',
+              112
+            ]
           },
           'info' => {
             'spaces_before_argument' => {
@@ -5538,12 +5304,10 @@ $result_trees{'index_table_chapter_no_node'} = {
           'cmdname' => 'cindex',
           'extra' => {
             'element_node' => {},
-            'index_entry' => {
-              'entry_element' => {},
-              'entry_number' => 113,
-              'in_code' => 0,
-              'index_name' => 'cp'
-            }
+            'index_entry' => [
+              'cp',
+              113
+            ]
           },
           'info' => {
             'spaces_before_argument' => {
@@ -5577,12 +5341,10 @@ $result_trees{'index_table_chapter_no_node'} = {
           'cmdname' => 'cindex',
           'extra' => {
             'element_node' => {},
-            'index_entry' => {
-              'entry_element' => {},
-              'entry_number' => 114,
-              'in_code' => 0,
-              'index_name' => 'cp'
-            }
+            'index_entry' => [
+              'cp',
+              114
+            ]
           },
           'info' => {
             'spaces_before_argument' => {
@@ -5616,12 +5378,10 @@ $result_trees{'index_table_chapter_no_node'} = {
           'cmdname' => 'cindex',
           'extra' => {
             'element_node' => {},
-            'index_entry' => {
-              'entry_element' => {},
-              'entry_number' => 115,
-              'in_code' => 0,
-              'index_name' => 'cp'
-            }
+            'index_entry' => [
+              'cp',
+              115
+            ]
           },
           'info' => {
             'spaces_before_argument' => {
@@ -5655,12 +5415,10 @@ $result_trees{'index_table_chapter_no_node'} = {
           'cmdname' => 'cindex',
           'extra' => {
             'element_node' => {},
-            'index_entry' => {
-              'entry_element' => {},
-              'entry_number' => 116,
-              'in_code' => 0,
-              'index_name' => 'cp'
-            }
+            'index_entry' => [
+              'cp',
+              116
+            ]
           },
           'info' => {
             'spaces_before_argument' => {
@@ -5694,12 +5452,10 @@ $result_trees{'index_table_chapter_no_node'} = {
           'cmdname' => 'cindex',
           'extra' => {
             'element_node' => {},
-            'index_entry' => {
-              'entry_element' => {},
-              'entry_number' => 117,
-              'in_code' => 0,
-              'index_name' => 'cp'
-            }
+            'index_entry' => [
+              'cp',
+              117
+            ]
           },
           'info' => {
             'spaces_before_argument' => {
@@ -5733,12 +5489,10 @@ $result_trees{'index_table_chapter_no_node'} = {
           'cmdname' => 'cindex',
           'extra' => {
             'element_node' => {},
-            'index_entry' => {
-              'entry_element' => {},
-              'entry_number' => 118,
-              'in_code' => 0,
-              'index_name' => 'cp'
-            }
+            'index_entry' => [
+              'cp',
+              118
+            ]
           },
           'info' => {
             'spaces_before_argument' => {
@@ -5772,12 +5526,10 @@ $result_trees{'index_table_chapter_no_node'} = {
           'cmdname' => 'cindex',
           'extra' => {
             'element_node' => {},
-            'index_entry' => {
-              'entry_element' => {},
-              'entry_number' => 119,
-              'in_code' => 0,
-              'index_name' => 'cp'
-            }
+            'index_entry' => [
+              'cp',
+              119
+            ]
           },
           'info' => {
             'spaces_before_argument' => {
@@ -5811,12 +5563,10 @@ $result_trees{'index_table_chapter_no_node'} = {
           'cmdname' => 'cindex',
           'extra' => {
             'element_node' => {},
-            'index_entry' => {
-              'entry_element' => {},
-              'entry_number' => 120,
-              'in_code' => 0,
-              'index_name' => 'cp'
-            }
+            'index_entry' => [
+              'cp',
+              120
+            ]
           },
           'info' => {
             'spaces_before_argument' => {
@@ -5850,12 +5600,10 @@ $result_trees{'index_table_chapter_no_node'} = {
           'cmdname' => 'cindex',
           'extra' => {
             'element_node' => {},
-            'index_entry' => {
-              'entry_element' => {},
-              'entry_number' => 121,
-              'in_code' => 0,
-              'index_name' => 'cp'
-            }
+            'index_entry' => [
+              'cp',
+              121
+            ]
           },
           'info' => {
             'spaces_before_argument' => {
@@ -5889,12 +5637,10 @@ $result_trees{'index_table_chapter_no_node'} = {
           'cmdname' => 'cindex',
           'extra' => {
             'element_node' => {},
-            'index_entry' => {
-              'entry_element' => {},
-              'entry_number' => 122,
-              'in_code' => 0,
-              'index_name' => 'cp'
-            }
+            'index_entry' => [
+              'cp',
+              122
+            ]
           },
           'info' => {
             'spaces_before_argument' => {
@@ -5928,12 +5674,10 @@ $result_trees{'index_table_chapter_no_node'} = {
           'cmdname' => 'cindex',
           'extra' => {
             'element_node' => {},
-            'index_entry' => {
-              'entry_element' => {},
-              'entry_number' => 123,
-              'in_code' => 0,
-              'index_name' => 'cp'
-            }
+            'index_entry' => [
+              'cp',
+              123
+            ]
           },
           'info' => {
             'spaces_before_argument' => {
@@ -5967,12 +5711,10 @@ $result_trees{'index_table_chapter_no_node'} = {
           'cmdname' => 'cindex',
           'extra' => {
             'element_node' => {},
-            'index_entry' => {
-              'entry_element' => {},
-              'entry_number' => 124,
-              'in_code' => 0,
-              'index_name' => 'cp'
-            }
+            'index_entry' => [
+              'cp',
+              124
+            ]
           },
           'info' => {
             'spaces_before_argument' => {
@@ -6006,12 +5748,10 @@ $result_trees{'index_table_chapter_no_node'} = {
           'cmdname' => 'cindex',
           'extra' => {
             'element_node' => {},
-            'index_entry' => {
-              'entry_element' => {},
-              'entry_number' => 125,
-              'in_code' => 0,
-              'index_name' => 'cp'
-            }
+            'index_entry' => [
+              'cp',
+              125
+            ]
           },
           'info' => {
             'spaces_before_argument' => {
@@ -6045,12 +5785,10 @@ $result_trees{'index_table_chapter_no_node'} = {
           'cmdname' => 'cindex',
           'extra' => {
             'element_node' => {},
-            'index_entry' => {
-              'entry_element' => {},
-              'entry_number' => 126,
-              'in_code' => 0,
-              'index_name' => 'cp'
-            }
+            'index_entry' => [
+              'cp',
+              126
+            ]
           },
           'info' => {
             'spaces_before_argument' => {
@@ -6084,12 +5822,10 @@ $result_trees{'index_table_chapter_no_node'} = {
           'cmdname' => 'cindex',
           'extra' => {
             'element_node' => {},
-            'index_entry' => {
-              'entry_element' => {},
-              'entry_number' => 127,
-              'in_code' => 0,
-              'index_name' => 'cp'
-            }
+            'index_entry' => [
+              'cp',
+              127
+            ]
           },
           'info' => {
             'spaces_before_argument' => {
@@ -6123,12 +5859,10 @@ $result_trees{'index_table_chapter_no_node'} = {
           'cmdname' => 'cindex',
           'extra' => {
             'element_node' => {},
-            'index_entry' => {
-              'entry_element' => {},
-              'entry_number' => 128,
-              'in_code' => 0,
-              'index_name' => 'cp'
-            }
+            'index_entry' => [
+              'cp',
+              128
+            ]
           },
           'info' => {
             'spaces_before_argument' => {
@@ -6162,12 +5896,10 @@ $result_trees{'index_table_chapter_no_node'} = {
           'cmdname' => 'cindex',
           'extra' => {
             'element_node' => {},
-            'index_entry' => {
-              'entry_element' => {},
-              'entry_number' => 129,
-              'in_code' => 0,
-              'index_name' => 'cp'
-            }
+            'index_entry' => [
+              'cp',
+              129
+            ]
           },
           'info' => {
             'spaces_before_argument' => {
@@ -6201,12 +5933,10 @@ $result_trees{'index_table_chapter_no_node'} = {
           'cmdname' => 'cindex',
           'extra' => {
             'element_node' => {},
-            'index_entry' => {
-              'entry_element' => {},
-              'entry_number' => 130,
-              'in_code' => 0,
-              'index_name' => 'cp'
-            }
+            'index_entry' => [
+              'cp',
+              130
+            ]
           },
           'info' => {
             'spaces_before_argument' => {
@@ -6421,278 +6151,143 @@ 
$result_trees{'index_table_chapter_no_node'}{'contents'}[2]{'contents'}[0]{'cont
 
$result_trees{'index_table_chapter_no_node'}{'contents'}[2]{'contents'}[0]{'contents'}[1]{'contents'}[1]{'extra'}{'node_content'}[0]
 = 
$result_trees{'index_table_chapter_no_node'}{'contents'}[2]{'contents'}[0]{'contents'}[1]{'contents'}[1]{'contents'}[0];
 
$result_trees{'index_table_chapter_no_node'}{'contents'}[2]{'contents'}[0]{'contents'}[2]{'contents'}[1]{'extra'}{'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'}[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'}[4]{'extra'}{'element_node'}
 = $result_trees{'index_table_chapter_no_node'}{'contents'}[3];
-$result_trees{'index_table_chapter_no_node'}{'contents'}[4]{'contents'}[4]{'extra'}{'index_entry'}{'entry_element'}
 = $result_trees{'index_table_chapter_no_node'}{'contents'}[4]{'contents'}[4];
 
$result_trees{'index_table_chapter_no_node'}{'contents'}[4]{'contents'}[8]{'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'}[8]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'index_table_chapter_no_node'}{'contents'}[4]{'contents'}[8]{'contents'}[0]{'contents'}[0]{'contents'}[0];
 
$result_trees{'index_table_chapter_no_node'}{'contents'}[4]{'contents'}[8]{'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'}[8]{'contents'}[0]{'contents'}[0]{'contents'}[1]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'index_table_chapter_no_node'}{'contents'}[4]{'contents'}[8]{'contents'}[0]{'contents'}[0]{'contents'}[1];
 
$result_trees{'index_table_chapter_no_node'}{'contents'}[4]{'contents'}[8]{'extra'}{'command_as_argument'}
 = 
$result_trees{'index_table_chapter_no_node'}{'contents'}[4]{'contents'}[8]{'args'}[0];
 
$result_trees{'index_table_chapter_no_node'}{'contents'}[4]{'contents'}[11]{'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'}[11]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'index_table_chapter_no_node'}{'contents'}[4]{'contents'}[11]{'contents'}[0]{'contents'}[0]{'contents'}[0];
 
$result_trees{'index_table_chapter_no_node'}{'contents'}[4]{'contents'}[11]{'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'}[11]{'contents'}[0]{'contents'}[0]{'contents'}[1]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'index_table_chapter_no_node'}{'contents'}[4]{'contents'}[11]{'contents'}[0]{'contents'}[0]{'contents'}[1];
 
$result_trees{'index_table_chapter_no_node'}{'contents'}[4]{'contents'}[11]{'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'}[11]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'index_table_chapter_no_node'}{'contents'}[4]{'contents'}[11]{'contents'}[1]{'contents'}[0]{'contents'}[0];
 
$result_trees{'index_table_chapter_no_node'}{'contents'}[4]{'contents'}[11]{'extra'}{'command_as_argument'}
 = 
$result_trees{'index_table_chapter_no_node'}{'contents'}[4]{'contents'}[11]{'args'}[0];
 
$result_trees{'index_table_chapter_no_node'}{'contents'}[8]{'contents'}[0]{'contents'}[0]{'contents'}[1]{'extra'}{'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'}{'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'}{'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'}{'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'}{'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'}{'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'}{'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'}{'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'}{'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'}{'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'}{'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'}{'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'}{'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'}{'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'}{'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'}{'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'}{'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'}{'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'}{'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'}{'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'}{'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'}{'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'}{'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'}{'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'}{'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'}{'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'}{'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'}{'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'}{'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'}{'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'}{'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'}{'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'}{'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'}{'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'}{'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'}{'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'}{'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'}{'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'}{'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'}{'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'}{'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'}{'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'}{'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'}{'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'}{'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'}{'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'}{'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'}{'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'}{'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'}{'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'}{'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'}{'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'}{'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'}{'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'}{'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'}{'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'}{'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'}{'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'}{'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'}{'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'}{'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'}{'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'}{'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'}{'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'}{'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'}{'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'}{'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'}{'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'}{'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'}{'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'}{'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'}{'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'}{'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'}{'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'}{'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'}{'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'}{'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'}{'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'}{'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'}{'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'}{'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'}{'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'}{'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'}{'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'}{'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'}{'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'}{'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'}{'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'}{'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'}{'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'}{'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'}{'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'}{'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'}{'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'}{'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'}{'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'}{'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'}{'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'}{'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'}{'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'}{'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'}{'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'}{'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'}{'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'}{'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'}{'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'}{'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'}{'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'}{'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'}{'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'}{'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'}{'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'}{'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'}{'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'}{'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'}{'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'}{'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'}{'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'}{'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'}{'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'}{'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'}{'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'}{'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'}{'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'}{'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'}{'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'}{'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'}{'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'}{'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_texis{'index_table_chapter_no_node'} = '\\input texinfo @c 
-*-texinfo-*-
 
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 2d78732628..1f797757c7 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
@@ -230,12 +230,10 @@ 
$result_trees{'multiple_index_text_sortas_seeentry_seealso'} = {
           'cmdname' => 'cindex',
           'extra' => {
             'element_node' => {},
-            'index_entry' => {
-              'entry_element' => {},
-              'entry_number' => 1,
-              'in_code' => 0,
-              'index_name' => 'cp'
-            },
+            'index_entry' => [
+              'cp',
+              1
+            ],
             'seealso' => {},
             'seeentry' => {},
             'sortas' => 'A---S'
@@ -300,12 +298,10 @@ 
$result_trees{'multiple_index_text_sortas_seeentry_seealso'} = {
           'cmdname' => 'cindex',
           'extra' => {
             'element_node' => {},
-            'index_entry' => {
-              'entry_element' => {},
-              'entry_number' => 2,
-              'in_code' => 0,
-              'index_name' => 'cp'
-            },
+            'index_entry' => [
+              'cp',
+              2
+            ],
             'sortas' => 'BB'
           },
           'info' => {
@@ -368,12 +364,10 @@ 
$result_trees{'multiple_index_text_sortas_seeentry_seealso'} = {
           'cmdname' => 'cindex',
           'extra' => {
             'element_node' => {},
-            'index_entry' => {
-              'entry_element' => {},
-              'entry_number' => 3,
-              'in_code' => 0,
-              'index_name' => 'cp'
-            },
+            'index_entry' => [
+              'cp',
+              3
+            ],
             'seeentry' => {}
           },
           'info' => {
@@ -444,13 +438,10 @@ 
$result_trees{'multiple_index_text_sortas_seeentry_seealso'} = {
   'type' => 'document_root'
 };
 
$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'}{'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'}{'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];
 
 $result_texis{'multiple_index_text_sortas_seeentry_seealso'} = '@node Top
diff --git a/tp/t/results/indices/nodes_before_top.pl 
b/tp/t/results/indices/nodes_before_top.pl
index 52c48e4218..1d55cce1b2 100644
--- a/tp/t/results/indices/nodes_before_top.pl
+++ b/tp/t/results/indices/nodes_before_top.pl
@@ -137,12 +137,10 @@ $result_trees{'nodes_before_top'} = {
           'cmdname' => 'cindex',
           'extra' => {
             'element_node' => {},
-            'index_entry' => {
-              'entry_element' => {},
-              'entry_number' => 1,
-              'in_code' => 0,
-              'index_name' => 'cp'
-            }
+            'index_entry' => [
+              'cp',
+              1
+            ]
           },
           'info' => {
             'spaces_before_argument' => {
@@ -383,12 +381,10 @@ $result_trees{'nodes_before_top'} = {
           'cmdname' => 'cindex',
           'extra' => {
             'element_node' => {},
-            'index_entry' => {
-              'entry_element' => {},
-              'entry_number' => 2,
-              'in_code' => 0,
-              'index_name' => 'cp'
-            }
+            'index_entry' => [
+              'cp',
+              2
+            ]
           },
           'info' => {
             'spaces_before_argument' => {
@@ -470,12 +466,10 @@ $result_trees{'nodes_before_top'} = {
           'cmdname' => 'cindex',
           'extra' => {
             'element_node' => {},
-            'index_entry' => {
-              'entry_element' => {},
-              'entry_number' => 3,
-              'in_code' => 0,
-              'index_name' => 'cp'
-            }
+            'index_entry' => [
+              'cp',
+              3
+            ]
           },
           'info' => {
             'spaces_before_argument' => {
@@ -576,12 +570,10 @@ $result_trees{'nodes_before_top'} = {
           'cmdname' => 'cindex',
           'extra' => {
             'element_node' => {},
-            'index_entry' => {
-              'entry_element' => {},
-              'entry_number' => 4,
-              'in_code' => 0,
-              'index_name' => 'cp'
-            }
+            'index_entry' => [
+              'cp',
+              4
+            ]
           },
           'info' => {
             'spaces_before_argument' => {
@@ -933,12 +925,10 @@ $result_trees{'nodes_before_top'} = {
           'cmdname' => 'cindex',
           'extra' => {
             'element_node' => {},
-            'index_entry' => {
-              'entry_element' => {},
-              'entry_number' => 5,
-              'in_code' => 0,
-              'index_name' => 'cp'
-            }
+            'index_entry' => [
+              'cp',
+              5
+            ]
           },
           'info' => {
             'spaces_before_argument' => {
@@ -972,12 +962,10 @@ $result_trees{'nodes_before_top'} = {
           'cmdname' => 'findex',
           'extra' => {
             'element_node' => {},
-            'index_entry' => {
-              'entry_element' => {},
-              'entry_number' => 1,
-              'in_code' => 1,
-              'index_name' => 'fn'
-            }
+            'index_entry' => [
+              'fn',
+              1
+            ]
           },
           'info' => {
             'spaces_before_argument' => {
@@ -1011,12 +999,10 @@ $result_trees{'nodes_before_top'} = {
           'cmdname' => 'cindex',
           'extra' => {
             'element_node' => {},
-            'index_entry' => {
-              'entry_element' => {},
-              'entry_number' => 6,
-              'in_code' => 0,
-              'index_name' => 'cp'
-            }
+            'index_entry' => [
+              'cp',
+              6
+            ]
           },
           'info' => {
             'spaces_before_argument' => {
@@ -1526,12 +1512,10 @@ $result_trees{'nodes_before_top'} = {
           'cmdname' => 'cindex',
           'extra' => {
             'element_node' => {},
-            'index_entry' => {
-              'entry_element' => {},
-              'entry_number' => 7,
-              'in_code' => 0,
-              'index_name' => 'cp'
-            }
+            'index_entry' => [
+              'cp',
+              7
+            ]
           },
           'info' => {
             'spaces_before_argument' => {
@@ -1565,12 +1549,10 @@ $result_trees{'nodes_before_top'} = {
           'cmdname' => 'findex',
           'extra' => {
             'element_node' => {},
-            'index_entry' => {
-              'entry_element' => {},
-              'entry_number' => 2,
-              'in_code' => 1,
-              'index_name' => 'fn'
-            }
+            'index_entry' => [
+              'fn',
+              2
+            ]
           },
           'info' => {
             'spaces_before_argument' => {
@@ -1604,12 +1586,10 @@ $result_trees{'nodes_before_top'} = {
           'cmdname' => 'cindex',
           'extra' => {
             'element_node' => {},
-            'index_entry' => {
-              'entry_element' => {},
-              'entry_number' => 8,
-              'in_code' => 0,
-              'index_name' => 'cp'
-            }
+            'index_entry' => [
+              'cp',
+              8
+            ]
           },
           'info' => {
             'spaces_before_argument' => {
@@ -1723,12 +1703,10 @@ $result_trees{'nodes_before_top'} = {
           'cmdname' => 'cindex',
           'extra' => {
             'element_node' => {},
-            'index_entry' => {
-              'entry_element' => {},
-              'entry_number' => 9,
-              'in_code' => 0,
-              'index_name' => 'cp'
-            }
+            'index_entry' => [
+              'cp',
+              9
+            ]
           },
           'info' => {
             'spaces_before_argument' => {
@@ -1806,12 +1784,10 @@ $result_trees{'nodes_before_top'} = {
           'cmdname' => 'findex',
           'extra' => {
             'element_node' => {},
-            'index_entry' => {
-              'entry_element' => {},
-              'entry_number' => 3,
-              'in_code' => 1,
-              'index_name' => 'fn'
-            }
+            'index_entry' => [
+              'fn',
+              3
+            ]
           },
           'info' => {
             'spaces_before_argument' => {
@@ -1845,12 +1821,10 @@ $result_trees{'nodes_before_top'} = {
           'cmdname' => 'cindex',
           'extra' => {
             'element_node' => {},
-            'index_entry' => {
-              'entry_element' => {},
-              'entry_number' => 10,
-              'in_code' => 0,
-              'index_name' => 'cp'
-            }
+            'index_entry' => [
+              'cp',
+              10
+            ]
           },
           'info' => {
             'spaces_before_argument' => {
@@ -1940,25 +1914,18 @@ $result_trees{'nodes_before_top'} = {
 
$result_trees{'nodes_before_top'}{'contents'}[1]{'args'}[1]{'extra'}{'node_content'}[0]
 = $result_trees{'nodes_before_top'}{'contents'}[1]{'args'}[1]{'contents'}[0];
 
$result_trees{'nodes_before_top'}{'contents'}[1]{'args'}[3]{'extra'}{'manual_content'}[0]
 = $result_trees{'nodes_before_top'}{'contents'}[1]{'args'}[3]{'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]{'contents'}[1]{'extra'}{'node_content'}[0]
 = 
$result_trees{'nodes_before_top'}{'contents'}[1]{'contents'}[3]{'contents'}[0]{'contents'}[1]{'contents'}[0];
 
$result_trees{'nodes_before_top'}{'contents'}[2]{'args'}[3]{'extra'}{'node_content'}[0]
 = $result_trees{'nodes_before_top'}{'contents'}[2]{'args'}[3]{'contents'}[0];
 
$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'}{'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'}[3]{'args'}[2]{'extra'}{'node_content'}[0]
 = $result_trees{'nodes_before_top'}{'contents'}[3]{'args'}[2]{'contents'}[0];
 
$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]{'contents'}[1]{'extra'}{'node_content'}[0]
 = 
$result_trees{'nodes_before_top'}{'contents'}[3]{'contents'}[10]{'contents'}[0]{'contents'}[1]{'contents'}[0];
 
$result_trees{'nodes_before_top'}{'contents'}[4]{'args'}[2]{'extra'}{'node_content'}[0]
 = $result_trees{'nodes_before_top'}{'contents'}[4]{'args'}[2]{'contents'}[0];
 
$result_trees{'nodes_before_top'}{'contents'}[4]{'args'}[3]{'extra'}{'node_content'}[0]
 = $result_trees{'nodes_before_top'}{'contents'}[4]{'args'}[3]{'contents'}[0];
 
$result_trees{'nodes_before_top'}{'contents'}[4]{'contents'}[1]{'extra'}{'element_node'}
 = $result_trees{'nodes_before_top'}{'contents'}[4];
-$result_trees{'nodes_before_top'}{'contents'}[4]{'contents'}[1]{'extra'}{'index_entry'}{'entry_element'}
 = $result_trees{'nodes_before_top'}{'contents'}[4]{'contents'}[1];
 
$result_trees{'nodes_before_top'}{'contents'}[4]{'contents'}[2]{'extra'}{'element_node'}
 = $result_trees{'nodes_before_top'}{'contents'}[4];
-$result_trees{'nodes_before_top'}{'contents'}[4]{'contents'}[2]{'extra'}{'index_entry'}{'entry_element'}
 = $result_trees{'nodes_before_top'}{'contents'}[4]{'contents'}[2];
 
$result_trees{'nodes_before_top'}{'contents'}[4]{'contents'}[3]{'extra'}{'element_node'}
 = $result_trees{'nodes_before_top'}{'contents'}[4];
-$result_trees{'nodes_before_top'}{'contents'}[4]{'contents'}[3]{'extra'}{'index_entry'}{'entry_element'}
 = $result_trees{'nodes_before_top'}{'contents'}[4]{'contents'}[3];
 
$result_trees{'nodes_before_top'}{'contents'}[4]{'contents'}[7]{'contents'}[0]{'contents'}[1]{'extra'}{'node_content'}[0]
 = 
$result_trees{'nodes_before_top'}{'contents'}[4]{'contents'}[7]{'contents'}[0]{'contents'}[1]{'contents'}[0];
 
$result_trees{'nodes_before_top'}{'contents'}[5]{'args'}[3]{'extra'}{'node_content'}[0]
 = $result_trees{'nodes_before_top'}{'contents'}[5]{'args'}[3]{'contents'}[0];
 
$result_trees{'nodes_before_top'}{'contents'}[5]{'contents'}[0]{'contents'}[0]{'contents'}[1]{'extra'}{'node_content'}[0]
 = 
$result_trees{'nodes_before_top'}{'contents'}[5]{'contents'}[0]{'contents'}[0]{'contents'}[1]{'contents'}[0];
@@ -1966,19 +1933,13 @@ 
$result_trees{'nodes_before_top'}{'contents'}[5]{'contents'}[0]{'contents'}[1]{'
 
$result_trees{'nodes_before_top'}{'contents'}[6]{'args'}[2]{'extra'}{'node_content'}[0]
 = $result_trees{'nodes_before_top'}{'contents'}[6]{'args'}[2]{'contents'}[0];
 
$result_trees{'nodes_before_top'}{'contents'}[6]{'args'}[3]{'extra'}{'node_content'}[0]
 = $result_trees{'nodes_before_top'}{'contents'}[6]{'args'}[3]{'contents'}[0];
 
$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'}{'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'}{'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'}[7]{'args'}[1]{'extra'}{'node_content'}[0]
 = $result_trees{'nodes_before_top'}{'contents'}[7]{'args'}[1]{'contents'}[0];
 
$result_trees{'nodes_before_top'}{'contents'}[7]{'args'}[3]{'extra'}{'node_content'}[0]
 = $result_trees{'nodes_before_top'}{'contents'}[7]{'args'}[3]{'contents'}[0];
 
$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'}{'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'}{'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_texis{'nodes_before_top'} = '\\input texinfo @c -*-texinfo-*-
 
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 dec5121e15..05106beeb8 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
@@ -116,12 +116,10 @@ $result_trees{'nodes_before_top_and_sections_chapter'} = {
           'cmdname' => 'cindex',
           'extra' => {
             'element_node' => {},
-            'index_entry' => {
-              'entry_element' => {},
-              'entry_number' => 1,
-              'in_code' => 0,
-              'index_name' => 'cp'
-            }
+            'index_entry' => [
+              'cp',
+              1
+            ]
           },
           'info' => {
             'spaces_before_argument' => {
@@ -419,12 +417,10 @@ $result_trees{'nodes_before_top_and_sections_chapter'} = {
           'cmdname' => 'cindex',
           'extra' => {
             'element_node' => {},
-            'index_entry' => {
-              'entry_element' => {},
-              'entry_number' => 2,
-              'in_code' => 0,
-              'index_name' => 'cp'
-            }
+            'index_entry' => [
+              'cp',
+              2
+            ]
           },
           'info' => {
             'spaces_before_argument' => {
@@ -515,12 +511,10 @@ $result_trees{'nodes_before_top_and_sections_chapter'} = {
           'cmdname' => 'cindex',
           'extra' => {
             'element_node' => {},
-            'index_entry' => {
-              'entry_element' => {},
-              'entry_number' => 3,
-              'in_code' => 0,
-              'index_name' => 'cp'
-            }
+            'index_entry' => [
+              'cp',
+              3
+            ]
           },
           'info' => {
             'spaces_before_argument' => {
@@ -621,12 +615,10 @@ $result_trees{'nodes_before_top_and_sections_chapter'} = {
           'cmdname' => 'cindex',
           'extra' => {
             'element_node' => {},
-            'index_entry' => {
-              'entry_element' => {},
-              'entry_number' => 4,
-              'in_code' => 0,
-              'index_name' => 'cp'
-            }
+            'index_entry' => [
+              'cp',
+              4
+            ]
           },
           'info' => {
             'spaces_before_argument' => {
@@ -835,12 +827,10 @@ $result_trees{'nodes_before_top_and_sections_chapter'} = {
           'cmdname' => 'cindex',
           'extra' => {
             'element_node' => {},
-            'index_entry' => {
-              'entry_element' => {},
-              'entry_number' => 5,
-              'in_code' => 0,
-              'index_name' => 'cp'
-            }
+            'index_entry' => [
+              'cp',
+              5
+            ]
           },
           'info' => {
             'spaces_before_argument' => {
@@ -1164,12 +1154,10 @@ $result_trees{'nodes_before_top_and_sections_chapter'} 
= {
           'cmdname' => 'cindex',
           'extra' => {
             'element_node' => {},
-            'index_entry' => {
-              'entry_element' => {},
-              'entry_number' => 6,
-              'in_code' => 0,
-              'index_name' => 'cp'
-            }
+            'index_entry' => [
+              'cp',
+              6
+            ]
           },
           'info' => {
             'spaces_before_argument' => {
@@ -1203,12 +1191,10 @@ $result_trees{'nodes_before_top_and_sections_chapter'} 
= {
           'cmdname' => 'findex',
           'extra' => {
             'element_node' => {},
-            'index_entry' => {
-              'entry_element' => {},
-              'entry_number' => 1,
-              'in_code' => 1,
-              'index_name' => 'fn'
-            }
+            'index_entry' => [
+              'fn',
+              1
+            ]
           },
           'info' => {
             'spaces_before_argument' => {
@@ -1242,12 +1228,10 @@ $result_trees{'nodes_before_top_and_sections_chapter'} 
= {
           'cmdname' => 'cindex',
           'extra' => {
             'element_node' => {},
-            'index_entry' => {
-              'entry_element' => {},
-              'entry_number' => 7,
-              'in_code' => 0,
-              'index_name' => 'cp'
-            }
+            'index_entry' => [
+              'cp',
+              7
+            ]
           },
           'info' => {
             'spaces_before_argument' => {
@@ -1757,12 +1741,10 @@ $result_trees{'nodes_before_top_and_sections_chapter'} 
= {
           'cmdname' => 'cindex',
           'extra' => {
             'element_node' => {},
-            'index_entry' => {
-              'entry_element' => {},
-              'entry_number' => 8,
-              'in_code' => 0,
-              'index_name' => 'cp'
-            }
+            'index_entry' => [
+              'cp',
+              8
+            ]
           },
           'info' => {
             'spaces_before_argument' => {
@@ -1796,12 +1778,10 @@ $result_trees{'nodes_before_top_and_sections_chapter'} 
= {
           'cmdname' => 'findex',
           'extra' => {
             'element_node' => {},
-            'index_entry' => {
-              'entry_element' => {},
-              'entry_number' => 2,
-              'in_code' => 1,
-              'index_name' => 'fn'
-            }
+            'index_entry' => [
+              'fn',
+              2
+            ]
           },
           'info' => {
             'spaces_before_argument' => {
@@ -1835,12 +1815,10 @@ $result_trees{'nodes_before_top_and_sections_chapter'} 
= {
           'cmdname' => 'cindex',
           'extra' => {
             'element_node' => {},
-            'index_entry' => {
-              'entry_element' => {},
-              'entry_number' => 9,
-              'in_code' => 0,
-              'index_name' => 'cp'
-            }
+            'index_entry' => [
+              'cp',
+              9
+            ]
           },
           'info' => {
             'spaces_before_argument' => {
@@ -1954,12 +1932,10 @@ $result_trees{'nodes_before_top_and_sections_chapter'} 
= {
           'cmdname' => 'cindex',
           'extra' => {
             'element_node' => {},
-            'index_entry' => {
-              'entry_element' => {},
-              'entry_number' => 10,
-              'in_code' => 0,
-              'index_name' => 'cp'
-            }
+            'index_entry' => [
+              'cp',
+              10
+            ]
           },
           'info' => {
             'spaces_before_argument' => {
@@ -2037,12 +2013,10 @@ $result_trees{'nodes_before_top_and_sections_chapter'} 
= {
           'cmdname' => 'findex',
           'extra' => {
             'element_node' => {},
-            'index_entry' => {
-              'entry_element' => {},
-              'entry_number' => 3,
-              'in_code' => 1,
-              'index_name' => 'fn'
-            }
+            'index_entry' => [
+              'fn',
+              3
+            ]
           },
           'info' => {
             'spaces_before_argument' => {
@@ -2076,12 +2050,10 @@ $result_trees{'nodes_before_top_and_sections_chapter'} 
= {
           'cmdname' => 'cindex',
           'extra' => {
             'element_node' => {},
-            'index_entry' => {
-              'entry_element' => {},
-              'entry_number' => 11,
-              'in_code' => 0,
-              'index_name' => 'cp'
-            }
+            'index_entry' => [
+              'cp',
+              11
+            ]
           },
           'info' => {
             'spaces_before_argument' => {
@@ -2375,12 +2347,10 @@ $result_trees{'nodes_before_top_and_sections_chapter'} 
= {
           'cmdname' => 'cindex',
           'extra' => {
             'element_node' => {},
-            'index_entry' => {
-              'entry_element' => {},
-              'entry_number' => 12,
-              'in_code' => 0,
-              'index_name' => 'cp'
-            }
+            'index_entry' => [
+              'cp',
+              12
+            ]
           },
           'info' => {
             'spaces_before_argument' => {
@@ -2430,29 +2400,21 @@ $result_trees{'nodes_before_top_and_sections_chapter'} 
= {
 
$result_trees{'nodes_before_top_and_sections_chapter'}{'contents'}[1]{'args'}[1]{'extra'}{'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]{'args'}[3]{'extra'}{'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'}[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]{'contents'}[1]{'extra'}{'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'}[2]{'args'}[3]{'extra'}{'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'}[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'}{'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'}[3]{'args'}[2]{'extra'}{'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'}[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'}[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]{'contents'}[1]{'extra'}{'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]{'contents'}[1]{'extra'}{'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]{'contents'}[1]{'extra'}{'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]{'args'}[2]{'extra'}{'node_content'}[0]
 = 
$result_trees{'nodes_before_top_and_sections_chapter'}{'contents'}[5]{'args'}[2]{'contents'}[0];
 
$result_trees{'nodes_before_top_and_sections_chapter'}{'contents'}[5]{'args'}[3]{'extra'}{'node_content'}[0]
 = 
$result_trees{'nodes_before_top_and_sections_chapter'}{'contents'}[5]{'args'}[3]{'contents'}[0];
 
$result_trees{'nodes_before_top_and_sections_chapter'}{'contents'}[5]{'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'}[1]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'nodes_before_top_and_sections_chapter'}{'contents'}[5]{'contents'}[1];
 
$result_trees{'nodes_before_top_and_sections_chapter'}{'contents'}[5]{'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'}[2]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'nodes_before_top_and_sections_chapter'}{'contents'}[5]{'contents'}[2];
 
$result_trees{'nodes_before_top_and_sections_chapter'}{'contents'}[5]{'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'}[3]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'nodes_before_top_and_sections_chapter'}{'contents'}[5]{'contents'}[3];
 
$result_trees{'nodes_before_top_and_sections_chapter'}{'contents'}[5]{'contents'}[7]{'contents'}[0]{'contents'}[1]{'extra'}{'node_content'}[0]
 = 
$result_trees{'nodes_before_top_and_sections_chapter'}{'contents'}[5]{'contents'}[7]{'contents'}[0]{'contents'}[1]{'contents'}[0];
 
$result_trees{'nodes_before_top_and_sections_chapter'}{'contents'}[6]{'args'}[3]{'extra'}{'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'}[6]{'contents'}[0]{'contents'}[0]{'contents'}[1]{'extra'}{'node_content'}[0]
 = 
$result_trees{'nodes_before_top_and_sections_chapter'}{'contents'}[6]{'contents'}[0]{'contents'}[0]{'contents'}[1]{'contents'}[0];
@@ -2460,25 +2422,18 @@ 
$result_trees{'nodes_before_top_and_sections_chapter'}{'contents'}[6]{'contents'
 
$result_trees{'nodes_before_top_and_sections_chapter'}{'contents'}[7]{'args'}[2]{'extra'}{'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]{'args'}[3]{'extra'}{'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'}[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'}{'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'}{'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'}[8]{'args'}[1]{'extra'}{'node_content'}[0]
 = 
$result_trees{'nodes_before_top_and_sections_chapter'}{'contents'}[8]{'args'}[1]{'contents'}[0];
 
$result_trees{'nodes_before_top_and_sections_chapter'}{'contents'}[8]{'args'}[3]{'extra'}{'node_content'}[0]
 = 
$result_trees{'nodes_before_top_and_sections_chapter'}{'contents'}[8]{'args'}[3]{'contents'}[0];
 
$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'}{'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'}{'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'}[9]{'args'}[1]{'extra'}{'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]{'args'}[3]{'extra'}{'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]{'args'}[2]{'extra'}{'node_content'}[0]
 = 
$result_trees{'nodes_before_top_and_sections_chapter'}{'contents'}[11]{'args'}[2]{'contents'}[0];
 
$result_trees{'nodes_before_top_and_sections_chapter'}{'contents'}[11]{'args'}[3]{'extra'}{'node_content'}[0]
 = 
$result_trees{'nodes_before_top_and_sections_chapter'}{'contents'}[11]{'args'}[3]{'contents'}[0];
 
$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_texis{'nodes_before_top_and_sections_chapter'} = '\\input texinfo @c 
-*-texinfo-*-
 
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 6150a29685..afb9b5ac94 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
@@ -116,12 +116,10 @@ 
$result_trees{'nodes_before_top_and_sections_chapter_no_node'} = {
           'cmdname' => 'cindex',
           'extra' => {
             'element_node' => {},
-            'index_entry' => {
-              'entry_element' => {},
-              'entry_number' => 1,
-              'in_code' => 0,
-              'index_name' => 'cp'
-            }
+            'index_entry' => [
+              'cp',
+              1
+            ]
           },
           'info' => {
             'spaces_before_argument' => {
@@ -419,12 +417,10 @@ 
$result_trees{'nodes_before_top_and_sections_chapter_no_node'} = {
           'cmdname' => 'cindex',
           'extra' => {
             'element_node' => {},
-            'index_entry' => {
-              'entry_element' => {},
-              'entry_number' => 2,
-              'in_code' => 0,
-              'index_name' => 'cp'
-            }
+            'index_entry' => [
+              'cp',
+              2
+            ]
           },
           'info' => {
             'spaces_before_argument' => {
@@ -515,12 +511,10 @@ 
$result_trees{'nodes_before_top_and_sections_chapter_no_node'} = {
           'cmdname' => 'cindex',
           'extra' => {
             'element_node' => {},
-            'index_entry' => {
-              'entry_element' => {},
-              'entry_number' => 3,
-              'in_code' => 0,
-              'index_name' => 'cp'
-            }
+            'index_entry' => [
+              'cp',
+              3
+            ]
           },
           'info' => {
             'spaces_before_argument' => {
@@ -621,12 +615,10 @@ 
$result_trees{'nodes_before_top_and_sections_chapter_no_node'} = {
           'cmdname' => 'cindex',
           'extra' => {
             'element_node' => {},
-            'index_entry' => {
-              'entry_element' => {},
-              'entry_number' => 4,
-              'in_code' => 0,
-              'index_name' => 'cp'
-            }
+            'index_entry' => [
+              'cp',
+              4
+            ]
           },
           'info' => {
             'spaces_before_argument' => {
@@ -835,12 +827,10 @@ 
$result_trees{'nodes_before_top_and_sections_chapter_no_node'} = {
           'cmdname' => 'cindex',
           'extra' => {
             'element_node' => {},
-            'index_entry' => {
-              'entry_element' => {},
-              'entry_number' => 5,
-              'in_code' => 0,
-              'index_name' => 'cp'
-            }
+            'index_entry' => [
+              'cp',
+              5
+            ]
           },
           'info' => {
             'spaces_before_argument' => {
@@ -1164,12 +1154,10 @@ 
$result_trees{'nodes_before_top_and_sections_chapter_no_node'} = {
           'cmdname' => 'cindex',
           'extra' => {
             'element_node' => {},
-            'index_entry' => {
-              'entry_element' => {},
-              'entry_number' => 6,
-              'in_code' => 0,
-              'index_name' => 'cp'
-            }
+            'index_entry' => [
+              'cp',
+              6
+            ]
           },
           'info' => {
             'spaces_before_argument' => {
@@ -1203,12 +1191,10 @@ 
$result_trees{'nodes_before_top_and_sections_chapter_no_node'} = {
           'cmdname' => 'findex',
           'extra' => {
             'element_node' => {},
-            'index_entry' => {
-              'entry_element' => {},
-              'entry_number' => 1,
-              'in_code' => 1,
-              'index_name' => 'fn'
-            }
+            'index_entry' => [
+              'fn',
+              1
+            ]
           },
           'info' => {
             'spaces_before_argument' => {
@@ -1242,12 +1228,10 @@ 
$result_trees{'nodes_before_top_and_sections_chapter_no_node'} = {
           'cmdname' => 'cindex',
           'extra' => {
             'element_node' => {},
-            'index_entry' => {
-              'entry_element' => {},
-              'entry_number' => 7,
-              'in_code' => 0,
-              'index_name' => 'cp'
-            }
+            'index_entry' => [
+              'cp',
+              7
+            ]
           },
           'info' => {
             'spaces_before_argument' => {
@@ -1757,12 +1741,10 @@ 
$result_trees{'nodes_before_top_and_sections_chapter_no_node'} = {
           'cmdname' => 'cindex',
           'extra' => {
             'element_node' => {},
-            'index_entry' => {
-              'entry_element' => {},
-              'entry_number' => 8,
-              'in_code' => 0,
-              'index_name' => 'cp'
-            }
+            'index_entry' => [
+              'cp',
+              8
+            ]
           },
           'info' => {
             'spaces_before_argument' => {
@@ -1796,12 +1778,10 @@ 
$result_trees{'nodes_before_top_and_sections_chapter_no_node'} = {
           'cmdname' => 'findex',
           'extra' => {
             'element_node' => {},
-            'index_entry' => {
-              'entry_element' => {},
-              'entry_number' => 2,
-              'in_code' => 1,
-              'index_name' => 'fn'
-            }
+            'index_entry' => [
+              'fn',
+              2
+            ]
           },
           'info' => {
             'spaces_before_argument' => {
@@ -1835,12 +1815,10 @@ 
$result_trees{'nodes_before_top_and_sections_chapter_no_node'} = {
           'cmdname' => 'cindex',
           'extra' => {
             'element_node' => {},
-            'index_entry' => {
-              'entry_element' => {},
-              'entry_number' => 9,
-              'in_code' => 0,
-              'index_name' => 'cp'
-            }
+            'index_entry' => [
+              'cp',
+              9
+            ]
           },
           'info' => {
             'spaces_before_argument' => {
@@ -1954,12 +1932,10 @@ 
$result_trees{'nodes_before_top_and_sections_chapter_no_node'} = {
           'cmdname' => 'cindex',
           'extra' => {
             'element_node' => {},
-            'index_entry' => {
-              'entry_element' => {},
-              'entry_number' => 10,
-              'in_code' => 0,
-              'index_name' => 'cp'
-            }
+            'index_entry' => [
+              'cp',
+              10
+            ]
           },
           'info' => {
             'spaces_before_argument' => {
@@ -2037,12 +2013,10 @@ 
$result_trees{'nodes_before_top_and_sections_chapter_no_node'} = {
           'cmdname' => 'findex',
           'extra' => {
             'element_node' => {},
-            'index_entry' => {
-              'entry_element' => {},
-              'entry_number' => 3,
-              'in_code' => 1,
-              'index_name' => 'fn'
-            }
+            'index_entry' => [
+              'fn',
+              3
+            ]
           },
           'info' => {
             'spaces_before_argument' => {
@@ -2076,12 +2050,10 @@ 
$result_trees{'nodes_before_top_and_sections_chapter_no_node'} = {
           'cmdname' => 'cindex',
           'extra' => {
             'element_node' => {},
-            'index_entry' => {
-              'entry_element' => {},
-              'entry_number' => 11,
-              'in_code' => 0,
-              'index_name' => 'cp'
-            }
+            'index_entry' => [
+              'cp',
+              11
+            ]
           },
           'info' => {
             'spaces_before_argument' => {
@@ -2375,12 +2347,10 @@ 
$result_trees{'nodes_before_top_and_sections_chapter_no_node'} = {
           'cmdname' => 'cindex',
           'extra' => {
             'element_node' => {},
-            'index_entry' => {
-              'entry_element' => {},
-              'entry_number' => 12,
-              'in_code' => 0,
-              'index_name' => 'cp'
-            }
+            'index_entry' => [
+              'cp',
+              12
+            ]
           },
           'info' => {
             'spaces_before_argument' => {
@@ -2430,29 +2400,21 @@ 
$result_trees{'nodes_before_top_and_sections_chapter_no_node'} = {
 
$result_trees{'nodes_before_top_and_sections_chapter_no_node'}{'contents'}[1]{'args'}[1]{'extra'}{'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]{'args'}[3]{'extra'}{'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'}[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]{'contents'}[1]{'extra'}{'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'}[2]{'args'}[3]{'extra'}{'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'}[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'}{'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'}[3]{'args'}[2]{'extra'}{'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'}[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'}[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]{'contents'}[1]{'extra'}{'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]{'contents'}[1]{'extra'}{'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]{'contents'}[1]{'extra'}{'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]{'args'}[2]{'extra'}{'node_content'}[0]
 = 
$result_trees{'nodes_before_top_and_sections_chapter_no_node'}{'contents'}[5]{'args'}[2]{'contents'}[0];
 
$result_trees{'nodes_before_top_and_sections_chapter_no_node'}{'contents'}[5]{'args'}[3]{'extra'}{'node_content'}[0]
 = 
$result_trees{'nodes_before_top_and_sections_chapter_no_node'}{'contents'}[5]{'args'}[3]{'contents'}[0];
 
$result_trees{'nodes_before_top_and_sections_chapter_no_node'}{'contents'}[5]{'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'}[1]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'nodes_before_top_and_sections_chapter_no_node'}{'contents'}[5]{'contents'}[1];
 
$result_trees{'nodes_before_top_and_sections_chapter_no_node'}{'contents'}[5]{'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'}[2]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'nodes_before_top_and_sections_chapter_no_node'}{'contents'}[5]{'contents'}[2];
 
$result_trees{'nodes_before_top_and_sections_chapter_no_node'}{'contents'}[5]{'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'}[3]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'nodes_before_top_and_sections_chapter_no_node'}{'contents'}[5]{'contents'}[3];
 
$result_trees{'nodes_before_top_and_sections_chapter_no_node'}{'contents'}[5]{'contents'}[7]{'contents'}[0]{'contents'}[1]{'extra'}{'node_content'}[0]
 = 
$result_trees{'nodes_before_top_and_sections_chapter_no_node'}{'contents'}[5]{'contents'}[7]{'contents'}[0]{'contents'}[1]{'contents'}[0];
 
$result_trees{'nodes_before_top_and_sections_chapter_no_node'}{'contents'}[6]{'args'}[3]{'extra'}{'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'}[6]{'contents'}[0]{'contents'}[0]{'contents'}[1]{'extra'}{'node_content'}[0]
 = 
$result_trees{'nodes_before_top_and_sections_chapter_no_node'}{'contents'}[6]{'contents'}[0]{'contents'}[0]{'contents'}[1]{'contents'}[0];
@@ -2460,25 +2422,18 @@ 
$result_trees{'nodes_before_top_and_sections_chapter_no_node'}{'contents'}[6]{'c
 
$result_trees{'nodes_before_top_and_sections_chapter_no_node'}{'contents'}[7]{'args'}[2]{'extra'}{'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]{'args'}[3]{'extra'}{'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'}[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'}{'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'}{'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'}[8]{'args'}[1]{'extra'}{'node_content'}[0]
 = 
$result_trees{'nodes_before_top_and_sections_chapter_no_node'}{'contents'}[8]{'args'}[1]{'contents'}[0];
 
$result_trees{'nodes_before_top_and_sections_chapter_no_node'}{'contents'}[8]{'args'}[3]{'extra'}{'node_content'}[0]
 = 
$result_trees{'nodes_before_top_and_sections_chapter_no_node'}{'contents'}[8]{'args'}[3]{'contents'}[0];
 
$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'}{'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'}{'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'}[9]{'args'}[1]{'extra'}{'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]{'args'}[3]{'extra'}{'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]{'args'}[2]{'extra'}{'node_content'}[0]
 = 
$result_trees{'nodes_before_top_and_sections_chapter_no_node'}{'contents'}[11]{'args'}[2]{'contents'}[0];
 
$result_trees{'nodes_before_top_and_sections_chapter_no_node'}{'contents'}[11]{'args'}[3]{'extra'}{'node_content'}[0]
 = 
$result_trees{'nodes_before_top_and_sections_chapter_no_node'}{'contents'}[11]{'args'}[3]{'contents'}[0];
 
$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_texis{'nodes_before_top_and_sections_chapter_no_node'} = '\\input 
texinfo @c -*-texinfo-*-
 
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 523c63ee39..6e94a4d2e9 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
@@ -116,12 +116,10 @@ 
$result_trees{'nodes_before_top_and_sections_unsplit_no_nodes'} = {
           'cmdname' => 'cindex',
           'extra' => {
             'element_node' => {},
-            'index_entry' => {
-              'entry_element' => {},
-              'entry_number' => 1,
-              'in_code' => 0,
-              'index_name' => 'cp'
-            }
+            'index_entry' => [
+              'cp',
+              1
+            ]
           },
           'info' => {
             'spaces_before_argument' => {
@@ -419,12 +417,10 @@ 
$result_trees{'nodes_before_top_and_sections_unsplit_no_nodes'} = {
           'cmdname' => 'cindex',
           'extra' => {
             'element_node' => {},
-            'index_entry' => {
-              'entry_element' => {},
-              'entry_number' => 2,
-              'in_code' => 0,
-              'index_name' => 'cp'
-            }
+            'index_entry' => [
+              'cp',
+              2
+            ]
           },
           'info' => {
             'spaces_before_argument' => {
@@ -515,12 +511,10 @@ 
$result_trees{'nodes_before_top_and_sections_unsplit_no_nodes'} = {
           'cmdname' => 'cindex',
           'extra' => {
             'element_node' => {},
-            'index_entry' => {
-              'entry_element' => {},
-              'entry_number' => 3,
-              'in_code' => 0,
-              'index_name' => 'cp'
-            }
+            'index_entry' => [
+              'cp',
+              3
+            ]
           },
           'info' => {
             'spaces_before_argument' => {
@@ -621,12 +615,10 @@ 
$result_trees{'nodes_before_top_and_sections_unsplit_no_nodes'} = {
           'cmdname' => 'cindex',
           'extra' => {
             'element_node' => {},
-            'index_entry' => {
-              'entry_element' => {},
-              'entry_number' => 4,
-              'in_code' => 0,
-              'index_name' => 'cp'
-            }
+            'index_entry' => [
+              'cp',
+              4
+            ]
           },
           'info' => {
             'spaces_before_argument' => {
@@ -835,12 +827,10 @@ 
$result_trees{'nodes_before_top_and_sections_unsplit_no_nodes'} = {
           'cmdname' => 'cindex',
           'extra' => {
             'element_node' => {},
-            'index_entry' => {
-              'entry_element' => {},
-              'entry_number' => 5,
-              'in_code' => 0,
-              'index_name' => 'cp'
-            }
+            'index_entry' => [
+              'cp',
+              5
+            ]
           },
           'info' => {
             'spaces_before_argument' => {
@@ -1164,12 +1154,10 @@ 
$result_trees{'nodes_before_top_and_sections_unsplit_no_nodes'} = {
           'cmdname' => 'cindex',
           'extra' => {
             'element_node' => {},
-            'index_entry' => {
-              'entry_element' => {},
-              'entry_number' => 6,
-              'in_code' => 0,
-              'index_name' => 'cp'
-            }
+            'index_entry' => [
+              'cp',
+              6
+            ]
           },
           'info' => {
             'spaces_before_argument' => {
@@ -1203,12 +1191,10 @@ 
$result_trees{'nodes_before_top_and_sections_unsplit_no_nodes'} = {
           'cmdname' => 'findex',
           'extra' => {
             'element_node' => {},
-            'index_entry' => {
-              'entry_element' => {},
-              'entry_number' => 1,
-              'in_code' => 1,
-              'index_name' => 'fn'
-            }
+            'index_entry' => [
+              'fn',
+              1
+            ]
           },
           'info' => {
             'spaces_before_argument' => {
@@ -1242,12 +1228,10 @@ 
$result_trees{'nodes_before_top_and_sections_unsplit_no_nodes'} = {
           'cmdname' => 'cindex',
           'extra' => {
             'element_node' => {},
-            'index_entry' => {
-              'entry_element' => {},
-              'entry_number' => 7,
-              'in_code' => 0,
-              'index_name' => 'cp'
-            }
+            'index_entry' => [
+              'cp',
+              7
+            ]
           },
           'info' => {
             'spaces_before_argument' => {
@@ -1757,12 +1741,10 @@ 
$result_trees{'nodes_before_top_and_sections_unsplit_no_nodes'} = {
           'cmdname' => 'cindex',
           'extra' => {
             'element_node' => {},
-            'index_entry' => {
-              'entry_element' => {},
-              'entry_number' => 8,
-              'in_code' => 0,
-              'index_name' => 'cp'
-            }
+            'index_entry' => [
+              'cp',
+              8
+            ]
           },
           'info' => {
             'spaces_before_argument' => {
@@ -1796,12 +1778,10 @@ 
$result_trees{'nodes_before_top_and_sections_unsplit_no_nodes'} = {
           'cmdname' => 'findex',
           'extra' => {
             'element_node' => {},
-            'index_entry' => {
-              'entry_element' => {},
-              'entry_number' => 2,
-              'in_code' => 1,
-              'index_name' => 'fn'
-            }
+            'index_entry' => [
+              'fn',
+              2
+            ]
           },
           'info' => {
             'spaces_before_argument' => {
@@ -1835,12 +1815,10 @@ 
$result_trees{'nodes_before_top_and_sections_unsplit_no_nodes'} = {
           'cmdname' => 'cindex',
           'extra' => {
             'element_node' => {},
-            'index_entry' => {
-              'entry_element' => {},
-              'entry_number' => 9,
-              'in_code' => 0,
-              'index_name' => 'cp'
-            }
+            'index_entry' => [
+              'cp',
+              9
+            ]
           },
           'info' => {
             'spaces_before_argument' => {
@@ -1954,12 +1932,10 @@ 
$result_trees{'nodes_before_top_and_sections_unsplit_no_nodes'} = {
           'cmdname' => 'cindex',
           'extra' => {
             'element_node' => {},
-            'index_entry' => {
-              'entry_element' => {},
-              'entry_number' => 10,
-              'in_code' => 0,
-              'index_name' => 'cp'
-            }
+            'index_entry' => [
+              'cp',
+              10
+            ]
           },
           'info' => {
             'spaces_before_argument' => {
@@ -2037,12 +2013,10 @@ 
$result_trees{'nodes_before_top_and_sections_unsplit_no_nodes'} = {
           'cmdname' => 'findex',
           'extra' => {
             'element_node' => {},
-            'index_entry' => {
-              'entry_element' => {},
-              'entry_number' => 3,
-              'in_code' => 1,
-              'index_name' => 'fn'
-            }
+            'index_entry' => [
+              'fn',
+              3
+            ]
           },
           'info' => {
             'spaces_before_argument' => {
@@ -2076,12 +2050,10 @@ 
$result_trees{'nodes_before_top_and_sections_unsplit_no_nodes'} = {
           'cmdname' => 'cindex',
           'extra' => {
             'element_node' => {},
-            'index_entry' => {
-              'entry_element' => {},
-              'entry_number' => 11,
-              'in_code' => 0,
-              'index_name' => 'cp'
-            }
+            'index_entry' => [
+              'cp',
+              11
+            ]
           },
           'info' => {
             'spaces_before_argument' => {
@@ -2375,12 +2347,10 @@ 
$result_trees{'nodes_before_top_and_sections_unsplit_no_nodes'} = {
           'cmdname' => 'cindex',
           'extra' => {
             'element_node' => {},
-            'index_entry' => {
-              'entry_element' => {},
-              'entry_number' => 12,
-              'in_code' => 0,
-              'index_name' => 'cp'
-            }
+            'index_entry' => [
+              'cp',
+              12
+            ]
           },
           'info' => {
             'spaces_before_argument' => {
@@ -2430,29 +2400,21 @@ 
$result_trees{'nodes_before_top_and_sections_unsplit_no_nodes'} = {
 
$result_trees{'nodes_before_top_and_sections_unsplit_no_nodes'}{'contents'}[1]{'args'}[1]{'extra'}{'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]{'args'}[3]{'extra'}{'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'}[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]{'contents'}[1]{'extra'}{'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'}[2]{'args'}[3]{'extra'}{'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'}[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'}{'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'}[3]{'args'}[2]{'extra'}{'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'}[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'}[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]{'contents'}[1]{'extra'}{'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]{'contents'}[1]{'extra'}{'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]{'contents'}[1]{'extra'}{'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]{'args'}[2]{'extra'}{'node_content'}[0]
 = 
$result_trees{'nodes_before_top_and_sections_unsplit_no_nodes'}{'contents'}[5]{'args'}[2]{'contents'}[0];
 
$result_trees{'nodes_before_top_and_sections_unsplit_no_nodes'}{'contents'}[5]{'args'}[3]{'extra'}{'node_content'}[0]
 = 
$result_trees{'nodes_before_top_and_sections_unsplit_no_nodes'}{'contents'}[5]{'args'}[3]{'contents'}[0];
 
$result_trees{'nodes_before_top_and_sections_unsplit_no_nodes'}{'contents'}[5]{'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'}[1]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'nodes_before_top_and_sections_unsplit_no_nodes'}{'contents'}[5]{'contents'}[1];
 
$result_trees{'nodes_before_top_and_sections_unsplit_no_nodes'}{'contents'}[5]{'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'}[2]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'nodes_before_top_and_sections_unsplit_no_nodes'}{'contents'}[5]{'contents'}[2];
 
$result_trees{'nodes_before_top_and_sections_unsplit_no_nodes'}{'contents'}[5]{'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'}[3]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'nodes_before_top_and_sections_unsplit_no_nodes'}{'contents'}[5]{'contents'}[3];
 
$result_trees{'nodes_before_top_and_sections_unsplit_no_nodes'}{'contents'}[5]{'contents'}[7]{'contents'}[0]{'contents'}[1]{'extra'}{'node_content'}[0]
 = 
$result_trees{'nodes_before_top_and_sections_unsplit_no_nodes'}{'contents'}[5]{'contents'}[7]{'contents'}[0]{'contents'}[1]{'contents'}[0];
 
$result_trees{'nodes_before_top_and_sections_unsplit_no_nodes'}{'contents'}[6]{'args'}[3]{'extra'}{'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'}[6]{'contents'}[0]{'contents'}[0]{'contents'}[1]{'extra'}{'node_content'}[0]
 = 
$result_trees{'nodes_before_top_and_sections_unsplit_no_nodes'}{'contents'}[6]{'contents'}[0]{'contents'}[0]{'contents'}[1]{'contents'}[0];
@@ -2460,25 +2422,18 @@ 
$result_trees{'nodes_before_top_and_sections_unsplit_no_nodes'}{'contents'}[6]{'
 
$result_trees{'nodes_before_top_and_sections_unsplit_no_nodes'}{'contents'}[7]{'args'}[2]{'extra'}{'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]{'args'}[3]{'extra'}{'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'}[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'}{'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'}{'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'}[8]{'args'}[1]{'extra'}{'node_content'}[0]
 = 
$result_trees{'nodes_before_top_and_sections_unsplit_no_nodes'}{'contents'}[8]{'args'}[1]{'contents'}[0];
 
$result_trees{'nodes_before_top_and_sections_unsplit_no_nodes'}{'contents'}[8]{'args'}[3]{'extra'}{'node_content'}[0]
 = 
$result_trees{'nodes_before_top_and_sections_unsplit_no_nodes'}{'contents'}[8]{'args'}[3]{'contents'}[0];
 
$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'}{'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'}{'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'}[9]{'args'}[1]{'extra'}{'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]{'args'}[3]{'extra'}{'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]{'args'}[2]{'extra'}{'node_content'}[0]
 = 
$result_trees{'nodes_before_top_and_sections_unsplit_no_nodes'}{'contents'}[11]{'args'}[2]{'contents'}[0];
 
$result_trees{'nodes_before_top_and_sections_unsplit_no_nodes'}{'contents'}[11]{'args'}[3]{'extra'}{'node_content'}[0]
 = 
$result_trees{'nodes_before_top_and_sections_unsplit_no_nodes'}{'contents'}[11]{'args'}[3]{'contents'}[0];
 
$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_texis{'nodes_before_top_and_sections_unsplit_no_nodes'} = '\\input 
texinfo @c -*-texinfo-*-
 
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 e22e70173f..a0a51bb268 100644
--- a/tp/t/results/indices/nodes_before_top_split_chapter.pl
+++ b/tp/t/results/indices/nodes_before_top_split_chapter.pl
@@ -137,12 +137,10 @@ $result_trees{'nodes_before_top_split_chapter'} = {
           'cmdname' => 'cindex',
           'extra' => {
             'element_node' => {},
-            'index_entry' => {
-              'entry_element' => {},
-              'entry_number' => 1,
-              'in_code' => 0,
-              'index_name' => 'cp'
-            }
+            'index_entry' => [
+              'cp',
+              1
+            ]
           },
           'info' => {
             'spaces_before_argument' => {
@@ -383,12 +381,10 @@ $result_trees{'nodes_before_top_split_chapter'} = {
           'cmdname' => 'cindex',
           'extra' => {
             'element_node' => {},
-            'index_entry' => {
-              'entry_element' => {},
-              'entry_number' => 2,
-              'in_code' => 0,
-              'index_name' => 'cp'
-            }
+            'index_entry' => [
+              'cp',
+              2
+            ]
           },
           'info' => {
             'spaces_before_argument' => {
@@ -470,12 +466,10 @@ $result_trees{'nodes_before_top_split_chapter'} = {
           'cmdname' => 'cindex',
           'extra' => {
             'element_node' => {},
-            'index_entry' => {
-              'entry_element' => {},
-              'entry_number' => 3,
-              'in_code' => 0,
-              'index_name' => 'cp'
-            }
+            'index_entry' => [
+              'cp',
+              3
+            ]
           },
           'info' => {
             'spaces_before_argument' => {
@@ -576,12 +570,10 @@ $result_trees{'nodes_before_top_split_chapter'} = {
           'cmdname' => 'cindex',
           'extra' => {
             'element_node' => {},
-            'index_entry' => {
-              'entry_element' => {},
-              'entry_number' => 4,
-              'in_code' => 0,
-              'index_name' => 'cp'
-            }
+            'index_entry' => [
+              'cp',
+              4
+            ]
           },
           'info' => {
             'spaces_before_argument' => {
@@ -933,12 +925,10 @@ $result_trees{'nodes_before_top_split_chapter'} = {
           'cmdname' => 'cindex',
           'extra' => {
             'element_node' => {},
-            'index_entry' => {
-              'entry_element' => {},
-              'entry_number' => 5,
-              'in_code' => 0,
-              'index_name' => 'cp'
-            }
+            'index_entry' => [
+              'cp',
+              5
+            ]
           },
           'info' => {
             'spaces_before_argument' => {
@@ -972,12 +962,10 @@ $result_trees{'nodes_before_top_split_chapter'} = {
           'cmdname' => 'findex',
           'extra' => {
             'element_node' => {},
-            'index_entry' => {
-              'entry_element' => {},
-              'entry_number' => 1,
-              'in_code' => 1,
-              'index_name' => 'fn'
-            }
+            'index_entry' => [
+              'fn',
+              1
+            ]
           },
           'info' => {
             'spaces_before_argument' => {
@@ -1011,12 +999,10 @@ $result_trees{'nodes_before_top_split_chapter'} = {
           'cmdname' => 'cindex',
           'extra' => {
             'element_node' => {},
-            'index_entry' => {
-              'entry_element' => {},
-              'entry_number' => 6,
-              'in_code' => 0,
-              'index_name' => 'cp'
-            }
+            'index_entry' => [
+              'cp',
+              6
+            ]
           },
           'info' => {
             'spaces_before_argument' => {
@@ -1526,12 +1512,10 @@ $result_trees{'nodes_before_top_split_chapter'} = {
           'cmdname' => 'cindex',
           'extra' => {
             'element_node' => {},
-            'index_entry' => {
-              'entry_element' => {},
-              'entry_number' => 7,
-              'in_code' => 0,
-              'index_name' => 'cp'
-            }
+            'index_entry' => [
+              'cp',
+              7
+            ]
           },
           'info' => {
             'spaces_before_argument' => {
@@ -1565,12 +1549,10 @@ $result_trees{'nodes_before_top_split_chapter'} = {
           'cmdname' => 'findex',
           'extra' => {
             'element_node' => {},
-            'index_entry' => {
-              'entry_element' => {},
-              'entry_number' => 2,
-              'in_code' => 1,
-              'index_name' => 'fn'
-            }
+            'index_entry' => [
+              'fn',
+              2
+            ]
           },
           'info' => {
             'spaces_before_argument' => {
@@ -1604,12 +1586,10 @@ $result_trees{'nodes_before_top_split_chapter'} = {
           'cmdname' => 'cindex',
           'extra' => {
             'element_node' => {},
-            'index_entry' => {
-              'entry_element' => {},
-              'entry_number' => 8,
-              'in_code' => 0,
-              'index_name' => 'cp'
-            }
+            'index_entry' => [
+              'cp',
+              8
+            ]
           },
           'info' => {
             'spaces_before_argument' => {
@@ -1723,12 +1703,10 @@ $result_trees{'nodes_before_top_split_chapter'} = {
           'cmdname' => 'cindex',
           'extra' => {
             'element_node' => {},
-            'index_entry' => {
-              'entry_element' => {},
-              'entry_number' => 9,
-              'in_code' => 0,
-              'index_name' => 'cp'
-            }
+            'index_entry' => [
+              'cp',
+              9
+            ]
           },
           'info' => {
             'spaces_before_argument' => {
@@ -1806,12 +1784,10 @@ $result_trees{'nodes_before_top_split_chapter'} = {
           'cmdname' => 'findex',
           'extra' => {
             'element_node' => {},
-            'index_entry' => {
-              'entry_element' => {},
-              'entry_number' => 3,
-              'in_code' => 1,
-              'index_name' => 'fn'
-            }
+            'index_entry' => [
+              'fn',
+              3
+            ]
           },
           'info' => {
             'spaces_before_argument' => {
@@ -1845,12 +1821,10 @@ $result_trees{'nodes_before_top_split_chapter'} = {
           'cmdname' => 'cindex',
           'extra' => {
             'element_node' => {},
-            'index_entry' => {
-              'entry_element' => {},
-              'entry_number' => 10,
-              'in_code' => 0,
-              'index_name' => 'cp'
-            }
+            'index_entry' => [
+              'cp',
+              10
+            ]
           },
           'info' => {
             'spaces_before_argument' => {
@@ -1940,25 +1914,18 @@ $result_trees{'nodes_before_top_split_chapter'} = {
 
$result_trees{'nodes_before_top_split_chapter'}{'contents'}[1]{'args'}[1]{'extra'}{'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]{'args'}[3]{'extra'}{'manual_content'}[0]
 = 
$result_trees{'nodes_before_top_split_chapter'}{'contents'}[1]{'args'}[3]{'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]{'contents'}[1]{'extra'}{'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'}[2]{'args'}[3]{'extra'}{'node_content'}[0]
 = 
$result_trees{'nodes_before_top_split_chapter'}{'contents'}[2]{'args'}[3]{'contents'}[0];
 
$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'}{'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'}[3]{'args'}[2]{'extra'}{'node_content'}[0]
 = 
$result_trees{'nodes_before_top_split_chapter'}{'contents'}[3]{'args'}[2]{'contents'}[0];
 
$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]{'contents'}[1]{'extra'}{'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'}[4]{'args'}[2]{'extra'}{'node_content'}[0]
 = 
$result_trees{'nodes_before_top_split_chapter'}{'contents'}[4]{'args'}[2]{'contents'}[0];
 
$result_trees{'nodes_before_top_split_chapter'}{'contents'}[4]{'args'}[3]{'extra'}{'node_content'}[0]
 = 
$result_trees{'nodes_before_top_split_chapter'}{'contents'}[4]{'args'}[3]{'contents'}[0];
 
$result_trees{'nodes_before_top_split_chapter'}{'contents'}[4]{'contents'}[1]{'extra'}{'element_node'}
 = $result_trees{'nodes_before_top_split_chapter'}{'contents'}[4];
-$result_trees{'nodes_before_top_split_chapter'}{'contents'}[4]{'contents'}[1]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'nodes_before_top_split_chapter'}{'contents'}[4]{'contents'}[1];
 
$result_trees{'nodes_before_top_split_chapter'}{'contents'}[4]{'contents'}[2]{'extra'}{'element_node'}
 = $result_trees{'nodes_before_top_split_chapter'}{'contents'}[4];
-$result_trees{'nodes_before_top_split_chapter'}{'contents'}[4]{'contents'}[2]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'nodes_before_top_split_chapter'}{'contents'}[4]{'contents'}[2];
 
$result_trees{'nodes_before_top_split_chapter'}{'contents'}[4]{'contents'}[3]{'extra'}{'element_node'}
 = $result_trees{'nodes_before_top_split_chapter'}{'contents'}[4];
-$result_trees{'nodes_before_top_split_chapter'}{'contents'}[4]{'contents'}[3]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'nodes_before_top_split_chapter'}{'contents'}[4]{'contents'}[3];
 
$result_trees{'nodes_before_top_split_chapter'}{'contents'}[4]{'contents'}[7]{'contents'}[0]{'contents'}[1]{'extra'}{'node_content'}[0]
 = 
$result_trees{'nodes_before_top_split_chapter'}{'contents'}[4]{'contents'}[7]{'contents'}[0]{'contents'}[1]{'contents'}[0];
 
$result_trees{'nodes_before_top_split_chapter'}{'contents'}[5]{'args'}[3]{'extra'}{'node_content'}[0]
 = 
$result_trees{'nodes_before_top_split_chapter'}{'contents'}[5]{'args'}[3]{'contents'}[0];
 
$result_trees{'nodes_before_top_split_chapter'}{'contents'}[5]{'contents'}[0]{'contents'}[0]{'contents'}[1]{'extra'}{'node_content'}[0]
 = 
$result_trees{'nodes_before_top_split_chapter'}{'contents'}[5]{'contents'}[0]{'contents'}[0]{'contents'}[1]{'contents'}[0];
@@ -1966,19 +1933,13 @@ 
$result_trees{'nodes_before_top_split_chapter'}{'contents'}[5]{'contents'}[0]{'c
 
$result_trees{'nodes_before_top_split_chapter'}{'contents'}[6]{'args'}[2]{'extra'}{'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]{'args'}[3]{'extra'}{'node_content'}[0]
 = 
$result_trees{'nodes_before_top_split_chapter'}{'contents'}[6]{'args'}[3]{'contents'}[0];
 
$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'}{'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'}{'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'}[7]{'args'}[1]{'extra'}{'node_content'}[0]
 = 
$result_trees{'nodes_before_top_split_chapter'}{'contents'}[7]{'args'}[1]{'contents'}[0];
 
$result_trees{'nodes_before_top_split_chapter'}{'contents'}[7]{'args'}[3]{'extra'}{'node_content'}[0]
 = 
$result_trees{'nodes_before_top_split_chapter'}{'contents'}[7]{'args'}[3]{'contents'}[0];
 
$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'}{'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'}{'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_texis{'nodes_before_top_split_chapter'} = '\\input texinfo @c 
-*-texinfo-*-
 
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 7cb3a7433e..0e54003119 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
@@ -137,12 +137,10 @@ $result_trees{'nodes_before_top_split_chapter_no_nodes'} 
= {
           'cmdname' => 'cindex',
           'extra' => {
             'element_node' => {},
-            'index_entry' => {
-              'entry_element' => {},
-              'entry_number' => 1,
-              'in_code' => 0,
-              'index_name' => 'cp'
-            }
+            'index_entry' => [
+              'cp',
+              1
+            ]
           },
           'info' => {
             'spaces_before_argument' => {
@@ -383,12 +381,10 @@ $result_trees{'nodes_before_top_split_chapter_no_nodes'} 
= {
           'cmdname' => 'cindex',
           'extra' => {
             'element_node' => {},
-            'index_entry' => {
-              'entry_element' => {},
-              'entry_number' => 2,
-              'in_code' => 0,
-              'index_name' => 'cp'
-            }
+            'index_entry' => [
+              'cp',
+              2
+            ]
           },
           'info' => {
             'spaces_before_argument' => {
@@ -470,12 +466,10 @@ $result_trees{'nodes_before_top_split_chapter_no_nodes'} 
= {
           'cmdname' => 'cindex',
           'extra' => {
             'element_node' => {},
-            'index_entry' => {
-              'entry_element' => {},
-              'entry_number' => 3,
-              'in_code' => 0,
-              'index_name' => 'cp'
-            }
+            'index_entry' => [
+              'cp',
+              3
+            ]
           },
           'info' => {
             'spaces_before_argument' => {
@@ -576,12 +570,10 @@ $result_trees{'nodes_before_top_split_chapter_no_nodes'} 
= {
           'cmdname' => 'cindex',
           'extra' => {
             'element_node' => {},
-            'index_entry' => {
-              'entry_element' => {},
-              'entry_number' => 4,
-              'in_code' => 0,
-              'index_name' => 'cp'
-            }
+            'index_entry' => [
+              'cp',
+              4
+            ]
           },
           'info' => {
             'spaces_before_argument' => {
@@ -933,12 +925,10 @@ $result_trees{'nodes_before_top_split_chapter_no_nodes'} 
= {
           'cmdname' => 'cindex',
           'extra' => {
             'element_node' => {},
-            'index_entry' => {
-              'entry_element' => {},
-              'entry_number' => 5,
-              'in_code' => 0,
-              'index_name' => 'cp'
-            }
+            'index_entry' => [
+              'cp',
+              5
+            ]
           },
           'info' => {
             'spaces_before_argument' => {
@@ -972,12 +962,10 @@ $result_trees{'nodes_before_top_split_chapter_no_nodes'} 
= {
           'cmdname' => 'findex',
           'extra' => {
             'element_node' => {},
-            'index_entry' => {
-              'entry_element' => {},
-              'entry_number' => 1,
-              'in_code' => 1,
-              'index_name' => 'fn'
-            }
+            'index_entry' => [
+              'fn',
+              1
+            ]
           },
           'info' => {
             'spaces_before_argument' => {
@@ -1011,12 +999,10 @@ $result_trees{'nodes_before_top_split_chapter_no_nodes'} 
= {
           'cmdname' => 'cindex',
           'extra' => {
             'element_node' => {},
-            'index_entry' => {
-              'entry_element' => {},
-              'entry_number' => 6,
-              'in_code' => 0,
-              'index_name' => 'cp'
-            }
+            'index_entry' => [
+              'cp',
+              6
+            ]
           },
           'info' => {
             'spaces_before_argument' => {
@@ -1526,12 +1512,10 @@ 
$result_trees{'nodes_before_top_split_chapter_no_nodes'} = {
           'cmdname' => 'cindex',
           'extra' => {
             'element_node' => {},
-            'index_entry' => {
-              'entry_element' => {},
-              'entry_number' => 7,
-              'in_code' => 0,
-              'index_name' => 'cp'
-            }
+            'index_entry' => [
+              'cp',
+              7
+            ]
           },
           'info' => {
             'spaces_before_argument' => {
@@ -1565,12 +1549,10 @@ 
$result_trees{'nodes_before_top_split_chapter_no_nodes'} = {
           'cmdname' => 'findex',
           'extra' => {
             'element_node' => {},
-            'index_entry' => {
-              'entry_element' => {},
-              'entry_number' => 2,
-              'in_code' => 1,
-              'index_name' => 'fn'
-            }
+            'index_entry' => [
+              'fn',
+              2
+            ]
           },
           'info' => {
             'spaces_before_argument' => {
@@ -1604,12 +1586,10 @@ 
$result_trees{'nodes_before_top_split_chapter_no_nodes'} = {
           'cmdname' => 'cindex',
           'extra' => {
             'element_node' => {},
-            'index_entry' => {
-              'entry_element' => {},
-              'entry_number' => 8,
-              'in_code' => 0,
-              'index_name' => 'cp'
-            }
+            'index_entry' => [
+              'cp',
+              8
+            ]
           },
           'info' => {
             'spaces_before_argument' => {
@@ -1723,12 +1703,10 @@ 
$result_trees{'nodes_before_top_split_chapter_no_nodes'} = {
           'cmdname' => 'cindex',
           'extra' => {
             'element_node' => {},
-            'index_entry' => {
-              'entry_element' => {},
-              'entry_number' => 9,
-              'in_code' => 0,
-              'index_name' => 'cp'
-            }
+            'index_entry' => [
+              'cp',
+              9
+            ]
           },
           'info' => {
             'spaces_before_argument' => {
@@ -1806,12 +1784,10 @@ 
$result_trees{'nodes_before_top_split_chapter_no_nodes'} = {
           'cmdname' => 'findex',
           'extra' => {
             'element_node' => {},
-            'index_entry' => {
-              'entry_element' => {},
-              'entry_number' => 3,
-              'in_code' => 1,
-              'index_name' => 'fn'
-            }
+            'index_entry' => [
+              'fn',
+              3
+            ]
           },
           'info' => {
             'spaces_before_argument' => {
@@ -1845,12 +1821,10 @@ 
$result_trees{'nodes_before_top_split_chapter_no_nodes'} = {
           'cmdname' => 'cindex',
           'extra' => {
             'element_node' => {},
-            'index_entry' => {
-              'entry_element' => {},
-              'entry_number' => 10,
-              'in_code' => 0,
-              'index_name' => 'cp'
-            }
+            'index_entry' => [
+              'cp',
+              10
+            ]
           },
           'info' => {
             'spaces_before_argument' => {
@@ -1940,25 +1914,18 @@ 
$result_trees{'nodes_before_top_split_chapter_no_nodes'} = {
 
$result_trees{'nodes_before_top_split_chapter_no_nodes'}{'contents'}[1]{'args'}[1]{'extra'}{'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]{'args'}[3]{'extra'}{'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'}[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]{'contents'}[1]{'extra'}{'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'}[2]{'args'}[3]{'extra'}{'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'}[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'}{'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'}[3]{'args'}[2]{'extra'}{'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'}[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]{'contents'}[1]{'extra'}{'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'}[4]{'args'}[2]{'extra'}{'node_content'}[0]
 = 
$result_trees{'nodes_before_top_split_chapter_no_nodes'}{'contents'}[4]{'args'}[2]{'contents'}[0];
 
$result_trees{'nodes_before_top_split_chapter_no_nodes'}{'contents'}[4]{'args'}[3]{'extra'}{'node_content'}[0]
 = 
$result_trees{'nodes_before_top_split_chapter_no_nodes'}{'contents'}[4]{'args'}[3]{'contents'}[0];
 
$result_trees{'nodes_before_top_split_chapter_no_nodes'}{'contents'}[4]{'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'}[1]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'nodes_before_top_split_chapter_no_nodes'}{'contents'}[4]{'contents'}[1];
 
$result_trees{'nodes_before_top_split_chapter_no_nodes'}{'contents'}[4]{'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'}[2]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'nodes_before_top_split_chapter_no_nodes'}{'contents'}[4]{'contents'}[2];
 
$result_trees{'nodes_before_top_split_chapter_no_nodes'}{'contents'}[4]{'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'}[3]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'nodes_before_top_split_chapter_no_nodes'}{'contents'}[4]{'contents'}[3];
 
$result_trees{'nodes_before_top_split_chapter_no_nodes'}{'contents'}[4]{'contents'}[7]{'contents'}[0]{'contents'}[1]{'extra'}{'node_content'}[0]
 = 
$result_trees{'nodes_before_top_split_chapter_no_nodes'}{'contents'}[4]{'contents'}[7]{'contents'}[0]{'contents'}[1]{'contents'}[0];
 
$result_trees{'nodes_before_top_split_chapter_no_nodes'}{'contents'}[5]{'args'}[3]{'extra'}{'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'}[5]{'contents'}[0]{'contents'}[0]{'contents'}[1]{'extra'}{'node_content'}[0]
 = 
$result_trees{'nodes_before_top_split_chapter_no_nodes'}{'contents'}[5]{'contents'}[0]{'contents'}[0]{'contents'}[1]{'contents'}[0];
@@ -1966,19 +1933,13 @@ 
$result_trees{'nodes_before_top_split_chapter_no_nodes'}{'contents'}[5]{'content
 
$result_trees{'nodes_before_top_split_chapter_no_nodes'}{'contents'}[6]{'args'}[2]{'extra'}{'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]{'args'}[3]{'extra'}{'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'}[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'}{'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'}{'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'}[7]{'args'}[1]{'extra'}{'node_content'}[0]
 = 
$result_trees{'nodes_before_top_split_chapter_no_nodes'}{'contents'}[7]{'args'}[1]{'contents'}[0];
 
$result_trees{'nodes_before_top_split_chapter_no_nodes'}{'contents'}[7]{'args'}[3]{'extra'}{'node_content'}[0]
 = 
$result_trees{'nodes_before_top_split_chapter_no_nodes'}{'contents'}[7]{'args'}[3]{'contents'}[0];
 
$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'}{'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'}{'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_texis{'nodes_before_top_split_chapter_no_nodes'} = '\\input texinfo @c 
-*-texinfo-*-
 
diff --git a/tp/t/results/indices/printindex_between_node_section.pl 
b/tp/t/results/indices/printindex_between_node_section.pl
index c8c6c05d03..2d6f83ecc8 100644
--- a/tp/t/results/indices/printindex_between_node_section.pl
+++ b/tp/t/results/indices/printindex_between_node_section.pl
@@ -92,12 +92,10 @@ $result_trees{'printindex_between_node_section'} = {
           'cmdname' => 'cindex',
           'extra' => {
             'element_node' => {},
-            'index_entry' => {
-              'entry_element' => {},
-              'entry_number' => 1,
-              'in_code' => 0,
-              'index_name' => 'cp'
-            }
+            'index_entry' => [
+              'cp',
+              1
+            ]
           },
           'info' => {
             'spaces_before_argument' => {
@@ -131,12 +129,10 @@ $result_trees{'printindex_between_node_section'} = {
           'cmdname' => 'cindex',
           'extra' => {
             'element_node' => {},
-            'index_entry' => {
-              'entry_element' => {},
-              'entry_number' => 2,
-              'in_code' => 0,
-              'index_name' => 'cp'
-            }
+            'index_entry' => [
+              'cp',
+              2
+            ]
           },
           'info' => {
             'spaces_before_argument' => {
@@ -170,12 +166,10 @@ $result_trees{'printindex_between_node_section'} = {
           'cmdname' => 'cindex',
           'extra' => {
             'element_node' => {},
-            'index_entry' => {
-              'entry_element' => {},
-              'entry_number' => 3,
-              'in_code' => 0,
-              'index_name' => 'cp'
-            }
+            'index_entry' => [
+              'cp',
+              3
+            ]
           },
           'info' => {
             'spaces_before_argument' => {
@@ -209,12 +203,10 @@ $result_trees{'printindex_between_node_section'} = {
           'cmdname' => 'cindex',
           'extra' => {
             'element_node' => {},
-            'index_entry' => {
-              'entry_element' => {},
-              'entry_number' => 4,
-              'in_code' => 0,
-              'index_name' => 'cp'
-            }
+            'index_entry' => [
+              'cp',
+              4
+            ]
           },
           'info' => {
             'spaces_before_argument' => {
@@ -322,12 +314,10 @@ $result_trees{'printindex_between_node_section'} = {
           'cmdname' => 'cindex',
           'extra' => {
             'element_node' => {},
-            'index_entry' => {
-              'entry_element' => {},
-              'entry_number' => 5,
-              'in_code' => 0,
-              'index_name' => 'cp'
-            }
+            'index_entry' => [
+              'cp',
+              5
+            ]
           },
           'info' => {
             'spaces_before_argument' => {
@@ -361,12 +351,10 @@ $result_trees{'printindex_between_node_section'} = {
           'cmdname' => 'cindex',
           'extra' => {
             'element_node' => {},
-            'index_entry' => {
-              'entry_element' => {},
-              'entry_number' => 6,
-              'in_code' => 0,
-              'index_name' => 'cp'
-            }
+            'index_entry' => [
+              'cp',
+              6
+            ]
           },
           'info' => {
             'spaces_before_argument' => {
@@ -501,17 +489,11 @@ $result_trees{'printindex_between_node_section'} = {
   'type' => 'document_root'
 };
 
$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'}{'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'}{'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'}{'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'}[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'}{'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_texis{'printindex_between_node_section'} = '@node Top
 @top top
diff --git a/tp/t/results/indices/printindex_between_part_chapter.pl 
b/tp/t/results/indices/printindex_between_part_chapter.pl
index 9e1f762458..ed4799d55e 100644
--- a/tp/t/results/indices/printindex_between_part_chapter.pl
+++ b/tp/t/results/indices/printindex_between_part_chapter.pl
@@ -93,12 +93,10 @@ $result_trees{'printindex_between_part_chapter'} = {
           'cmdname' => 'cindex',
           'extra' => {
             'element_node' => {},
-            'index_entry' => {
-              'entry_element' => {},
-              'entry_number' => 1,
-              'in_code' => 0,
-              'index_name' => 'cp'
-            }
+            'index_entry' => [
+              'cp',
+              1
+            ]
           },
           'info' => {
             'spaces_before_argument' => {
@@ -132,12 +130,10 @@ $result_trees{'printindex_between_part_chapter'} = {
           'cmdname' => 'cindex',
           'extra' => {
             'element_node' => {},
-            'index_entry' => {
-              'entry_element' => {},
-              'entry_number' => 2,
-              'in_code' => 0,
-              'index_name' => 'cp'
-            }
+            'index_entry' => [
+              'cp',
+              2
+            ]
           },
           'info' => {
             'spaces_before_argument' => {
@@ -171,12 +167,10 @@ $result_trees{'printindex_between_part_chapter'} = {
           'cmdname' => 'cindex',
           'extra' => {
             'element_node' => {},
-            'index_entry' => {
-              'entry_element' => {},
-              'entry_number' => 3,
-              'in_code' => 0,
-              'index_name' => 'cp'
-            }
+            'index_entry' => [
+              'cp',
+              3
+            ]
           },
           'info' => {
             'spaces_before_argument' => {
@@ -210,12 +204,10 @@ $result_trees{'printindex_between_part_chapter'} = {
           'cmdname' => 'cindex',
           'extra' => {
             'element_node' => {},
-            'index_entry' => {
-              'entry_element' => {},
-              'entry_number' => 4,
-              'in_code' => 0,
-              'index_name' => 'cp'
-            }
+            'index_entry' => [
+              'cp',
+              4
+            ]
           },
           'info' => {
             'spaces_before_argument' => {
@@ -470,12 +462,10 @@ $result_trees{'printindex_between_part_chapter'} = {
           'cmdname' => 'cindex',
           'extra' => {
             'element_node' => {},
-            'index_entry' => {
-              'entry_element' => {},
-              'entry_number' => 5,
-              'in_code' => 0,
-              'index_name' => 'cp'
-            }
+            'index_entry' => [
+              'cp',
+              5
+            ]
           },
           'info' => {
             'spaces_before_argument' => {
@@ -509,12 +499,10 @@ $result_trees{'printindex_between_part_chapter'} = {
           'cmdname' => 'cindex',
           'extra' => {
             'element_node' => {},
-            'index_entry' => {
-              'entry_element' => {},
-              'entry_number' => 6,
-              'in_code' => 0,
-              'index_name' => 'cp'
-            }
+            'index_entry' => [
+              'cp',
+              6
+            ]
           },
           'info' => {
             'spaces_before_argument' => {
@@ -550,18 +538,12 @@ $result_trees{'printindex_between_part_chapter'} = {
   'type' => 'document_root'
 };
 
$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'}{'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'}{'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'}{'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'}[5]{'extra'}{'associated_part'}
 = $result_trees{'printindex_between_part_chapter'}{'contents'}[3];
 
$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'}{'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
 @top 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 e8249ffb05..03e2d732df 100644
--- a/tp/t/results/indices/printindex_index_entry_in_copying.pl
+++ b/tp/t/results/indices/printindex_index_entry_in_copying.pl
@@ -50,12 +50,10 @@ $result_trees{'printindex_index_entry_in_copying'} = {
                   'cmdname' => 'findex',
                   'extra' => {
                     'element_region' => 'copying',
-                    'index_entry' => {
-                      'entry_element' => {},
-                      'entry_number' => 1,
-                      'in_code' => 1,
-                      'index_name' => 'fn'
-                    }
+                    'index_entry' => [
+                      'fn',
+                      1
+                    ]
                   },
                   'info' => {
                     'spaces_before_argument' => {
@@ -136,12 +134,10 @@ $result_trees{'printindex_index_entry_in_copying'} = {
                           'name' => {}
                         },
                         'element_region' => 'copying',
-                        'index_entry' => {
-                          'entry_element' => {},
-                          'entry_number' => 2,
-                          'in_code' => 1,
-                          'index_name' => 'fn'
-                        },
+                        'index_entry' => [
+                          'fn',
+                          2
+                        ],
                         'original_def_cmdname' => 'defun'
                       },
                       'source_info' => {
@@ -211,12 +207,10 @@ $result_trees{'printindex_index_entry_in_copying'} = {
                           'name' => {}
                         },
                         'element_region' => 'copying',
-                        'index_entry' => {
-                          'entry_element' => {},
-                          'entry_number' => 3,
-                          'in_code' => 1,
-                          'index_name' => 'fn'
-                        },
+                        'index_entry' => [
+                          'fn',
+                          3
+                        ],
                         'original_def_cmdname' => 'defunx'
                       },
                       'info' => {
@@ -343,12 +337,10 @@ $result_trees{'printindex_index_entry_in_copying'} = {
                               'cmdname' => 'item',
                               'extra' => {
                                 'element_region' => 'copying',
-                                'index_entry' => {
-                                  'entry_element' => {},
-                                  'entry_number' => 4,
-                                  'in_code' => 1,
-                                  'index_name' => 'fn'
-                                }
+                                'index_entry' => [
+                                  'fn',
+                                  4
+                                ]
                               },
                               'info' => {
                                 'spaces_before_argument' => {
@@ -381,12 +373,10 @@ $result_trees{'printindex_index_entry_in_copying'} = {
                               'cmdname' => 'itemx',
                               'extra' => {
                                 'element_region' => 'copying',
-                                'index_entry' => {
-                                  'entry_element' => {},
-                                  'entry_number' => 5,
-                                  'in_code' => 1,
-                                  'index_name' => 'fn'
-                                }
+                                'index_entry' => [
+                                  'fn',
+                                  5
+                                ]
                               },
                               'info' => {
                                 'spaces_before_argument' => {
@@ -880,17 +870,12 @@ $result_trees{'printindex_index_entry_in_copying'} = {
   ],
   'type' => 'document_root'
 };
-$result_trees{'printindex_index_entry_in_copying'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[1]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'printindex_index_entry_in_copying'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[1];
 
$result_trees{'printindex_index_entry_in_copying'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[3]{'contents'}[0]{'extra'}{'def_index_element'}
 = 
$result_trees{'printindex_index_entry_in_copying'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[3]{'contents'}[0]{'args'}[0]{'contents'}[2];
 
$result_trees{'printindex_index_entry_in_copying'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[3]{'contents'}[0]{'extra'}{'def_parsed_hash'}{'category'}
 = 
$result_trees{'printindex_index_entry_in_copying'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[3]{'contents'}[0]{'args'}[0]{'contents'}[0];
 
$result_trees{'printindex_index_entry_in_copying'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[3]{'contents'}[0]{'extra'}{'def_parsed_hash'}{'name'}
 = 
$result_trees{'printindex_index_entry_in_copying'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[3]{'contents'}[0]{'args'}[0]{'contents'}[2];
-$result_trees{'printindex_index_entry_in_copying'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[3]{'contents'}[0]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'printindex_index_entry_in_copying'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[3]{'contents'}[0];
 
$result_trees{'printindex_index_entry_in_copying'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[3]{'contents'}[1]{'extra'}{'def_index_element'}
 = 
$result_trees{'printindex_index_entry_in_copying'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[3]{'contents'}[1]{'args'}[0]{'contents'}[2];
 
$result_trees{'printindex_index_entry_in_copying'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[3]{'contents'}[1]{'extra'}{'def_parsed_hash'}{'category'}
 = 
$result_trees{'printindex_index_entry_in_copying'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[3]{'contents'}[1]{'args'}[0]{'contents'}[0];
 
$result_trees{'printindex_index_entry_in_copying'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[3]{'contents'}[1]{'extra'}{'def_parsed_hash'}{'name'}
 = 
$result_trees{'printindex_index_entry_in_copying'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[3]{'contents'}[1]{'args'}[0]{'contents'}[2];
-$result_trees{'printindex_index_entry_in_copying'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[3]{'contents'}[1]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'printindex_index_entry_in_copying'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[3]{'contents'}[1];
-$result_trees{'printindex_index_entry_in_copying'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[5]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'printindex_index_entry_in_copying'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[5]{'contents'}[0]{'contents'}[0]{'contents'}[0];
-$result_trees{'printindex_index_entry_in_copying'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[5]{'contents'}[0]{'contents'}[0]{'contents'}[1]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'printindex_index_entry_in_copying'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[5]{'contents'}[0]{'contents'}[0]{'contents'}[1];
 
$result_trees{'printindex_index_entry_in_copying'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[5]{'extra'}{'command_as_argument'}
 = 
$result_trees{'printindex_index_entry_in_copying'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[5]{'args'}[0]{'contents'}[0];
 
$result_trees{'printindex_index_entry_in_copying'}{'contents'}[2]{'contents'}[4]{'contents'}[0]{'contents'}[1]{'extra'}{'node_content'}[0]
 = 
$result_trees{'printindex_index_entry_in_copying'}{'contents'}[2]{'contents'}[4]{'contents'}[0]{'contents'}[1]{'contents'}[0];
 
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 7f526b3882..525ee25e7a 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
@@ -68,12 +68,10 @@ 
$result_trees{'printindex_index_entry_in_copying_in_footnote'} = {
                               'cmdname' => 'cindex',
                               'extra' => {
                                 'element_region' => 'copying',
-                                'index_entry' => {
-                                  'entry_element' => {},
-                                  'entry_number' => 1,
-                                  'in_code' => 0,
-                                  'index_name' => 'cp'
-                                }
+                                'index_entry' => [
+                                  'cp',
+                                  1
+                                ]
                               },
                               'info' => {
                                 'spaces_before_argument' => {
@@ -504,7 +502,6 @@ 
$result_trees{'printindex_index_entry_in_copying_in_footnote'} = {
   ],
   'type' => 'document_root'
 };
-$result_trees{'printindex_index_entry_in_copying_in_footnote'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[1]{'contents'}[1]{'args'}[0]{'contents'}[1]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'printindex_index_entry_in_copying_in_footnote'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[1]{'contents'}[1]{'args'}[0]{'contents'}[1];
 
$result_trees{'printindex_index_entry_in_copying_in_footnote'}{'contents'}[2]{'contents'}[4]{'contents'}[0]{'contents'}[1]{'extra'}{'node_content'}[0]
 = 
$result_trees{'printindex_index_entry_in_copying_in_footnote'}{'contents'}[2]{'contents'}[4]{'contents'}[0]{'contents'}[1]{'contents'}[0];
 
 $result_texis{'printindex_index_entry_in_copying_in_footnote'} = '@copying
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 b01018ed3e..c839f0e2e0 100644
--- a/tp/t/results/indices/printindex_index_entry_in_copying_no_insertcopying.pl
+++ b/tp/t/results/indices/printindex_index_entry_in_copying_no_insertcopying.pl
@@ -50,12 +50,10 @@ 
$result_trees{'printindex_index_entry_in_copying_no_insertcopying'} = {
                   'cmdname' => 'findex',
                   'extra' => {
                     'element_region' => 'copying',
-                    'index_entry' => {
-                      'entry_element' => {},
-                      'entry_number' => 1,
-                      'in_code' => 1,
-                      'index_name' => 'fn'
-                    }
+                    'index_entry' => [
+                      'fn',
+                      1
+                    ]
                   },
                   'info' => {
                     'spaces_before_argument' => {
@@ -136,12 +134,10 @@ 
$result_trees{'printindex_index_entry_in_copying_no_insertcopying'} = {
                           'name' => {}
                         },
                         'element_region' => 'copying',
-                        'index_entry' => {
-                          'entry_element' => {},
-                          'entry_number' => 2,
-                          'in_code' => 1,
-                          'index_name' => 'fn'
-                        },
+                        'index_entry' => [
+                          'fn',
+                          2
+                        ],
                         'original_def_cmdname' => 'defun'
                       },
                       'source_info' => {
@@ -211,12 +207,10 @@ 
$result_trees{'printindex_index_entry_in_copying_no_insertcopying'} = {
                           'name' => {}
                         },
                         'element_region' => 'copying',
-                        'index_entry' => {
-                          'entry_element' => {},
-                          'entry_number' => 3,
-                          'in_code' => 1,
-                          'index_name' => 'fn'
-                        },
+                        'index_entry' => [
+                          'fn',
+                          3
+                        ],
                         'original_def_cmdname' => 'defunx'
                       },
                       'info' => {
@@ -343,12 +337,10 @@ 
$result_trees{'printindex_index_entry_in_copying_no_insertcopying'} = {
                               'cmdname' => 'item',
                               'extra' => {
                                 'element_region' => 'copying',
-                                'index_entry' => {
-                                  'entry_element' => {},
-                                  'entry_number' => 4,
-                                  'in_code' => 1,
-                                  'index_name' => 'fn'
-                                }
+                                'index_entry' => [
+                                  'fn',
+                                  4
+                                ]
                               },
                               'info' => {
                                 'spaces_before_argument' => {
@@ -381,12 +373,10 @@ 
$result_trees{'printindex_index_entry_in_copying_no_insertcopying'} = {
                               'cmdname' => 'itemx',
                               'extra' => {
                                 'element_region' => 'copying',
-                                'index_entry' => {
-                                  'entry_element' => {},
-                                  'entry_number' => 5,
-                                  'in_code' => 1,
-                                  'index_name' => 'fn'
-                                }
+                                'index_entry' => [
+                                  'fn',
+                                  5
+                                ]
                               },
                               'info' => {
                                 'spaces_before_argument' => {
@@ -850,17 +840,12 @@ 
$result_trees{'printindex_index_entry_in_copying_no_insertcopying'} = {
   ],
   'type' => 'document_root'
 };
-$result_trees{'printindex_index_entry_in_copying_no_insertcopying'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[1]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'printindex_index_entry_in_copying_no_insertcopying'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[1];
 
$result_trees{'printindex_index_entry_in_copying_no_insertcopying'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[3]{'contents'}[0]{'extra'}{'def_index_element'}
 = 
$result_trees{'printindex_index_entry_in_copying_no_insertcopying'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[3]{'contents'}[0]{'args'}[0]{'contents'}[2];
 
$result_trees{'printindex_index_entry_in_copying_no_insertcopying'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[3]{'contents'}[0]{'extra'}{'def_parsed_hash'}{'category'}
 = 
$result_trees{'printindex_index_entry_in_copying_no_insertcopying'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[3]{'contents'}[0]{'args'}[0]{'contents'}[0];
 
$result_trees{'printindex_index_entry_in_copying_no_insertcopying'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[3]{'contents'}[0]{'extra'}{'def_parsed_hash'}{'name'}
 = 
$result_trees{'printindex_index_entry_in_copying_no_insertcopying'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[3]{'contents'}[0]{'args'}[0]{'contents'}[2];
-$result_trees{'printindex_index_entry_in_copying_no_insertcopying'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[3]{'contents'}[0]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'printindex_index_entry_in_copying_no_insertcopying'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[3]{'contents'}[0];
 
$result_trees{'printindex_index_entry_in_copying_no_insertcopying'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[3]{'contents'}[1]{'extra'}{'def_index_element'}
 = 
$result_trees{'printindex_index_entry_in_copying_no_insertcopying'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[3]{'contents'}[1]{'args'}[0]{'contents'}[2];
 
$result_trees{'printindex_index_entry_in_copying_no_insertcopying'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[3]{'contents'}[1]{'extra'}{'def_parsed_hash'}{'category'}
 = 
$result_trees{'printindex_index_entry_in_copying_no_insertcopying'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[3]{'contents'}[1]{'args'}[0]{'contents'}[0];
 
$result_trees{'printindex_index_entry_in_copying_no_insertcopying'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[3]{'contents'}[1]{'extra'}{'def_parsed_hash'}{'name'}
 = 
$result_trees{'printindex_index_entry_in_copying_no_insertcopying'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[3]{'contents'}[1]{'args'}[0]{'contents'}[2];
-$result_trees{'printindex_index_entry_in_copying_no_insertcopying'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[3]{'contents'}[1]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'printindex_index_entry_in_copying_no_insertcopying'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[3]{'contents'}[1];
-$result_trees{'printindex_index_entry_in_copying_no_insertcopying'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[5]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'printindex_index_entry_in_copying_no_insertcopying'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[5]{'contents'}[0]{'contents'}[0]{'contents'}[0];
-$result_trees{'printindex_index_entry_in_copying_no_insertcopying'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[5]{'contents'}[0]{'contents'}[0]{'contents'}[1]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'printindex_index_entry_in_copying_no_insertcopying'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[5]{'contents'}[0]{'contents'}[0]{'contents'}[1];
 
$result_trees{'printindex_index_entry_in_copying_no_insertcopying'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[5]{'extra'}{'command_as_argument'}
 = 
$result_trees{'printindex_index_entry_in_copying_no_insertcopying'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[5]{'args'}[0]{'contents'}[0];
 
$result_trees{'printindex_index_entry_in_copying_no_insertcopying'}{'contents'}[2]{'contents'}[3]{'contents'}[0]{'contents'}[1]{'extra'}{'node_content'}[0]
 = 
$result_trees{'printindex_index_entry_in_copying_no_insertcopying'}{'contents'}[2]{'contents'}[3]{'contents'}[0]{'contents'}[1]{'contents'}[0];
 
diff --git a/tp/t/results/indices/printindex_with_space_before.pl 
b/tp/t/results/indices/printindex_with_space_before.pl
index 9601fffbfc..2c6c1fe1a8 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 907d594354..8612080ae6 100644
--- a/tp/t/results/indices/same_index_entry_merged_indices.pl
+++ b/tp/t/results/indices/same_index_entry_merged_indices.pl
@@ -259,12 +259,10 @@ $result_trees{'same_index_entry_merged_indices'} = {
                   'name' => {}
                 },
                 'element_node' => {},
-                'index_entry' => {
-                  'entry_element' => {},
-                  'entry_number' => 1,
-                  'in_code' => 1,
-                  'index_name' => 'fn'
-                },
+                'index_entry' => [
+                  'fn',
+                  1
+                ],
                 'original_def_cmdname' => 'deffn'
               },
               'source_info' => {
@@ -386,12 +384,10 @@ $result_trees{'same_index_entry_merged_indices'} = {
                   'name' => {}
                 },
                 'element_node' => {},
-                'index_entry' => {
-                  'entry_element' => {},
-                  'entry_number' => 1,
-                  'in_code' => 1,
-                  'index_name' => 'vr'
-                },
+                'index_entry' => [
+                  'vr',
+                  1
+                ],
                 'original_def_cmdname' => 'defvar'
               },
               'source_info' => {
@@ -518,12 +514,10 @@ 
$result_trees{'same_index_entry_merged_indices'}{'contents'}[4]{'contents'}[3]{'
 
$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'}{'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'}{'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 75dd278d4c..052479a495 100644
--- a/tp/t/results/indices/same_only_seealso_seeentry.pl
+++ b/tp/t/results/indices/same_only_seealso_seeentry.pl
@@ -184,12 +184,10 @@ $result_trees{'same_only_seealso_seeentry'} = {
           'cmdname' => 'cindex',
           'extra' => {
             'element_node' => {},
-            'index_entry' => {
-              'entry_element' => {},
-              'entry_number' => 1,
-              'in_code' => 0,
-              'index_name' => 'cp'
-            },
+            'index_entry' => [
+              'cp',
+              1
+            ],
             'seealso' => {}
           },
           'info' => {
@@ -246,12 +244,10 @@ $result_trees{'same_only_seealso_seeentry'} = {
           'cmdname' => 'cindex',
           'extra' => {
             'element_node' => {},
-            'index_entry' => {
-              'entry_element' => {},
-              'entry_number' => 2,
-              'in_code' => 0,
-              'index_name' => 'cp'
-            },
+            'index_entry' => [
+              'cp',
+              2
+            ],
             'seealso' => {}
           },
           'info' => {
@@ -313,12 +309,10 @@ $result_trees{'same_only_seealso_seeentry'} = {
           'cmdname' => 'cindex',
           'extra' => {
             'element_node' => {},
-            'index_entry' => {
-              'entry_element' => {},
-              'entry_number' => 3,
-              'in_code' => 0,
-              'index_name' => 'cp'
-            },
+            'index_entry' => [
+              'cp',
+              3
+            ],
             'seeentry' => {}
           },
           'info' => {
@@ -375,12 +369,10 @@ $result_trees{'same_only_seealso_seeentry'} = {
           'cmdname' => 'cindex',
           'extra' => {
             'element_node' => {},
-            'index_entry' => {
-              'entry_element' => {},
-              'entry_number' => 4,
-              'in_code' => 0,
-              'index_name' => 'cp'
-            },
+            'index_entry' => [
+              'cp',
+              4
+            ],
             'seeentry' => {}
           },
           'info' => {
@@ -442,12 +434,10 @@ $result_trees{'same_only_seealso_seeentry'} = {
           'cmdname' => 'cindex',
           'extra' => {
             'element_node' => {},
-            'index_entry' => {
-              'entry_element' => {},
-              'entry_number' => 5,
-              'in_code' => 0,
-              'index_name' => 'cp'
-            },
+            'index_entry' => [
+              'cp',
+              5
+            ],
             'seealso' => {}
           },
           'info' => {
@@ -504,12 +494,10 @@ $result_trees{'same_only_seealso_seeentry'} = {
           'cmdname' => 'cindex',
           'extra' => {
             'element_node' => {},
-            'index_entry' => {
-              'entry_element' => {},
-              'entry_number' => 6,
-              'in_code' => 0,
-              'index_name' => 'cp'
-            },
+            'index_entry' => [
+              'cp',
+              6
+            ],
             'seeentry' => {}
           },
           'info' => {
@@ -580,22 +568,16 @@ $result_trees{'same_only_seealso_seeentry'} = {
   'type' => 'document_root'
 };
 
$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'}{'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'}{'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'}{'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'}{'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'}{'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];
 
 $result_texis{'same_only_seealso_seeentry'} = '@node Top
diff --git a/tp/t/results/indices/same_seealso_seeentry.pl 
b/tp/t/results/indices/same_seealso_seeentry.pl
index 1443c5e9a6..b62af107e9 100644
--- a/tp/t/results/indices/same_seealso_seeentry.pl
+++ b/tp/t/results/indices/same_seealso_seeentry.pl
@@ -184,12 +184,10 @@ $result_trees{'same_seealso_seeentry'} = {
           'cmdname' => 'cindex',
           'extra' => {
             'element_node' => {},
-            'index_entry' => {
-              'entry_element' => {},
-              'entry_number' => 1,
-              'in_code' => 0,
-              'index_name' => 'cp'
-            },
+            'index_entry' => [
+              'cp',
+              1
+            ],
             'seealso' => {}
           },
           'info' => {
@@ -246,12 +244,10 @@ $result_trees{'same_seealso_seeentry'} = {
           'cmdname' => 'cindex',
           'extra' => {
             'element_node' => {},
-            'index_entry' => {
-              'entry_element' => {},
-              'entry_number' => 2,
-              'in_code' => 0,
-              'index_name' => 'cp'
-            },
+            'index_entry' => [
+              'cp',
+              2
+            ],
             'seealso' => {}
           },
           'info' => {
@@ -313,12 +309,10 @@ $result_trees{'same_seealso_seeentry'} = {
           'cmdname' => 'cindex',
           'extra' => {
             'element_node' => {},
-            'index_entry' => {
-              'entry_element' => {},
-              'entry_number' => 3,
-              'in_code' => 0,
-              'index_name' => 'cp'
-            },
+            'index_entry' => [
+              'cp',
+              3
+            ],
             'seeentry' => {}
           },
           'info' => {
@@ -375,12 +369,10 @@ $result_trees{'same_seealso_seeentry'} = {
           'cmdname' => 'cindex',
           'extra' => {
             'element_node' => {},
-            'index_entry' => {
-              'entry_element' => {},
-              'entry_number' => 4,
-              'in_code' => 0,
-              'index_name' => 'cp'
-            },
+            'index_entry' => [
+              'cp',
+              4
+            ],
             'seeentry' => {}
           },
           'info' => {
@@ -442,12 +434,10 @@ $result_trees{'same_seealso_seeentry'} = {
           'cmdname' => 'cindex',
           'extra' => {
             'element_node' => {},
-            'index_entry' => {
-              'entry_element' => {},
-              'entry_number' => 5,
-              'in_code' => 0,
-              'index_name' => 'cp'
-            },
+            'index_entry' => [
+              'cp',
+              5
+            ],
             'seealso' => {}
           },
           'info' => {
@@ -504,12 +494,10 @@ $result_trees{'same_seealso_seeentry'} = {
           'cmdname' => 'cindex',
           'extra' => {
             'element_node' => {},
-            'index_entry' => {
-              'entry_element' => {},
-              'entry_number' => 6,
-              'in_code' => 0,
-              'index_name' => 'cp'
-            },
+            'index_entry' => [
+              'cp',
+              6
+            ],
             'seeentry' => {}
           },
           'info' => {
@@ -549,12 +537,10 @@ $result_trees{'same_seealso_seeentry'} = {
           'cmdname' => 'cindex',
           'extra' => {
             'element_node' => {},
-            'index_entry' => {
-              'entry_element' => {},
-              'entry_number' => 7,
-              'in_code' => 0,
-              'index_name' => 'cp'
-            }
+            'index_entry' => [
+              'cp',
+              7
+            ]
           },
           'info' => {
             'spaces_before_argument' => {
@@ -624,25 +610,18 @@ $result_trees{'same_seealso_seeentry'} = {
   'type' => 'document_root'
 };
 
$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'}{'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'}{'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'}{'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'}{'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'}{'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'}{'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
 @top top
diff --git a/tp/t/results/indices/seealso_duplicate.pl 
b/tp/t/results/indices/seealso_duplicate.pl
index 6e65939222..0ab46cb0eb 100644
--- a/tp/t/results/indices/seealso_duplicate.pl
+++ b/tp/t/results/indices/seealso_duplicate.pl
@@ -106,12 +106,10 @@ $result_trees{'seealso_duplicate'} = {
           'cmdname' => 'cindex',
           'extra' => {
             'element_node' => {},
-            'index_entry' => {
-              'entry_element' => {},
-              'entry_number' => 1,
-              'in_code' => 0,
-              'index_name' => 'cp'
-            },
+            'index_entry' => [
+              'cp',
+              1
+            ],
             'subentry' => {
               'args' => [
                 {
@@ -192,12 +190,10 @@ $result_trees{'seealso_duplicate'} = {
           'cmdname' => 'cindex',
           'extra' => {
             'element_node' => {},
-            'index_entry' => {
-              'entry_element' => {},
-              'entry_number' => 2,
-              'in_code' => 0,
-              'index_name' => 'cp'
-            },
+            'index_entry' => [
+              'cp',
+              2
+            ],
             'subentry' => {
               'args' => [
                 {
@@ -344,10 +340,8 @@ $result_trees{'seealso_duplicate'} = {
   'type' => 'document_root'
 };
 
$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'}{'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 bf31071935..869fcfba1f 100644
--- a/tp/t/results/indices/seeentry.pl
+++ b/tp/t/results/indices/seeentry.pl
@@ -174,12 +174,10 @@ $result_trees{'seeentry'} = {
           'cmdname' => 'cindex',
           'extra' => {
             'element_node' => {},
-            'index_entry' => {
-              'entry_element' => {},
-              'entry_number' => 1,
-              'in_code' => 0,
-              'index_name' => 'cp'
-            },
+            'index_entry' => [
+              'cp',
+              1
+            ],
             'seeentry' => {}
           },
           'info' => {
@@ -236,12 +234,10 @@ $result_trees{'seeentry'} = {
           'cmdname' => 'cindex',
           'extra' => {
             'element_node' => {},
-            'index_entry' => {
-              'entry_element' => {},
-              'entry_number' => 2,
-              'in_code' => 0,
-              'index_name' => 'cp'
-            },
+            'index_entry' => [
+              'cp',
+              2
+            ],
             'seealso' => {}
           },
           'info' => {
@@ -303,12 +299,10 @@ $result_trees{'seeentry'} = {
           'cmdname' => 'findex',
           'extra' => {
             'element_node' => {},
-            'index_entry' => {
-              'entry_element' => {},
-              'entry_number' => 1,
-              'in_code' => 1,
-              'index_name' => 'fn'
-            },
+            'index_entry' => [
+              'fn',
+              1
+            ],
             'seeentry' => {}
           },
           'info' => {
@@ -365,12 +359,10 @@ $result_trees{'seeentry'} = {
           'cmdname' => 'findex',
           'extra' => {
             'element_node' => {},
-            'index_entry' => {
-              'entry_element' => {},
-              'entry_number' => 2,
-              'in_code' => 1,
-              'index_name' => 'fn'
-            },
+            'index_entry' => [
+              'fn',
+              2
+            ],
             'seealso' => {}
           },
           'info' => {
@@ -475,16 +467,12 @@ $result_trees{'seeentry'} = {
   'type' => 'document_root'
 };
 
$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'}{'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'}{'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'}{'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];
 
 $result_texis{'seeentry'} = '@node Top
diff --git a/tp/t/results/indices/sorted_subentries.pl 
b/tp/t/results/indices/sorted_subentries.pl
index e3813621cd..c6ad0fbd8b 100644
--- a/tp/t/results/indices/sorted_subentries.pl
+++ b/tp/t/results/indices/sorted_subentries.pl
@@ -150,12 +150,10 @@ $result_trees{'sorted_subentries'} = {
           'cmdname' => 'cindex',
           'extra' => {
             'element_node' => {},
-            'index_entry' => {
-              'entry_element' => {},
-              'entry_number' => 1,
-              'in_code' => 0,
-              'index_name' => 'cp'
-            },
+            'index_entry' => [
+              'cp',
+              1
+            ],
             'subentry' => {
               'args' => [
                 {
@@ -221,12 +219,10 @@ $result_trees{'sorted_subentries'} = {
           'cmdname' => 'cindex',
           'extra' => {
             'element_node' => {},
-            'index_entry' => {
-              'entry_element' => {},
-              'entry_number' => 2,
-              'in_code' => 0,
-              'index_name' => 'cp'
-            },
+            'index_entry' => [
+              'cp',
+              2
+            ],
             'subentry' => {
               'args' => [
                 {
@@ -292,12 +288,10 @@ $result_trees{'sorted_subentries'} = {
           'cmdname' => 'cindex',
           'extra' => {
             'element_node' => {},
-            'index_entry' => {
-              'entry_element' => {},
-              'entry_number' => 3,
-              'in_code' => 0,
-              'index_name' => 'cp'
-            },
+            'index_entry' => [
+              'cp',
+              3
+            ],
             'subentry' => {
               'args' => [
                 {
@@ -363,12 +357,10 @@ $result_trees{'sorted_subentries'} = {
           'cmdname' => 'cindex',
           'extra' => {
             'element_node' => {},
-            'index_entry' => {
-              'entry_element' => {},
-              'entry_number' => 4,
-              'in_code' => 0,
-              'index_name' => 'cp'
-            },
+            'index_entry' => [
+              'cp',
+              4
+            ],
             'subentry' => {
               'args' => [
                 {
@@ -439,12 +431,10 @@ $result_trees{'sorted_subentries'} = {
           'cmdname' => 'cindex',
           'extra' => {
             'element_node' => {},
-            'index_entry' => {
-              'entry_element' => {},
-              'entry_number' => 5,
-              'in_code' => 0,
-              'index_name' => 'cp'
-            },
+            'index_entry' => [
+              'cp',
+              5
+            ],
             'subentry' => {
               'args' => [
                 {
@@ -542,12 +532,10 @@ $result_trees{'sorted_subentries'} = {
           'cmdname' => 'cindex',
           'extra' => {
             'element_node' => {},
-            'index_entry' => {
-              'entry_element' => {},
-              'entry_number' => 6,
-              'in_code' => 0,
-              'index_name' => 'cp'
-            },
+            'index_entry' => [
+              'cp',
+              6
+            ],
             'subentry' => {
               'args' => [
                 {
@@ -614,12 +602,10 @@ $result_trees{'sorted_subentries'} = {
           'cmdname' => 'cindex',
           'extra' => {
             'element_node' => {},
-            'index_entry' => {
-              'entry_element' => {},
-              'entry_number' => 7,
-              'in_code' => 0,
-              'index_name' => 'cp'
-            }
+            'index_entry' => [
+              'cp',
+              7
+            ]
           },
           'info' => {
             'spaces_before_argument' => {
@@ -652,12 +638,10 @@ $result_trees{'sorted_subentries'} = {
           'cmdname' => 'cindex',
           'extra' => {
             'element_node' => {},
-            'index_entry' => {
-              'entry_element' => {},
-              'entry_number' => 8,
-              'in_code' => 0,
-              'index_name' => 'cp'
-            },
+            'index_entry' => [
+              'cp',
+              8
+            ],
             'subentry' => {
               'args' => [
                 {
@@ -723,12 +707,10 @@ $result_trees{'sorted_subentries'} = {
           'cmdname' => 'cindex',
           'extra' => {
             'element_node' => {},
-            'index_entry' => {
-              'entry_element' => {},
-              'entry_number' => 9,
-              'in_code' => 0,
-              'index_name' => 'cp'
-            },
+            'index_entry' => [
+              'cp',
+              9
+            ],
             'subentry' => {
               'args' => [
                 {
@@ -786,12 +768,10 @@ $result_trees{'sorted_subentries'} = {
           'cmdname' => 'cindex',
           'extra' => {
             'element_node' => {},
-            'index_entry' => {
-              'entry_element' => {},
-              'entry_number' => 10,
-              'in_code' => 0,
-              'index_name' => 'cp'
-            }
+            'index_entry' => [
+              'cp',
+              10
+            ]
           },
           'info' => {
             'spaces_before_argument' => {
@@ -824,12 +804,10 @@ $result_trees{'sorted_subentries'} = {
           'cmdname' => 'cindex',
           'extra' => {
             'element_node' => {},
-            'index_entry' => {
-              'entry_element' => {},
-              'entry_number' => 11,
-              'in_code' => 0,
-              'index_name' => 'cp'
-            },
+            'index_entry' => [
+              'cp',
+              11
+            ],
             'subentry' => {
               'args' => [
                 {
@@ -1029,12 +1007,10 @@ $result_trees{'sorted_subentries'} = {
           'cmdname' => 'cindex',
           'extra' => {
             'element_node' => {},
-            'index_entry' => {
-              'entry_element' => {},
-              'entry_number' => 12,
-              'in_code' => 0,
-              'index_name' => 'cp'
-            },
+            'index_entry' => [
+              'cp',
+              12
+            ],
             'subentry' => {
               'args' => [
                 {
@@ -1133,12 +1109,10 @@ $result_trees{'sorted_subentries'} = {
           'cmdname' => 'cindex',
           'extra' => {
             'element_node' => {},
-            'index_entry' => {
-              'entry_element' => {},
-              'entry_number' => 13,
-              'in_code' => 0,
-              'index_name' => 'cp'
-            }
+            'index_entry' => [
+              'cp',
+              13
+            ]
           },
           'info' => {
             'spaces_before_argument' => {
@@ -1186,12 +1160,10 @@ $result_trees{'sorted_subentries'} = {
           'cmdname' => 'cindex',
           'extra' => {
             'element_node' => {},
-            'index_entry' => {
-              'entry_element' => {},
-              'entry_number' => 14,
-              'in_code' => 0,
-              'index_name' => 'cp'
-            },
+            'index_entry' => [
+              'cp',
+              14
+            ],
             'subentry' => {
               'args' => [
                 {
@@ -1272,12 +1244,10 @@ $result_trees{'sorted_subentries'} = {
           'cmdname' => 'cindex',
           'extra' => {
             'element_node' => {},
-            'index_entry' => {
-              'entry_element' => {},
-              'entry_number' => 15,
-              'in_code' => 0,
-              'index_name' => 'cp'
-            },
+            'index_entry' => [
+              'cp',
+              15
+            ],
             'subentry' => {
               'args' => [
                 {
@@ -1467,12 +1437,10 @@ $result_trees{'sorted_subentries'} = {
           'cmdname' => 'cindex',
           'extra' => {
             'element_node' => {},
-            'index_entry' => {
-              'entry_element' => {},
-              'entry_number' => 16,
-              'in_code' => 0,
-              'index_name' => 'cp'
-            },
+            'index_entry' => [
+              'cp',
+              16
+            ],
             'subentry' => {
               'args' => [
                 {
@@ -1593,12 +1561,10 @@ $result_trees{'sorted_subentries'} = {
           'cmdname' => 'cindex',
           'extra' => {
             'element_node' => {},
-            'index_entry' => {
-              'entry_element' => {},
-              'entry_number' => 17,
-              'in_code' => 0,
-              'index_name' => 'cp'
-            },
+            'index_entry' => [
+              'cp',
+              17
+            ],
             'subentry' => {
               'args' => [
                 {
@@ -1696,12 +1662,10 @@ $result_trees{'sorted_subentries'} = {
           'cmdname' => 'cindex',
           'extra' => {
             'element_node' => {},
-            'index_entry' => {
-              'entry_element' => {},
-              'entry_number' => 18,
-              'in_code' => 0,
-              'index_name' => 'cp'
-            },
+            'index_entry' => [
+              'cp',
+              18
+            ],
             'subentry' => {
               'args' => [
                 {
@@ -1836,63 +1800,45 @@ $result_trees{'sorted_subentries'} = {
   'type' => 'document_root'
 };
 
$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'}{'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'}{'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'}{'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'}{'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'}{'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'}{'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'}{'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'}{'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'}{'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'}{'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'}[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'}{'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'}{'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'}{'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'}{'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'}{'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'}{'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 143507877c..12f0c1226d 100644
--- a/tp/t/results/indices/split_chapter_index.pl
+++ b/tp/t/results/indices/split_chapter_index.pl
@@ -145,12 +145,10 @@ $result_trees{'split_chapter_index'} = {
           'cmdname' => 'cindex',
           'extra' => {
             'element_node' => {},
-            'index_entry' => {
-              'entry_element' => {},
-              'entry_number' => 1,
-              'in_code' => 0,
-              'index_name' => 'cp'
-            }
+            'index_entry' => [
+              'cp',
+              1
+            ]
           },
           'info' => {
             'spaces_before_argument' => {
@@ -391,12 +389,10 @@ $result_trees{'split_chapter_index'} = {
           'cmdname' => 'cindex',
           'extra' => {
             'element_node' => {},
-            'index_entry' => {
-              'entry_element' => {},
-              'entry_number' => 2,
-              'in_code' => 0,
-              'index_name' => 'cp'
-            }
+            'index_entry' => [
+              'cp',
+              2
+            ]
           },
           'info' => {
             'spaces_before_argument' => {
@@ -430,12 +426,10 @@ $result_trees{'split_chapter_index'} = {
           'cmdname' => 'cindex',
           'extra' => {
             'element_node' => {},
-            'index_entry' => {
-              'entry_element' => {},
-              'entry_number' => 3,
-              'in_code' => 0,
-              'index_name' => 'cp'
-            }
+            'index_entry' => [
+              'cp',
+              3
+            ]
           },
           'info' => {
             'spaces_before_argument' => {
@@ -469,12 +463,10 @@ $result_trees{'split_chapter_index'} = {
           'cmdname' => 'findex',
           'extra' => {
             'element_node' => {},
-            'index_entry' => {
-              'entry_element' => {},
-              'entry_number' => 1,
-              'in_code' => 1,
-              'index_name' => 'fn'
-            }
+            'index_entry' => [
+              'fn',
+              1
+            ]
           },
           'info' => {
             'spaces_before_argument' => {
@@ -508,12 +500,10 @@ $result_trees{'split_chapter_index'} = {
           'cmdname' => 'cindex',
           'extra' => {
             'element_node' => {},
-            'index_entry' => {
-              'entry_element' => {},
-              'entry_number' => 4,
-              'in_code' => 0,
-              'index_name' => 'cp'
-            }
+            'index_entry' => [
+              'cp',
+              4
+            ]
           },
           'info' => {
             'spaces_before_argument' => {
@@ -591,12 +581,10 @@ $result_trees{'split_chapter_index'} = {
           'cmdname' => 'cindex',
           'extra' => {
             'element_node' => {},
-            'index_entry' => {
-              'entry_element' => {},
-              'entry_number' => 5,
-              'in_code' => 0,
-              'index_name' => 'cp'
-            }
+            'index_entry' => [
+              'cp',
+              5
+            ]
           },
           'info' => {
             'spaces_before_argument' => {
@@ -635,12 +623,10 @@ $result_trees{'split_chapter_index'} = {
           'cmdname' => 'findex',
           'extra' => {
             'element_node' => {},
-            'index_entry' => {
-              'entry_element' => {},
-              'entry_number' => 2,
-              'in_code' => 1,
-              'index_name' => 'fn'
-            }
+            'index_entry' => [
+              'fn',
+              2
+            ]
           },
           'info' => {
             'spaces_before_argument' => {
@@ -674,12 +660,10 @@ $result_trees{'split_chapter_index'} = {
           'cmdname' => 'cindex',
           'extra' => {
             'element_node' => {},
-            'index_entry' => {
-              'entry_element' => {},
-              'entry_number' => 6,
-              'in_code' => 0,
-              'index_name' => 'cp'
-            }
+            'index_entry' => [
+              'cp',
+              6
+            ]
           },
           'info' => {
             'spaces_before_argument' => {
@@ -713,12 +697,10 @@ $result_trees{'split_chapter_index'} = {
           'cmdname' => 'findex',
           'extra' => {
             'element_node' => {},
-            'index_entry' => {
-              'entry_element' => {},
-              'entry_number' => 3,
-              'in_code' => 1,
-              'index_name' => 'fn'
-            }
+            'index_entry' => [
+              'fn',
+              3
+            ]
           },
           'info' => {
             'spaces_before_argument' => {
@@ -1034,12 +1016,10 @@ $result_trees{'split_chapter_index'} = {
           'cmdname' => 'cindex',
           'extra' => {
             'element_node' => {},
-            'index_entry' => {
-              'entry_element' => {},
-              'entry_number' => 7,
-              'in_code' => 0,
-              'index_name' => 'cp'
-            }
+            'index_entry' => [
+              'cp',
+              7
+            ]
           },
           'info' => {
             'spaces_before_argument' => {
@@ -1078,12 +1058,10 @@ $result_trees{'split_chapter_index'} = {
           'cmdname' => 'cindex',
           'extra' => {
             'element_node' => {},
-            'index_entry' => {
-              'entry_element' => {},
-              'entry_number' => 8,
-              'in_code' => 0,
-              'index_name' => 'cp'
-            }
+            'index_entry' => [
+              'cp',
+              8
+            ]
           },
           'info' => {
             'spaces_before_argument' => {
@@ -1205,12 +1183,10 @@ $result_trees{'split_chapter_index'} = {
           'cmdname' => 'cindex',
           'extra' => {
             'element_node' => {},
-            'index_entry' => {
-              'entry_element' => {},
-              'entry_number' => 9,
-              'in_code' => 0,
-              'index_name' => 'cp'
-            }
+            'index_entry' => [
+              'cp',
+              9
+            ]
           },
           'info' => {
             'spaces_before_argument' => {
@@ -1256,32 +1232,20 @@ $result_trees{'split_chapter_index'} = {
   'type' => 'document_root'
 };
 
$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]{'contents'}[1]{'extra'}{'node_content'}[0]
 = 
$result_trees{'split_chapter_index'}{'contents'}[2]{'contents'}[5]{'contents'}[0]{'contents'}[1]{'contents'}[0];
 
$result_trees{'split_chapter_index'}{'contents'}[4]{'contents'}[2]{'extra'}{'element_node'}
 = $result_trees{'split_chapter_index'}{'contents'}[3];
-$result_trees{'split_chapter_index'}{'contents'}[4]{'contents'}[2]{'extra'}{'index_entry'}{'entry_element'}
 = $result_trees{'split_chapter_index'}{'contents'}[4]{'contents'}[2];
 
$result_trees{'split_chapter_index'}{'contents'}[4]{'contents'}[3]{'extra'}{'element_node'}
 = $result_trees{'split_chapter_index'}{'contents'}[3];
-$result_trees{'split_chapter_index'}{'contents'}[4]{'contents'}[3]{'extra'}{'index_entry'}{'entry_element'}
 = $result_trees{'split_chapter_index'}{'contents'}[4]{'contents'}[3];
 
$result_trees{'split_chapter_index'}{'contents'}[4]{'contents'}[4]{'extra'}{'element_node'}
 = $result_trees{'split_chapter_index'}{'contents'}[3];
-$result_trees{'split_chapter_index'}{'contents'}[4]{'contents'}[4]{'extra'}{'index_entry'}{'entry_element'}
 = $result_trees{'split_chapter_index'}{'contents'}[4]{'contents'}[4];
 
$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'}[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]{'extra'}{'element_node'}
 = $result_trees{'split_chapter_index'}{'contents'}[3];
-$result_trees{'split_chapter_index'}{'contents'}[4]{'contents'}[11]{'extra'}{'index_entry'}{'entry_element'}
 = $result_trees{'split_chapter_index'}{'contents'}[4]{'contents'}[11];
 
$result_trees{'split_chapter_index'}{'contents'}[4]{'contents'}[12]{'extra'}{'element_node'}
 = $result_trees{'split_chapter_index'}{'contents'}[3];
-$result_trees{'split_chapter_index'}{'contents'}[4]{'contents'}[12]{'extra'}{'index_entry'}{'entry_element'}
 = $result_trees{'split_chapter_index'}{'contents'}[4]{'contents'}[12];
 
$result_trees{'split_chapter_index'}{'contents'}[4]{'contents'}[13]{'extra'}{'element_node'}
 = $result_trees{'split_chapter_index'}{'contents'}[3];
-$result_trees{'split_chapter_index'}{'contents'}[4]{'contents'}[13]{'extra'}{'index_entry'}{'entry_element'}
 = $result_trees{'split_chapter_index'}{'contents'}[4]{'contents'}[13];
 
$result_trees{'split_chapter_index'}{'contents'}[4]{'contents'}[15]{'contents'}[0]{'contents'}[1]{'extra'}{'node_content'}[0]
 = 
$result_trees{'split_chapter_index'}{'contents'}[4]{'contents'}[15]{'contents'}[0]{'contents'}[1]{'contents'}[0];
 
$result_trees{'split_chapter_index'}{'contents'}[6]{'contents'}[1]{'contents'}[0]{'contents'}[1]{'extra'}{'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'}{'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'}{'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'}[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 c75048854a..b0f0502ad9 100644
--- a/tp/t/results/indices/subentries.pl
+++ b/tp/t/results/indices/subentries.pl
@@ -152,12 +152,10 @@ $result_trees{'subentries'} = {
           'cmdname' => 'cindex',
           'extra' => {
             'element_node' => {},
-            'index_entry' => {
-              'entry_element' => {},
-              'entry_number' => 1,
-              'in_code' => 0,
-              'index_name' => 'cp'
-            }
+            'index_entry' => [
+              'cp',
+              1
+            ]
           },
           'info' => {
             'spaces_before_argument' => {
@@ -190,12 +188,10 @@ $result_trees{'subentries'} = {
           'cmdname' => 'cindex',
           'extra' => {
             'element_node' => {},
-            'index_entry' => {
-              'entry_element' => {},
-              'entry_number' => 2,
-              'in_code' => 0,
-              'index_name' => 'cp'
-            },
+            'index_entry' => [
+              'cp',
+              2
+            ],
             'subentry' => {
               'args' => [
                 {
@@ -261,12 +257,10 @@ $result_trees{'subentries'} = {
           'cmdname' => 'cindex',
           'extra' => {
             'element_node' => {},
-            'index_entry' => {
-              'entry_element' => {},
-              'entry_number' => 3,
-              'in_code' => 0,
-              'index_name' => 'cp'
-            },
+            'index_entry' => [
+              'cp',
+              3
+            ],
             'subentry' => {
               'args' => [
                 {
@@ -364,12 +358,10 @@ $result_trees{'subentries'} = {
           'cmdname' => 'cindex',
           'extra' => {
             'element_node' => {},
-            'index_entry' => {
-              'entry_element' => {},
-              'entry_number' => 4,
-              'in_code' => 0,
-              'index_name' => 'cp'
-            },
+            'index_entry' => [
+              'cp',
+              4
+            ],
             'subentry' => {
               'args' => [
                 {
@@ -505,12 +497,10 @@ $result_trees{'subentries'} = {
           'cmdname' => 'findex',
           'extra' => {
             'element_node' => {},
-            'index_entry' => {
-              'entry_element' => {},
-              'entry_number' => 1,
-              'in_code' => 1,
-              'index_name' => 'fn'
-            }
+            'index_entry' => [
+              'fn',
+              1
+            ]
           },
           'info' => {
             'spaces_before_argument' => {
@@ -543,12 +533,10 @@ $result_trees{'subentries'} = {
           'cmdname' => 'findex',
           'extra' => {
             'element_node' => {},
-            'index_entry' => {
-              'entry_element' => {},
-              'entry_number' => 2,
-              'in_code' => 1,
-              'index_name' => 'fn'
-            },
+            'index_entry' => [
+              'fn',
+              2
+            ],
             'subentry' => {
               'args' => [
                 {
@@ -614,12 +602,10 @@ $result_trees{'subentries'} = {
           'cmdname' => 'findex',
           'extra' => {
             'element_node' => {},
-            'index_entry' => {
-              'entry_element' => {},
-              'entry_number' => 3,
-              'in_code' => 1,
-              'index_name' => 'fn'
-            },
+            'index_entry' => [
+              'fn',
+              3
+            ],
             'subentry' => {
               'args' => [
                 {
@@ -717,12 +703,10 @@ $result_trees{'subentries'} = {
           'cmdname' => 'findex',
           'extra' => {
             'element_node' => {},
-            'index_entry' => {
-              'entry_element' => {},
-              'entry_number' => 4,
-              'in_code' => 1,
-              'index_name' => 'fn'
-            },
+            'index_entry' => [
+              'fn',
+              4
+            ],
             'subentry' => {
               'args' => [
                 {
@@ -923,30 +907,22 @@ $result_trees{'subentries'} = {
   'type' => 'document_root'
 };
 
$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'}{'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'}{'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'}{'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'}{'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'}{'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'}{'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'}{'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'};
 $result_trees{'subentries'}{'contents'}[4]{'contents'}[21] = 
$result_trees{'subentries'}{'contents'}[4]{'contents'}[18]{'extra'}{'subentry'}{'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 4a382b0eb8..5bcebad8f0 100644
--- a/tp/t/results/indices/subentry_and_sortas.pl
+++ b/tp/t/results/indices/subentry_and_sortas.pl
@@ -173,12 +173,10 @@ $result_trees{'subentry_and_sortas'} = {
           'cmdname' => 'cindex',
           'extra' => {
             'element_node' => {},
-            'index_entry' => {
-              'entry_element' => {},
-              'entry_number' => 1,
-              'in_code' => 0,
-              'index_name' => 'cp'
-            },
+            'index_entry' => [
+              'cp',
+              1
+            ],
             'sortas' => 'A---S',
             'subentry' => {
               'args' => [
@@ -295,12 +293,10 @@ $result_trees{'subentry_and_sortas'} = {
           'cmdname' => 'findex',
           'extra' => {
             'element_node' => {},
-            'index_entry' => {
-              'entry_element' => {},
-              'entry_number' => 1,
-              'in_code' => 1,
-              'index_name' => 'fn'
-            },
+            'index_entry' => [
+              'fn',
+              1
+            ],
             'sortas' => 'X---S',
             'subentry' => {
               'args' => [
@@ -461,10 +457,8 @@ $result_trees{'subentry_and_sortas'} = {
   'type' => 'document_root'
 };
 
$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'}{'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'};
 
 $result_texis{'subentry_and_sortas'} = '@node Top
diff --git a/tp/t/results/indices/subentry_and_sortas_spaces.pl 
b/tp/t/results/indices/subentry_and_sortas_spaces.pl
index a1f9afa32c..f7b15689d1 100644
--- a/tp/t/results/indices/subentry_and_sortas_spaces.pl
+++ b/tp/t/results/indices/subentry_and_sortas_spaces.pl
@@ -168,12 +168,10 @@ $result_trees{'subentry_and_sortas_spaces'} = {
           'cmdname' => 'cindex',
           'extra' => {
             'element_node' => {},
-            'index_entry' => {
-              'entry_element' => {},
-              'entry_number' => 1,
-              'in_code' => 0,
-              'index_name' => 'cp'
-            },
+            'index_entry' => [
+              'cp',
+              1
+            ],
             'sortas' => 'A---S',
             'subentry' => {
               'args' => [
@@ -259,12 +257,10 @@ $result_trees{'subentry_and_sortas_spaces'} = {
           'cmdname' => 'cindex',
           'extra' => {
             'element_node' => {},
-            'index_entry' => {
-              'entry_element' => {},
-              'entry_number' => 2,
-              'in_code' => 0,
-              'index_name' => 'cp'
-            },
+            'index_entry' => [
+              'cp',
+              2
+            ],
             'subentry' => {
               'args' => [
                 {
@@ -336,12 +332,10 @@ $result_trees{'subentry_and_sortas_spaces'} = {
           'cmdname' => 'cindex',
           'extra' => {
             'element_node' => {},
-            'index_entry' => {
-              'entry_element' => {},
-              'entry_number' => 3,
-              'in_code' => 0,
-              'index_name' => 'cp'
-            },
+            'index_entry' => [
+              'cp',
+              3
+            ],
             'subentry' => {
               'args' => [
                 {
@@ -458,12 +452,10 @@ $result_trees{'subentry_and_sortas_spaces'} = {
           'cmdname' => 'cindex',
           'extra' => {
             'element_node' => {},
-            'index_entry' => {
-              'entry_element' => {},
-              'entry_number' => 4,
-              'in_code' => 0,
-              'index_name' => 'cp'
-            },
+            'index_entry' => [
+              'cp',
+              4
+            ],
             'subentry' => {
               'args' => [
                 {
@@ -593,17 +585,13 @@ $result_trees{'subentry_and_sortas_spaces'} = {
   'type' => 'document_root'
 };
 
$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'}{'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'}{'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'}{'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 f9815f9b45..68ef353a4a 100644
--- a/tp/t/results/indices/syncode_index_print_both.pl
+++ b/tp/t/results/indices/syncode_index_print_both.pl
@@ -203,12 +203,10 @@ $result_trees{'syncode_index_print_both'} = {
           'cmdname' => 'cindex',
           'extra' => {
             'element_node' => {},
-            'index_entry' => {
-              'entry_element' => {},
-              'entry_number' => 1,
-              'in_code' => 0,
-              'index_name' => 'cp'
-            }
+            'index_entry' => [
+              'cp',
+              1
+            ]
           },
           'info' => {
             'spaces_before_argument' => {
@@ -242,12 +240,10 @@ $result_trees{'syncode_index_print_both'} = {
           'cmdname' => 'findex',
           'extra' => {
             'element_node' => {},
-            'index_entry' => {
-              'entry_element' => {},
-              'entry_number' => 1,
-              'in_code' => 1,
-              'index_name' => 'fn'
-            }
+            'index_entry' => [
+              'fn',
+              1
+            ]
           },
           'info' => {
             'spaces_before_argument' => {
@@ -394,9 +390,7 @@ $result_trees{'syncode_index_print_both'} = {
   'type' => 'document_root'
 };
 
$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'}{'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 711ca1befe..57b67f1b68 100644
--- a/tp/t/results/indices/syncodeindex_to_plain.pl
+++ b/tp/t/results/indices/syncodeindex_to_plain.pl
@@ -133,12 +133,10 @@ $result_trees{'syncodeindex_to_plain'} = {
           'cmdname' => 'kindex',
           'extra' => {
             'element_node' => {},
-            'index_entry' => {
-              'entry_element' => {},
-              'entry_number' => 1,
-              'in_code' => 1,
-              'index_name' => 'ky'
-            }
+            'index_entry' => [
+              'ky',
+              1
+            ]
           },
           'info' => {
             'spaces_before_argument' => {
@@ -172,12 +170,10 @@ $result_trees{'syncodeindex_to_plain'} = {
           'cmdname' => 'vindex',
           'extra' => {
             'element_node' => {},
-            'index_entry' => {
-              'entry_element' => {},
-              'entry_number' => 1,
-              'in_code' => 1,
-              'index_name' => 'vr'
-            }
+            'index_entry' => [
+              'vr',
+              1
+            ]
           },
           'info' => {
             'spaces_before_argument' => {
@@ -211,12 +207,10 @@ $result_trees{'syncodeindex_to_plain'} = {
           'cmdname' => 'cindex',
           'extra' => {
             'element_node' => {},
-            'index_entry' => {
-              'entry_element' => {},
-              'entry_number' => 1,
-              'in_code' => 0,
-              'index_name' => 'cp'
-            }
+            'index_entry' => [
+              'cp',
+              1
+            ]
           },
           'info' => {
             'spaces_before_argument' => {
@@ -346,11 +340,8 @@ $result_trees{'syncodeindex_to_plain'} = {
   'type' => 'document_root'
 };
 
$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'}{'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'}{'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_texis{'syncodeindex_to_plain'} = '@syncodeindex ky cp
 
diff --git a/tp/t/results/indices/transparent_sort_chars.pl 
b/tp/t/results/indices/transparent_sort_chars.pl
index bcd60d966a..1c5fb00d05 100644
--- a/tp/t/results/indices/transparent_sort_chars.pl
+++ b/tp/t/results/indices/transparent_sort_chars.pl
@@ -178,12 +178,10 @@ $result_trees{'transparent_sort_chars'} = {
           'cmdname' => 'cindex',
           'extra' => {
             'element_node' => {},
-            'index_entry' => {
-              'entry_element' => {},
-              'entry_number' => 1,
-              'in_code' => 0,
-              'index_name' => 'cp'
-            },
+            'index_entry' => [
+              'cp',
+              1
+            ],
             'index_ignore_chars' => '-'
           },
           'info' => {
@@ -218,12 +216,10 @@ $result_trees{'transparent_sort_chars'} = {
           'cmdname' => 'cindex',
           'extra' => {
             'element_node' => {},
-            'index_entry' => {
-              'entry_element' => {},
-              'entry_number' => 2,
-              'in_code' => 0,
-              'index_name' => 'cp'
-            },
+            'index_entry' => [
+              'cp',
+              2
+            ],
             'index_ignore_chars' => '-'
           },
           'info' => {
@@ -258,12 +254,10 @@ $result_trees{'transparent_sort_chars'} = {
           'cmdname' => 'cindex',
           'extra' => {
             'element_node' => {},
-            'index_entry' => {
-              'entry_element' => {},
-              'entry_number' => 3,
-              'in_code' => 0,
-              'index_name' => 'cp'
-            },
+            'index_entry' => [
+              'cp',
+              3
+            ],
             'index_ignore_chars' => '-'
           },
           'info' => {
@@ -337,11 +331,8 @@ $result_trees{'transparent_sort_chars'} = {
   'type' => 'document_root'
 };
 
$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'}{'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'}{'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_texis{'transparent_sort_chars'} = '@set txiindexhyphenignore
 
diff --git a/tp/t/results/indices/unknown_then_known_index_entry.pl 
b/tp/t/results/indices/unknown_then_known_index_entry.pl
index 8fd83f5c5f..f1e78d5893 100644
--- a/tp/t/results/indices/unknown_then_known_index_entry.pl
+++ b/tp/t/results/indices/unknown_then_known_index_entry.pl
@@ -75,12 +75,10 @@ $result_trees{'unknown_then_known_index_entry'} = {
           ],
           'cmdname' => 'someindex',
           'extra' => {
-            'index_entry' => {
-              'entry_element' => {},
-              'entry_number' => 1,
-              'in_code' => 0,
-              'index_name' => 'some'
-            }
+            'index_entry' => [
+              'some',
+              1
+            ]
           },
           'info' => {
             'spaces_before_argument' => {
@@ -100,7 +98,6 @@ $result_trees{'unknown_then_known_index_entry'} = {
   ],
   'type' => 'document_root'
 };
-$result_trees{'unknown_then_known_index_entry'}{'contents'}[0]{'contents'}[2]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'unknown_then_known_index_entry'}{'contents'}[0]{'contents'}[2];
 
 $result_texis{'unknown_then_known_index_entry'} = ' someindex entry.
 @defindex some
diff --git a/tp/t/results/indices/w_lines_count.pl 
b/tp/t/results/indices/w_lines_count.pl
index 48e7430089..bd992dc585 100644
Binary files a/tp/t/results/indices/w_lines_count.pl and 
b/tp/t/results/indices/w_lines_count.pl differ
diff --git a/tp/t/results/info_tests/before_node_and_section.pl 
b/tp/t/results/info_tests/before_node_and_section.pl
index 40a4469abc..634f80ce60 100644
--- a/tp/t/results/info_tests/before_node_and_section.pl
+++ b/tp/t/results/info_tests/before_node_and_section.pl
@@ -68,12 +68,10 @@ $result_trees{'before_node_and_section'} = {
           ],
           'cmdname' => 'cindex',
           'extra' => {
-            'index_entry' => {
-              'entry_element' => {},
-              'entry_number' => 1,
-              'in_code' => 0,
-              'index_name' => 'cp'
-            }
+            'index_entry' => [
+              'cp',
+              1
+            ]
           },
           'info' => {
             'spaces_before_argument' => {
@@ -631,7 +629,6 @@ $result_trees{'before_node_and_section'} = {
   'type' => 'document_root'
 };
 
$result_trees{'before_node_and_section'}{'contents'}[0]{'contents'}[0]{'contents'}[2]{'args'}[0]{'extra'}{'node_content'}[0]
 = 
$result_trees{'before_node_and_section'}{'contents'}[0]{'contents'}[0]{'contents'}[2]{'args'}[0]{'contents'}[0];
-$result_trees{'before_node_and_section'}{'contents'}[0]{'contents'}[1]{'extra'}{'index_entry'}{'entry_element'}
 = $result_trees{'before_node_and_section'}{'contents'}[0]{'contents'}[1];
 
$result_trees{'before_node_and_section'}{'contents'}[0]{'contents'}[4]{'contents'}[0]{'contents'}[1]{'extra'}{'node_content'}[0]
 = 
$result_trees{'before_node_and_section'}{'contents'}[0]{'contents'}[4]{'contents'}[0]{'contents'}[1]{'contents'}[0];
 
$result_trees{'before_node_and_section'}{'contents'}[2]{'contents'}[2]{'contents'}[5]{'args'}[0]{'extra'}{'node_content'}[0]
 = 
$result_trees{'before_node_and_section'}{'contents'}[2]{'contents'}[2]{'contents'}[5]{'args'}[0]{'contents'}[0];
 
$result_trees{'before_node_and_section'}{'contents'}[2]{'contents'}[3]{'contents'}[0]{'contents'}[1]{'extra'}{'node_content'}[0]
 = 
$result_trees{'before_node_and_section'}{'contents'}[2]{'contents'}[3]{'contents'}[0]{'contents'}[1]{'contents'}[0];
diff --git a/tp/t/results/info_tests/colon_in_index_entry.pl 
b/tp/t/results/info_tests/colon_in_index_entry.pl
index c4e2c82163..000bbf9af7 100644
--- a/tp/t/results/info_tests/colon_in_index_entry.pl
+++ b/tp/t/results/info_tests/colon_in_index_entry.pl
@@ -94,12 +94,10 @@ $result_trees{'colon_in_index_entry'} = {
           'cmdname' => 'cindex',
           'extra' => {
             'element_node' => {},
-            'index_entry' => {
-              'entry_element' => {},
-              'entry_number' => 1,
-              'in_code' => 0,
-              'index_name' => 'cp'
-            }
+            'index_entry' => [
+              'cp',
+              1
+            ]
           },
           'info' => {
             'spaces_before_argument' => {
@@ -167,12 +165,10 @@ $result_trees{'colon_in_index_entry'} = {
                       'cmdname' => 'item',
                       'extra' => {
                         'element_node' => {},
-                        'index_entry' => {
-                          'entry_element' => {},
-                          'entry_number' => 1,
-                          'in_code' => 0,
-                          'index_name' => 'vr'
-                        }
+                        'index_entry' => [
+                          'vr',
+                          1
+                        ]
                       },
                       'info' => {
                         'spaces_before_argument' => {
@@ -333,12 +329,10 @@ $result_trees{'colon_in_index_entry'} = {
                   'name' => {}
                 },
                 'element_node' => {},
-                'index_entry' => {
-                  'entry_element' => {},
-                  'entry_number' => 2,
-                  'in_code' => 0,
-                  'index_name' => 'vr'
-                },
+                'index_entry' => [
+                  'vr',
+                  2
+                ],
                 'original_def_cmdname' => 'defvr'
               },
               'source_info' => {
@@ -449,12 +443,10 @@ $result_trees{'colon_in_index_entry'} = {
                   'name' => {}
                 },
                 'element_node' => {},
-                'index_entry' => {
-                  'entry_element' => {},
-                  'entry_number' => 3,
-                  'in_code' => 0,
-                  'index_name' => 'vr'
-                },
+                'index_entry' => [
+                  'vr',
+                  3
+                ],
                 'original_def_cmdname' => 'defvrx'
               },
               'info' => {
@@ -572,20 +564,16 @@ $result_trees{'colon_in_index_entry'} = {
   'type' => 'document_root'
 };
 
$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'}{'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'}{'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'}{'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_texis{'colon_in_index_entry'} = '@node Top
 
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 2e4ff05e36..98791c9483 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
@@ -321,12 +321,10 @@ $result_trees{'colons_in_index_entries_and_node'} = {
           'cmdname' => 'cindex',
           'extra' => {
             'element_node' => {},
-            'index_entry' => {
-              'entry_element' => {},
-              'entry_number' => 1,
-              'in_code' => 0,
-              'index_name' => 'cp'
-            }
+            'index_entry' => [
+              'cp',
+              1
+            ]
           },
           'info' => {
             'spaces_before_argument' => {
@@ -360,12 +358,10 @@ $result_trees{'colons_in_index_entries_and_node'} = {
           'cmdname' => 'cindex',
           'extra' => {
             'element_node' => {},
-            'index_entry' => {
-              'entry_element' => {},
-              'entry_number' => 2,
-              'in_code' => 0,
-              'index_name' => 'cp'
-            }
+            'index_entry' => [
+              'cp',
+              2
+            ]
           },
           'info' => {
             'spaces_before_argument' => {
@@ -399,12 +395,10 @@ $result_trees{'colons_in_index_entries_and_node'} = {
           'cmdname' => 'cindex',
           'extra' => {
             'element_node' => {},
-            'index_entry' => {
-              'entry_element' => {},
-              'entry_number' => 3,
-              'in_code' => 0,
-              'index_name' => 'cp'
-            }
+            'index_entry' => [
+              'cp',
+              3
+            ]
           },
           'info' => {
             'spaces_before_argument' => {
@@ -510,12 +504,10 @@ $result_trees{'colons_in_index_entries_and_node'} = {
           'cmdname' => 'cindex',
           'extra' => {
             'element_node' => {},
-            'index_entry' => {
-              'entry_element' => {},
-              'entry_number' => 4,
-              'in_code' => 0,
-              'index_name' => 'cp'
-            }
+            'index_entry' => [
+              'cp',
+              4
+            ]
           },
           'info' => {
             'spaces_before_argument' => {
@@ -549,12 +541,10 @@ $result_trees{'colons_in_index_entries_and_node'} = {
           'cmdname' => 'cindex',
           'extra' => {
             'element_node' => {},
-            'index_entry' => {
-              'entry_element' => {},
-              'entry_number' => 5,
-              'in_code' => 0,
-              'index_name' => 'cp'
-            }
+            'index_entry' => [
+              'cp',
+              5
+            ]
           },
           'info' => {
             'spaces_before_argument' => {
@@ -588,12 +578,10 @@ $result_trees{'colons_in_index_entries_and_node'} = {
           'cmdname' => 'cindex',
           'extra' => {
             'element_node' => {},
-            'index_entry' => {
-              'entry_element' => {},
-              'entry_number' => 6,
-              'in_code' => 0,
-              'index_name' => 'cp'
-            }
+            'index_entry' => [
+              'cp',
+              6
+            ]
           },
           'info' => {
             'spaces_before_argument' => {
@@ -730,17 +718,11 @@ 
$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'}[0]{'contents'}[1]{'extra'}{'node_content'}[4]
 = 
$result_trees{'colons_in_index_entries_and_node'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'contents'}[1]{'contents'}[4];
 
$result_trees{'colons_in_index_entries_and_node'}{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'extra'}{'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'}[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'}{'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'}{'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'}{'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'}{'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'}{'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_texis{'colons_in_index_entries_and_node'} = '@node Top
 
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 1086431466..eaeb79cd4d 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
@@ -321,12 +321,10 @@ 
$result_trees{'colons_in_index_entries_and_node_no_quoting'} = {
           'cmdname' => 'cindex',
           'extra' => {
             'element_node' => {},
-            'index_entry' => {
-              'entry_element' => {},
-              'entry_number' => 1,
-              'in_code' => 0,
-              'index_name' => 'cp'
-            }
+            'index_entry' => [
+              'cp',
+              1
+            ]
           },
           'info' => {
             'spaces_before_argument' => {
@@ -360,12 +358,10 @@ 
$result_trees{'colons_in_index_entries_and_node_no_quoting'} = {
           'cmdname' => 'cindex',
           'extra' => {
             'element_node' => {},
-            'index_entry' => {
-              'entry_element' => {},
-              'entry_number' => 2,
-              'in_code' => 0,
-              'index_name' => 'cp'
-            }
+            'index_entry' => [
+              'cp',
+              2
+            ]
           },
           'info' => {
             'spaces_before_argument' => {
@@ -399,12 +395,10 @@ 
$result_trees{'colons_in_index_entries_and_node_no_quoting'} = {
           'cmdname' => 'cindex',
           'extra' => {
             'element_node' => {},
-            'index_entry' => {
-              'entry_element' => {},
-              'entry_number' => 3,
-              'in_code' => 0,
-              'index_name' => 'cp'
-            }
+            'index_entry' => [
+              'cp',
+              3
+            ]
           },
           'info' => {
             'spaces_before_argument' => {
@@ -510,12 +504,10 @@ 
$result_trees{'colons_in_index_entries_and_node_no_quoting'} = {
           'cmdname' => 'cindex',
           'extra' => {
             'element_node' => {},
-            'index_entry' => {
-              'entry_element' => {},
-              'entry_number' => 4,
-              'in_code' => 0,
-              'index_name' => 'cp'
-            }
+            'index_entry' => [
+              'cp',
+              4
+            ]
           },
           'info' => {
             'spaces_before_argument' => {
@@ -549,12 +541,10 @@ 
$result_trees{'colons_in_index_entries_and_node_no_quoting'} = {
           'cmdname' => 'cindex',
           'extra' => {
             'element_node' => {},
-            'index_entry' => {
-              'entry_element' => {},
-              'entry_number' => 5,
-              'in_code' => 0,
-              'index_name' => 'cp'
-            }
+            'index_entry' => [
+              'cp',
+              5
+            ]
           },
           'info' => {
             'spaces_before_argument' => {
@@ -588,12 +578,10 @@ 
$result_trees{'colons_in_index_entries_and_node_no_quoting'} = {
           'cmdname' => 'cindex',
           'extra' => {
             'element_node' => {},
-            'index_entry' => {
-              'entry_element' => {},
-              'entry_number' => 6,
-              'in_code' => 0,
-              'index_name' => 'cp'
-            }
+            'index_entry' => [
+              'cp',
+              6
+            ]
           },
           'info' => {
             'spaces_before_argument' => {
@@ -730,17 +718,11 @@ 
$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'}[0]{'contents'}[1]{'extra'}{'node_content'}[4]
 = 
$result_trees{'colons_in_index_entries_and_node_no_quoting'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'contents'}[1]{'contents'}[4];
 
$result_trees{'colons_in_index_entries_and_node_no_quoting'}{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'extra'}{'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'}[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'}{'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'}{'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'}{'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'}{'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'}{'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_texis{'colons_in_index_entries_and_node_no_quoting'} = '@node Top
 
diff --git a/tp/t/results/info_tests/def_in_copying.pl 
b/tp/t/results/info_tests/def_in_copying.pl
index de19472435..91004bb5ab 100644
--- a/tp/t/results/info_tests/def_in_copying.pl
+++ b/tp/t/results/info_tests/def_in_copying.pl
@@ -245,12 +245,10 @@ $result_trees{'def_in_copying'} = {
                       'name' => {}
                     },
                     'element_region' => 'copying',
-                    'index_entry' => {
-                      'entry_element' => {},
-                      'entry_number' => 1,
-                      'in_code' => 1,
-                      'index_name' => 'fn'
-                    },
+                    'index_entry' => [
+                      'fn',
+                      1
+                    ],
                     'original_def_cmdname' => 'deffn'
                   },
                   'source_info' => {
@@ -315,12 +313,10 @@ $result_trees{'def_in_copying'} = {
                       'name' => {}
                     },
                     'element_region' => 'copying',
-                    'index_entry' => {
-                      'entry_element' => {},
-                      'entry_number' => 2,
-                      'in_code' => 1,
-                      'index_name' => 'fn'
-                    },
+                    'index_entry' => [
+                      'fn',
+                      2
+                    ],
                     'original_def_cmdname' => 'deffnx'
                   },
                   'info' => {
@@ -530,12 +526,10 @@ $result_trees{'def_in_copying'} = {
                   'name' => {}
                 },
                 'element_node' => {},
-                'index_entry' => {
-                  'entry_element' => {},
-                  'entry_number' => 3,
-                  'in_code' => 1,
-                  'index_name' => 'fn'
-                },
+                'index_entry' => [
+                  'fn',
+                  3
+                ],
                 'original_def_cmdname' => 'deffn'
               },
               'source_info' => {
@@ -600,12 +594,10 @@ $result_trees{'def_in_copying'} = {
                   'name' => {}
                 },
                 'element_node' => {},
-                'index_entry' => {
-                  'entry_element' => {},
-                  'entry_number' => 4,
-                  'in_code' => 1,
-                  'index_name' => 'fn'
-                },
+                'index_entry' => [
+                  'fn',
+                  4
+                ],
                 'original_def_cmdname' => 'deffnx'
               },
               'info' => {
@@ -744,21 +736,17 @@ $result_trees{'def_in_copying'} = {
 
$result_trees{'def_in_copying'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'contents'}[0]{'extra'}{'def_index_element'}
 = 
$result_trees{'def_in_copying'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'contents'}[0]{'args'}[0]{'contents'}[2];
 
$result_trees{'def_in_copying'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'contents'}[0]{'extra'}{'def_parsed_hash'}{'category'}
 = 
$result_trees{'def_in_copying'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'contents'}[0]{'args'}[0]{'contents'}[0];
 
$result_trees{'def_in_copying'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'contents'}[0]{'extra'}{'def_parsed_hash'}{'name'}
 = 
$result_trees{'def_in_copying'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'contents'}[0]{'args'}[0]{'contents'}[2];
-$result_trees{'def_in_copying'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'contents'}[0]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'def_in_copying'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'contents'}[0];
 
$result_trees{'def_in_copying'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'extra'}{'def_index_element'}
 = 
$result_trees{'def_in_copying'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'args'}[0]{'contents'}[2];
 
$result_trees{'def_in_copying'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'extra'}{'def_parsed_hash'}{'category'}
 = 
$result_trees{'def_in_copying'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'args'}[0]{'contents'}[0];
 
$result_trees{'def_in_copying'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'extra'}{'def_parsed_hash'}{'name'}
 = 
$result_trees{'def_in_copying'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'args'}[0]{'contents'}[2];
-$result_trees{'def_in_copying'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'def_in_copying'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'contents'}[1];
 
$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'}{'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'}{'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
 @deffn aa bb cc
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 652cef2542..4a949e9e9e 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
@@ -237,12 +237,10 @@ $result_trees{'end_of_line_command_in_node_lines'} = {
           'cmdname' => 'cindex',
           'extra' => {
             'element_node' => {},
-            'index_entry' => {
-              'entry_element' => {},
-              'entry_number' => 1,
-              'in_code' => 0,
-              'index_name' => 'cp'
-            }
+            'index_entry' => [
+              'cp',
+              1
+            ]
           },
           'info' => {
             'spaces_before_argument' => {
@@ -856,7 +854,6 @@ $result_trees{'end_of_line_command_in_node_lines'} = {
   'type' => 'document_root'
 };
 
$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'}[6]{'contents'}[1]{'contents'}[0]{'args'}[0]{'extra'}{'node_content'}[0]
 = 
$result_trees{'end_of_line_command_in_node_lines'}{'contents'}[6]{'contents'}[1]{'contents'}[0]{'args'}[0]{'contents'}[0];
 
$result_trees{'end_of_line_command_in_node_lines'}{'contents'}[6]{'contents'}[1]{'contents'}[0]{'args'}[0]{'extra'}{'node_content'}[1]
 = 
$result_trees{'end_of_line_command_in_node_lines'}{'contents'}[6]{'contents'}[1]{'contents'}[0]{'args'}[0]{'contents'}[1];
 
$result_trees{'end_of_line_command_in_node_lines'}{'contents'}[6]{'contents'}[1]{'contents'}[0]{'args'}[0]{'extra'}{'node_content'}[2]
 = 
$result_trees{'end_of_line_command_in_node_lines'}{'contents'}[6]{'contents'}[1]{'contents'}[0]{'args'}[0]{'contents'}[2];
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 0966a2875b..a6cb190397 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
@@ -320,12 +320,10 @@ $result_trees{'index_entry_at_end_node'} = {
           'cmdname' => 'cindex',
           'extra' => {
             'element_node' => {},
-            'index_entry' => {
-              'entry_element' => {},
-              'entry_number' => 1,
-              'in_code' => 0,
-              'index_name' => 'cp'
-            }
+            'index_entry' => [
+              'cp',
+              1
+            ]
           },
           'info' => {
             'spaces_before_argument' => {
@@ -467,7 +465,6 @@ $result_trees{'index_entry_at_end_node'} = {
 
$result_trees{'index_entry_at_end_node'}{'contents'}[2]{'contents'}[2]{'contents'}[0]{'contents'}[1]{'extra'}{'node_content'}[0]
 = 
$result_trees{'index_entry_at_end_node'}{'contents'}[2]{'contents'}[2]{'contents'}[0]{'contents'}[1]{'contents'}[0];
 
$result_trees{'index_entry_at_end_node'}{'contents'}[2]{'contents'}[2]{'contents'}[1]{'contents'}[1]{'extra'}{'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'}[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_texis{'index_entry_at_end_node'} = '@node Top
 @top Element
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 b11a8c6a8f..bb3e936044 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
@@ -277,12 +277,10 @@ $result_trees{'multitable_anchor_and_index_entry'} = {
                           'cmdname' => 'cindex',
                           'extra' => {
                             'element_node' => {},
-                            'index_entry' => {
-                              'entry_element' => {},
-                              'entry_number' => 1,
-                              'in_code' => 0,
-                              'index_name' => 'cp'
-                            }
+                            'index_entry' => [
+                              'cp',
+                              1
+                            ]
                           },
                           'info' => {
                             'spaces_before_argument' => {
@@ -585,12 +583,10 @@ $result_trees{'multitable_anchor_and_index_entry'} = {
                           'cmdname' => 'cindex',
                           'extra' => {
                             'element_node' => {},
-                            'index_entry' => {
-                              'entry_element' => {},
-                              'entry_number' => 2,
-                              'in_code' => 0,
-                              'index_name' => 'cp'
-                            }
+                            'index_entry' => [
+                              'cp',
+                              2
+                            ]
                           },
                           'info' => {
                             'spaces_before_argument' => {
@@ -916,10 +912,8 @@ $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'}[2]{'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'}[2]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'multitable_anchor_and_index_entry'}{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[2];
 
$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'}[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'}[2]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'multitable_anchor_and_index_entry'}{'contents'}[1]{'contents'}[3]{'contents'}[0]{'contents'}[1]{'contents'}[0]{'contents'}[2];
 
$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];
 
$result_trees{'multitable_anchor_and_index_entry'}{'contents'}[1]{'contents'}[3]{'extra'}{'prototypes'}[1]{'contents'}[0]
 = 
$result_trees{'multitable_anchor_and_index_entry'}{'contents'}[1]{'contents'}[3]{'args'}[0]{'contents'}[2]{'contents'}[0];
 
$result_trees{'multitable_anchor_and_index_entry'}{'contents'}[1]{'contents'}[6]{'contents'}[0]{'args'}[0]{'extra'}{'node_content'}[0]
 = 
$result_trees{'multitable_anchor_and_index_entry'}{'contents'}[1]{'contents'}[6]{'contents'}[0]{'args'}[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 70da04549a..03f5dab944 100644
--- a/tp/t/results/info_tests/nested_multitable_anchor_index.pl
+++ b/tp/t/results/info_tests/nested_multitable_anchor_index.pl
@@ -206,12 +206,10 @@ $result_trees{'nested_multitable_anchor_index'} = {
                                           'cmdname' => 'cindex',
                                           'extra' => {
                                             'element_node' => {},
-                                            'index_entry' => {
-                                              'entry_element' => {},
-                                              'entry_number' => 1,
-                                              'in_code' => 0,
-                                              'index_name' => 'cp'
-                                            }
+                                            'index_entry' => [
+                                              'cp',
+                                              1
+                                            ]
                                           },
                                           'info' => {
                                             'spaces_before_argument' => {
@@ -439,12 +437,10 @@ $result_trees{'nested_multitable_anchor_index'} = {
                           'cmdname' => 'cindex',
                           'extra' => {
                             'element_node' => {},
-                            'index_entry' => {
-                              'entry_element' => {},
-                              'entry_number' => 2,
-                              'in_code' => 0,
-                              'index_name' => 'cp'
-                            }
+                            'index_entry' => [
+                              'cp',
+                              2
+                            ]
                           },
                           'info' => {
                             'spaces_before_argument' => {
@@ -663,11 +659,9 @@ $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'}[2]{'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'}[2]{'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'}[2];
 
$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'}[2]{'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'}[2]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'nested_multitable_anchor_index'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'contents'}[1]{'contents'}[1]{'contents'}[2];
 
$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];
 
$result_trees{'nested_multitable_anchor_index'}{'contents'}[1]{'contents'}[5]{'contents'}[0]{'args'}[0]{'extra'}{'node_content'}[0]
 = 
$result_trees{'nested_multitable_anchor_index'}{'contents'}[1]{'contents'}[5]{'contents'}[0]{'args'}[0]{'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 bea0ffb31c..afc8d4e962 100644
--- a/tp/t/results/info_tests/one_node_counted_elements.pl
+++ b/tp/t/results/info_tests/one_node_counted_elements.pl
@@ -37,12 +37,10 @@ $result_trees{'one_node_counted_elements'} = {
           ],
           'cmdname' => 'cindex',
           'extra' => {
-            'index_entry' => {
-              'entry_element' => {},
-              'entry_number' => 1,
-              'in_code' => 0,
-              'index_name' => 'cp'
-            }
+            'index_entry' => [
+              'cp',
+              1
+            ]
           },
           'info' => {
             'spaces_before_argument' => {
@@ -137,12 +135,10 @@ $result_trees{'one_node_counted_elements'} = {
           'cmdname' => 'cindex',
           'extra' => {
             'element_node' => {},
-            'index_entry' => {
-              'entry_element' => {},
-              'entry_number' => 2,
-              'in_code' => 0,
-              'index_name' => 'cp'
-            }
+            'index_entry' => [
+              'cp',
+              2
+            ]
           },
           'info' => {
             'spaces_before_argument' => {
@@ -421,10 +417,8 @@ $result_trees{'one_node_counted_elements'} = {
   ],
   'type' => 'document_root'
 };
-$result_trees{'one_node_counted_elements'}{'contents'}[0]{'contents'}[1]{'extra'}{'index_entry'}{'entry_element'}
 = $result_trees{'one_node_counted_elements'}{'contents'}[0]{'contents'}[1];
 
$result_trees{'one_node_counted_elements'}{'contents'}[1]{'args'}[3]{'extra'}{'manual_content'}[0]
 = 
$result_trees{'one_node_counted_elements'}{'contents'}[1]{'args'}[3]{'contents'}[1];
 
$result_trees{'one_node_counted_elements'}{'contents'}[1]{'contents'}[1]{'extra'}{'element_node'}
 = $result_trees{'one_node_counted_elements'}{'contents'}[1];
-$result_trees{'one_node_counted_elements'}{'contents'}[1]{'contents'}[1]{'extra'}{'index_entry'}{'entry_element'}
 = $result_trees{'one_node_counted_elements'}{'contents'}[1]{'contents'}[1];
 
$result_trees{'one_node_counted_elements'}{'contents'}[1]{'contents'}[5]{'contents'}[0]{'contents'}[1]{'extra'}{'manual_content'}[0]
 = 
$result_trees{'one_node_counted_elements'}{'contents'}[1]{'contents'}[5]{'contents'}[0]{'contents'}[1]{'contents'}[1];
 
$result_trees{'one_node_counted_elements'}{'contents'}[1]{'contents'}[8]{'contents'}[1]{'args'}[0]{'extra'}{'node_content'}[0]
 = 
$result_trees{'one_node_counted_elements'}{'contents'}[1]{'contents'}[8]{'contents'}[1]{'args'}[0]{'contents'}[0];
 
diff --git a/tp/t/results/info_tests/test_index.pl 
b/tp/t/results/info_tests/test_index.pl
index 3d49d5da2e..7e68236a0e 100644
--- a/tp/t/results/info_tests/test_index.pl
+++ b/tp/t/results/info_tests/test_index.pl
@@ -133,12 +133,10 @@ $result_trees{'test_index'} = {
           'cmdname' => 'cindex',
           'extra' => {
             'element_node' => {},
-            'index_entry' => {
-              'entry_element' => {},
-              'entry_number' => 1,
-              'in_code' => 0,
-              'index_name' => 'cp'
-            }
+            'index_entry' => [
+              'cp',
+              1
+            ]
           },
           'info' => {
             'spaces_before_argument' => {
@@ -172,12 +170,10 @@ $result_trees{'test_index'} = {
           'cmdname' => 'cindex',
           'extra' => {
             'element_node' => {},
-            'index_entry' => {
-              'entry_element' => {},
-              'entry_number' => 2,
-              'in_code' => 0,
-              'index_name' => 'cp'
-            }
+            'index_entry' => [
+              'cp',
+              2
+            ]
           },
           'info' => {
             'spaces_before_argument' => {
@@ -221,12 +217,10 @@ $result_trees{'test_index'} = {
           'cmdname' => 'cindex',
           'extra' => {
             'element_node' => {},
-            'index_entry' => {
-              'entry_element' => {},
-              'entry_number' => 3,
-              'in_code' => 0,
-              'index_name' => 'cp'
-            }
+            'index_entry' => [
+              'cp',
+              3
+            ]
           },
           'info' => {
             'spaces_before_argument' => {
@@ -260,12 +254,10 @@ $result_trees{'test_index'} = {
           'cmdname' => 'cindex',
           'extra' => {
             'element_node' => {},
-            'index_entry' => {
-              'entry_element' => {},
-              'entry_number' => 4,
-              'in_code' => 0,
-              'index_name' => 'cp'
-            }
+            'index_entry' => [
+              'cp',
+              4
+            ]
           },
           'info' => {
             'spaces_before_argument' => {
@@ -369,12 +361,10 @@ $result_trees{'test_index'} = {
                   'name' => {}
                 },
                 'element_node' => {},
-                'index_entry' => {
-                  'entry_element' => {},
-                  'entry_number' => 1,
-                  'in_code' => 1,
-                  'index_name' => 'fn'
-                },
+                'index_entry' => [
+                  'fn',
+                  1
+                ],
                 'original_def_cmdname' => 'deffn'
               },
               'source_info' => {
@@ -452,12 +442,10 @@ $result_trees{'test_index'} = {
                   'name' => {}
                 },
                 'element_node' => {},
-                'index_entry' => {
-                  'entry_element' => {},
-                  'entry_number' => 2,
-                  'in_code' => 1,
-                  'index_name' => 'fn'
-                },
+                'index_entry' => [
+                  'fn',
+                  2
+                ],
                 'original_def_cmdname' => 'deffnx'
               },
               'info' => {
@@ -580,12 +568,10 @@ $result_trees{'test_index'} = {
                       'cmdname' => 'item',
                       'extra' => {
                         'element_node' => {},
-                        'index_entry' => {
-                          'entry_element' => {},
-                          'entry_number' => 3,
-                          'in_code' => 1,
-                          'index_name' => 'fn'
-                        }
+                        'index_entry' => [
+                          'fn',
+                          3
+                        ]
                       },
                       'info' => {
                         'spaces_before_argument' => {
@@ -647,12 +633,10 @@ $result_trees{'test_index'} = {
                       'cmdname' => 'item',
                       'extra' => {
                         'element_node' => {},
-                        'index_entry' => {
-                          'entry_element' => {},
-                          'entry_number' => 4,
-                          'in_code' => 1,
-                          'index_name' => 'fn'
-                        }
+                        'index_entry' => [
+                          'fn',
+                          4
+                        ]
                       },
                       'info' => {
                         'spaces_before_argument' => {
@@ -685,12 +669,10 @@ $result_trees{'test_index'} = {
                       'cmdname' => 'itemx',
                       'extra' => {
                         'element_node' => {},
-                        'index_entry' => {
-                          'entry_element' => {},
-                          'entry_number' => 5,
-                          'in_code' => 1,
-                          'index_name' => 'fn'
-                        }
+                        'index_entry' => [
+                          'fn',
+                          5
+                        ]
                       },
                       'info' => {
                         'spaces_before_argument' => {
@@ -1010,12 +992,10 @@ $result_trees{'test_index'} = {
           'cmdname' => 'cindex',
           'extra' => {
             'element_node' => {},
-            'index_entry' => {
-              'entry_element' => {},
-              'entry_number' => 5,
-              'in_code' => 0,
-              'index_name' => 'cp'
-            }
+            'index_entry' => [
+              'cp',
+              5
+            ]
           },
           'info' => {
             'spaces_before_argument' => {
@@ -1049,12 +1029,10 @@ $result_trees{'test_index'} = {
           'cmdname' => 'findex',
           'extra' => {
             'element_node' => {},
-            'index_entry' => {
-              'entry_element' => {},
-              'entry_number' => 6,
-              'in_code' => 1,
-              'index_name' => 'fn'
-            }
+            'index_entry' => [
+              'fn',
+              6
+            ]
           },
           'info' => {
             'spaces_before_argument' => {
@@ -1102,12 +1080,10 @@ $result_trees{'test_index'} = {
           'cmdname' => 'findex',
           'extra' => {
             'element_node' => {},
-            'index_entry' => {
-              'entry_element' => {},
-              'entry_number' => 7,
-              'in_code' => 1,
-              'index_name' => 'fn'
-            }
+            'index_entry' => [
+              'fn',
+              7
+            ]
           },
           'info' => {
             'spaces_before_argument' => {
@@ -1225,12 +1201,10 @@ $result_trees{'test_index'} = {
           'cmdname' => 'findex',
           'extra' => {
             'element_node' => {},
-            'index_entry' => {
-              'entry_element' => {},
-              'entry_number' => 8,
-              'in_code' => 1,
-              'index_name' => 'fn'
-            }
+            'index_entry' => [
+              'fn',
+              8
+            ]
           },
           'info' => {
             'spaces_before_argument' => {
@@ -2319,12 +2293,10 @@ $result_trees{'test_index'} = {
           'cmdname' => 'findex',
           'extra' => {
             'element_node' => {},
-            'index_entry' => {
-              'entry_element' => {},
-              'entry_number' => 9,
-              'in_code' => 1,
-              'index_name' => 'fn'
-            }
+            'index_entry' => [
+              'fn',
+              9
+            ]
           },
           'info' => {
             'spaces_before_argument' => {
@@ -2433,12 +2405,10 @@ $result_trees{'test_index'} = {
           'cmdname' => 'cindex',
           'extra' => {
             'element_node' => {},
-            'index_entry' => {
-              'entry_element' => {},
-              'entry_number' => 6,
-              'in_code' => 0,
-              'index_name' => 'cp'
-            }
+            'index_entry' => [
+              'cp',
+              6
+            ]
           },
           'info' => {
             'spaces_before_argument' => {
@@ -2534,12 +2504,10 @@ $result_trees{'test_index'} = {
           'cmdname' => 'findex',
           'extra' => {
             'element_node' => {},
-            'index_entry' => {
-              'entry_element' => {},
-              'entry_number' => 10,
-              'in_code' => 1,
-              'index_name' => 'fn'
-            }
+            'index_entry' => [
+              'fn',
+              10
+            ]
           },
           'info' => {
             'spaces_before_argument' => {
@@ -2841,12 +2809,10 @@ $result_trees{'test_index'} = {
           'cmdname' => 'cindex',
           'extra' => {
             'element_node' => {},
-            'index_entry' => {
-              'entry_element' => {},
-              'entry_number' => 7,
-              'in_code' => 0,
-              'index_name' => 'cp'
-            }
+            'index_entry' => [
+              'cp',
+              7
+            ]
           },
           'info' => {
             'spaces_before_argument' => {
@@ -2923,48 +2889,31 @@ $result_trees{'test_index'} = {
 };
 
$result_trees{'test_index'}{'contents'}[2]{'contents'}[1]{'contents'}[0]{'args'}[0]{'extra'}{'node_content'}[0]
 = 
$result_trees{'test_index'}{'contents'}[2]{'contents'}[1]{'contents'}[0]{'args'}[0]{'contents'}[0];
 
$result_trees{'test_index'}{'contents'}[2]{'contents'}[4]{'extra'}{'element_node'}
 = $result_trees{'test_index'}{'contents'}[1];
-$result_trees{'test_index'}{'contents'}[2]{'contents'}[4]{'extra'}{'index_entry'}{'entry_element'}
 = $result_trees{'test_index'}{'contents'}[2]{'contents'}[4];
 
$result_trees{'test_index'}{'contents'}[2]{'contents'}[5]{'extra'}{'element_node'}
 = $result_trees{'test_index'}{'contents'}[1];
-$result_trees{'test_index'}{'contents'}[2]{'contents'}[5]{'extra'}{'index_entry'}{'entry_element'}
 = $result_trees{'test_index'}{'contents'}[2]{'contents'}[5];
 
$result_trees{'test_index'}{'contents'}[2]{'contents'}[6]{'extra'}{'element_node'}
 = $result_trees{'test_index'}{'contents'}[1];
-$result_trees{'test_index'}{'contents'}[2]{'contents'}[6]{'extra'}{'index_entry'}{'entry_element'}
 = $result_trees{'test_index'}{'contents'}[2]{'contents'}[6];
 
$result_trees{'test_index'}{'contents'}[2]{'contents'}[7]{'extra'}{'element_node'}
 = $result_trees{'test_index'}{'contents'}[1];
-$result_trees{'test_index'}{'contents'}[2]{'contents'}[7]{'extra'}{'index_entry'}{'entry_element'}
 = $result_trees{'test_index'}{'contents'}[2]{'contents'}[7];
 
$result_trees{'test_index'}{'contents'}[2]{'contents'}[9]{'contents'}[0]{'extra'}{'def_index_element'}
 = 
$result_trees{'test_index'}{'contents'}[2]{'contents'}[9]{'contents'}[0]{'args'}[0]{'contents'}[2];
 
$result_trees{'test_index'}{'contents'}[2]{'contents'}[9]{'contents'}[0]{'extra'}{'def_parsed_hash'}{'category'}
 = 
$result_trees{'test_index'}{'contents'}[2]{'contents'}[9]{'contents'}[0]{'args'}[0]{'contents'}[0];
 
$result_trees{'test_index'}{'contents'}[2]{'contents'}[9]{'contents'}[0]{'extra'}{'def_parsed_hash'}{'name'}
 = 
$result_trees{'test_index'}{'contents'}[2]{'contents'}[9]{'contents'}[0]{'args'}[0]{'contents'}[2];
 
$result_trees{'test_index'}{'contents'}[2]{'contents'}[9]{'contents'}[0]{'extra'}{'element_node'}
 = $result_trees{'test_index'}{'contents'}[1];
-$result_trees{'test_index'}{'contents'}[2]{'contents'}[9]{'contents'}[0]{'extra'}{'index_entry'}{'entry_element'}
 = $result_trees{'test_index'}{'contents'}[2]{'contents'}[9]{'contents'}[0];
 
$result_trees{'test_index'}{'contents'}[2]{'contents'}[9]{'contents'}[1]{'extra'}{'def_index_element'}
 = 
$result_trees{'test_index'}{'contents'}[2]{'contents'}[9]{'contents'}[1]{'args'}[0]{'contents'}[2];
 
$result_trees{'test_index'}{'contents'}[2]{'contents'}[9]{'contents'}[1]{'extra'}{'def_parsed_hash'}{'category'}
 = 
$result_trees{'test_index'}{'contents'}[2]{'contents'}[9]{'contents'}[1]{'args'}[0]{'contents'}[0];
 
$result_trees{'test_index'}{'contents'}[2]{'contents'}[9]{'contents'}[1]{'extra'}{'def_parsed_hash'}{'name'}
 = 
$result_trees{'test_index'}{'contents'}[2]{'contents'}[9]{'contents'}[1]{'args'}[0]{'contents'}[2];
 
$result_trees{'test_index'}{'contents'}[2]{'contents'}[9]{'contents'}[1]{'extra'}{'element_node'}
 = $result_trees{'test_index'}{'contents'}[1];
-$result_trees{'test_index'}{'contents'}[2]{'contents'}[9]{'contents'}[1]{'extra'}{'index_entry'}{'entry_element'}
 = $result_trees{'test_index'}{'contents'}[2]{'contents'}[9]{'contents'}[1];
 
$result_trees{'test_index'}{'contents'}[2]{'contents'}[11]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'extra'}{'element_node'}
 = $result_trees{'test_index'}{'contents'}[1];
-$result_trees{'test_index'}{'contents'}[2]{'contents'}[11]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'test_index'}{'contents'}[2]{'contents'}[11]{'contents'}[0]{'contents'}[0]{'contents'}[0];
 
$result_trees{'test_index'}{'contents'}[2]{'contents'}[11]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'extra'}{'element_node'}
 = $result_trees{'test_index'}{'contents'}[1];
-$result_trees{'test_index'}{'contents'}[2]{'contents'}[11]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'test_index'}{'contents'}[2]{'contents'}[11]{'contents'}[1]{'contents'}[0]{'contents'}[0];
 
$result_trees{'test_index'}{'contents'}[2]{'contents'}[11]{'contents'}[1]{'contents'}[0]{'contents'}[1]{'extra'}{'element_node'}
 = $result_trees{'test_index'}{'contents'}[1];
-$result_trees{'test_index'}{'contents'}[2]{'contents'}[11]{'contents'}[1]{'contents'}[0]{'contents'}[1]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'test_index'}{'contents'}[2]{'contents'}[11]{'contents'}[1]{'contents'}[0]{'contents'}[1];
 
$result_trees{'test_index'}{'contents'}[2]{'contents'}[11]{'extra'}{'command_as_argument'}
 = 
$result_trees{'test_index'}{'contents'}[2]{'contents'}[11]{'args'}[0]{'contents'}[0];
 
$result_trees{'test_index'}{'contents'}[2]{'contents'}[13]{'contents'}[0]{'contents'}[1]{'extra'}{'node_content'}[0]
 = 
$result_trees{'test_index'}{'contents'}[2]{'contents'}[13]{'contents'}[0]{'contents'}[1]{'contents'}[0];
 
$result_trees{'test_index'}{'contents'}[2]{'contents'}[13]{'contents'}[1]{'contents'}[1]{'extra'}{'node_content'}[0]
 = 
$result_trees{'test_index'}{'contents'}[2]{'contents'}[13]{'contents'}[1]{'contents'}[1]{'contents'}[0];
 
$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'}{'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'}[5]{'extra'}{'element_node'}
 = $result_trees{'test_index'}{'contents'}[3];
-$result_trees{'test_index'}{'contents'}[4]{'contents'}[5]{'extra'}{'index_entry'}{'entry_element'}
 = $result_trees{'test_index'}{'contents'}[4]{'contents'}[5];
 
$result_trees{'test_index'}{'contents'}[4]{'contents'}[18]{'extra'}{'element_node'}
 = $result_trees{'test_index'}{'contents'}[3];
-$result_trees{'test_index'}{'contents'}[4]{'contents'}[18]{'extra'}{'index_entry'}{'entry_element'}
 = $result_trees{'test_index'}{'contents'}[4]{'contents'}[18];
 
$result_trees{'test_index'}{'contents'}[4]{'contents'}[170]{'extra'}{'element_node'}
 = $result_trees{'test_index'}{'contents'}[3];
-$result_trees{'test_index'}{'contents'}[4]{'contents'}[170]{'extra'}{'index_entry'}{'entry_element'}
 = $result_trees{'test_index'}{'contents'}[4]{'contents'}[170];
 
$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'}{'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'}{'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_texis{'test_index'} = '@node Top
 @top Element top
diff --git a/tp/t/results/invalid_nestings/block_not_matching.pl 
b/tp/t/results/invalid_nestings/block_not_matching.pl
index 201f09b9a3..2ee77b6621 100644
--- a/tp/t/results/invalid_nestings/block_not_matching.pl
+++ b/tp/t/results/invalid_nestings/block_not_matching.pl
@@ -110,12 +110,10 @@ $result_trees{'block_not_matching'} = {
                   'category' => {},
                   'name' => {}
                 },
-                'index_entry' => {
-                  'entry_element' => {},
-                  'entry_number' => 1,
-                  'in_code' => 1,
-                  'index_name' => 'fn'
-                },
+                'index_entry' => [
+                  'fn',
+                  1
+                ],
                 'original_def_cmdname' => 'deffn'
               },
               'source_info' => {
@@ -517,7 +515,6 @@ $result_trees{'block_not_matching'} = {
 
$result_trees{'block_not_matching'}{'contents'}[0]{'contents'}[2]{'contents'}[0]{'extra'}{'def_index_element'}
 = 
$result_trees{'block_not_matching'}{'contents'}[0]{'contents'}[2]{'contents'}[0]{'args'}[0]{'contents'}[2];
 
$result_trees{'block_not_matching'}{'contents'}[0]{'contents'}[2]{'contents'}[0]{'extra'}{'def_parsed_hash'}{'category'}
 = 
$result_trees{'block_not_matching'}{'contents'}[0]{'contents'}[2]{'contents'}[0]{'args'}[0]{'contents'}[0];
 
$result_trees{'block_not_matching'}{'contents'}[0]{'contents'}[2]{'contents'}[0]{'extra'}{'def_parsed_hash'}{'name'}
 = 
$result_trees{'block_not_matching'}{'contents'}[0]{'contents'}[2]{'contents'}[0]{'args'}[0]{'contents'}[2];
-$result_trees{'block_not_matching'}{'contents'}[0]{'contents'}[2]{'contents'}[0]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'block_not_matching'}{'contents'}[0]{'contents'}[2]{'contents'}[0];
 
$result_trees{'block_not_matching'}{'contents'}[0]{'contents'}[4]{'extra'}{'command_as_argument'}
 = 
$result_trees{'block_not_matching'}{'contents'}[0]{'contents'}[4]{'args'}[0]{'contents'}[0];
 
$result_trees{'block_not_matching'}{'contents'}[0]{'contents'}[6]{'extra'}{'command_as_argument'}
 = 
$result_trees{'block_not_matching'}{'contents'}[0]{'contents'}[6]{'args'}[0]{'contents'}[0];
 
diff --git a/tp/t/results/invalid_nestings/center.pl 
b/tp/t/results/invalid_nestings/center.pl
index 242f902640..92f1cf3e03 100644
--- a/tp/t/results/invalid_nestings/center.pl
+++ b/tp/t/results/invalid_nestings/center.pl
@@ -143,12 +143,10 @@ $result_trees{'center'} = {
                   ],
                   'cmdname' => 'cindex',
                   'extra' => {
-                    'index_entry' => {
-                      'entry_element' => {},
-                      'entry_number' => 1,
-                      'in_code' => 0,
-                      'index_name' => 'cp'
-                    }
+                    'index_entry' => [
+                      'cp',
+                      1
+                    ]
                   },
                   'info' => {
                     'spaces_before_argument' => {
@@ -1308,7 +1306,6 @@ $result_trees{'center'} = {
   ],
   'type' => 'document_root'
 };
-$result_trees{'center'}{'contents'}[0]{'contents'}[2]{'args'}[0]{'contents'}[1]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'center'}{'contents'}[0]{'contents'}[2]{'args'}[0]{'contents'}[1];
 
$result_trees{'center'}{'contents'}[0]{'contents'}[20]{'extra'}{'command_as_argument'}
 = 
$result_trees{'center'}{'contents'}[0]{'contents'}[20]{'args'}[0]{'contents'}[0];
 
$result_trees{'center'}{'contents'}[0]{'contents'}[22]{'extra'}{'command_as_argument'}
 = 
$result_trees{'center'}{'contents'}[0]{'contents'}[22]{'args'}[0]{'contents'}[0];
 
$result_trees{'center'}{'contents'}[0]{'contents'}[33]{'extra'}{'prototypes'}[0]{'contents'}[0]
 = 
$result_trees{'center'}{'contents'}[0]{'contents'}[33]{'args'}[0]{'contents'}[0]{'contents'}[0];
diff --git a/tp/t/results/invalid_nestings/def_in_style_command.pl 
b/tp/t/results/invalid_nestings/def_in_style_command.pl
index 6fbca72aa7..ac735a9791 100644
--- a/tp/t/results/invalid_nestings/def_in_style_command.pl
+++ b/tp/t/results/invalid_nestings/def_in_style_command.pl
@@ -94,12 +94,10 @@ $result_trees{'def_in_style_command'} = {
                   'category' => {},
                   'name' => {}
                 },
-                'index_entry' => {
-                  'entry_element' => {},
-                  'entry_number' => 1,
-                  'in_code' => 1,
-                  'index_name' => 'fn'
-                },
+                'index_entry' => [
+                  'fn',
+                  1
+                ],
                 'original_def_cmdname' => 'defun'
               },
               'source_info' => {
@@ -176,7 +174,6 @@ $result_trees{'def_in_style_command'} = {
 
$result_trees{'def_in_style_command'}{'contents'}[0]{'contents'}[1]{'contents'}[0]{'extra'}{'def_index_element'}
 = 
$result_trees{'def_in_style_command'}{'contents'}[0]{'contents'}[1]{'contents'}[0]{'args'}[0]{'contents'}[2];
 
$result_trees{'def_in_style_command'}{'contents'}[0]{'contents'}[1]{'contents'}[0]{'extra'}{'def_parsed_hash'}{'category'}
 = 
$result_trees{'def_in_style_command'}{'contents'}[0]{'contents'}[1]{'contents'}[0]{'args'}[0]{'contents'}[0];
 
$result_trees{'def_in_style_command'}{'contents'}[0]{'contents'}[1]{'contents'}[0]{'extra'}{'def_parsed_hash'}{'name'}
 = 
$result_trees{'def_in_style_command'}{'contents'}[0]{'contents'}[1]{'contents'}[0]{'args'}[0]{'contents'}[2];
-$result_trees{'def_in_style_command'}{'contents'}[0]{'contents'}[1]{'contents'}[0]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'def_in_style_command'}{'contents'}[0]{'contents'}[1]{'contents'}[0];
 
 $result_texis{'def_in_style_command'} = '@code{
 }@defun name args...
diff --git 
a/tp/t/results/invalid_nestings/def_not_closed_in_menu_description.pl 
b/tp/t/results/invalid_nestings/def_not_closed_in_menu_description.pl
index 5b50bf556b..66c6342d38 100644
--- a/tp/t/results/invalid_nestings/def_not_closed_in_menu_description.pl
+++ b/tp/t/results/invalid_nestings/def_not_closed_in_menu_description.pl
@@ -118,12 +118,10 @@ $result_trees{'def_not_closed_in_menu_description'} = {
                               'category' => {},
                               'name' => {}
                             },
-                            'index_entry' => {
-                              'entry_element' => {},
-                              'entry_number' => 1,
-                              'in_code' => 1,
-                              'index_name' => 'fn'
-                            },
+                            'index_entry' => [
+                              'fn',
+                              1
+                            ],
                             'original_def_cmdname' => 'deffn'
                           },
                           'source_info' => {
@@ -224,7 +222,6 @@ 
$result_trees{'def_not_closed_in_menu_description'}{'contents'}[0]{'contents'}[0
 
$result_trees{'def_not_closed_in_menu_description'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[3]{'contents'}[1]{'contents'}[0]{'extra'}{'def_index_element'}
 = 
$result_trees{'def_not_closed_in_menu_description'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[3]{'contents'}[1]{'contents'}[0]{'args'}[0]{'contents'}[2];
 
$result_trees{'def_not_closed_in_menu_description'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[3]{'contents'}[1]{'contents'}[0]{'extra'}{'def_parsed_hash'}{'category'}
 = 
$result_trees{'def_not_closed_in_menu_description'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[3]{'contents'}[1]{'contents'}[0]{'args'}[0]{'contents'}[0];
 
$result_trees{'def_not_closed_in_menu_description'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[3]{'contents'}[1]{'contents'}[0]{'extra'}{'def_parsed_hash'}{'name'}
 = 
$result_trees{'def_not_closed_in_menu_description'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[3]{'contents'}[1]{'contents'}[0]{'args'}[0]{'contents'}[2];
-$result_trees{'def_not_closed_in_menu_description'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[3]{'contents'}[1]{'contents'}[0]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'def_not_closed_in_menu_description'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[3]{'contents'}[1]{'contents'}[0];
 
 $result_texis{'def_not_closed_in_menu_description'} = '@menu
 * (info):: before deff @deffn bidule truc chose
diff --git a/tp/t/results/invalid_nestings/in_table.pl 
b/tp/t/results/invalid_nestings/in_table.pl
index 712f3c4575..67d414109b 100644
--- a/tp/t/results/invalid_nestings/in_table.pl
+++ b/tp/t/results/invalid_nestings/in_table.pl
@@ -520,12 +520,10 @@ $result_trees{'in_table'} = {
                               'cmdname' => 'cindex',
                               'extra' => {
                                 'element_node' => {},
-                                'index_entry' => {
-                                  'entry_element' => {},
-                                  'entry_number' => 1,
-                                  'in_code' => 0,
-                                  'index_name' => 'cp'
-                                }
+                                'index_entry' => [
+                                  'cp',
+                                  1
+                                ]
                               },
                               'info' => {
                                 'spaces_before_argument' => {
@@ -666,12 +664,10 @@ $result_trees{'in_table'} = {
                               'cmdname' => 'cindex',
                               'extra' => {
                                 'element_node' => {},
-                                'index_entry' => {
-                                  'entry_element' => {},
-                                  'entry_number' => 2,
-                                  'in_code' => 0,
-                                  'index_name' => 'cp'
-                                }
+                                'index_entry' => [
+                                  'cp',
+                                  2
+                                ]
                               },
                               'info' => {
                                 'spaces_before_argument' => {
@@ -692,12 +688,10 @@ $result_trees{'in_table'} = {
                       'cmdname' => 'item',
                       'extra' => {
                         'element_node' => {},
-                        'index_entry' => {
-                          'entry_element' => {},
-                          'entry_number' => 1,
-                          'in_code' => 1,
-                          'index_name' => 'vr'
-                        }
+                        'index_entry' => [
+                          'vr',
+                          1
+                        ]
                       },
                       'info' => {
                         'spaces_before_argument' => {
@@ -780,12 +774,10 @@ $result_trees{'in_table'} = {
                               'cmdname' => 'cindex',
                               'extra' => {
                                 'element_node' => {},
-                                'index_entry' => {
-                                  'entry_element' => {},
-                                  'entry_number' => 3,
-                                  'in_code' => 0,
-                                  'index_name' => 'cp'
-                                }
+                                'index_entry' => [
+                                  'cp',
+                                  3
+                                ]
                               },
                               'info' => {
                                 'spaces_before_argument' => {
@@ -806,12 +798,10 @@ $result_trees{'in_table'} = {
                       'cmdname' => 'item',
                       'extra' => {
                         'element_node' => {},
-                        'index_entry' => {
-                          'entry_element' => {},
-                          'entry_number' => 2,
-                          'in_code' => 1,
-                          'index_name' => 'vr'
-                        }
+                        'index_entry' => [
+                          'vr',
+                          2
+                        ]
                       },
                       'info' => {
                         'spaces_before_argument' => {
@@ -1012,16 +1002,11 @@ $result_trees{'in_table'} = {
 };
 
$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'}[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'}{'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'}{'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'}{'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'}{'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_texis{'in_table'} = '
diff --git a/tp/t/results/invalid_nestings/multitable_item_in_index.pl 
b/tp/t/results/invalid_nestings/multitable_item_in_index.pl
index 3dbdd1e51a..89d1268c2b 100644
--- a/tp/t/results/invalid_nestings/multitable_item_in_index.pl
+++ b/tp/t/results/invalid_nestings/multitable_item_in_index.pl
@@ -69,12 +69,10 @@ $result_trees{'multitable_item_in_index'} = {
                   ],
                   'cmdname' => 'vindex',
                   'extra' => {
-                    'index_entry' => {
-                      'entry_element' => {},
-                      'entry_number' => 1,
-                      'in_code' => 1,
-                      'index_name' => 'vr'
-                    }
+                    'index_entry' => [
+                      'vr',
+                      1
+                    ]
                   },
                   'info' => {
                     'spaces_before_argument' => {
@@ -158,7 +156,6 @@ $result_trees{'multitable_item_in_index'} = {
   ],
   'type' => 'document_root'
 };
-$result_trees{'multitable_item_in_index'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'multitable_item_in_index'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[0];
 
$result_trees{'multitable_item_in_index'}{'contents'}[0]{'contents'}[0]{'extra'}{'prototypes'}[0]{'contents'}[0]
 = 
$result_trees{'multitable_item_in_index'}{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0]{'contents'}[0];
 
$result_trees{'multitable_item_in_index'}{'contents'}[0]{'contents'}[0]{'extra'}{'prototypes'}[1]{'contents'}[0]
 = 
$result_trees{'multitable_item_in_index'}{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[2]{'contents'}[0];
 
diff --git a/tp/t/results/invalid_nestings/node_on_index_entry_line.pl 
b/tp/t/results/invalid_nestings/node_on_index_entry_line.pl
index 43ee90577e..cdf9cbc649 100644
--- a/tp/t/results/invalid_nestings/node_on_index_entry_line.pl
+++ b/tp/t/results/invalid_nestings/node_on_index_entry_line.pl
@@ -32,12 +32,10 @@ $result_trees{'node_on_index_entry_line'} = {
           ],
           'cmdname' => 'cindex',
           'extra' => {
-            'index_entry' => {
-              'entry_element' => {},
-              'entry_number' => 1,
-              'in_code' => 0,
-              'index_name' => 'cp'
-            }
+            'index_entry' => [
+              'cp',
+              1
+            ]
           },
           'info' => {
             'spaces_before_argument' => {
@@ -196,7 +194,6 @@ $result_trees{'node_on_index_entry_line'} = {
   ],
   'type' => 'document_root'
 };
-$result_trees{'node_on_index_entry_line'}{'contents'}[0]{'contents'}[1]{'extra'}{'index_entry'}{'entry_element'}
 = $result_trees{'node_on_index_entry_line'}{'contents'}[0]{'contents'}[1];
 
$result_trees{'node_on_index_entry_line'}{'contents'}[1]{'args'}[1]{'extra'}{'manual_content'}[0]
 = 
$result_trees{'node_on_index_entry_line'}{'contents'}[1]{'args'}[1]{'contents'}[1];
 
$result_trees{'node_on_index_entry_line'}{'contents'}[1]{'args'}[1]{'extra'}{'node_content'}[0]
 = 
$result_trees{'node_on_index_entry_line'}{'contents'}[1]{'args'}[1]{'contents'}[3];
 
$result_trees{'node_on_index_entry_line'}{'contents'}[1]{'args'}[2]{'extra'}{'manual_content'}[0]
 = 
$result_trees{'node_on_index_entry_line'}{'contents'}[1]{'args'}[2]{'contents'}[1];
diff --git a/tp/t/results/invalid_nestings/on_def_line.pl 
b/tp/t/results/invalid_nestings/on_def_line.pl
index 09dd8ec5ba..6ebf9c0dd8 100644
--- a/tp/t/results/invalid_nestings/on_def_line.pl
+++ b/tp/t/results/invalid_nestings/on_def_line.pl
@@ -161,12 +161,10 @@ $result_trees{'on_def_line'} = {
                   'category' => {},
                   'name' => {}
                 },
-                'index_entry' => {
-                  'entry_element' => {},
-                  'entry_number' => 1,
-                  'in_code' => 1,
-                  'index_name' => 'fn'
-                },
+                'index_entry' => [
+                  'fn',
+                  1
+                ],
                 'original_def_cmdname' => 'deffn'
               },
               'source_info' => {
@@ -326,12 +324,10 @@ $result_trees{'on_def_line'} = {
                   'category' => {},
                   'name' => {}
                 },
-                'index_entry' => {
-                  'entry_element' => {},
-                  'entry_number' => 2,
-                  'in_code' => 1,
-                  'index_name' => 'fn'
-                },
+                'index_entry' => [
+                  'fn',
+                  2
+                ],
                 'original_def_cmdname' => 'deffnx'
               },
               'info' => {
@@ -399,11 +395,9 @@ $result_trees{'on_def_line'} = {
 
$result_trees{'on_def_line'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'extra'}{'def_index_element'}
 = 
$result_trees{'on_def_line'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[2];
 
$result_trees{'on_def_line'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'extra'}{'def_parsed_hash'}{'category'}
 = 
$result_trees{'on_def_line'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0];
 
$result_trees{'on_def_line'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'extra'}{'def_parsed_hash'}{'name'}
 = 
$result_trees{'on_def_line'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[2];
-$result_trees{'on_def_line'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'extra'}{'index_entry'}{'entry_element'}
 = $result_trees{'on_def_line'}{'contents'}[0]{'contents'}[0]{'contents'}[0];
 
$result_trees{'on_def_line'}{'contents'}[0]{'contents'}[0]{'contents'}[1]{'extra'}{'def_index_element'}
 = 
$result_trees{'on_def_line'}{'contents'}[0]{'contents'}[0]{'contents'}[1]{'args'}[0]{'contents'}[2];
 
$result_trees{'on_def_line'}{'contents'}[0]{'contents'}[0]{'contents'}[1]{'extra'}{'def_parsed_hash'}{'category'}
 = 
$result_trees{'on_def_line'}{'contents'}[0]{'contents'}[0]{'contents'}[1]{'args'}[0]{'contents'}[0];
 
$result_trees{'on_def_line'}{'contents'}[0]{'contents'}[0]{'contents'}[1]{'extra'}{'def_parsed_hash'}{'name'}
 = 
$result_trees{'on_def_line'}{'contents'}[0]{'contents'}[0]{'contents'}[1]{'args'}[0]{'contents'}[2];
-$result_trees{'on_def_line'}{'contents'}[0]{'contents'}[0]{'contents'}[1]{'extra'}{'index_entry'}{'entry_element'}
 = $result_trees{'on_def_line'}{'contents'}[0]{'contents'}[0]{'contents'}[1];
 
 $result_texis{'on_def_line'} = '@deffn {@anchor{in anchor}} @titlefont{in 
titlefont} @footnote{footnote} @exdent exdent
 @deffnx {@anchor{in anchorx}} @titlefont{in titlefontx} @footnote{footnotex} 
@exdent exdentx
diff --git a/tp/t/results/invalid_nestings/on_index_entry_line.pl 
b/tp/t/results/invalid_nestings/on_index_entry_line.pl
index b40bd1ab23..2d16bac7b5 100644
--- a/tp/t/results/invalid_nestings/on_index_entry_line.pl
+++ b/tp/t/results/invalid_nestings/on_index_entry_line.pl
@@ -128,12 +128,10 @@ $result_trees{'on_index_entry_line'} = {
           ],
           'cmdname' => 'cindex',
           'extra' => {
-            'index_entry' => {
-              'entry_element' => {},
-              'entry_number' => 1,
-              'in_code' => 0,
-              'index_name' => 'cp'
-            }
+            'index_entry' => [
+              'cp',
+              1
+            ]
           },
           'info' => {
             'spaces_before_argument' => {
@@ -153,7 +151,6 @@ $result_trees{'on_index_entry_line'} = {
   ],
   'type' => 'document_root'
 };
-$result_trees{'on_index_entry_line'}{'contents'}[0]{'contents'}[0]{'extra'}{'index_entry'}{'entry_element'}
 = $result_trees{'on_index_entry_line'}{'contents'}[0]{'contents'}[0];
 
 $result_texis{'on_index_entry_line'} = '@cindex @indent @titlefont{in 
titlefont} @anchor{in anchor}@footnote{footnote} @exdent exdent
 ';
diff --git a/tp/t/results/invalid_nestings/raw_block_on_line.pl 
b/tp/t/results/invalid_nestings/raw_block_on_line.pl
index 6a87bec552..56d844c7d3 100644
--- a/tp/t/results/invalid_nestings/raw_block_on_line.pl
+++ b/tp/t/results/invalid_nestings/raw_block_on_line.pl
@@ -38,12 +38,10 @@ $result_trees{'raw_block_on_line'} = {
           ],
           'cmdname' => 'cindex',
           'extra' => {
-            'index_entry' => {
-              'entry_element' => {},
-              'entry_number' => 1,
-              'in_code' => 0,
-              'index_name' => 'cp'
-            }
+            'index_entry' => [
+              'cp',
+              1
+            ]
           },
           'info' => {
             'spaces_before_argument' => {
@@ -63,7 +61,6 @@ $result_trees{'raw_block_on_line'} = {
   ],
   'type' => 'document_root'
 };
-$result_trees{'raw_block_on_line'}{'contents'}[0]{'contents'}[0]{'extra'}{'index_entry'}{'entry_element'}
 = $result_trees{'raw_block_on_line'}{'contents'}[0]{'contents'}[0];
 
 $result_texis{'raw_block_on_line'} = '@cindex @tex
 ';
diff --git a/tp/t/results/invalid_nestings/section_on_def_line.pl 
b/tp/t/results/invalid_nestings/section_on_def_line.pl
index 743a36463b..3a54c7c0e8 100644
--- a/tp/t/results/invalid_nestings/section_on_def_line.pl
+++ b/tp/t/results/invalid_nestings/section_on_def_line.pl
@@ -51,12 +51,10 @@ $result_trees{'section_on_def_line'} = {
                   'category' => {},
                   'name' => {}
                 },
-                'index_entry' => {
-                  'entry_element' => {},
-                  'entry_number' => 1,
-                  'in_code' => 1,
-                  'index_name' => 'fn'
-                },
+                'index_entry' => [
+                  'fn',
+                  1
+                ],
                 'original_def_cmdname' => 'deffn'
               },
               'source_info' => {
@@ -137,7 +135,6 @@ $result_trees{'section_on_def_line'} = {
 
$result_trees{'section_on_def_line'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'extra'}{'def_index_element'}
 = 
$result_trees{'section_on_def_line'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[2];
 
$result_trees{'section_on_def_line'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'extra'}{'def_parsed_hash'}{'category'}
 = 
$result_trees{'section_on_def_line'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0];
 
$result_trees{'section_on_def_line'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'extra'}{'def_parsed_hash'}{'name'}
 = 
$result_trees{'section_on_def_line'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[2];
-$result_trees{'section_on_def_line'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'section_on_def_line'}{'contents'}[0]{'contents'}[0]{'contents'}[0];
 
 $result_texis{'section_on_def_line'} = '@deffn a b @section s
 
diff --git a/tp/t/results/invalid_nestings/section_on_defx_line.pl 
b/tp/t/results/invalid_nestings/section_on_defx_line.pl
index c9ed17d74a..d5b0f2ed39 100644
--- a/tp/t/results/invalid_nestings/section_on_defx_line.pl
+++ b/tp/t/results/invalid_nestings/section_on_defx_line.pl
@@ -78,12 +78,10 @@ $result_trees{'section_on_defx_line'} = {
                   'category' => {},
                   'name' => {}
                 },
-                'index_entry' => {
-                  'entry_element' => {},
-                  'entry_number' => 1,
-                  'in_code' => 1,
-                  'index_name' => 'fn'
-                },
+                'index_entry' => [
+                  'fn',
+                  1
+                ],
                 'original_def_cmdname' => 'deffn'
               },
               'source_info' => {
@@ -133,12 +131,10 @@ $result_trees{'section_on_defx_line'} = {
                   'category' => {},
                   'name' => {}
                 },
-                'index_entry' => {
-                  'entry_element' => {},
-                  'entry_number' => 2,
-                  'in_code' => 1,
-                  'index_name' => 'fn'
-                },
+                'index_entry' => [
+                  'fn',
+                  2
+                ],
                 'original_def_cmdname' => 'deffnx'
               },
               'info' => {
@@ -224,11 +220,9 @@ $result_trees{'section_on_defx_line'} = {
 
$result_trees{'section_on_defx_line'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'extra'}{'def_index_element'}
 = 
$result_trees{'section_on_defx_line'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[2];
 
$result_trees{'section_on_defx_line'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'extra'}{'def_parsed_hash'}{'category'}
 = 
$result_trees{'section_on_defx_line'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0];
 
$result_trees{'section_on_defx_line'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'extra'}{'def_parsed_hash'}{'name'}
 = 
$result_trees{'section_on_defx_line'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[2];
-$result_trees{'section_on_defx_line'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'section_on_defx_line'}{'contents'}[0]{'contents'}[0]{'contents'}[0];
 
$result_trees{'section_on_defx_line'}{'contents'}[0]{'contents'}[0]{'contents'}[1]{'extra'}{'def_index_element'}
 = 
$result_trees{'section_on_defx_line'}{'contents'}[0]{'contents'}[0]{'contents'}[1]{'args'}[0]{'contents'}[2];
 
$result_trees{'section_on_defx_line'}{'contents'}[0]{'contents'}[0]{'contents'}[1]{'extra'}{'def_parsed_hash'}{'category'}
 = 
$result_trees{'section_on_defx_line'}{'contents'}[0]{'contents'}[0]{'contents'}[1]{'args'}[0]{'contents'}[0];
 
$result_trees{'section_on_defx_line'}{'contents'}[0]{'contents'}[0]{'contents'}[1]{'extra'}{'def_parsed_hash'}{'name'}
 = 
$result_trees{'section_on_defx_line'}{'contents'}[0]{'contents'}[0]{'contents'}[1]{'args'}[0]{'contents'}[2];
-$result_trees{'section_on_defx_line'}{'contents'}[0]{'contents'}[0]{'contents'}[1]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'section_on_defx_line'}{'contents'}[0]{'contents'}[0]{'contents'}[1];
 
 $result_texis{'section_on_defx_line'} = '@deffn h j k l 
 @deffnx a b @section s
diff --git a/tp/t/results/invalid_nestings/section_on_index_entry_line.pl 
b/tp/t/results/invalid_nestings/section_on_index_entry_line.pl
index a2fd9f8722..71f6680e34 100644
--- a/tp/t/results/invalid_nestings/section_on_index_entry_line.pl
+++ b/tp/t/results/invalid_nestings/section_on_index_entry_line.pl
@@ -27,12 +27,10 @@ $result_trees{'section_on_index_entry_line'} = {
           ],
           'cmdname' => 'cindex',
           'extra' => {
-            'index_entry' => {
-              'entry_element' => {},
-              'entry_number' => 1,
-              'in_code' => 0,
-              'index_name' => 'cp'
-            }
+            'index_entry' => [
+              'cp',
+              1
+            ]
           },
           'info' => {
             'spaces_before_argument' => {
@@ -97,7 +95,6 @@ $result_trees{'section_on_index_entry_line'} = {
   ],
   'type' => 'document_root'
 };
-$result_trees{'section_on_index_entry_line'}{'contents'}[0]{'contents'}[0]{'extra'}{'index_entry'}{'entry_element'}
 = $result_trees{'section_on_index_entry_line'}{'contents'}[0]{'contents'}[0];
 
 $result_texis{'section_on_index_entry_line'} = '@cindex a @section b
 
diff --git a/tp/t/results/invalid_nestings/tab_in_index.pl 
b/tp/t/results/invalid_nestings/tab_in_index.pl
index 47f7eb0d01..4184a2ea85 100644
--- a/tp/t/results/invalid_nestings/tab_in_index.pl
+++ b/tp/t/results/invalid_nestings/tab_in_index.pl
@@ -115,12 +115,10 @@ $result_trees{'tab_in_index'} = {
                           ],
                           'cmdname' => 'vindex',
                           'extra' => {
-                            'index_entry' => {
-                              'entry_element' => {},
-                              'entry_number' => 1,
-                              'in_code' => 1,
-                              'index_name' => 'vr'
-                            }
+                            'index_entry' => [
+                              'vr',
+                              1
+                            ]
                           },
                           'info' => {
                             'spaces_before_argument' => {
@@ -220,7 +218,6 @@ $result_trees{'tab_in_index'} = {
   ],
   'type' => 'document_root'
 };
-$result_trees{'tab_in_index'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[1]{'contents'}[2]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'tab_in_index'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[1]{'contents'}[2];
 
$result_trees{'tab_in_index'}{'contents'}[0]{'contents'}[0]{'extra'}{'prototypes'}[0]{'contents'}[0]
 = 
$result_trees{'tab_in_index'}{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0]{'contents'}[0];
 
$result_trees{'tab_in_index'}{'contents'}[0]{'contents'}[0]{'extra'}{'prototypes'}[1]{'contents'}[0]
 = 
$result_trees{'tab_in_index'}{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[2]{'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 ba3f392270..efd198126d 100644
--- a/tp/t/results/itemize/inter_item_commands_in_enumerate.pl
+++ b/tp/t/results/itemize/inter_item_commands_in_enumerate.pl
@@ -289,12 +289,10 @@ $result_trees{'inter_item_commands_in_enumerate'} = {
                   'cmdname' => 'cindex',
                   'extra' => {
                     'element_node' => {},
-                    'index_entry' => {
-                      'entry_element' => {},
-                      'entry_number' => 1,
-                      'in_code' => 0,
-                      'index_name' => 'cp'
-                    }
+                    'index_entry' => [
+                      'cp',
+                      1
+                    ]
                   },
                   'info' => {
                     'spaces_before_argument' => {
@@ -430,12 +428,10 @@ $result_trees{'inter_item_commands_in_enumerate'} = {
                   'cmdname' => 'cindex',
                   'extra' => {
                     'element_node' => {},
-                    'index_entry' => {
-                      'entry_element' => {},
-                      'entry_number' => 2,
-                      'in_code' => 0,
-                      'index_name' => 'cp'
-                    }
+                    'index_entry' => [
+                      'cp',
+                      2
+                    ]
                   },
                   'info' => {
                     'spaces_before_argument' => {
@@ -561,12 +557,10 @@ $result_trees{'inter_item_commands_in_enumerate'} = {
                   'cmdname' => 'cindex',
                   'extra' => {
                     'element_node' => {},
-                    'index_entry' => {
-                      'entry_element' => {},
-                      'entry_number' => 3,
-                      'in_code' => 0,
-                      'index_name' => 'cp'
-                    }
+                    'index_entry' => [
+                      'cp',
+                      3
+                    ]
                   },
                   'info' => {
                     'spaces_before_argument' => {
@@ -706,12 +700,10 @@ $result_trees{'inter_item_commands_in_enumerate'} = {
                   'cmdname' => 'cindex',
                   'extra' => {
                     'element_node' => {},
-                    'index_entry' => {
-                      'entry_element' => {},
-                      'entry_number' => 4,
-                      'in_code' => 0,
-                      'index_name' => 'cp'
-                    }
+                    'index_entry' => [
+                      'cp',
+                      4
+                    ]
                   },
                   'info' => {
                     'spaces_before_argument' => {
@@ -837,12 +829,10 @@ $result_trees{'inter_item_commands_in_enumerate'} = {
                   'cmdname' => 'cindex',
                   'extra' => {
                     'element_node' => {},
-                    'index_entry' => {
-                      'entry_element' => {},
-                      'entry_number' => 5,
-                      'in_code' => 0,
-                      'index_name' => 'cp'
-                    }
+                    'index_entry' => [
+                      'cp',
+                      5
+                    ]
                   },
                   'info' => {
                     'spaces_before_argument' => {
@@ -886,12 +876,10 @@ $result_trees{'inter_item_commands_in_enumerate'} = {
                   'cmdname' => 'cindex',
                   'extra' => {
                     'element_node' => {},
-                    'index_entry' => {
-                      'entry_element' => {},
-                      'entry_number' => 6,
-                      'in_code' => 0,
-                      'index_name' => 'cp'
-                    }
+                    'index_entry' => [
+                      'cp',
+                      6
+                    ]
                   },
                   'info' => {
                     'spaces_before_argument' => {
@@ -925,12 +913,10 @@ $result_trees{'inter_item_commands_in_enumerate'} = {
                   'cmdname' => 'cindex',
                   'extra' => {
                     'element_node' => {},
-                    'index_entry' => {
-                      'entry_element' => {},
-                      'entry_number' => 7,
-                      'in_code' => 0,
-                      'index_name' => 'cp'
-                    }
+                    'index_entry' => [
+                      'cp',
+                      7
+                    ]
                   },
                   'info' => {
                     'spaces_before_argument' => {
@@ -1037,19 +1023,12 @@ $result_trees{'inter_item_commands_in_enumerate'} = {
   'type' => 'document_root'
 };
 
$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'}{'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'}{'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'}[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'}[1]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'inter_item_commands_in_enumerate'}{'contents'}[4]{'contents'}[9]{'contents'}[0]{'contents'}[1];
 
$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'}{'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'}{'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
 @top 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 83fda73bda..e41e17da74 100644
--- a/tp/t/results/itemize/inter_item_commands_in_itemize.pl
+++ b/tp/t/results/itemize/inter_item_commands_in_itemize.pl
@@ -198,12 +198,10 @@ $result_trees{'inter_item_commands_in_itemize'} = {
                   'cmdname' => 'cindex',
                   'extra' => {
                     'element_node' => {},
-                    'index_entry' => {
-                      'entry_element' => {},
-                      'entry_number' => 1,
-                      'in_code' => 0,
-                      'index_name' => 'cp'
-                    }
+                    'index_entry' => [
+                      'cp',
+                      1
+                    ]
                   },
                   'info' => {
                     'spaces_before_argument' => {
@@ -345,12 +343,10 @@ $result_trees{'inter_item_commands_in_itemize'} = {
                   'cmdname' => 'cindex',
                   'extra' => {
                     'element_node' => {},
-                    'index_entry' => {
-                      'entry_element' => {},
-                      'entry_number' => 2,
-                      'in_code' => 0,
-                      'index_name' => 'cp'
-                    }
+                    'index_entry' => [
+                      'cp',
+                      2
+                    ]
                   },
                   'info' => {
                     'spaces_before_argument' => {
@@ -426,12 +422,10 @@ $result_trees{'inter_item_commands_in_itemize'} = {
                   'cmdname' => 'cindex',
                   'extra' => {
                     'element_node' => {},
-                    'index_entry' => {
-                      'entry_element' => {},
-                      'entry_number' => 3,
-                      'in_code' => 0,
-                      'index_name' => 'cp'
-                    }
+                    'index_entry' => [
+                      'cp',
+                      3
+                    ]
                   },
                   'info' => {
                     'spaces_before_argument' => {
@@ -577,12 +571,10 @@ $result_trees{'inter_item_commands_in_itemize'} = {
                   'cmdname' => 'cindex',
                   'extra' => {
                     'element_node' => {},
-                    'index_entry' => {
-                      'entry_element' => {},
-                      'entry_number' => 4,
-                      'in_code' => 0,
-                      'index_name' => 'cp'
-                    }
+                    'index_entry' => [
+                      'cp',
+                      4
+                    ]
                   },
                   'info' => {
                     'spaces_before_argument' => {
@@ -684,15 +676,11 @@ $result_trees{'inter_item_commands_in_itemize'} = {
   'type' => 'document_root'
 };
 
$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'}{'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'}{'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'}[2]{'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'}[2]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'inter_item_commands_in_itemize'}{'contents'}[4]{'contents'}[5]{'contents'}[0]{'contents'}[2];
 
$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];
 
 $result_texis{'inter_item_commands_in_itemize'} = '@node Top
diff --git a/tp/t/results/languages/documentlanguage.pl 
b/tp/t/results/languages/documentlanguage.pl
index 0bdcb57f91..5b94e7e8e3 100644
--- a/tp/t/results/languages/documentlanguage.pl
+++ b/tp/t/results/languages/documentlanguage.pl
@@ -531,12 +531,10 @@ $result_trees{'documentlanguage'} = {
                 },
                 'documentlanguage' => 'pt',
                 'element_node' => {},
-                'index_entry' => {
-                  'entry_element' => {},
-                  'entry_number' => 1,
-                  'in_code' => 1,
-                  'index_name' => 'fn'
-                },
+                'index_entry' => [
+                  'fn',
+                  1
+                ],
                 'original_def_cmdname' => 'deftypemethod'
               },
               'source_info' => {
@@ -684,7 +682,6 @@ 
$result_trees{'documentlanguage'}{'contents'}[4]{'contents'}[3]{'contents'}[0]{'
 
$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'}{'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 31b9c255f0..21e8cc1cf4 100644
--- a/tp/t/results/languages/documentlanguage_option.pl
+++ b/tp/t/results/languages/documentlanguage_option.pl
@@ -531,12 +531,10 @@ $result_trees{'documentlanguage_option'} = {
                 },
                 'documentlanguage' => 'fr',
                 'element_node' => {},
-                'index_entry' => {
-                  'entry_element' => {},
-                  'entry_number' => 1,
-                  'in_code' => 1,
-                  'index_name' => 'fn'
-                },
+                'index_entry' => [
+                  'fn',
+                  1
+                ],
                 'original_def_cmdname' => 'deftypemethod'
               },
               'source_info' => {
@@ -684,7 +682,6 @@ 
$result_trees{'documentlanguage_option'}{'contents'}[4]{'contents'}[3]{'contents
 
$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'}{'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 140810c9f8..b2f0998cbc 100644
--- a/tp/t/results/languages/documentlanguage_unknown.pl
+++ b/tp/t/results/languages/documentlanguage_unknown.pl
@@ -531,12 +531,10 @@ $result_trees{'documentlanguage_unknown'} = {
                 },
                 'documentlanguage' => 'unknown',
                 'element_node' => {},
-                'index_entry' => {
-                  'entry_element' => {},
-                  'entry_number' => 1,
-                  'in_code' => 1,
-                  'index_name' => 'fn'
-                },
+                'index_entry' => [
+                  'fn',
+                  1
+                ],
                 'original_def_cmdname' => 'deftypemethod'
               },
               'source_info' => {
@@ -684,7 +682,6 @@ 
$result_trees{'documentlanguage_unknown'}{'contents'}[4]{'contents'}[3]{'content
 
$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'}{'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 7bb3e8a85b..3879dbfb45 100644
--- a/tp/t/results/languages/multiple_documentlanguage.pl
+++ b/tp/t/results/languages/multiple_documentlanguage.pl
@@ -161,12 +161,10 @@ $result_trees{'multiple_documentlanguage'} = {
                         },
                         'documentlanguage' => 'fr',
                         'element_region' => 'copying',
-                        'index_entry' => {
-                          'entry_element' => {},
-                          'entry_number' => 1,
-                          'in_code' => 1,
-                          'index_name' => 'vr'
-                        },
+                        'index_entry' => [
+                          'vr',
+                          1
+                        ],
                         'original_def_cmdname' => 'defivar'
                       },
                       'source_info' => {
@@ -522,12 +520,10 @@ $result_trees{'multiple_documentlanguage'} = {
                 },
                 'documentlanguage' => 'fr',
                 'element_node' => {},
-                'index_entry' => {
-                  'entry_element' => {},
-                  'entry_number' => 2,
-                  'in_code' => 1,
-                  'index_name' => 'vr'
-                },
+                'index_entry' => [
+                  'vr',
+                  2
+                ],
                 'original_def_cmdname' => 'defivar'
               },
               'source_info' => {
@@ -806,12 +802,10 @@ $result_trees{'multiple_documentlanguage'} = {
                 },
                 'documentlanguage' => 'hr',
                 'element_node' => {},
-                'index_entry' => {
-                  'entry_element' => {},
-                  'entry_number' => 3,
-                  'in_code' => 1,
-                  'index_name' => 'vr'
-                },
+                'index_entry' => [
+                  'vr',
+                  3
+                ],
                 'original_def_cmdname' => 'defivar'
               },
               'source_info' => {
@@ -974,7 +968,6 @@ 
$result_trees{'multiple_documentlanguage'}{'contents'}[0]{'contents'}[0]{'conten
 
$result_trees{'multiple_documentlanguage'}{'contents'}[0]{'contents'}[0]{'contents'}[2]{'contents'}[0]{'contents'}[0]{'extra'}{'def_parsed_hash'}{'category'}
 = 
$result_trees{'multiple_documentlanguage'}{'contents'}[0]{'contents'}[0]{'contents'}[2]{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0];
 
$result_trees{'multiple_documentlanguage'}{'contents'}[0]{'contents'}[0]{'contents'}[2]{'contents'}[0]{'contents'}[0]{'extra'}{'def_parsed_hash'}{'class'}
 = 
$result_trees{'multiple_documentlanguage'}{'contents'}[0]{'contents'}[0]{'contents'}[2]{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[2];
 
$result_trees{'multiple_documentlanguage'}{'contents'}[0]{'contents'}[0]{'contents'}[2]{'contents'}[0]{'contents'}[0]{'extra'}{'def_parsed_hash'}{'name'}
 = 
$result_trees{'multiple_documentlanguage'}{'contents'}[0]{'contents'}[0]{'contents'}[2]{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[4];
-$result_trees{'multiple_documentlanguage'}{'contents'}[0]{'contents'}[0]{'contents'}[2]{'contents'}[0]{'contents'}[0]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'multiple_documentlanguage'}{'contents'}[0]{'contents'}[0]{'contents'}[2]{'contents'}[0]{'contents'}[0];
 
$result_trees{'multiple_documentlanguage'}{'contents'}[4]{'contents'}[1]{'contents'}[0]{'extra'}{'def_index_element'}{'contents'}[0]
 = 
$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'}{'def_index_element'}{'contents'}[2]
 = 
$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_index_ref_element'}{'contents'}[0]
 = 
$result_trees{'multiple_documentlanguage'}{'contents'}[4]{'contents'}[1]{'contents'}[0]{'args'}[0]{'contents'}[4];
@@ -983,7 +976,6 @@ 
$result_trees{'multiple_documentlanguage'}{'contents'}[4]{'contents'}[1]{'conten
 
$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'}{'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];
 
$result_trees{'multiple_documentlanguage'}{'contents'}[4]{'contents'}[9]{'contents'}[0]{'extra'}{'def_index_ref_element'}{'contents'}[0]
 = 
$result_trees{'multiple_documentlanguage'}{'contents'}[4]{'contents'}[9]{'contents'}[0]{'args'}[0]{'contents'}[4];
@@ -992,7 +984,6 @@ 
$result_trees{'multiple_documentlanguage'}{'contents'}[4]{'contents'}[9]{'conten
 
$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'}{'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 99e6f0c02f..03d1bde49b 100644
--- a/tp/t/results/languages/multiple_in_preamble.pl
+++ b/tp/t/results/languages/multiple_in_preamble.pl
@@ -161,12 +161,10 @@ $result_trees{'multiple_in_preamble'} = {
                         },
                         'documentlanguage' => 'fr',
                         'element_region' => 'copying',
-                        'index_entry' => {
-                          'entry_element' => {},
-                          'entry_number' => 1,
-                          'in_code' => 1,
-                          'index_name' => 'vr'
-                        },
+                        'index_entry' => [
+                          'vr',
+                          1
+                        ],
                         'original_def_cmdname' => 'defivar'
                       },
                       'source_info' => {
@@ -558,12 +556,10 @@ $result_trees{'multiple_in_preamble'} = {
                 },
                 'documentlanguage' => 'hr',
                 'element_node' => {},
-                'index_entry' => {
-                  'entry_element' => {},
-                  'entry_number' => 2,
-                  'in_code' => 1,
-                  'index_name' => 'vr'
-                },
+                'index_entry' => [
+                  'vr',
+                  2
+                ],
                 'original_def_cmdname' => 'defivar'
               },
               'source_info' => {
@@ -785,12 +781,10 @@ $result_trees{'multiple_in_preamble'} = {
                 },
                 'documentlanguage' => 'de',
                 'element_node' => {},
-                'index_entry' => {
-                  'entry_element' => {},
-                  'entry_number' => 3,
-                  'in_code' => 1,
-                  'index_name' => 'vr'
-                },
+                'index_entry' => [
+                  'vr',
+                  3
+                ],
                 'original_def_cmdname' => 'defivar'
               },
               'source_info' => {
@@ -867,7 +861,6 @@ 
$result_trees{'multiple_in_preamble'}{'contents'}[0]{'contents'}[0]{'contents'}[
 
$result_trees{'multiple_in_preamble'}{'contents'}[0]{'contents'}[0]{'contents'}[2]{'contents'}[0]{'contents'}[0]{'extra'}{'def_parsed_hash'}{'category'}
 = 
$result_trees{'multiple_in_preamble'}{'contents'}[0]{'contents'}[0]{'contents'}[2]{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0];
 
$result_trees{'multiple_in_preamble'}{'contents'}[0]{'contents'}[0]{'contents'}[2]{'contents'}[0]{'contents'}[0]{'extra'}{'def_parsed_hash'}{'class'}
 = 
$result_trees{'multiple_in_preamble'}{'contents'}[0]{'contents'}[0]{'contents'}[2]{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[2];
 
$result_trees{'multiple_in_preamble'}{'contents'}[0]{'contents'}[0]{'contents'}[2]{'contents'}[0]{'contents'}[0]{'extra'}{'def_parsed_hash'}{'name'}
 = 
$result_trees{'multiple_in_preamble'}{'contents'}[0]{'contents'}[0]{'contents'}[2]{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[4];
-$result_trees{'multiple_in_preamble'}{'contents'}[0]{'contents'}[0]{'contents'}[2]{'contents'}[0]{'contents'}[0]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'multiple_in_preamble'}{'contents'}[0]{'contents'}[0]{'contents'}[2]{'contents'}[0]{'contents'}[0];
 
$result_trees{'multiple_in_preamble'}{'contents'}[4]{'contents'}[1]{'contents'}[0]{'extra'}{'def_index_element'}{'contents'}[0]
 = 
$result_trees{'multiple_in_preamble'}{'contents'}[4]{'contents'}[1]{'contents'}[0]{'args'}[0]{'contents'}[4];
 
$result_trees{'multiple_in_preamble'}{'contents'}[4]{'contents'}[1]{'contents'}[0]{'extra'}{'def_index_element'}{'contents'}[2]
 = 
$result_trees{'multiple_in_preamble'}{'contents'}[4]{'contents'}[1]{'contents'}[0]{'args'}[0]{'contents'}[2];
 
$result_trees{'multiple_in_preamble'}{'contents'}[4]{'contents'}[1]{'contents'}[0]{'extra'}{'def_index_ref_element'}{'contents'}[0]
 = 
$result_trees{'multiple_in_preamble'}{'contents'}[4]{'contents'}[1]{'contents'}[0]{'args'}[0]{'contents'}[4];
@@ -876,7 +869,6 @@ 
$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'}{'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'}{'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];
 
$result_trees{'multiple_in_preamble'}{'contents'}[4]{'contents'}[5]{'contents'}[0]{'extra'}{'def_index_ref_element'}{'contents'}[0]
 = 
$result_trees{'multiple_in_preamble'}{'contents'}[4]{'contents'}[5]{'contents'}[0]{'args'}[0]{'contents'}[4];
@@ -885,7 +877,6 @@ 
$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'}{'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'}{'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 1d69c4892e..71a8483c3c 100644
--- a/tp/t/results/languages/multiple_in_preamble_before_node.pl
+++ b/tp/t/results/languages/multiple_in_preamble_before_node.pl
@@ -161,12 +161,10 @@ $result_trees{'multiple_in_preamble_before_node'} = {
                         },
                         'documentlanguage' => 'fr',
                         'element_region' => 'copying',
-                        'index_entry' => {
-                          'entry_element' => {},
-                          'entry_number' => 1,
-                          'in_code' => 1,
-                          'index_name' => 'vr'
-                        },
+                        'index_entry' => [
+                          'vr',
+                          1
+                        ],
                         'original_def_cmdname' => 'defivar'
                       },
                       'source_info' => {
@@ -609,12 +607,10 @@ $result_trees{'multiple_in_preamble_before_node'} = {
                 },
                 'documentlanguage' => 'de',
                 'element_node' => {},
-                'index_entry' => {
-                  'entry_element' => {},
-                  'entry_number' => 2,
-                  'in_code' => 1,
-                  'index_name' => 'vr'
-                },
+                'index_entry' => [
+                  'vr',
+                  2
+                ],
                 'original_def_cmdname' => 'defivar'
               },
               'source_info' => {
@@ -718,7 +714,6 @@ 
$result_trees{'multiple_in_preamble_before_node'}{'contents'}[0]{'contents'}[0]{
 
$result_trees{'multiple_in_preamble_before_node'}{'contents'}[0]{'contents'}[0]{'contents'}[2]{'contents'}[0]{'contents'}[0]{'extra'}{'def_parsed_hash'}{'category'}
 = 
$result_trees{'multiple_in_preamble_before_node'}{'contents'}[0]{'contents'}[0]{'contents'}[2]{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0];
 
$result_trees{'multiple_in_preamble_before_node'}{'contents'}[0]{'contents'}[0]{'contents'}[2]{'contents'}[0]{'contents'}[0]{'extra'}{'def_parsed_hash'}{'class'}
 = 
$result_trees{'multiple_in_preamble_before_node'}{'contents'}[0]{'contents'}[0]{'contents'}[2]{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[2];
 
$result_trees{'multiple_in_preamble_before_node'}{'contents'}[0]{'contents'}[0]{'contents'}[2]{'contents'}[0]{'contents'}[0]{'extra'}{'def_parsed_hash'}{'name'}
 = 
$result_trees{'multiple_in_preamble_before_node'}{'contents'}[0]{'contents'}[0]{'contents'}[2]{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[4];
-$result_trees{'multiple_in_preamble_before_node'}{'contents'}[0]{'contents'}[0]{'contents'}[2]{'contents'}[0]{'contents'}[0]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'multiple_in_preamble_before_node'}{'contents'}[0]{'contents'}[0]{'contents'}[2]{'contents'}[0]{'contents'}[0];
 
$result_trees{'multiple_in_preamble_before_node'}{'contents'}[4]{'contents'}[1]{'contents'}[0]{'extra'}{'def_index_element'}{'contents'}[0]
 = 
$result_trees{'multiple_in_preamble_before_node'}{'contents'}[4]{'contents'}[1]{'contents'}[0]{'args'}[0]{'contents'}[4];
 
$result_trees{'multiple_in_preamble_before_node'}{'contents'}[4]{'contents'}[1]{'contents'}[0]{'extra'}{'def_index_element'}{'contents'}[2]
 = 
$result_trees{'multiple_in_preamble_before_node'}{'contents'}[4]{'contents'}[1]{'contents'}[0]{'args'}[0]{'contents'}[2];
 
$result_trees{'multiple_in_preamble_before_node'}{'contents'}[4]{'contents'}[1]{'contents'}[0]{'extra'}{'def_index_ref_element'}{'contents'}[0]
 = 
$result_trees{'multiple_in_preamble_before_node'}{'contents'}[4]{'contents'}[1]{'contents'}[0]{'args'}[0]{'contents'}[4];
@@ -727,7 +722,6 @@ 
$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'}{'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'}{'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 4ee66adf1b..90d5141d0c 100644
--- a/tp/t/results/languages/multiple_lang_chapters.pl
+++ b/tp/t/results/languages/multiple_lang_chapters.pl
@@ -820,12 +820,10 @@ $result_trees{'multiple_lang_chapters'} = {
                 },
                 'documentlanguage' => 'ja',
                 'element_node' => {},
-                'index_entry' => {
-                  'entry_element' => {},
-                  'entry_number' => 1,
-                  'in_code' => 1,
-                  'index_name' => 'vr'
-                },
+                'index_entry' => [
+                  'vr',
+                  1
+                ],
                 'original_def_cmdname' => 'defivar'
               },
               'source_info' => {
@@ -1120,12 +1118,10 @@ $result_trees{'multiple_lang_chapters'} = {
                 },
                 'documentlanguage' => 'en',
                 'element_node' => {},
-                'index_entry' => {
-                  'entry_element' => {},
-                  'entry_number' => 2,
-                  'in_code' => 1,
-                  'index_name' => 'vr'
-                },
+                'index_entry' => [
+                  'vr',
+                  2
+                ],
                 'original_def_cmdname' => 'defivar'
               },
               'source_info' => {
@@ -1384,12 +1380,10 @@ $result_trees{'multiple_lang_chapters'} = {
                 },
                 'documentlanguage' => 'fr_FR',
                 'element_node' => {},
-                'index_entry' => {
-                  'entry_element' => {},
-                  'entry_number' => 3,
-                  'in_code' => 1,
-                  'index_name' => 'vr'
-                },
+                'index_entry' => [
+                  'vr',
+                  3
+                ],
                 'original_def_cmdname' => 'defivar'
               },
               'source_info' => {
@@ -1716,7 +1710,6 @@ 
$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'}{'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'}{'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'}[6]{'contents'}[1]{'contents'}[1]{'args'}[0]{'extra'}{'node_content'}[0]
 = 
$result_trees{'multiple_lang_chapters'}{'contents'}[6]{'contents'}[1]{'contents'}[1]{'args'}[0]{'contents'}[0];
 
$result_trees{'multiple_lang_chapters'}{'contents'}[6]{'contents'}[2]{'contents'}[0]{'extra'}{'def_index_element'}{'contents'}[0]
 = 
$result_trees{'multiple_lang_chapters'}{'contents'}[6]{'contents'}[2]{'contents'}[0]{'args'}[0]{'contents'}[4];
 
$result_trees{'multiple_lang_chapters'}{'contents'}[6]{'contents'}[2]{'contents'}[0]{'extra'}{'def_index_element'}{'contents'}[2]
 = 
$result_trees{'multiple_lang_chapters'}{'contents'}[6]{'contents'}[2]{'contents'}[0]{'args'}[0]{'contents'}[2];
@@ -1726,7 +1719,6 @@ 
$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'}{'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'}{'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'}[8]{'contents'}[1]{'contents'}[0]{'extra'}{'def_index_element'}{'contents'}[0]
 = 
$result_trees{'multiple_lang_chapters'}{'contents'}[8]{'contents'}[1]{'contents'}[0]{'args'}[0]{'contents'}[4];
 
$result_trees{'multiple_lang_chapters'}{'contents'}[8]{'contents'}[1]{'contents'}[0]{'extra'}{'def_index_element'}{'contents'}[2]
 = 
$result_trees{'multiple_lang_chapters'}{'contents'}[8]{'contents'}[1]{'contents'}[0]{'args'}[0]{'contents'}[2];
 
$result_trees{'multiple_lang_chapters'}{'contents'}[8]{'contents'}[1]{'contents'}[0]{'extra'}{'def_index_ref_element'}{'contents'}[0]
 = 
$result_trees{'multiple_lang_chapters'}{'contents'}[8]{'contents'}[1]{'contents'}[0]{'args'}[0]{'contents'}[4];
@@ -1735,7 +1727,6 @@ 
$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'}{'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'}{'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'}[12]{'contents'}[1]{'contents'}[1]{'args'}[0]{'extra'}{'node_content'}[0]
 = 
$result_trees{'multiple_lang_chapters'}{'contents'}[12]{'contents'}[1]{'contents'}[1]{'args'}[0]{'contents'}[0];
 
 $result_texis{'multiple_lang_chapters'} = '
diff --git a/tp/t/results/languages/multiple_lang_chapters_latex.pl 
b/tp/t/results/languages/multiple_lang_chapters_latex.pl
index 475203219d..1c71a264a3 100644
--- a/tp/t/results/languages/multiple_lang_chapters_latex.pl
+++ b/tp/t/results/languages/multiple_lang_chapters_latex.pl
@@ -820,12 +820,10 @@ $result_trees{'multiple_lang_chapters_latex'} = {
                 },
                 'documentlanguage' => 'ja',
                 'element_node' => {},
-                'index_entry' => {
-                  'entry_element' => {},
-                  'entry_number' => 1,
-                  'in_code' => 1,
-                  'index_name' => 'vr'
-                },
+                'index_entry' => [
+                  'vr',
+                  1
+                ],
                 'original_def_cmdname' => 'defivar'
               },
               'source_info' => {
@@ -1120,12 +1118,10 @@ $result_trees{'multiple_lang_chapters_latex'} = {
                 },
                 'documentlanguage' => 'en',
                 'element_node' => {},
-                'index_entry' => {
-                  'entry_element' => {},
-                  'entry_number' => 2,
-                  'in_code' => 1,
-                  'index_name' => 'vr'
-                },
+                'index_entry' => [
+                  'vr',
+                  2
+                ],
                 'original_def_cmdname' => 'defivar'
               },
               'source_info' => {
@@ -1384,12 +1380,10 @@ $result_trees{'multiple_lang_chapters_latex'} = {
                 },
                 'documentlanguage' => 'fr_FR',
                 'element_node' => {},
-                'index_entry' => {
-                  'entry_element' => {},
-                  'entry_number' => 3,
-                  'in_code' => 1,
-                  'index_name' => 'vr'
-                },
+                'index_entry' => [
+                  'vr',
+                  3
+                ],
                 'original_def_cmdname' => 'defivar'
               },
               'source_info' => {
@@ -1716,7 +1710,6 @@ 
$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'}{'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'}{'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'}[6]{'contents'}[1]{'contents'}[1]{'args'}[0]{'extra'}{'node_content'}[0]
 = 
$result_trees{'multiple_lang_chapters_latex'}{'contents'}[6]{'contents'}[1]{'contents'}[1]{'args'}[0]{'contents'}[0];
 
$result_trees{'multiple_lang_chapters_latex'}{'contents'}[6]{'contents'}[2]{'contents'}[0]{'extra'}{'def_index_element'}{'contents'}[0]
 = 
$result_trees{'multiple_lang_chapters_latex'}{'contents'}[6]{'contents'}[2]{'contents'}[0]{'args'}[0]{'contents'}[4];
 
$result_trees{'multiple_lang_chapters_latex'}{'contents'}[6]{'contents'}[2]{'contents'}[0]{'extra'}{'def_index_element'}{'contents'}[2]
 = 
$result_trees{'multiple_lang_chapters_latex'}{'contents'}[6]{'contents'}[2]{'contents'}[0]{'args'}[0]{'contents'}[2];
@@ -1726,7 +1719,6 @@ 
$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'}{'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'}{'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'}[8]{'contents'}[1]{'contents'}[0]{'extra'}{'def_index_element'}{'contents'}[0]
 = 
$result_trees{'multiple_lang_chapters_latex'}{'contents'}[8]{'contents'}[1]{'contents'}[0]{'args'}[0]{'contents'}[4];
 
$result_trees{'multiple_lang_chapters_latex'}{'contents'}[8]{'contents'}[1]{'contents'}[0]{'extra'}{'def_index_element'}{'contents'}[2]
 = 
$result_trees{'multiple_lang_chapters_latex'}{'contents'}[8]{'contents'}[1]{'contents'}[0]{'args'}[0]{'contents'}[2];
 
$result_trees{'multiple_lang_chapters_latex'}{'contents'}[8]{'contents'}[1]{'contents'}[0]{'extra'}{'def_index_ref_element'}{'contents'}[0]
 = 
$result_trees{'multiple_lang_chapters_latex'}{'contents'}[8]{'contents'}[1]{'contents'}[0]{'args'}[0]{'contents'}[4];
@@ -1735,7 +1727,6 @@ 
$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'}{'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'}{'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'}[12]{'contents'}[1]{'contents'}[1]{'args'}[0]{'extra'}{'node_content'}[0]
 = 
$result_trees{'multiple_lang_chapters_latex'}{'contents'}[12]{'contents'}[1]{'contents'}[1]{'args'}[0]{'contents'}[0];
 
 $result_texis{'multiple_lang_chapters_latex'} = '
diff --git a/tp/t/results/languages/multiple_lang_chapters_texi2html.pl 
b/tp/t/results/languages/multiple_lang_chapters_texi2html.pl
index 1f26cf694d..e29d1b6f19 100644
--- a/tp/t/results/languages/multiple_lang_chapters_texi2html.pl
+++ b/tp/t/results/languages/multiple_lang_chapters_texi2html.pl
@@ -787,12 +787,10 @@ $result_trees{'multiple_lang_chapters_texi2html'} = {
                 },
                 'documentlanguage' => 'ja',
                 'element_node' => {},
-                'index_entry' => {
-                  'entry_element' => {},
-                  'entry_number' => 1,
-                  'in_code' => 1,
-                  'index_name' => 'vr'
-                },
+                'index_entry' => [
+                  'vr',
+                  1
+                ],
                 'original_def_cmdname' => 'defivar'
               },
               'source_info' => {
@@ -1087,12 +1085,10 @@ $result_trees{'multiple_lang_chapters_texi2html'} = {
                 },
                 'documentlanguage' => 'en',
                 'element_node' => {},
-                'index_entry' => {
-                  'entry_element' => {},
-                  'entry_number' => 2,
-                  'in_code' => 1,
-                  'index_name' => 'vr'
-                },
+                'index_entry' => [
+                  'vr',
+                  2
+                ],
                 'original_def_cmdname' => 'defivar'
               },
               'source_info' => {
@@ -1351,12 +1347,10 @@ $result_trees{'multiple_lang_chapters_texi2html'} = {
                 },
                 'documentlanguage' => 'fr_FR',
                 'element_node' => {},
-                'index_entry' => {
-                  'entry_element' => {},
-                  'entry_number' => 3,
-                  'in_code' => 1,
-                  'index_name' => 'vr'
-                },
+                'index_entry' => [
+                  'vr',
+                  3
+                ],
                 'original_def_cmdname' => 'defivar'
               },
               'source_info' => {
@@ -1683,7 +1677,6 @@ 
$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'}{'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'}{'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'}[6]{'contents'}[1]{'contents'}[1]{'args'}[0]{'extra'}{'node_content'}[0]
 = 
$result_trees{'multiple_lang_chapters_texi2html'}{'contents'}[6]{'contents'}[1]{'contents'}[1]{'args'}[0]{'contents'}[0];
 
$result_trees{'multiple_lang_chapters_texi2html'}{'contents'}[6]{'contents'}[2]{'contents'}[0]{'extra'}{'def_index_element'}{'contents'}[0]
 = 
$result_trees{'multiple_lang_chapters_texi2html'}{'contents'}[6]{'contents'}[2]{'contents'}[0]{'args'}[0]{'contents'}[4];
 
$result_trees{'multiple_lang_chapters_texi2html'}{'contents'}[6]{'contents'}[2]{'contents'}[0]{'extra'}{'def_index_element'}{'contents'}[2]
 = 
$result_trees{'multiple_lang_chapters_texi2html'}{'contents'}[6]{'contents'}[2]{'contents'}[0]{'args'}[0]{'contents'}[2];
@@ -1693,7 +1686,6 @@ 
$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'}{'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'}{'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'}[8]{'contents'}[1]{'contents'}[0]{'extra'}{'def_index_element'}{'contents'}[0]
 = 
$result_trees{'multiple_lang_chapters_texi2html'}{'contents'}[8]{'contents'}[1]{'contents'}[0]{'args'}[0]{'contents'}[4];
 
$result_trees{'multiple_lang_chapters_texi2html'}{'contents'}[8]{'contents'}[1]{'contents'}[0]{'extra'}{'def_index_element'}{'contents'}[2]
 = 
$result_trees{'multiple_lang_chapters_texi2html'}{'contents'}[8]{'contents'}[1]{'contents'}[0]{'args'}[0]{'contents'}[2];
 
$result_trees{'multiple_lang_chapters_texi2html'}{'contents'}[8]{'contents'}[1]{'contents'}[0]{'extra'}{'def_index_ref_element'}{'contents'}[0]
 = 
$result_trees{'multiple_lang_chapters_texi2html'}{'contents'}[8]{'contents'}[1]{'contents'}[0]{'args'}[0]{'contents'}[4];
@@ -1702,7 +1694,6 @@ 
$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'}{'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'}{'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'}[12]{'contents'}[1]{'contents'}[1]{'args'}[0]{'extra'}{'node_content'}[0]
 = 
$result_trees{'multiple_lang_chapters_texi2html'}{'contents'}[12]{'contents'}[1]{'contents'}[1]{'args'}[0]{'contents'}[0];
 
 $result_texis{'multiple_lang_chapters_texi2html'} = '
diff --git a/tp/t/results/languages/simple_documentlanguage.pl 
b/tp/t/results/languages/simple_documentlanguage.pl
index 388bcceb31..7b0887a76b 100644
--- a/tp/t/results/languages/simple_documentlanguage.pl
+++ b/tp/t/results/languages/simple_documentlanguage.pl
@@ -209,12 +209,10 @@ $result_trees{'simple_documentlanguage'} = {
                 },
                 'documentlanguage' => 'fr',
                 'element_node' => {},
-                'index_entry' => {
-                  'entry_element' => {},
-                  'entry_number' => 1,
-                  'in_code' => 1,
-                  'index_name' => 'vr'
-                },
+                'index_entry' => [
+                  'vr',
+                  1
+                ],
                 'original_def_cmdname' => 'defivar'
               },
               'source_info' => {
@@ -294,7 +292,6 @@ 
$result_trees{'simple_documentlanguage'}{'contents'}[2]{'contents'}[1]{'contents
 
$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'}{'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_texis{'simple_documentlanguage'} = '@documentlanguage fr
 
diff --git a/tp/t/results/languages/unknown_region.pl 
b/tp/t/results/languages/unknown_region.pl
index a02088e992..5972812e0a 100644
--- a/tp/t/results/languages/unknown_region.pl
+++ b/tp/t/results/languages/unknown_region.pl
@@ -209,12 +209,10 @@ $result_trees{'unknown_region'} = {
                 },
                 'documentlanguage' => 'fr_NOWHERE',
                 'element_node' => {},
-                'index_entry' => {
-                  'entry_element' => {},
-                  'entry_number' => 1,
-                  'in_code' => 1,
-                  'index_name' => 'vr'
-                },
+                'index_entry' => [
+                  'vr',
+                  1
+                ],
                 'original_def_cmdname' => 'defivar'
               },
               'source_info' => {
@@ -294,7 +292,6 @@ 
$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'}{'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'}{'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_texis{'unknown_region'} = '@documentlanguage fr_NOWHERE
 
diff --git a/tp/t/results/latex_tests/brace_in_index.pl 
b/tp/t/results/latex_tests/brace_in_index.pl
index 14904e7946..dc08d0dc01 100644
--- a/tp/t/results/latex_tests/brace_in_index.pl
+++ b/tp/t/results/latex_tests/brace_in_index.pl
@@ -146,12 +146,10 @@ $result_trees{'brace_in_index'} = {
           ],
           'cmdname' => 'cindex',
           'extra' => {
-            'index_entry' => {
-              'entry_element' => {},
-              'entry_number' => 1,
-              'in_code' => 0,
-              'index_name' => 'cp'
-            }
+            'index_entry' => [
+              'cp',
+              1
+            ]
           },
           'info' => {
             'spaces_before_argument' => {
@@ -204,12 +202,10 @@ $result_trees{'brace_in_index'} = {
           ],
           'cmdname' => 'cindex',
           'extra' => {
-            'index_entry' => {
-              'entry_element' => {},
-              'entry_number' => 2,
-              'in_code' => 0,
-              'index_name' => 'cp'
-            }
+            'index_entry' => [
+              'cp',
+              2
+            ]
           },
           'info' => {
             'spaces_before_argument' => {
@@ -262,12 +258,10 @@ $result_trees{'brace_in_index'} = {
           ],
           'cmdname' => 'cindex',
           'extra' => {
-            'index_entry' => {
-              'entry_element' => {},
-              'entry_number' => 3,
-              'in_code' => 0,
-              'index_name' => 'cp'
-            }
+            'index_entry' => [
+              'cp',
+              3
+            ]
           },
           'info' => {
             'spaces_before_argument' => {
@@ -372,12 +366,10 @@ $result_trees{'brace_in_index'} = {
                   'category' => {},
                   'name' => {}
                 },
-                'index_entry' => {
-                  'entry_element' => {},
-                  'entry_number' => 1,
-                  'in_code' => 1,
-                  'index_name' => 'fn'
-                },
+                'index_entry' => [
+                  'fn',
+                  1
+                ],
                 'original_def_cmdname' => 'defun'
               },
               'source_info' => {
@@ -451,13 +443,9 @@ $result_trees{'brace_in_index'} = {
   ],
   'type' => 'document_root'
 };
-$result_trees{'brace_in_index'}{'contents'}[0]{'contents'}[7]{'extra'}{'index_entry'}{'entry_element'}
 = $result_trees{'brace_in_index'}{'contents'}[0]{'contents'}[7];
-$result_trees{'brace_in_index'}{'contents'}[0]{'contents'}[9]{'extra'}{'index_entry'}{'entry_element'}
 = $result_trees{'brace_in_index'}{'contents'}[0]{'contents'}[9];
-$result_trees{'brace_in_index'}{'contents'}[0]{'contents'}[11]{'extra'}{'index_entry'}{'entry_element'}
 = $result_trees{'brace_in_index'}{'contents'}[0]{'contents'}[11];
 
$result_trees{'brace_in_index'}{'contents'}[0]{'contents'}[13]{'contents'}[0]{'extra'}{'def_index_element'}
 = 
$result_trees{'brace_in_index'}{'contents'}[0]{'contents'}[13]{'contents'}[0]{'args'}[0]{'contents'}[2];
 
$result_trees{'brace_in_index'}{'contents'}[0]{'contents'}[13]{'contents'}[0]{'extra'}{'def_parsed_hash'}{'category'}
 = 
$result_trees{'brace_in_index'}{'contents'}[0]{'contents'}[13]{'contents'}[0]{'args'}[0]{'contents'}[0];
 
$result_trees{'brace_in_index'}{'contents'}[0]{'contents'}[13]{'contents'}[0]{'extra'}{'def_parsed_hash'}{'name'}
 = 
$result_trees{'brace_in_index'}{'contents'}[0]{'contents'}[13]{'contents'}[0]{'args'}[0]{'contents'}[2];
-$result_trees{'brace_in_index'}{'contents'}[0]{'contents'}[13]{'contents'}[0]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'brace_in_index'}{'contents'}[0]{'contents'}[13]{'contents'}[0];
 
 $result_texis{'brace_in_index'} = '@{
 
diff --git a/tp/t/results/latex_tests/indices.pl 
b/tp/t/results/latex_tests/indices.pl
index ed05ee3750..922cdd2bbc 100644
--- a/tp/t/results/latex_tests/indices.pl
+++ b/tp/t/results/latex_tests/indices.pl
@@ -231,12 +231,10 @@ $result_trees{'indices'} = {
           'cmdname' => 'cindex',
           'extra' => {
             'element_node' => {},
-            'index_entry' => {
-              'entry_element' => {},
-              'entry_number' => 1,
-              'in_code' => 0,
-              'index_name' => 'cp'
-            },
+            'index_entry' => [
+              'cp',
+              1
+            ],
             'index_ignore_chars' => '\\'
           },
           'info' => {
@@ -271,12 +269,10 @@ $result_trees{'indices'} = {
           'cmdname' => 'cindex',
           'extra' => {
             'element_node' => {},
-            'index_entry' => {
-              'entry_element' => {},
-              'entry_number' => 2,
-              'in_code' => 0,
-              'index_name' => 'cp'
-            },
+            'index_entry' => [
+              'cp',
+              2
+            ],
             'index_ignore_chars' => '\\'
           },
           'info' => {
@@ -311,12 +307,10 @@ $result_trees{'indices'} = {
           'cmdname' => 'cindex',
           'extra' => {
             'element_node' => {},
-            'index_entry' => {
-              'entry_element' => {},
-              'entry_number' => 3,
-              'in_code' => 0,
-              'index_name' => 'cp'
-            },
+            'index_entry' => [
+              'cp',
+              3
+            ],
             'index_ignore_chars' => '\\'
           },
           'info' => {
@@ -351,12 +345,10 @@ $result_trees{'indices'} = {
           'cmdname' => 'cindex',
           'extra' => {
             'element_node' => {},
-            'index_entry' => {
-              'entry_element' => {},
-              'entry_number' => 4,
-              'in_code' => 0,
-              'index_name' => 'cp'
-            },
+            'index_entry' => [
+              'cp',
+              4
+            ],
             'index_ignore_chars' => '\\'
           },
           'info' => {
@@ -391,12 +383,10 @@ $result_trees{'indices'} = {
           'cmdname' => 'cindex',
           'extra' => {
             'element_node' => {},
-            'index_entry' => {
-              'entry_element' => {},
-              'entry_number' => 5,
-              'in_code' => 0,
-              'index_name' => 'cp'
-            },
+            'index_entry' => [
+              'cp',
+              5
+            ],
             'index_ignore_chars' => '\\'
           },
           'info' => {
@@ -446,12 +436,10 @@ $result_trees{'indices'} = {
           'cmdname' => 'cindex',
           'extra' => {
             'element_node' => {},
-            'index_entry' => {
-              'entry_element' => {},
-              'entry_number' => 6,
-              'in_code' => 0,
-              'index_name' => 'cp'
-            },
+            'index_entry' => [
+              'cp',
+              6
+            ],
             'index_ignore_chars' => '\\'
           },
           'info' => {
@@ -559,12 +547,10 @@ $result_trees{'indices'} = {
           'cmdname' => 'cindex',
           'extra' => {
             'element_node' => {},
-            'index_entry' => {
-              'entry_element' => {},
-              'entry_number' => 7,
-              'in_code' => 0,
-              'index_name' => 'cp'
-            },
+            'index_entry' => [
+              'cp',
+              7
+            ],
             'index_ignore_chars' => '\\',
             'subentry' => {
               'args' => [
@@ -825,12 +811,10 @@ $result_trees{'indices'} = {
           'cmdname' => 'cindex',
           'extra' => {
             'element_node' => {},
-            'index_entry' => {
-              'entry_element' => {},
-              'entry_number' => 8,
-              'in_code' => 0,
-              'index_name' => 'cp'
-            },
+            'index_entry' => [
+              'cp',
+              8
+            ],
             'index_ignore_chars' => '\\'
           },
           'info' => {
@@ -887,12 +871,10 @@ $result_trees{'indices'} = {
           'cmdname' => 'cindex',
           'extra' => {
             'element_node' => {},
-            'index_entry' => {
-              'entry_element' => {},
-              'entry_number' => 9,
-              'in_code' => 0,
-              'index_name' => 'cp'
-            },
+            'index_entry' => [
+              'cp',
+              9
+            ],
             'index_ignore_chars' => '\\',
             'sortas' => '\\cmd'
           },
@@ -978,12 +960,10 @@ $result_trees{'indices'} = {
           'cmdname' => 'cindex',
           'extra' => {
             'element_node' => {},
-            'index_entry' => {
-              'entry_element' => {},
-              'entry_number' => 10,
-              'in_code' => 0,
-              'index_name' => 'cp'
-            }
+            'index_entry' => [
+              'cp',
+              10
+            ]
           },
           'info' => {
             'spaces_before_argument' => {
@@ -1061,12 +1041,10 @@ $result_trees{'indices'} = {
           'cmdname' => 'findex',
           'extra' => {
             'element_node' => {},
-            'index_entry' => {
-              'entry_element' => {},
-              'entry_number' => 1,
-              'in_code' => 1,
-              'index_name' => 'fn'
-            }
+            'index_entry' => [
+              'fn',
+              1
+            ]
           },
           'info' => {
             'spaces_before_argument' => {
@@ -1175,29 +1153,18 @@ $result_trees{'indices'} = {
   'type' => 'document_root'
 };
 
$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'}{'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'}{'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'}{'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'}{'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'}{'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'}{'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'}{'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'}{'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'}{'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'}{'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'} = '
 @set txiindexbackslashignore
diff --git a/tp/t/results/latex_tests/indices_disable_encoding.pl 
b/tp/t/results/latex_tests/indices_disable_encoding.pl
index d3868c6661..21f50a9080 100644
--- a/tp/t/results/latex_tests/indices_disable_encoding.pl
+++ b/tp/t/results/latex_tests/indices_disable_encoding.pl
@@ -231,12 +231,10 @@ $result_trees{'indices_disable_encoding'} = {
           'cmdname' => 'cindex',
           'extra' => {
             'element_node' => {},
-            'index_entry' => {
-              'entry_element' => {},
-              'entry_number' => 1,
-              'in_code' => 0,
-              'index_name' => 'cp'
-            },
+            'index_entry' => [
+              'cp',
+              1
+            ],
             'index_ignore_chars' => '\\'
           },
           'info' => {
@@ -271,12 +269,10 @@ $result_trees{'indices_disable_encoding'} = {
           'cmdname' => 'cindex',
           'extra' => {
             'element_node' => {},
-            'index_entry' => {
-              'entry_element' => {},
-              'entry_number' => 2,
-              'in_code' => 0,
-              'index_name' => 'cp'
-            },
+            'index_entry' => [
+              'cp',
+              2
+            ],
             'index_ignore_chars' => '\\'
           },
           'info' => {
@@ -311,12 +307,10 @@ $result_trees{'indices_disable_encoding'} = {
           'cmdname' => 'cindex',
           'extra' => {
             'element_node' => {},
-            'index_entry' => {
-              'entry_element' => {},
-              'entry_number' => 3,
-              'in_code' => 0,
-              'index_name' => 'cp'
-            },
+            'index_entry' => [
+              'cp',
+              3
+            ],
             'index_ignore_chars' => '\\'
           },
           'info' => {
@@ -351,12 +345,10 @@ $result_trees{'indices_disable_encoding'} = {
           'cmdname' => 'cindex',
           'extra' => {
             'element_node' => {},
-            'index_entry' => {
-              'entry_element' => {},
-              'entry_number' => 4,
-              'in_code' => 0,
-              'index_name' => 'cp'
-            },
+            'index_entry' => [
+              'cp',
+              4
+            ],
             'index_ignore_chars' => '\\'
           },
           'info' => {
@@ -391,12 +383,10 @@ $result_trees{'indices_disable_encoding'} = {
           'cmdname' => 'cindex',
           'extra' => {
             'element_node' => {},
-            'index_entry' => {
-              'entry_element' => {},
-              'entry_number' => 5,
-              'in_code' => 0,
-              'index_name' => 'cp'
-            },
+            'index_entry' => [
+              'cp',
+              5
+            ],
             'index_ignore_chars' => '\\'
           },
           'info' => {
@@ -446,12 +436,10 @@ $result_trees{'indices_disable_encoding'} = {
           'cmdname' => 'cindex',
           'extra' => {
             'element_node' => {},
-            'index_entry' => {
-              'entry_element' => {},
-              'entry_number' => 6,
-              'in_code' => 0,
-              'index_name' => 'cp'
-            },
+            'index_entry' => [
+              'cp',
+              6
+            ],
             'index_ignore_chars' => '\\'
           },
           'info' => {
@@ -559,12 +547,10 @@ $result_trees{'indices_disable_encoding'} = {
           'cmdname' => 'cindex',
           'extra' => {
             'element_node' => {},
-            'index_entry' => {
-              'entry_element' => {},
-              'entry_number' => 7,
-              'in_code' => 0,
-              'index_name' => 'cp'
-            },
+            'index_entry' => [
+              'cp',
+              7
+            ],
             'index_ignore_chars' => '\\',
             'subentry' => {
               'args' => [
@@ -825,12 +811,10 @@ $result_trees{'indices_disable_encoding'} = {
           'cmdname' => 'cindex',
           'extra' => {
             'element_node' => {},
-            'index_entry' => {
-              'entry_element' => {},
-              'entry_number' => 8,
-              'in_code' => 0,
-              'index_name' => 'cp'
-            },
+            'index_entry' => [
+              'cp',
+              8
+            ],
             'index_ignore_chars' => '\\'
           },
           'info' => {
@@ -887,12 +871,10 @@ $result_trees{'indices_disable_encoding'} = {
           'cmdname' => 'cindex',
           'extra' => {
             'element_node' => {},
-            'index_entry' => {
-              'entry_element' => {},
-              'entry_number' => 9,
-              'in_code' => 0,
-              'index_name' => 'cp'
-            },
+            'index_entry' => [
+              'cp',
+              9
+            ],
             'index_ignore_chars' => '\\',
             'sortas' => '\\cmd'
           },
@@ -978,12 +960,10 @@ $result_trees{'indices_disable_encoding'} = {
           'cmdname' => 'cindex',
           'extra' => {
             'element_node' => {},
-            'index_entry' => {
-              'entry_element' => {},
-              'entry_number' => 10,
-              'in_code' => 0,
-              'index_name' => 'cp'
-            }
+            'index_entry' => [
+              'cp',
+              10
+            ]
           },
           'info' => {
             'spaces_before_argument' => {
@@ -1061,12 +1041,10 @@ $result_trees{'indices_disable_encoding'} = {
           'cmdname' => 'findex',
           'extra' => {
             'element_node' => {},
-            'index_entry' => {
-              'entry_element' => {},
-              'entry_number' => 1,
-              'in_code' => 1,
-              'index_name' => 'fn'
-            }
+            'index_entry' => [
+              'fn',
+              1
+            ]
           },
           'info' => {
             'spaces_before_argument' => {
@@ -1175,29 +1153,18 @@ $result_trees{'indices_disable_encoding'} = {
   'type' => 'document_root'
 };
 
$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'}{'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'}{'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'}{'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'}{'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'}{'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'}{'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'}{'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'}{'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'}{'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'}{'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'} = '
 @set txiindexbackslashignore
diff --git a/tp/t/results/latex_tests/vbar_in_index.pl 
b/tp/t/results/latex_tests/vbar_in_index.pl
index c8591c58a0..bf19d40bbc 100644
--- a/tp/t/results/latex_tests/vbar_in_index.pl
+++ b/tp/t/results/latex_tests/vbar_in_index.pl
@@ -32,12 +32,10 @@ $result_trees{'vbar_in_index'} = {
           ],
           'cmdname' => 'findex',
           'extra' => {
-            'index_entry' => {
-              'entry_element' => {},
-              'entry_number' => 1,
-              'in_code' => 1,
-              'index_name' => 'fn'
-            }
+            'index_entry' => [
+              'fn',
+              1
+            ]
           },
           'info' => {
             'spaces_before_argument' => {
@@ -70,12 +68,10 @@ $result_trees{'vbar_in_index'} = {
           ],
           'cmdname' => 'cindex',
           'extra' => {
-            'index_entry' => {
-              'entry_element' => {},
-              'entry_number' => 1,
-              'in_code' => 0,
-              'index_name' => 'cp'
-            }
+            'index_entry' => [
+              'cp',
+              1
+            ]
           },
           'info' => {
             'spaces_before_argument' => {
@@ -95,8 +91,6 @@ $result_trees{'vbar_in_index'} = {
   ],
   'type' => 'document_root'
 };
-$result_trees{'vbar_in_index'}{'contents'}[0]{'contents'}[1]{'extra'}{'index_entry'}{'entry_element'}
 = $result_trees{'vbar_in_index'}{'contents'}[0]{'contents'}[1];
-$result_trees{'vbar_in_index'}{'contents'}[0]{'contents'}[2]{'extra'}{'index_entry'}{'entry_element'}
 = $result_trees{'vbar_in_index'}{'contents'}[0]{'contents'}[2];
 
 $result_texis{'vbar_in_index'} = '@findex A|B
 @cindex C|D
diff --git a/tp/t/results/layout/no_monolithic.pl 
b/tp/t/results/layout/no_monolithic.pl
index 069ec0ae55..27f4bb0519 100644
--- a/tp/t/results/layout/no_monolithic.pl
+++ b/tp/t/results/layout/no_monolithic.pl
@@ -147,12 +147,10 @@ $result_trees{'no_monolithic'} = {
           'cmdname' => 'cindex',
           'extra' => {
             'element_node' => {},
-            'index_entry' => {
-              'entry_element' => {},
-              'entry_number' => 1,
-              'in_code' => 0,
-              'index_name' => 'cp'
-            }
+            'index_entry' => [
+              'cp',
+              1
+            ]
           },
           'info' => {
             'spaces_before_argument' => {
@@ -455,7 +453,6 @@ $result_trees{'no_monolithic'} = {
   'type' => 'document_root'
 };
 
$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]{'contents'}[1]{'extra'}{'node_content'}[0]
 = 
$result_trees{'no_monolithic'}{'contents'}[2]{'contents'}[5]{'contents'}[0]{'contents'}[1]{'contents'}[0];
 
 $result_texis{'no_monolithic'} = '\\input texinfo @c -*-texinfo-*-
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 6ef2ce45ec..7d626f54e8 100644
--- a/tp/t/results/layout/no_monolithic_only_toc_out.pl
+++ b/tp/t/results/layout/no_monolithic_only_toc_out.pl
@@ -147,12 +147,10 @@ $result_trees{'no_monolithic_only_toc_out'} = {
           'cmdname' => 'cindex',
           'extra' => {
             'element_node' => {},
-            'index_entry' => {
-              'entry_element' => {},
-              'entry_number' => 1,
-              'in_code' => 0,
-              'index_name' => 'cp'
-            }
+            'index_entry' => [
+              'cp',
+              1
+            ]
           },
           'info' => {
             'spaces_before_argument' => {
@@ -455,7 +453,6 @@ $result_trees{'no_monolithic_only_toc_out'} = {
   'type' => 'document_root'
 };
 
$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]{'contents'}[1]{'extra'}{'node_content'}[0]
 = 
$result_trees{'no_monolithic_only_toc_out'}{'contents'}[2]{'contents'}[5]{'contents'}[0]{'contents'}[1]{'contents'}[0];
 
 $result_texis{'no_monolithic_only_toc_out'} = '\\input texinfo @c -*-texinfo-*-
diff --git a/tp/t/results/macro/backslash_in_arg.pl 
b/tp/t/results/macro/backslash_in_arg.pl
index 3fd558ba9c..39cb39c5e7 100644
--- a/tp/t/results/macro/backslash_in_arg.pl
+++ b/tp/t/results/macro/backslash_in_arg.pl
@@ -189,12 +189,10 @@ $result_trees{'backslash_in_arg'} = {
           'cmdname' => 'findex',
           'extra' => {
             'element_node' => {},
-            'index_entry' => {
-              'entry_element' => {},
-              'entry_number' => 1,
-              'in_code' => 1,
-              'index_name' => 'fn'
-            }
+            'index_entry' => [
+              'fn',
+              1
+            ]
           },
           'info' => {
             'spaces_before_argument' => {
@@ -259,12 +257,10 @@ $result_trees{'backslash_in_arg'} = {
           'cmdname' => 'findex',
           'extra' => {
             'element_node' => {},
-            'index_entry' => {
-              'entry_element' => {},
-              'entry_number' => 2,
-              'in_code' => 1,
-              'index_name' => 'fn'
-            }
+            'index_entry' => [
+              'fn',
+              2
+            ]
           },
           'info' => {
             'spaces_before_argument' => {
@@ -334,12 +330,10 @@ $result_trees{'backslash_in_arg'} = {
           'cmdname' => 'findex',
           'extra' => {
             'element_node' => {},
-            'index_entry' => {
-              'entry_element' => {},
-              'entry_number' => 3,
-              'in_code' => 1,
-              'index_name' => 'fn'
-            }
+            'index_entry' => [
+              'fn',
+              3
+            ]
           },
           'info' => {
             'spaces_before_argument' => {
@@ -404,12 +398,10 @@ $result_trees{'backslash_in_arg'} = {
           'cmdname' => 'findex',
           'extra' => {
             'element_node' => {},
-            'index_entry' => {
-              'entry_element' => {},
-              'entry_number' => 4,
-              'in_code' => 1,
-              'index_name' => 'fn'
-            }
+            'index_entry' => [
+              'fn',
+              4
+            ]
           },
           'info' => {
             'spaces_before_argument' => {
@@ -477,13 +469,9 @@ $result_trees{'backslash_in_arg'} = {
   'type' => 'document_root'
 };
 
$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'}{'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'}{'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'}{'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_texis{'backslash_in_arg'} = '@node Top
 @node chap
diff --git a/tp/t/results/macro/macro_alias_definfoenclose_defindex.pl 
b/tp/t/results/macro/macro_alias_definfoenclose_defindex.pl
index 5622575b8b..1142083832 100644
--- a/tp/t/results/macro/macro_alias_definfoenclose_defindex.pl
+++ b/tp/t/results/macro/macro_alias_definfoenclose_defindex.pl
@@ -439,12 +439,10 @@ $result_trees{'macro_alias_definfoenclose_defindex'} = {
           'cmdname' => 'phooindex',
           'extra' => {
             'element_node' => {},
-            'index_entry' => {
-              'entry_element' => {},
-              'entry_number' => 1,
-              'in_code' => 0,
-              'index_name' => 'phoo'
-            }
+            'index_entry' => [
+              'phoo',
+              1
+            ]
           },
           'info' => {
             'spaces_before_argument' => {
@@ -701,12 +699,10 @@ $result_trees{'macro_alias_definfoenclose_defindex'} = {
           'cmdname' => 'phooindex',
           'extra' => {
             'element_node' => {},
-            'index_entry' => {
-              'entry_element' => {},
-              'entry_number' => 2,
-              'in_code' => 0,
-              'index_name' => 'phoo'
-            }
+            'index_entry' => [
+              'phoo',
+              2
+            ]
           },
           'info' => {
             'spaces_before_argument' => {
@@ -1033,12 +1029,10 @@ $result_trees{'macro_alias_definfoenclose_defindex'} = {
           'cmdname' => 'phooindex',
           'extra' => {
             'element_node' => {},
-            'index_entry' => {
-              'entry_element' => {},
-              'entry_number' => 3,
-              'in_code' => 0,
-              'index_name' => 'phoo'
-            }
+            'index_entry' => [
+              'phoo',
+              3
+            ]
           },
           'info' => {
             'spaces_before_argument' => {
@@ -1284,11 +1278,8 @@ $result_trees{'macro_alias_definfoenclose_defindex'} = {
   'type' => 'document_root'
 };
 
$result_trees{'macro_alias_definfoenclose_defindex'}{'contents'}[4]{'contents'}[11]{'extra'}{'element_node'}
 = $result_trees{'macro_alias_definfoenclose_defindex'}{'contents'}[3];
-$result_trees{'macro_alias_definfoenclose_defindex'}{'contents'}[4]{'contents'}[11]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'macro_alias_definfoenclose_defindex'}{'contents'}[4]{'contents'}[11];
 
$result_trees{'macro_alias_definfoenclose_defindex'}{'contents'}[4]{'contents'}[20]{'extra'}{'element_node'}
 = $result_trees{'macro_alias_definfoenclose_defindex'}{'contents'}[3];
-$result_trees{'macro_alias_definfoenclose_defindex'}{'contents'}[4]{'contents'}[20]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'macro_alias_definfoenclose_defindex'}{'contents'}[4]{'contents'}[20];
 
$result_trees{'macro_alias_definfoenclose_defindex'}{'contents'}[4]{'contents'}[32]{'extra'}{'element_node'}
 = $result_trees{'macro_alias_definfoenclose_defindex'}{'contents'}[3];
-$result_trees{'macro_alias_definfoenclose_defindex'}{'contents'}[4]{'contents'}[32]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'macro_alias_definfoenclose_defindex'}{'contents'}[4]{'contents'}[32];
 
 $result_texis{'macro_alias_definfoenclose_defindex'} = '@node Top
 @top top
diff --git a/tp/t/results/macro/macro_in_def_delimiters.pl 
b/tp/t/results/macro/macro_in_def_delimiters.pl
index 84ac024f58..780b8c12d2 100644
--- a/tp/t/results/macro/macro_in_def_delimiters.pl
+++ b/tp/t/results/macro/macro_in_def_delimiters.pl
@@ -452,12 +452,10 @@ $result_trees{'macro_in_def_delimiters'} = {
                   'category' => {},
                   'name' => {}
                 },
-                'index_entry' => {
-                  'entry_element' => {},
-                  'entry_number' => 1,
-                  'in_code' => 1,
-                  'index_name' => 'fn'
-                },
+                'index_entry' => [
+                  'fn',
+                  1
+                ],
                 'original_def_cmdname' => 'deffn'
               },
               'source_info' => {
@@ -488,7 +486,6 @@ $result_trees{'macro_in_def_delimiters'} = {
 
$result_trees{'macro_in_def_delimiters'}{'contents'}[0]{'contents'}[2]{'contents'}[0]{'extra'}{'def_index_element'}
 = 
$result_trees{'macro_in_def_delimiters'}{'contents'}[0]{'contents'}[2]{'contents'}[0]{'args'}[0]{'contents'}[2];
 
$result_trees{'macro_in_def_delimiters'}{'contents'}[0]{'contents'}[2]{'contents'}[0]{'extra'}{'def_parsed_hash'}{'category'}
 = 
$result_trees{'macro_in_def_delimiters'}{'contents'}[0]{'contents'}[2]{'contents'}[0]{'args'}[0]{'contents'}[0];
 
$result_trees{'macro_in_def_delimiters'}{'contents'}[0]{'contents'}[2]{'contents'}[0]{'extra'}{'def_parsed_hash'}{'name'}
 = 
$result_trees{'macro_in_def_delimiters'}{'contents'}[0]{'contents'}[2]{'contents'}[0]{'args'}[0]{'contents'}[2];
-$result_trees{'macro_in_def_delimiters'}{'contents'}[0]{'contents'}[2]{'contents'}[0]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'macro_in_def_delimiters'}{'contents'}[0]{'contents'}[2]{'contents'}[0];
 
 $result_texis{'macro_in_def_delimiters'} = '@macro string
 aa(b *c)
diff --git a/tp/t/results/macro/macro_in_index_commands.pl 
b/tp/t/results/macro/macro_in_index_commands.pl
index 04b58b21ec..c6bd4713a4 100644
--- a/tp/t/results/macro/macro_in_index_commands.pl
+++ b/tp/t/results/macro/macro_in_index_commands.pl
@@ -826,12 +826,10 @@ $result_trees{'macro_in_index_commands'} = {
           'cmdname' => 'trucindex',
           'extra' => {
             'element_node' => {},
-            'index_entry' => {
-              'entry_element' => {},
-              'entry_number' => 1,
-              'in_code' => 0,
-              'index_name' => 'truc'
-            }
+            'index_entry' => [
+              'truc',
+              1
+            ]
           },
           'info' => {
             'spaces_before_argument' => {
@@ -959,12 +957,10 @@ $result_trees{'macro_in_index_commands'} = {
           'cmdname' => 'codeidxindex',
           'extra' => {
             'element_node' => {},
-            'index_entry' => {
-              'entry_element' => {},
-              'entry_number' => 1,
-              'in_code' => 1,
-              'index_name' => 'codeidx'
-            }
+            'index_entry' => [
+              'codeidx',
+              1
+            ]
           },
           'info' => {
             'spaces_before_argument' => {
@@ -1030,12 +1026,10 @@ $result_trees{'macro_in_index_commands'} = {
           'cmdname' => 'kindex',
           'extra' => {
             'element_node' => {},
-            'index_entry' => {
-              'entry_element' => {},
-              'entry_number' => 1,
-              'in_code' => 1,
-              'index_name' => 'ky'
-            }
+            'index_entry' => [
+              'ky',
+              1
+            ]
           },
           'info' => {
             'spaces_before_argument' => {
@@ -1113,12 +1107,10 @@ $result_trees{'macro_in_index_commands'} = {
           'cmdname' => 'pindex',
           'extra' => {
             'element_node' => {},
-            'index_entry' => {
-              'entry_element' => {},
-              'entry_number' => 1,
-              'in_code' => 1,
-              'index_name' => 'pg'
-            }
+            'index_entry' => [
+              'pg',
+              1
+            ]
           },
           'info' => {
             'spaces_before_argument' => {
@@ -1307,13 +1299,9 @@ $result_trees{'macro_in_index_commands'} = {
   'type' => 'document_root'
 };
 
$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'}{'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'}{'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'}{'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_texis{'macro_in_index_commands'} = '@macro cp
 cp
diff --git a/tp/t/results/menu/menu_in_deffn.pl 
b/tp/t/results/menu/menu_in_deffn.pl
index 8d08c371ba..a71174a339 100644
--- a/tp/t/results/menu/menu_in_deffn.pl
+++ b/tp/t/results/menu/menu_in_deffn.pl
@@ -91,12 +91,10 @@ $result_trees{'menu_in_deffn'} = {
                   'name' => {}
                 },
                 'element_node' => {},
-                'index_entry' => {
-                  'entry_element' => {},
-                  'entry_number' => 1,
-                  'in_code' => 1,
-                  'index_name' => 'fn'
-                },
+                'index_entry' => [
+                  'fn',
+                  1
+                ],
                 'original_def_cmdname' => 'deffn'
               },
               'source_info' => {
@@ -281,7 +279,6 @@ 
$result_trees{'menu_in_deffn'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'ext
 
$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'}{'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]{'contents'}[1]{'extra'}{'manual_content'}[0]
 = 
$result_trees{'menu_in_deffn'}{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'contents'}[1]{'contents'}[1];
 
 $result_texis{'menu_in_deffn'} = '@node first
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 6cfebbbb84..b95f2b474c 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
@@ -349,12 +349,10 @@ $result_trees{'comment_space_command_on_line'} = {
           'cmdname' => 'cindex',
           'extra' => {
             'element_node' => {},
-            'index_entry' => {
-              'entry_element' => {},
-              'entry_number' => 1,
-              'in_code' => 0,
-              'index_name' => 'cp'
-            }
+            'index_entry' => [
+              'cp',
+              1
+            ]
           },
           'info' => {
             'spaces_before_argument' => {
@@ -642,7 +640,6 @@ $result_trees{'comment_space_command_on_line'} = {
   'type' => 'document_root'
 };
 
$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_texis{'comment_space_command_on_line'} = '@settitle Settitle @ @c 
settittle
diff --git a/tp/t/results/misc_commands/index_entries.pl 
b/tp/t/results/misc_commands/index_entries.pl
index 12ab1cad80..a1a54d2208 100644
--- a/tp/t/results/misc_commands/index_entries.pl
+++ b/tp/t/results/misc_commands/index_entries.pl
@@ -28,12 +28,10 @@ $result_trees{'index_entries'} = {
           ],
           'cmdname' => 'cindex',
           'extra' => {
-            'index_entry' => {
-              'entry_element' => {},
-              'entry_number' => 1,
-              'in_code' => 0,
-              'index_name' => 'cp'
-            }
+            'index_entry' => [
+              'cp',
+              1
+            ]
           },
           'info' => {
             'spaces_before_argument' => {
@@ -110,12 +108,10 @@ $result_trees{'index_entries'} = {
           ],
           'cmdname' => 'trucindex',
           'extra' => {
-            'index_entry' => {
-              'entry_element' => {},
-              'entry_number' => 1,
-              'in_code' => 0,
-              'index_name' => 'truc'
-            }
+            'index_entry' => [
+              'truc',
+              1
+            ]
           },
           'info' => {
             'spaces_before_argument' => {
@@ -135,8 +131,6 @@ $result_trees{'index_entries'} = {
   ],
   'type' => 'document_root'
 };
-$result_trees{'index_entries'}{'contents'}[0]{'contents'}[0]{'extra'}{'index_entry'}{'entry_element'}
 = $result_trees{'index_entries'}{'contents'}[0]{'contents'}[0];
-$result_trees{'index_entries'}{'contents'}[0]{'contents'}[4]{'extra'}{'index_entry'}{'entry_element'}
 = $result_trees{'index_entries'}{'contents'}[0]{'contents'}[4];
 
 $result_texis{'index_entries'} = '@cindex cindex entry
 
diff --git a/tp/t/results/moresectioning/no_element.pl 
b/tp/t/results/moresectioning/no_element.pl
index ba87d42c99..b27cc3109c 100644
--- a/tp/t/results/moresectioning/no_element.pl
+++ b/tp/t/results/moresectioning/no_element.pl
@@ -560,12 +560,10 @@ $result_trees{'no_element'} = {
           ],
           'cmdname' => 'cindex',
           'extra' => {
-            'index_entry' => {
-              'entry_element' => {},
-              'entry_number' => 1,
-              'in_code' => 0,
-              'index_name' => 'cp'
-            }
+            'index_entry' => [
+              'cp',
+              1
+            ]
           },
           'info' => {
             'spaces_before_argument' => {
@@ -590,7 +588,6 @@ 
$result_trees{'no_element'}{'contents'}[0]{'contents'}[9]{'contents'}[1]{'args'}
 
$result_trees{'no_element'}{'contents'}[0]{'contents'}[11]{'contents'}[0]{'args'}[0]{'contents'}[5]{'contents'}[1]{'args'}[0]{'extra'}{'node_content'}[0]
 = 
$result_trees{'no_element'}{'contents'}[0]{'contents'}[11]{'contents'}[0]{'args'}[0]{'contents'}[5]{'contents'}[1]{'args'}[0]{'contents'}[0];
 
$result_trees{'no_element'}{'contents'}[0]{'contents'}[15]{'contents'}[1]{'args'}[0]{'extra'}{'node_content'}[0]
 = 
$result_trees{'no_element'}{'contents'}[0]{'contents'}[15]{'contents'}[1]{'args'}[0]{'contents'}[0];
 
$result_trees{'no_element'}{'contents'}[0]{'contents'}[17]{'contents'}[0]{'contents'}[1]{'extra'}{'node_content'}[0]
 = 
$result_trees{'no_element'}{'contents'}[0]{'contents'}[17]{'contents'}[0]{'contents'}[1]{'contents'}[0];
-$result_trees{'no_element'}{'contents'}[0]{'contents'}[19]{'extra'}{'index_entry'}{'entry_element'}
 = $result_trees{'no_element'}{'contents'}[0]{'contents'}[19];
 
 $result_texis{'no_element'} = '@settitle no_element test
 @documentencoding ISO-8859-1
diff --git a/tp/t/results/moresectioning/placed_things_before_element.pl 
b/tp/t/results/moresectioning/placed_things_before_element.pl
index 45b8998a7d..7f346d904c 100644
--- a/tp/t/results/moresectioning/placed_things_before_element.pl
+++ b/tp/t/results/moresectioning/placed_things_before_element.pl
@@ -487,12 +487,10 @@ $result_trees{'placed_things_before_element'} = {
           ],
           'cmdname' => 'cindex',
           'extra' => {
-            'index_entry' => {
-              'entry_element' => {},
-              'entry_number' => 1,
-              'in_code' => 0,
-              'index_name' => 'cp'
-            }
+            'index_entry' => [
+              'cp',
+              1
+            ]
           },
           'info' => {
             'spaces_before_argument' => {
@@ -637,7 +635,6 @@ 
$result_trees{'placed_things_before_element'}{'contents'}[0]{'contents'}[5]{'con
 
$result_trees{'placed_things_before_element'}{'contents'}[0]{'contents'}[7]{'contents'}[0]{'args'}[0]{'contents'}[5]{'contents'}[1]{'args'}[0]{'extra'}{'node_content'}[0]
 = 
$result_trees{'placed_things_before_element'}{'contents'}[0]{'contents'}[7]{'contents'}[0]{'args'}[0]{'contents'}[5]{'contents'}[1]{'args'}[0]{'contents'}[0];
 
$result_trees{'placed_things_before_element'}{'contents'}[0]{'contents'}[11]{'contents'}[1]{'args'}[0]{'extra'}{'node_content'}[0]
 = 
$result_trees{'placed_things_before_element'}{'contents'}[0]{'contents'}[11]{'contents'}[1]{'args'}[0]{'contents'}[0];
 
$result_trees{'placed_things_before_element'}{'contents'}[0]{'contents'}[13]{'contents'}[0]{'contents'}[1]{'extra'}{'node_content'}[0]
 = 
$result_trees{'placed_things_before_element'}{'contents'}[0]{'contents'}[13]{'contents'}[0]{'contents'}[1]{'contents'}[0];
-$result_trees{'placed_things_before_element'}{'contents'}[0]{'contents'}[15]{'extra'}{'index_entry'}{'entry_element'}
 = $result_trees{'placed_things_before_element'}{'contents'}[0]{'contents'}[15];
 
$result_trees{'placed_things_before_element'}{'contents'}[1]{'contents'}[1]{'contents'}[1]{'args'}[0]{'extra'}{'node_content'}[0]
 = 
$result_trees{'placed_things_before_element'}{'contents'}[1]{'contents'}[1]{'contents'}[1]{'args'}[0]{'contents'}[0];
 
$result_trees{'placed_things_before_element'}{'contents'}[1]{'contents'}[3]{'contents'}[1]{'args'}[0]{'extra'}{'node_content'}[0]
 = 
$result_trees{'placed_things_before_element'}{'contents'}[1]{'contents'}[3]{'contents'}[1]{'args'}[0]{'contents'}[0];
 
diff --git a/tp/t/results/moresectioning/placed_things_before_node.pl 
b/tp/t/results/moresectioning/placed_things_before_node.pl
index bf034df64c..de8d570c90 100644
--- a/tp/t/results/moresectioning/placed_things_before_node.pl
+++ b/tp/t/results/moresectioning/placed_things_before_node.pl
@@ -491,12 +491,10 @@ $result_trees{'placed_things_before_node'} = {
           ],
           'cmdname' => 'cindex',
           'extra' => {
-            'index_entry' => {
-              'entry_element' => {},
-              'entry_number' => 1,
-              'in_code' => 0,
-              'index_name' => 'cp'
-            }
+            'index_entry' => [
+              'cp',
+              1
+            ]
           },
           'info' => {
             'spaces_before_argument' => {
@@ -743,7 +741,6 @@ 
$result_trees{'placed_things_before_node'}{'contents'}[0]{'contents'}[6]{'conten
 
$result_trees{'placed_things_before_node'}{'contents'}[0]{'contents'}[8]{'contents'}[0]{'args'}[0]{'contents'}[5]{'contents'}[1]{'args'}[0]{'extra'}{'node_content'}[0]
 = 
$result_trees{'placed_things_before_node'}{'contents'}[0]{'contents'}[8]{'contents'}[0]{'args'}[0]{'contents'}[5]{'contents'}[1]{'args'}[0]{'contents'}[0];
 
$result_trees{'placed_things_before_node'}{'contents'}[0]{'contents'}[12]{'contents'}[1]{'args'}[0]{'extra'}{'node_content'}[0]
 = 
$result_trees{'placed_things_before_node'}{'contents'}[0]{'contents'}[12]{'contents'}[1]{'args'}[0]{'contents'}[0];
 
$result_trees{'placed_things_before_node'}{'contents'}[0]{'contents'}[14]{'contents'}[0]{'contents'}[1]{'extra'}{'node_content'}[0]
 = 
$result_trees{'placed_things_before_node'}{'contents'}[0]{'contents'}[14]{'contents'}[0]{'contents'}[1]{'contents'}[0];
-$result_trees{'placed_things_before_node'}{'contents'}[0]{'contents'}[16]{'extra'}{'index_entry'}{'entry_element'}
 = $result_trees{'placed_things_before_node'}{'contents'}[0]{'contents'}[16];
 
$result_trees{'placed_things_before_node'}{'contents'}[4]{'contents'}[1]{'contents'}[1]{'args'}[0]{'extra'}{'node_content'}[0]
 = 
$result_trees{'placed_things_before_node'}{'contents'}[4]{'contents'}[1]{'contents'}[1]{'args'}[0]{'contents'}[0];
 
$result_trees{'placed_things_before_node'}{'contents'}[4]{'contents'}[3]{'contents'}[1]{'args'}[0]{'extra'}{'node_content'}[0]
 = 
$result_trees{'placed_things_before_node'}{'contents'}[4]{'contents'}[3]{'contents'}[1]{'args'}[0]{'contents'}[0];
 
diff --git a/tp/t/results/multitable/inter_item_commands_in_multitable.pl 
b/tp/t/results/multitable/inter_item_commands_in_multitable.pl
index 2fe32a22d7..13696eb1a8 100644
--- a/tp/t/results/multitable/inter_item_commands_in_multitable.pl
+++ b/tp/t/results/multitable/inter_item_commands_in_multitable.pl
@@ -97,12 +97,10 @@ $result_trees{'inter_item_commands_in_multitable'} = {
                           ],
                           'cmdname' => 'cindex',
                           'extra' => {
-                            'index_entry' => {
-                              'entry_element' => {},
-                              'entry_number' => 1,
-                              'in_code' => 0,
-                              'index_name' => 'cp'
-                            }
+                            'index_entry' => [
+                              'cp',
+                              1
+                            ]
                           },
                           'info' => {
                             'spaces_before_argument' => {
@@ -486,12 +484,10 @@ $result_trees{'inter_item_commands_in_multitable'} = {
                           ],
                           'cmdname' => 'cindex',
                           'extra' => {
-                            'index_entry' => {
-                              'entry_element' => {},
-                              'entry_number' => 2,
-                              'in_code' => 0,
-                              'index_name' => 'cp'
-                            }
+                            'index_entry' => [
+                              'cp',
+                              2
+                            ]
                           },
                           'info' => {
                             'spaces_before_argument' => {
@@ -665,12 +661,10 @@ $result_trees{'inter_item_commands_in_multitable'} = {
                   ],
                   'cmdname' => 'cindex',
                   'extra' => {
-                    'index_entry' => {
-                      'entry_element' => {},
-                      'entry_number' => 3,
-                      'in_code' => 0,
-                      'index_name' => 'cp'
-                    }
+                    'index_entry' => [
+                      'cp',
+                      3
+                    ]
                   },
                   'info' => {
                     'spaces_before_argument' => {
@@ -792,11 +786,8 @@ $result_trees{'inter_item_commands_in_multitable'} = {
   ],
   'type' => 'document_root'
 };
-$result_trees{'inter_item_commands_in_multitable'}{'contents'}[0]{'contents'}[0]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'contents'}[3]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'inter_item_commands_in_multitable'}{'contents'}[0]{'contents'}[0]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'contents'}[3];
 
$result_trees{'inter_item_commands_in_multitable'}{'contents'}[0]{'contents'}[0]{'extra'}{'prototypes'}[0]{'contents'}[0]
 = 
$result_trees{'inter_item_commands_in_multitable'}{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0]{'contents'}[0];
-$result_trees{'inter_item_commands_in_multitable'}{'contents'}[0]{'contents'}[2]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[2]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'inter_item_commands_in_multitable'}{'contents'}[0]{'contents'}[2]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[2];
 
$result_trees{'inter_item_commands_in_multitable'}{'contents'}[0]{'contents'}[2]{'extra'}{'columnfractions'}
 = 
$result_trees{'inter_item_commands_in_multitable'}{'contents'}[0]{'contents'}[2]{'args'}[0]{'contents'}[0];
-$result_trees{'inter_item_commands_in_multitable'}{'contents'}[0]{'contents'}[4]{'contents'}[0]{'contents'}[1]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'inter_item_commands_in_multitable'}{'contents'}[0]{'contents'}[4]{'contents'}[0]{'contents'}[1];
 
$result_trees{'inter_item_commands_in_multitable'}{'contents'}[0]{'contents'}[4]{'extra'}{'prototypes'}[0]{'contents'}[0]
 = 
$result_trees{'inter_item_commands_in_multitable'}{'contents'}[0]{'contents'}[4]{'args'}[0]{'contents'}[0]{'contents'}[0];
 
 $result_texis{'inter_item_commands_in_multitable'} = '@multitable {truc}
diff --git a/tp/t/results/plaintext_tests/at_commands_glued_in_example.pl 
b/tp/t/results/plaintext_tests/at_commands_glued_in_example.pl
index a6c2241b4f..ff8193207b 100644
--- a/tp/t/results/plaintext_tests/at_commands_glued_in_example.pl
+++ b/tp/t/results/plaintext_tests/at_commands_glued_in_example.pl
@@ -398,12 +398,10 @@ $result_trees{'at_commands_glued_in_example'} = {
                   ],
                   'cmdname' => 'cindex',
                   'extra' => {
-                    'index_entry' => {
-                      'entry_element' => {},
-                      'entry_number' => 1,
-                      'in_code' => 0,
-                      'index_name' => 'cp'
-                    }
+                    'index_entry' => [
+                      'cp',
+                      1
+                    ]
                   },
                   'info' => {
                     'spaces_before_argument' => {
@@ -466,7 +464,6 @@ $result_trees{'at_commands_glued_in_example'} = {
   'type' => 'document_root'
 };
 
$result_trees{'at_commands_glued_in_example'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[19]{'args'}[0]{'extra'}{'node_content'}[0]
 = 
$result_trees{'at_commands_glued_in_example'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[19]{'args'}[0]{'contents'}[0];
-$result_trees{'at_commands_glued_in_example'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[40]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'at_commands_glued_in_example'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[40];
 
 $result_texis{'at_commands_glued_in_example'} = '@example
 at@@.
diff --git a/tp/t/results/plaintext_tests/at_commands_glued_in_paragraph.pl 
b/tp/t/results/plaintext_tests/at_commands_glued_in_paragraph.pl
index b09ac05f11..bff6f124a7 100644
--- a/tp/t/results/plaintext_tests/at_commands_glued_in_paragraph.pl
+++ b/tp/t/results/plaintext_tests/at_commands_glued_in_paragraph.pl
@@ -392,12 +392,10 @@ $result_trees{'at_commands_glued_in_paragraph'} = {
           ],
           'cmdname' => 'cindex',
           'extra' => {
-            'index_entry' => {
-              'entry_element' => {},
-              'entry_number' => 1,
-              'in_code' => 0,
-              'index_name' => 'cp'
-            }
+            'index_entry' => [
+              'cp',
+              1
+            ]
           },
           'info' => {
             'spaces_before_argument' => {
@@ -418,7 +416,6 @@ $result_trees{'at_commands_glued_in_paragraph'} = {
   'type' => 'document_root'
 };
 
$result_trees{'at_commands_glued_in_paragraph'}{'contents'}[0]{'contents'}[0]{'contents'}[19]{'args'}[0]{'extra'}{'node_content'}[0]
 = 
$result_trees{'at_commands_glued_in_paragraph'}{'contents'}[0]{'contents'}[0]{'contents'}[19]{'args'}[0]{'contents'}[0];
-$result_trees{'at_commands_glued_in_paragraph'}{'contents'}[0]{'contents'}[3]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'at_commands_glued_in_paragraph'}{'contents'}[0]{'contents'}[3];
 
 $result_texis{'at_commands_glued_in_paragraph'} = 'at@@.
 TeX@TeX{}TeX.
diff --git a/tp/t/results/preformatted/def_in_example.pl 
b/tp/t/results/preformatted/def_in_example.pl
index 7223b367b2..85e3951e0b 100644
--- a/tp/t/results/preformatted/def_in_example.pl
+++ b/tp/t/results/preformatted/def_in_example.pl
@@ -84,12 +84,10 @@ $result_trees{'def_in_example'} = {
                       'category' => {},
                       'name' => {}
                     },
-                    'index_entry' => {
-                      'entry_element' => {},
-                      'entry_number' => 1,
-                      'in_code' => 1,
-                      'index_name' => 'fn'
-                    },
+                    'index_entry' => [
+                      'fn',
+                      1
+                    ],
                     'original_def_cmdname' => 'defun'
                   },
                   'source_info' => {
@@ -205,7 +203,6 @@ $result_trees{'def_in_example'} = {
 
$result_trees{'def_in_example'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'extra'}{'def_index_element'}
 = 
$result_trees{'def_in_example'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[2];
 
$result_trees{'def_in_example'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'extra'}{'def_parsed_hash'}{'category'}
 = 
$result_trees{'def_in_example'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0];
 
$result_trees{'def_in_example'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'extra'}{'def_parsed_hash'}{'name'}
 = 
$result_trees{'def_in_example'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[2];
-$result_trees{'def_in_example'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'def_in_example'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[0];
 
 $result_texis{'def_in_example'} = '@example
 @defun name arg
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 b8c8143656..b22a0c07d1 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
@@ -216,12 +216,10 @@ 
$result_trees{'index_entries_relate_to_item_no_transformation'} = {
                       'cmdname' => 'cindex',
                       'extra' => {
                         'element_node' => {},
-                        'index_entry' => {
-                          'entry_element' => {},
-                          'entry_number' => 1,
-                          'in_code' => 0,
-                          'index_name' => 'cp'
-                        }
+                        'index_entry' => [
+                          'cp',
+                          1
+                        ]
                       },
                       'info' => {
                         'spaces_before_argument' => {
@@ -255,12 +253,10 @@ 
$result_trees{'index_entries_relate_to_item_no_transformation'} = {
                       'cmdname' => 'cindex',
                       'extra' => {
                         'element_node' => {},
-                        'index_entry' => {
-                          'entry_element' => {},
-                          'entry_number' => 2,
-                          'in_code' => 0,
-                          'index_name' => 'cp'
-                        }
+                        'index_entry' => [
+                          'cp',
+                          2
+                        ]
                       },
                       'info' => {
                         'spaces_before_argument' => {
@@ -294,12 +290,10 @@ 
$result_trees{'index_entries_relate_to_item_no_transformation'} = {
                       'cmdname' => 'cindex',
                       'extra' => {
                         'element_node' => {},
-                        'index_entry' => {
-                          'entry_element' => {},
-                          'entry_number' => 3,
-                          'in_code' => 0,
-                          'index_name' => 'cp'
-                        }
+                        'index_entry' => [
+                          'cp',
+                          3
+                        ]
                       },
                       'info' => {
                         'spaces_before_argument' => {
@@ -611,11 +605,8 @@ 
$result_trees{'index_entries_relate_to_item_no_transformation'} = {
   'type' => 'document_root'
 };
 
$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'}{'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'}{'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];
 
 $result_texis{'index_entries_relate_to_item_no_transformation'} = '\\input 
texinfo @c -*-texinfo-*-
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 fee142581e..d4e502a4c1 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
@@ -216,41 +216,10 @@ 
$result_trees{'index_entries_relate_to_item_transformation'} = {
                       'cmdname' => 'cindex',
                       'extra' => {
                         'element_node' => {},
-                        'index_entry' => {
-                          'entry_associated_element' => {
-                            'args' => [
-                              {
-                                'contents' => [
-                                  {
-                                    'text' => 'A'
-                                  }
-                                ],
-                                'info' => {
-                                  'spaces_after_argument' => {
-                                    'text' => '
-'
-                                  }
-                                },
-                                'type' => 'line_arg'
-                              }
-                            ],
-                            'cmdname' => 'item',
-                            'info' => {
-                              'spaces_before_argument' => {
-                                'text' => ' '
-                              }
-                            },
-                            'source_info' => {
-                              'file_name' => 
'index_entries_relate_to_item.texi',
-                              'line_nr' => 14,
-                              'macro' => ''
-                            }
-                          },
-                          'entry_element' => {},
-                          'entry_number' => 1,
-                          'in_code' => 0,
-                          'index_name' => 'cp'
-                        }
+                        'index_entry' => [
+                          'cp',
+                          1
+                        ]
                       },
                       'info' => {
                         'spaces_before_argument' => {
@@ -284,12 +253,10 @@ 
$result_trees{'index_entries_relate_to_item_transformation'} = {
                       'cmdname' => 'cindex',
                       'extra' => {
                         'element_node' => {},
-                        'index_entry' => {
-                          'entry_element' => {},
-                          'entry_number' => 2,
-                          'in_code' => 0,
-                          'index_name' => 'cp'
-                        }
+                        'index_entry' => [
+                          'cp',
+                          2
+                        ]
                       },
                       'info' => {
                         'spaces_before_argument' => {
@@ -323,12 +290,10 @@ 
$result_trees{'index_entries_relate_to_item_transformation'} = {
                       'cmdname' => 'cindex',
                       'extra' => {
                         'element_node' => {},
-                        'index_entry' => {
-                          'entry_element' => {},
-                          'entry_number' => 3,
-                          'in_code' => 0,
-                          'index_name' => 'cp'
-                        }
+                        'index_entry' => [
+                          'cp',
+                          3
+                        ]
                       },
                       'info' => {
                         'spaces_before_argument' => {
@@ -342,7 +307,35 @@ 
$result_trees{'index_entries_relate_to_item_transformation'} = {
                       },
                       'type' => 'index_entry_command'
                     },
-                    {},
+                    {
+                      'args' => [
+                        {
+                          'contents' => [
+                            {
+                              'text' => 'A'
+                            }
+                          ],
+                          'info' => {
+                            'spaces_after_argument' => {
+                              'text' => '
+'
+                            }
+                          },
+                          'type' => 'line_arg'
+                        }
+                      ],
+                      'cmdname' => 'item',
+                      'info' => {
+                        'spaces_before_argument' => {
+                          'text' => ' '
+                        }
+                      },
+                      'source_info' => {
+                        'file_name' => 'index_entries_relate_to_item.texi',
+                        'line_nr' => 14,
+                        'macro' => ''
+                      }
+                    },
                     {
                       'args' => [
                         {
@@ -612,12 +605,8 @@ 
$result_trees{'index_entries_relate_to_item_transformation'} = {
   'type' => 'document_root'
 };
 
$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'}{'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'}{'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];
 
 $result_texis{'index_entries_relate_to_item_transformation'} = '\\input 
texinfo @c -*-texinfo-*-
diff --git a/tp/t/results/transformations/master_menu_fr.pl 
b/tp/t/results/transformations/master_menu_fr.pl
index d284698dea..e49f1d1646 100644
--- a/tp/t/results/transformations/master_menu_fr.pl
+++ b/tp/t/results/transformations/master_menu_fr.pl
@@ -263,9 +263,7 @@ $result_trees{'master_menu_fr'} = {
                       ],
                       'extra' => {
                         'node_content' => [
-                          {
-                            'text' => 'section'
-                          }
+                          {}
                         ],
                         'normalized' => 'section'
                       },
@@ -462,9 +460,7 @@ $result_trees{'master_menu_fr'} = {
                   ],
                   'extra' => {
                     'node_content' => [
-                      {
-                        'text' => 'section'
-                      }
+                      {}
                     ],
                     'normalized' => 'section'
                   },
@@ -619,6 +615,8 @@ $result_trees{'master_menu_fr'} = {
   'type' => 'document_root'
 };
 
$result_trees{'master_menu_fr'}{'contents'}[2]{'contents'}[1]{'contents'}[0]{'contents'}[1]{'extra'}{'node_content'}[0]
 = 
$result_trees{'master_menu_fr'}{'contents'}[2]{'contents'}[1]{'contents'}[0]{'contents'}[1]{'contents'}[0];
+$result_trees{'master_menu_fr'}{'contents'}[2]{'contents'}[1]{'contents'}[2]{'contents'}[1]{'contents'}[1]{'extra'}{'node_content'}[0]
 = 
$result_trees{'master_menu_fr'}{'contents'}[2]{'contents'}[1]{'contents'}[2]{'contents'}[1]{'contents'}[1]{'contents'}[0];
+$result_trees{'master_menu_fr'}{'contents'}[4]{'contents'}[1]{'contents'}[0]{'contents'}[1]{'extra'}{'node_content'}[0]
 = 
$result_trees{'master_menu_fr'}{'contents'}[4]{'contents'}[1]{'contents'}[0]{'contents'}[1]{'contents'}[0];
 
 $result_texis{'master_menu_fr'} = '\\input texinfo.tex
 
diff --git a/tp/t/results/value/value_in_index_commands.pl 
b/tp/t/results/value/value_in_index_commands.pl
index c63d085f45..5281f5eb38 100644
--- a/tp/t/results/value/value_in_index_commands.pl
+++ b/tp/t/results/value/value_in_index_commands.pl
@@ -534,12 +534,10 @@ $result_trees{'value_in_index_commands'} = {
           'cmdname' => 'trucindex',
           'extra' => {
             'element_node' => {},
-            'index_entry' => {
-              'entry_element' => {},
-              'entry_number' => 1,
-              'in_code' => 0,
-              'index_name' => 'truc'
-            }
+            'index_entry' => [
+              'truc',
+              1
+            ]
           },
           'info' => {
             'spaces_before_argument' => {
@@ -667,12 +665,10 @@ $result_trees{'value_in_index_commands'} = {
           'cmdname' => 'codeidxindex',
           'extra' => {
             'element_node' => {},
-            'index_entry' => {
-              'entry_element' => {},
-              'entry_number' => 1,
-              'in_code' => 1,
-              'index_name' => 'codeidx'
-            }
+            'index_entry' => [
+              'codeidx',
+              1
+            ]
           },
           'info' => {
             'spaces_before_argument' => {
@@ -736,12 +732,10 @@ $result_trees{'value_in_index_commands'} = {
           'cmdname' => 'kindex',
           'extra' => {
             'element_node' => {},
-            'index_entry' => {
-              'entry_element' => {},
-              'entry_number' => 1,
-              'in_code' => 1,
-              'index_name' => 'ky'
-            }
+            'index_entry' => [
+              'ky',
+              1
+            ]
           },
           'info' => {
             'spaces_before_argument' => {
@@ -815,12 +809,10 @@ $result_trees{'value_in_index_commands'} = {
           'cmdname' => 'pindex',
           'extra' => {
             'element_node' => {},
-            'index_entry' => {
-              'entry_element' => {},
-              'entry_number' => 1,
-              'in_code' => 1,
-              'index_name' => 'pg'
-            }
+            'index_entry' => [
+              'pg',
+              1
+            ]
           },
           'info' => {
             'spaces_before_argument' => {
@@ -1000,13 +992,9 @@ $result_trees{'value_in_index_commands'} = {
   'type' => 'document_root'
 };
 
$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'}{'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'}{'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'}{'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_texis{'value_in_index_commands'} = '@set cp cp
 @set fn fn
diff --git a/tp/t/results/xml_tests/commands_and_spaces.pl 
b/tp/t/results/xml_tests/commands_and_spaces.pl
index c544b6ac1f..0947e54226 100644
--- a/tp/t/results/xml_tests/commands_and_spaces.pl
+++ b/tp/t/results/xml_tests/commands_and_spaces.pl
@@ -1619,12 +1619,10 @@ $result_trees{'commands_and_spaces'} = {
                   'name' => {}
                 },
                 'element_node' => {},
-                'index_entry' => {
-                  'entry_element' => {},
-                  'entry_number' => 1,
-                  'in_code' => 1,
-                  'index_name' => 'fn'
-                },
+                'index_entry' => [
+                  'fn',
+                  1
+                ],
                 'original_def_cmdname' => 'deffn'
               },
               'source_info' => {
@@ -1730,7 +1728,6 @@ 
$result_trees{'commands_and_spaces'}{'contents'}[1]{'contents'}[43]{'contents'}[
 
$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'}{'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_texis{'commands_and_spaces'} = '@set  foo   some @value
 
diff --git a/tp/t/results/xtable/block_commands_in_table.pl 
b/tp/t/results/xtable/block_commands_in_table.pl
index 01e94d681b..de3b9809f8 100644
--- a/tp/t/results/xtable/block_commands_in_table.pl
+++ b/tp/t/results/xtable/block_commands_in_table.pl
@@ -748,12 +748,10 @@ $result_trees{'block_commands_in_table'} = {
                       'cmdname' => 'item',
                       'extra' => {
                         'element_node' => {},
-                        'index_entry' => {
-                          'entry_element' => {},
-                          'entry_number' => 1,
-                          'in_code' => 1,
-                          'index_name' => 'vr'
-                        }
+                        'index_entry' => [
+                          'vr',
+                          1
+                        ]
                       },
                       'info' => {
                         'spaces_before_argument' => {
@@ -801,12 +799,10 @@ $result_trees{'block_commands_in_table'} = {
                       'cmdname' => 'vindex',
                       'extra' => {
                         'element_node' => {},
-                        'index_entry' => {
-                          'entry_element' => {},
-                          'entry_number' => 2,
-                          'in_code' => 1,
-                          'index_name' => 'vr'
-                        }
+                        'index_entry' => [
+                          'vr',
+                          2
+                        ]
                       },
                       'info' => {
                         'spaces_before_argument' => {
@@ -840,12 +836,10 @@ $result_trees{'block_commands_in_table'} = {
                       'cmdname' => 'itemx',
                       'extra' => {
                         'element_node' => {},
-                        'index_entry' => {
-                          'entry_element' => {},
-                          'entry_number' => 3,
-                          'in_code' => 1,
-                          'index_name' => 'vr'
-                        }
+                        'index_entry' => [
+                          'vr',
+                          3
+                        ]
                       },
                       'info' => {
                         'spaces_before_argument' => {
@@ -979,12 +973,10 @@ $result_trees{'block_commands_in_table'} = {
                       'cmdname' => 'item',
                       'extra' => {
                         'element_node' => {},
-                        'index_entry' => {
-                          'entry_element' => {},
-                          'entry_number' => 4,
-                          'in_code' => 1,
-                          'index_name' => 'vr'
-                        }
+                        'index_entry' => [
+                          'vr',
+                          4
+                        ]
                       },
                       'info' => {
                         'spaces_before_argument' => {
@@ -1027,12 +1019,10 @@ $result_trees{'block_commands_in_table'} = {
                       'cmdname' => 'itemx',
                       'extra' => {
                         'element_node' => {},
-                        'index_entry' => {
-                          'entry_element' => {},
-                          'entry_number' => 5,
-                          'in_code' => 1,
-                          'index_name' => 'vr'
-                        }
+                        'index_entry' => [
+                          'vr',
+                          5
+                        ]
                       },
                       'info' => {
                         'spaces_before_argument' => {
@@ -1341,16 +1331,11 @@ $result_trees{'block_commands_in_table'} = {
 };
 
$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'}{'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'}{'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'}{'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'}{'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'}{'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/empty_item_itemx.pl 
b/tp/t/results/xtable/empty_item_itemx.pl
index f289b8bfb5..4f9e562baa 100644
--- a/tp/t/results/xtable/empty_item_itemx.pl
+++ b/tp/t/results/xtable/empty_item_itemx.pl
@@ -81,12 +81,10 @@ $result_trees{'empty_item_itemx'} = {
                       ],
                       'cmdname' => 'item',
                       'extra' => {
-                        'index_entry' => {
-                          'entry_element' => {},
-                          'entry_number' => 1,
-                          'in_code' => 1,
-                          'index_name' => 'vr'
-                        }
+                        'index_entry' => [
+                          'vr',
+                          1
+                        ]
                       },
                       'info' => {
                         'spaces_before_argument' => {
@@ -140,12 +138,10 @@ $result_trees{'empty_item_itemx'} = {
                       ],
                       'cmdname' => 'itemx',
                       'extra' => {
-                        'index_entry' => {
-                          'entry_element' => {},
-                          'entry_number' => 2,
-                          'in_code' => 1,
-                          'index_name' => 'vr'
-                        }
+                        'index_entry' => [
+                          'vr',
+                          2
+                        ]
                       },
                       'info' => {
                         'spaces_before_argument' => {
@@ -219,12 +215,10 @@ $result_trees{'empty_item_itemx'} = {
                       ],
                       'cmdname' => 'item',
                       'extra' => {
-                        'index_entry' => {
-                          'entry_element' => {},
-                          'entry_number' => 3,
-                          'in_code' => 1,
-                          'index_name' => 'vr'
-                        }
+                        'index_entry' => [
+                          'vr',
+                          3
+                        ]
                       },
                       'info' => {
                         'spaces_before_argument' => {
@@ -296,9 +290,6 @@ $result_trees{'empty_item_itemx'} = {
   ],
   'type' => 'document_root'
 };
-$result_trees{'empty_item_itemx'}{'contents'}[0]{'contents'}[0]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'empty_item_itemx'}{'contents'}[0]{'contents'}[0]{'contents'}[1]{'contents'}[0]{'contents'}[0];
-$result_trees{'empty_item_itemx'}{'contents'}[0]{'contents'}[0]{'contents'}[1]{'contents'}[0]{'contents'}[2]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'empty_item_itemx'}{'contents'}[0]{'contents'}[0]{'contents'}[1]{'contents'}[0]{'contents'}[2];
-$result_trees{'empty_item_itemx'}{'contents'}[0]{'contents'}[0]{'contents'}[3]{'contents'}[0]{'contents'}[0]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'empty_item_itemx'}{'contents'}[0]{'contents'}[0]{'contents'}[3]{'contents'}[0]{'contents'}[0];
 
$result_trees{'empty_item_itemx'}{'contents'}[0]{'contents'}[0]{'extra'}{'command_as_argument'}
 = 
$result_trees{'empty_item_itemx'}{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0];
 
 $result_texis{'empty_item_itemx'} = '@vtable @asis
diff --git a/tp/t/results/xtable/index_command_before_end_table.pl 
b/tp/t/results/xtable/index_command_before_end_table.pl
index f036c972b5..c274ef1edc 100644
--- a/tp/t/results/xtable/index_command_before_end_table.pl
+++ b/tp/t/results/xtable/index_command_before_end_table.pl
@@ -139,12 +139,10 @@ $result_trees{'index_command_before_end_table'} = {
                       ],
                       'cmdname' => 'vindex',
                       'extra' => {
-                        'index_entry' => {
-                          'entry_element' => {},
-                          'entry_number' => 1,
-                          'in_code' => 1,
-                          'index_name' => 'vr'
-                        }
+                        'index_entry' => [
+                          'vr',
+                          1
+                        ]
                       },
                       'info' => {
                         'spaces_before_argument' => {
@@ -217,7 +215,6 @@ $result_trees{'index_command_before_end_table'} = {
   ],
   'type' => 'document_root'
 };
-$result_trees{'index_command_before_end_table'}{'contents'}[0]{'contents'}[1]{'contents'}[0]{'contents'}[1]{'contents'}[2]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'index_command_before_end_table'}{'contents'}[0]{'contents'}[1]{'contents'}[0]{'contents'}[1]{'contents'}[2];
 
$result_trees{'index_command_before_end_table'}{'contents'}[0]{'contents'}[1]{'extra'}{'command_as_argument'}
 = 
$result_trees{'index_command_before_end_table'}{'contents'}[0]{'contents'}[1]{'args'}[0]{'contents'}[0];
 
 $result_texis{'index_command_before_end_table'} = '
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 80084f2e8f..6c9b69af0c 100644
--- a/tp/t/results/xtable/inter_item_commands_in_table.pl
+++ b/tp/t/results/xtable/inter_item_commands_in_table.pl
@@ -200,12 +200,10 @@ $result_trees{'inter_item_commands_in_table'} = {
                       'cmdname' => 'item',
                       'extra' => {
                         'element_node' => {},
-                        'index_entry' => {
-                          'entry_element' => {},
-                          'entry_number' => 1,
-                          'in_code' => 1,
-                          'index_name' => 'vr'
-                        }
+                        'index_entry' => [
+                          'vr',
+                          1
+                        ]
                       },
                       'info' => {
                         'spaces_before_argument' => {
@@ -339,12 +337,10 @@ $result_trees{'inter_item_commands_in_table'} = {
                       'cmdname' => 'item',
                       'extra' => {
                         'element_node' => {},
-                        'index_entry' => {
-                          'entry_element' => {},
-                          'entry_number' => 2,
-                          'in_code' => 1,
-                          'index_name' => 'vr'
-                        }
+                        'index_entry' => [
+                          'vr',
+                          2
+                        ]
                       },
                       'info' => {
                         'spaces_before_argument' => {
@@ -392,12 +388,10 @@ $result_trees{'inter_item_commands_in_table'} = {
                       'cmdname' => 'itemx',
                       'extra' => {
                         'element_node' => {},
-                        'index_entry' => {
-                          'entry_element' => {},
-                          'entry_number' => 3,
-                          'in_code' => 1,
-                          'index_name' => 'vr'
-                        }
+                        'index_entry' => [
+                          'vr',
+                          3
+                        ]
                       },
                       'info' => {
                         'spaces_before_argument' => {
@@ -531,12 +525,10 @@ $result_trees{'inter_item_commands_in_table'} = {
                       'cmdname' => 'item',
                       'extra' => {
                         'element_node' => {},
-                        'index_entry' => {
-                          'entry_element' => {},
-                          'entry_number' => 1,
-                          'in_code' => 1,
-                          'index_name' => 'fn'
-                        }
+                        'index_entry' => [
+                          'fn',
+                          1
+                        ]
                       },
                       'info' => {
                         'spaces_before_argument' => {
@@ -571,12 +563,10 @@ $result_trees{'inter_item_commands_in_table'} = {
                           'cmdname' => 'cindex',
                           'extra' => {
                             'element_node' => {},
-                            'index_entry' => {
-                              'entry_element' => {},
-                              'entry_number' => 1,
-                              'in_code' => 0,
-                              'index_name' => 'cp'
-                            }
+                            'index_entry' => [
+                              'cp',
+                              1
+                            ]
                           },
                           'info' => {
                             'spaces_before_argument' => {
@@ -633,12 +623,10 @@ $result_trees{'inter_item_commands_in_table'} = {
                       'cmdname' => 'itemx',
                       'extra' => {
                         'element_node' => {},
-                        'index_entry' => {
-                          'entry_element' => {},
-                          'entry_number' => 2,
-                          'in_code' => 1,
-                          'index_name' => 'fn'
-                        }
+                        'index_entry' => [
+                          'fn',
+                          2
+                        ]
                       },
                       'info' => {
                         'spaces_before_argument' => {
@@ -695,12 +683,10 @@ $result_trees{'inter_item_commands_in_table'} = {
                       'cmdname' => 'item',
                       'extra' => {
                         'element_node' => {},
-                        'index_entry' => {
-                          'entry_element' => {},
-                          'entry_number' => 3,
-                          'in_code' => 1,
-                          'index_name' => 'fn'
-                        }
+                        'index_entry' => [
+                          'fn',
+                          3
+                        ]
                       },
                       'info' => {
                         'spaces_before_argument' => {
@@ -758,12 +744,10 @@ $result_trees{'inter_item_commands_in_table'} = {
                       'cmdname' => 'itemx',
                       'extra' => {
                         'element_node' => {},
-                        'index_entry' => {
-                          'entry_element' => {},
-                          'entry_number' => 4,
-                          'in_code' => 1,
-                          'index_name' => 'fn'
-                        }
+                        'index_entry' => [
+                          'fn',
+                          4
+                        ]
                       },
                       'info' => {
                         'spaces_before_argument' => {
@@ -903,12 +887,10 @@ $result_trees{'inter_item_commands_in_table'} = {
                       'cmdname' => 'item',
                       'extra' => {
                         'element_node' => {},
-                        'index_entry' => {
-                          'entry_element' => {},
-                          'entry_number' => 5,
-                          'in_code' => 1,
-                          'index_name' => 'fn'
-                        }
+                        'index_entry' => [
+                          'fn',
+                          5
+                        ]
                       },
                       'info' => {
                         'spaces_before_argument' => {
@@ -943,12 +925,10 @@ $result_trees{'inter_item_commands_in_table'} = {
                           'cmdname' => 'cindex',
                           'extra' => {
                             'element_node' => {},
-                            'index_entry' => {
-                              'entry_element' => {},
-                              'entry_number' => 2,
-                              'in_code' => 0,
-                              'index_name' => 'cp'
-                            }
+                            'index_entry' => [
+                              'cp',
+                              2
+                            ]
                           },
                           'info' => {
                             'spaces_before_argument' => {
@@ -985,12 +965,10 @@ $result_trees{'inter_item_commands_in_table'} = {
                       'cmdname' => 'itemx',
                       'extra' => {
                         'element_node' => {},
-                        'index_entry' => {
-                          'entry_element' => {},
-                          'entry_number' => 6,
-                          'in_code' => 1,
-                          'index_name' => 'fn'
-                        }
+                        'index_entry' => [
+                          'fn',
+                          6
+                        ]
                       },
                       'info' => {
                         'spaces_before_argument' => {
@@ -1124,12 +1102,10 @@ $result_trees{'inter_item_commands_in_table'} = {
                       'cmdname' => 'cindex',
                       'extra' => {
                         'element_node' => {},
-                        'index_entry' => {
-                          'entry_element' => {},
-                          'entry_number' => 3,
-                          'in_code' => 0,
-                          'index_name' => 'cp'
-                        }
+                        'index_entry' => [
+                          'cp',
+                          3
+                        ]
                       },
                       'info' => {
                         'spaces_before_argument' => {
@@ -1301,12 +1277,10 @@ $result_trees{'inter_item_commands_in_table'} = {
                   'cmdname' => 'cindex',
                   'extra' => {
                     'element_node' => {},
-                    'index_entry' => {
-                      'entry_element' => {},
-                      'entry_number' => 4,
-                      'in_code' => 0,
-                      'index_name' => 'cp'
-                    }
+                    'index_entry' => [
+                      'cp',
+                      4
+                    ]
                   },
                   'info' => {
                     'spaces_before_argument' => {
@@ -1472,12 +1446,10 @@ $result_trees{'inter_item_commands_in_table'} = {
                       'cmdname' => 'cindex',
                       'extra' => {
                         'element_node' => {},
-                        'index_entry' => {
-                          'entry_element' => {},
-                          'entry_number' => 5,
-                          'in_code' => 0,
-                          'index_name' => 'cp'
-                        }
+                        'index_entry' => [
+                          'cp',
+                          5
+                        ]
                       },
                       'info' => {
                         'spaces_before_argument' => {
@@ -1649,12 +1621,10 @@ $result_trees{'inter_item_commands_in_table'} = {
                   'cmdname' => 'cindex',
                   'extra' => {
                     'element_node' => {},
-                    'index_entry' => {
-                      'entry_element' => {},
-                      'entry_number' => 6,
-                      'in_code' => 0,
-                      'index_name' => 'cp'
-                    }
+                    'index_entry' => [
+                      'cp',
+                      6
+                    ]
                   },
                   'info' => {
                     'spaces_before_argument' => {
@@ -1823,12 +1793,10 @@ $result_trees{'inter_item_commands_in_table'} = {
                   'cmdname' => 'cindex',
                   'extra' => {
                     'element_node' => {},
-                    'index_entry' => {
-                      'entry_element' => {},
-                      'entry_number' => 7,
-                      'in_code' => 0,
-                      'index_name' => 'cp'
-                    }
+                    'index_entry' => [
+                      'cp',
+                      7
+                    ]
                   },
                   'info' => {
                     'spaces_before_argument' => {
@@ -1988,12 +1956,10 @@ $result_trees{'inter_item_commands_in_table'} = {
                   'cmdname' => 'cindex',
                   'extra' => {
                     'element_node' => {},
-                    'index_entry' => {
-                      'entry_element' => {},
-                      'entry_number' => 8,
-                      'in_code' => 0,
-                      'index_name' => 'cp'
-                    }
+                    'index_entry' => [
+                      'cp',
+                      8
+                    ]
                   },
                   'info' => {
                     'spaces_before_argument' => {
@@ -2165,12 +2131,10 @@ $result_trees{'inter_item_commands_in_table'} = {
                       'cmdname' => 'cindex',
                       'extra' => {
                         'element_node' => {},
-                        'index_entry' => {
-                          'entry_element' => {},
-                          'entry_number' => 9,
-                          'in_code' => 0,
-                          'index_name' => 'cp'
-                        }
+                        'index_entry' => [
+                          'cp',
+                          9
+                        ]
                       },
                       'info' => {
                         'spaces_before_argument' => {
@@ -2320,12 +2284,10 @@ $result_trees{'inter_item_commands_in_table'} = {
                       'cmdname' => 'cindex',
                       'extra' => {
                         'element_node' => {},
-                        'index_entry' => {
-                          'entry_element' => {},
-                          'entry_number' => 10,
-                          'in_code' => 0,
-                          'index_name' => 'cp'
-                        }
+                        'index_entry' => [
+                          'cp',
+                          10
+                        ]
                       },
                       'info' => {
                         'spaces_before_argument' => {
@@ -2369,12 +2331,10 @@ $result_trees{'inter_item_commands_in_table'} = {
                       'cmdname' => 'cindex',
                       'extra' => {
                         'element_node' => {},
-                        'index_entry' => {
-                          'entry_element' => {},
-                          'entry_number' => 11,
-                          'in_code' => 0,
-                          'index_name' => 'cp'
-                        }
+                        'index_entry' => [
+                          'cp',
+                          11
+                        ]
                       },
                       'info' => {
                         'spaces_before_argument' => {
@@ -2408,12 +2368,10 @@ $result_trees{'inter_item_commands_in_table'} = {
                       'cmdname' => 'cindex',
                       'extra' => {
                         'element_node' => {},
-                        'index_entry' => {
-                          'entry_element' => {},
-                          'entry_number' => 12,
-                          'in_code' => 0,
-                          'index_name' => 'cp'
-                        }
+                        'index_entry' => [
+                          'cp',
+                          12
+                        ]
                       },
                       'info' => {
                         'spaces_before_argument' => {
@@ -2536,58 +2494,37 @@ $result_trees{'inter_item_commands_in_table'} = {
   'type' => 'document_root'
 };
 
$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'}{'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'}{'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'}{'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'}{'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'}{'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'}{'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'}{'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'}{'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'}{'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'}{'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'}{'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'}{'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'}{'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'}{'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'}{'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'}{'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'}{'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'}{'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'}{'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'}{'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];
 
 $result_texis{'inter_item_commands_in_table'} = '@node Top
diff --git a/tp/t/results/xtable/inter_item_commands_in_table_in_example.pl 
b/tp/t/results/xtable/inter_item_commands_in_table_in_example.pl
index b7981287bd..41977949f5 100644
--- a/tp/t/results/xtable/inter_item_commands_in_table_in_example.pl
+++ b/tp/t/results/xtable/inter_item_commands_in_table_in_example.pl
@@ -108,12 +108,10 @@ $result_trees{'inter_item_commands_in_table_in_example'} 
= {
                                   ],
                                   'cmdname' => 'cindex',
                                   'extra' => {
-                                    'index_entry' => {
-                                      'entry_element' => {},
-                                      'entry_number' => 1,
-                                      'in_code' => 0,
-                                      'index_name' => 'cp'
-                                    }
+                                    'index_entry' => [
+                                      'cp',
+                                      1
+                                    ]
                                   },
                                   'info' => {
                                     'spaces_before_argument' => {
@@ -377,7 +375,6 @@ $result_trees{'inter_item_commands_in_table_in_example'} = {
   ],
   'type' => 'document_root'
 };
-$result_trees{'inter_item_commands_in_table_in_example'}{'contents'}[0]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'inter_item_commands_in_table_in_example'}{'contents'}[0]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[1]{'contents'}[0]{'contents'}[0];
 
$result_trees{'inter_item_commands_in_table_in_example'}{'contents'}[0]{'contents'}[1]{'contents'}[0]{'extra'}{'command_as_argument'}
 = 
$result_trees{'inter_item_commands_in_table_in_example'}{'contents'}[0]{'contents'}[1]{'contents'}[0]{'args'}[0]{'contents'}[0];
 
 $result_texis{'inter_item_commands_in_table_in_example'} = '@example
diff --git a/tp/t/results/xtable/table_nested.pl 
b/tp/t/results/xtable/table_nested.pl
index fd6bcd4073..06993b2e60 100644
--- a/tp/t/results/xtable/table_nested.pl
+++ b/tp/t/results/xtable/table_nested.pl
@@ -263,12 +263,10 @@ $result_trees{'table_nested'} = {
                           ],
                           'cmdname' => 'item',
                           'extra' => {
-                            'index_entry' => {
-                              'entry_element' => {},
-                              'entry_number' => 1,
-                              'in_code' => 1,
-                              'index_name' => 'vr'
-                            }
+                            'index_entry' => [
+                              'vr',
+                              1
+                            ]
                           },
                           'info' => {
                             'spaces_before_argument' => {
@@ -300,12 +298,10 @@ $result_trees{'table_nested'} = {
                           ],
                           'cmdname' => 'itemx',
                           'extra' => {
-                            'index_entry' => {
-                              'entry_element' => {},
-                              'entry_number' => 2,
-                              'in_code' => 1,
-                              'index_name' => 'vr'
-                            }
+                            'index_entry' => [
+                              'vr',
+                              2
+                            ]
                           },
                           'info' => {
                             'spaces_before_argument' => {
@@ -371,12 +367,10 @@ $result_trees{'table_nested'} = {
                           ],
                           'cmdname' => 'item',
                           'extra' => {
-                            'index_entry' => {
-                              'entry_element' => {},
-                              'entry_number' => 3,
-                              'in_code' => 1,
-                              'index_name' => 'vr'
-                            }
+                            'index_entry' => [
+                              'vr',
+                              3
+                            ]
                           },
                           'info' => {
                             'spaces_before_argument' => {
@@ -442,12 +436,10 @@ $result_trees{'table_nested'} = {
                           ],
                           'cmdname' => 'item',
                           'extra' => {
-                            'index_entry' => {
-                              'entry_element' => {},
-                              'entry_number' => 4,
-                              'in_code' => 1,
-                              'index_name' => 'vr'
-                            }
+                            'index_entry' => [
+                              'vr',
+                              4
+                            ]
                           },
                           'info' => {
                             'spaces_before_argument' => {
@@ -857,12 +849,10 @@ $result_trees{'table_nested'} = {
                           ],
                           'cmdname' => 'item',
                           'extra' => {
-                            'index_entry' => {
-                              'entry_element' => {},
-                              'entry_number' => 5,
-                              'in_code' => 1,
-                              'index_name' => 'vr'
-                            }
+                            'index_entry' => [
+                              'vr',
+                              5
+                            ]
                           },
                           'info' => {
                             'spaces_before_argument' => {
@@ -894,12 +884,10 @@ $result_trees{'table_nested'} = {
                           ],
                           'cmdname' => 'itemx',
                           'extra' => {
-                            'index_entry' => {
-                              'entry_element' => {},
-                              'entry_number' => 6,
-                              'in_code' => 1,
-                              'index_name' => 'vr'
-                            }
+                            'index_entry' => [
+                              'vr',
+                              6
+                            ]
                           },
                           'info' => {
                             'spaces_before_argument' => {
@@ -965,12 +953,10 @@ $result_trees{'table_nested'} = {
                           ],
                           'cmdname' => 'item',
                           'extra' => {
-                            'index_entry' => {
-                              'entry_element' => {},
-                              'entry_number' => 7,
-                              'in_code' => 1,
-                              'index_name' => 'vr'
-                            }
+                            'index_entry' => [
+                              'vr',
+                              7
+                            ]
                           },
                           'info' => {
                             'spaces_before_argument' => {
@@ -1036,12 +1022,10 @@ $result_trees{'table_nested'} = {
                           ],
                           'cmdname' => 'item',
                           'extra' => {
-                            'index_entry' => {
-                              'entry_element' => {},
-                              'entry_number' => 8,
-                              'in_code' => 1,
-                              'index_name' => 'vr'
-                            }
+                            'index_entry' => [
+                              'vr',
+                              8
+                            ]
                           },
                           'info' => {
                             'spaces_before_argument' => {
@@ -1466,12 +1450,10 @@ $result_trees{'table_nested'} = {
                               ],
                               'cmdname' => 'item',
                               'extra' => {
-                                'index_entry' => {
-                                  'entry_element' => {},
-                                  'entry_number' => 9,
-                                  'in_code' => 1,
-                                  'index_name' => 'vr'
-                                }
+                                'index_entry' => [
+                                  'vr',
+                                  9
+                                ]
                               },
                               'info' => {
                                 'spaces_before_argument' => {
@@ -1503,12 +1485,10 @@ $result_trees{'table_nested'} = {
                               ],
                               'cmdname' => 'itemx',
                               'extra' => {
-                                'index_entry' => {
-                                  'entry_element' => {},
-                                  'entry_number' => 10,
-                                  'in_code' => 1,
-                                  'index_name' => 'vr'
-                                }
+                                'index_entry' => [
+                                  'vr',
+                                  10
+                                ]
                               },
                               'info' => {
                                 'spaces_before_argument' => {
@@ -1574,12 +1554,10 @@ $result_trees{'table_nested'} = {
                               ],
                               'cmdname' => 'item',
                               'extra' => {
-                                'index_entry' => {
-                                  'entry_element' => {},
-                                  'entry_number' => 11,
-                                  'in_code' => 1,
-                                  'index_name' => 'vr'
-                                }
+                                'index_entry' => [
+                                  'vr',
+                                  11
+                                ]
                               },
                               'info' => {
                                 'spaces_before_argument' => {
@@ -1645,12 +1623,10 @@ $result_trees{'table_nested'} = {
                               ],
                               'cmdname' => 'item',
                               'extra' => {
-                                'index_entry' => {
-                                  'entry_element' => {},
-                                  'entry_number' => 12,
-                                  'in_code' => 1,
-                                  'index_name' => 'vr'
-                                }
+                                'index_entry' => [
+                                  'vr',
+                                  12
+                                ]
                               },
                               'info' => {
                                 'spaces_before_argument' => {
@@ -2009,22 +1985,10 @@ $result_trees{'table_nested'} = {
   ],
   'type' => 'document_root'
 };
-$result_trees{'table_nested'}{'contents'}[0]{'contents'}[3]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'table_nested'}{'contents'}[0]{'contents'}[3]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'contents'}[0];
-$result_trees{'table_nested'}{'contents'}[0]{'contents'}[3]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'contents'}[1]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'table_nested'}{'contents'}[0]{'contents'}[3]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'contents'}[1];
-$result_trees{'table_nested'}{'contents'}[0]{'contents'}[3]{'contents'}[1]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'table_nested'}{'contents'}[0]{'contents'}[3]{'contents'}[1]{'contents'}[1]{'contents'}[0]{'contents'}[0];
-$result_trees{'table_nested'}{'contents'}[0]{'contents'}[3]{'contents'}[1]{'contents'}[2]{'contents'}[0]{'contents'}[0]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'table_nested'}{'contents'}[0]{'contents'}[3]{'contents'}[1]{'contents'}[2]{'contents'}[0]{'contents'}[0];
 
$result_trees{'table_nested'}{'contents'}[0]{'contents'}[3]{'contents'}[1]{'extra'}{'command_as_argument'}
 = 
$result_trees{'table_nested'}{'contents'}[0]{'contents'}[3]{'contents'}[1]{'args'}[0]{'contents'}[0];
 
$result_trees{'table_nested'}{'contents'}[0]{'contents'}[3]{'contents'}[4]{'extra'}{'command_as_argument'}
 = 
$result_trees{'table_nested'}{'contents'}[0]{'contents'}[3]{'contents'}[4]{'args'}[0]{'contents'}[0];
-$result_trees{'table_nested'}{'contents'}[0]{'contents'}[6]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'table_nested'}{'contents'}[0]{'contents'}[6]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'contents'}[0];
-$result_trees{'table_nested'}{'contents'}[0]{'contents'}[6]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'contents'}[1]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'table_nested'}{'contents'}[0]{'contents'}[6]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'contents'}[1];
-$result_trees{'table_nested'}{'contents'}[0]{'contents'}[6]{'contents'}[1]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'table_nested'}{'contents'}[0]{'contents'}[6]{'contents'}[1]{'contents'}[1]{'contents'}[0]{'contents'}[0];
-$result_trees{'table_nested'}{'contents'}[0]{'contents'}[6]{'contents'}[1]{'contents'}[2]{'contents'}[0]{'contents'}[0]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'table_nested'}{'contents'}[0]{'contents'}[6]{'contents'}[1]{'contents'}[2]{'contents'}[0]{'contents'}[0];
 
$result_trees{'table_nested'}{'contents'}[0]{'contents'}[6]{'contents'}[1]{'extra'}{'command_as_argument'}
 = 
$result_trees{'table_nested'}{'contents'}[0]{'contents'}[6]{'contents'}[1]{'args'}[0]{'contents'}[0];
 
$result_trees{'table_nested'}{'contents'}[0]{'contents'}[6]{'contents'}[3]{'extra'}{'command_as_argument'}
 = 
$result_trees{'table_nested'}{'contents'}[0]{'contents'}[6]{'contents'}[3]{'args'}[0]{'contents'}[0];
-$result_trees{'table_nested'}{'contents'}[0]{'contents'}[9]{'contents'}[0]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'table_nested'}{'contents'}[0]{'contents'}[9]{'contents'}[0]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'contents'}[0];
-$result_trees{'table_nested'}{'contents'}[0]{'contents'}[9]{'contents'}[0]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'contents'}[1]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'table_nested'}{'contents'}[0]{'contents'}[9]{'contents'}[0]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'contents'}[1];
-$result_trees{'table_nested'}{'contents'}[0]{'contents'}[9]{'contents'}[0]{'contents'}[1]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'table_nested'}{'contents'}[0]{'contents'}[9]{'contents'}[0]{'contents'}[1]{'contents'}[1]{'contents'}[0]{'contents'}[0];
-$result_trees{'table_nested'}{'contents'}[0]{'contents'}[9]{'contents'}[0]{'contents'}[1]{'contents'}[2]{'contents'}[0]{'contents'}[0]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'table_nested'}{'contents'}[0]{'contents'}[9]{'contents'}[0]{'contents'}[1]{'contents'}[2]{'contents'}[0]{'contents'}[0];
 
$result_trees{'table_nested'}{'contents'}[0]{'contents'}[9]{'contents'}[0]{'contents'}[1]{'extra'}{'command_as_argument'}
 = 
$result_trees{'table_nested'}{'contents'}[0]{'contents'}[9]{'contents'}[0]{'contents'}[1]{'args'}[0]{'contents'}[0];
 
$result_trees{'table_nested'}{'contents'}[0]{'contents'}[9]{'contents'}[0]{'contents'}[4]{'extra'}{'command_as_argument'}
 = 
$result_trees{'table_nested'}{'contents'}[0]{'contents'}[9]{'contents'}[0]{'contents'}[4]{'args'}[0]{'contents'}[0];
 
diff --git a/tp/t/test_utils.pl b/tp/t/test_utils.pl
index f4cf47d942..445cd76277 100644
--- a/tp/t/test_utils.pl
+++ b/tp/t/test_utils.pl
@@ -412,13 +412,6 @@ sub _duplicate_element_keys($$)
     if (exists($current->{'extra'}->{'type'})) {
       duplicate_key_array($current->{'extra'}->{'type'}, 'content');
     }
-    # only need to duplicate for @def* index entries
-    # in that case they are not duplicated in the XS parser output
-    if (exists($current->{'extra'}->{'index_entry'})
-        and exists($current->{'extra'}->{'def_command'})) {
-      duplicate_key_array($current->{'extra'}->{'index_entry'},
-        'content_normalized');
-    }
     if (exists($current->{'extra'}->{'prototypes'})
         and (defined($current->{'extra'}->{'prototypes'}))) {
       foreach my $prototype (@{$current->{'extra'}->{'prototypes'}}) {



reply via email to

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