texinfo-commits
[Top][All Lists]
Advanced

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

[no subject]


From: Patrice Dumas
Date: Thu, 16 Feb 2023 18:07:30 -0500 (EST)

branch: master
commit 25686a7a0e4bab5820a867620145549a40959b5e
Author: Patrice Dumas <pertusus@free.fr>
AuthorDate: Fri Feb 17 00:07:20 2023 +0100

    * tp/Texinfo/ParserNonXS.pm (_enter_index_entry),
    tp/Texinfo/XS/parsetexi/api.c (build_single_index_data),
    tp/Texinfo/XS/parsetexi/indices.c (enter_index_entry): remove
    index_at_command and index_type_command entries from index entries.
    Remove index_at_command argument of enter_index_entry, update callers.
    
    * tp/Texinfo/Convert/Plaintext.pm (): determine @-command name
    associated to index entry based on the tree element.
---
 ChangeLog                                          |  11 +
 tp/Texinfo/Convert/Plaintext.pm                    |   6 +-
 tp/Texinfo/ParserNonXS.pm                          |  30 +-
 tp/Texinfo/XS/parsetexi/api.c                      |   4 -
 tp/Texinfo/XS/parsetexi/end_line.c                 |   5 +-
 tp/Texinfo/XS/parsetexi/indices.c                  |  10 +-
 tp/Texinfo/XS/parsetexi/indices.h                  |   5 +-
 tp/Texinfo/XS/parsetexi/tree_types.h               |   2 -
 .../results/converters_tests/at_commands_in_raw.pl |   4 +-
 tp/t/results/converters_tests/complex_nestings.pl  |  20 +-
 .../converters_tests/definition_commands.pl        | 312 +++---------
 tp/t/results/converters_tests/form_feeds.pl        |   8 +-
 .../converters_tests/frenchspacing_and_code.pl     |  16 +-
 .../index_entry_in_preformatted.pl                 |  12 +-
 .../indices_in_begin_tables_lists.pl               | 116 ++---
 ...ces_in_begin_tables_lists_entries_after_item.pl | 116 ++---
 .../printindex_merged_indices_code_style.pl        |  20 +-
 .../references_to_top_no_top_output.pl             |   8 +-
 .../converters_tests/test_deftypefnnewline.pl      |  56 +--
 .../converters_tests/things_before_setfilename.pl  |   4 +-
 .../things_before_setfilename_no_element.pl        |   4 +-
 tp/t/results/coverage/commands.pl                  |   4 +-
 tp/t/results/coverage/def.pl                       |  60 +--
 tp/t/results/coverage/formats_titles.pl            |   4 +-
 tp/t/results/coverage/multitable.pl                |   4 +-
 tp/t/results/coverage/preformatted.pl              |   4 +-
 .../coverage/punctuation_in_line_commands.pl       |   4 +-
 tp/t/results/coverage/table.pl                     |  16 +-
 .../coverage_braces/contain_plain_text_nestings.pl |   4 -
 .../results/coverage_braces/heading_in_footnote.pl |   4 +-
 tp/t/results/def/all_commands.pl                   | 108 ++---
 tp/t/results/def/all_commands_delimiters.pl        | 188 ++-----
 .../def/all_commands_delimiters_printindex.pl      | 188 ++-----
 tp/t/results/def/all_commands_printindex.pl        | 108 ++---
 tp/t/results/def/ampchar.pl                        |   4 +-
 tp/t/results/def/code_in_def.pl                    |   4 +-
 tp/t/results/def/def_defx_mismatch.pl              |   8 +-
 tp/t/results/def/defx_after_comment.pl             |   8 +-
 tp/t/results/def/defx_after_comment_in_example.pl  |   8 +-
 tp/t/results/def/defx_after_empty_line.pl          |   8 +-
 .../def/defx_after_empty_line_in_example.pl        |   8 +-
 tp/t/results/def/defx_after_paragraph_end.pl       |   8 +-
 .../def/defx_after_preformatted_with_text.pl       |   8 +-
 tp/t/results/def/defx_after_text.pl                |   8 +-
 tp/t/results/def/defx_in_example.pl                |   8 +-
 tp/t/results/def/double_command.pl                 |  16 +-
 tp/t/results/def/empty_def_arguments.pl            |   4 +-
 tp/t/results/def/empty_def_command.pl              |  12 +-
 tp/t/results/def/empty_deftype.pl                  |  16 +-
 tp/t/results/def/end_of_line_end_file.pl           |   4 +-
 tp/t/results/def/end_of_line_protect_at_end.pl     |   4 +-
 tp/t/results/def/end_of_lines_protected.pl         |   4 +-
 .../def/end_of_lines_protected_in_footnote.pl      |   4 +-
 .../def/end_of_lines_protected_non_ascii.pl        |   4 +-
 tp/t/results/def/inter_item_commands_in_def.pl     |  20 +-
 .../def/inter_item_commands_in_def_in_example.pl   |  20 +-
 tp/t/results/def/leading_space_in_def_arg.pl       |   4 +-
 tp/t/results/def/no_category_or_no_name.pl         |   4 +-
 tp/t/results/def/not_closed.pl                     |  12 +-
 tp/t/results/def/omit_def_space.pl                 |   8 +-
 tp/t/results/def/protected_brace.pl                |   4 +-
 tp/t/results/def/ref_in_def.pl                     |   8 +-
 tp/t/results/def/space_in_def_for_index.pl         |   8 +-
 tp/t/results/def/wrong_braces_simple.pl            |  36 +-
 tp/t/results/def/wrong_braces_with_end_of_lines.pl |   8 +-
 tp/t/results/float/cindex_in_caption.pl            |   4 +-
 tp/t/results/float/complex_float.pl                |  12 +-
 tp/t/results/float/float_copying.pl                |  16 +-
 .../char_latin1_latin1_in_refs.pl                  |  24 +-
 .../formats_encodings/char_latin1_utf8_in_refs.pl  |  24 +-
 .../char_latin2_latin2_in_refs.pl                  |   4 +-
 tp/t/results/formats_encodings/sample_utf8.pl      |  16 +-
 tp/t/results/heading/heading_in_copying.pl         |   4 +-
 .../deftypefnnewline_for_copying_after.pl          |   8 +-
 .../deftypefnnewline_for_copying_before.pl         |   8 +-
 tp/t/results/html_tests/float_copying.pl           |  24 +-
 .../results/html_tests/index_and_node_same_name.pl |   4 +-
 tp/t/results/html_tests/index_below.pl             |   4 +-
 tp/t/results/indices/complex_recursive_synindex.pl |  24 +-
 tp/t/results/indices/def_syn_indices.pl            |  28 +-
 ...default_cp_index_and_one_letter_syncodeindex.pl |   8 +-
 tp/t/results/indices/double_index_entry.pl         |  12 +-
 tp/t/results/indices/double_seeentry_seealso.pl    |  16 +-
 tp/t/results/indices/double_syncodeindex.pl        |   8 +-
 tp/t/results/indices/empty_string_index_entry.pl   |  16 +-
 tp/t/results/indices/encoding_index_ascii.pl       | 220 +++------
 .../encoding_index_ascii_enable_encoding.pl        | 220 +++------
 tp/t/results/indices/encoding_index_latin1.pl      | 220 +++------
 .../encoding_index_latin1_enable_encoding.pl       | 220 +++------
 tp/t/results/indices/encoding_index_utf8.pl        | 220 +++------
 .../indices/encoding_index_utf8_enable_encoding.pl | 220 +++------
 tp/t/results/indices/explicit_sort_key.pl          |  10 +-
 tp/t/results/indices/ftable_vtable.pl              |  28 +-
 .../indices/ignored_sort_char_empty_entries.pl     |  14 +-
 tp/t/results/indices/image_lines_count.pl          | Bin 7448 -> 7354 bytes
 tp/t/results/indices/image_text_lines_count.pl     | Bin 7943 -> 7849 bytes
 tp/t/results/indices/index_and_node_same_name.pl   |   4 +-
 tp/t/results/indices/index_entries_locations.pl    |  16 +-
 .../indices/index_entry_before_first_node.pl       | Bin 7797 -> 7703 bytes
 tp/t/results/indices/index_entry_before_node.pl    |   4 +-
 tp/t/results/indices/index_entry_in_footnote.pl    | Bin 9313 -> 9187 bytes
 .../index_entry_in_footnote_different_node_end.pl  |   8 +-
 .../indices/index_entry_in_footnote_sections.pl    |   4 +-
 .../index_entry_in_footnote_sections_separate.pl   |   4 +-
 .../indices/index_entry_in_footnote_separate.pl    |   8 +-
 tp/t/results/indices/index_no_node.pl              |  56 +--
 tp/t/results/indices/index_no_node_no_top.pl       |  56 +--
 .../indices/index_no_node_no_top_no_node.pl        |  56 +--
 tp/t/results/indices/index_nodes.pl                |  44 +-
 .../indices/index_nodes_no_split_no_use_nodes.pl   |  44 +-
 tp/t/results/indices/index_special_region.pl       |  32 +-
 .../index_special_region_no_insertcopying.pl       |  32 +-
 ...egion_no_insertcopying_no_titlepage_no_nodes.pl |  32 +-
 ...l_region_no_insertcopying_titlepage_no_nodes.pl |  32 +-
 ...copying_titlepage_no_nodes_footnotes_default.pl |  32 +-
 .../index_special_region_no_titlepage_no_nodes.pl  |  32 +-
 .../index_special_region_titlepage_no_nodes.pl     |  32 +-
 ..._region_titlepage_no_nodes_footnotes_default.pl |  32 +-
 tp/t/results/indices/index_split.pl                |  76 +--
 .../indices/index_split_split_chapter_no_nodes.pl  |  76 +--
 tp/t/results/indices/index_table.pl                | 540 ++++++---------------
 .../results/indices/index_table_chapter_no_node.pl | 540 ++++++---------------
 .../multiple_index_text_sortas_seeentry_seealso.pl |   8 +-
 tp/t/results/indices/nodes_before_top.pl           |  52 +-
 .../nodes_before_top_and_sections_chapter.pl       |  60 +--
 ...odes_before_top_and_sections_chapter_no_node.pl |  60 +--
 ...des_before_top_and_sections_unsplit_no_nodes.pl |  60 +--
 .../indices/nodes_before_top_split_chapter.pl      |  52 +-
 .../nodes_before_top_split_chapter_no_nodes.pl     |  52 +-
 .../indices/printindex_between_node_section.pl     |  24 +-
 .../indices/printindex_between_part_chapter.pl     |  24 +-
 .../indices/printindex_index_entry_in_copying.pl   |  20 +-
 ...rintindex_index_entry_in_copying_in_footnote.pl |   4 +-
 ...ndex_index_entry_in_copying_no_insertcopying.pl |  20 +-
 .../indices/printindex_with_space_before.pl        | Bin 9165 -> 9071 bytes
 .../indices/same_index_entry_merged_indices.pl     |   8 +-
 tp/t/results/indices/same_only_seealso_seeentry.pl |  24 +-
 tp/t/results/indices/same_seealso_seeentry.pl      |  28 +-
 tp/t/results/indices/seealso_duplicate.pl          |   8 +-
 tp/t/results/indices/seeentry.pl                   |  16 +-
 tp/t/results/indices/sorted_subentries.pl          |  72 +--
 tp/t/results/indices/split_chapter_index.pl        |  48 +-
 tp/t/results/indices/subentries.pl                 |  32 +-
 tp/t/results/indices/subentry_and_sortas.pl        |   4 -
 tp/t/results/indices/subentry_and_sortas_spaces.pl |  14 +-
 tp/t/results/indices/syncode_index_print_both.pl   |   8 +-
 tp/t/results/indices/syncodeindex_to_plain.pl      |  12 +-
 tp/t/results/indices/transparent_sort_chars.pl     |  12 +-
 .../indices/unknown_then_known_index_entry.pl      |   4 +-
 tp/t/results/indices/w_lines_count.pl              |   4 +-
 tp/t/results/info_tests/before_node_and_section.pl |   4 +-
 tp/t/results/info_tests/colon_in_index_entry.pl    |  16 +-
 .../info_tests/colons_in_index_entries_and_node.pl |  24 +-
 .../colons_in_index_entries_and_node_no_quoting.pl |  24 +-
 tp/t/results/info_tests/def_in_copying.pl          |  16 +-
 .../end_of_line_command_in_node_lines.pl           |   4 +-
 tp/t/results/info_tests/index_entry_at_end_node.pl |   4 +-
 .../multitable_anchor_and_index_entry.pl           |   8 +-
 .../info_tests/nested_multitable_anchor_index.pl   |   8 +-
 .../info_tests/one_node_counted_elements.pl        |   8 +-
 tp/t/results/info_tests/test_index.pl              |  68 +--
 .../results/invalid_nestings/block_not_matching.pl |   4 +-
 tp/t/results/invalid_nestings/center.pl            |   4 +-
 .../invalid_nestings/def_in_style_command.pl       |   4 +-
 .../def_not_closed_in_menu_description.pl          |   4 +-
 tp/t/results/invalid_nestings/in_table.pl          |  20 +-
 .../invalid_nestings/multitable_item_in_index.pl   |   4 +-
 .../invalid_nestings/node_on_index_entry_line.pl   |   4 +-
 tp/t/results/invalid_nestings/on_def_line.pl       |   8 +-
 .../invalid_nestings/on_index_entry_line.pl        |   4 +-
 tp/t/results/invalid_nestings/raw_block_on_line.pl |   4 +-
 .../invalid_nestings/section_on_def_line.pl        |   4 +-
 .../invalid_nestings/section_on_defx_line.pl       |   8 +-
 .../section_on_index_entry_line.pl                 |   4 +-
 tp/t/results/invalid_nestings/tab_in_index.pl      |   4 +-
 .../itemize/inter_item_commands_in_enumerate.pl    |  28 +-
 .../itemize/inter_item_commands_in_itemize.pl      |  16 +-
 tp/t/results/languages/documentlanguage.pl         |   4 +-
 tp/t/results/languages/documentlanguage_option.pl  |   4 +-
 tp/t/results/languages/documentlanguage_unknown.pl |   4 +-
 .../results/languages/multiple_documentlanguage.pl |  12 +-
 tp/t/results/languages/multiple_in_preamble.pl     |  12 +-
 .../languages/multiple_in_preamble_before_node.pl  |   8 +-
 tp/t/results/languages/multiple_lang_chapters.pl   |  12 +-
 .../languages/multiple_lang_chapters_latex.pl      |  12 +-
 .../languages/multiple_lang_chapters_texi2html.pl  |  12 +-
 tp/t/results/languages/simple_documentlanguage.pl  |   4 +-
 tp/t/results/languages/unknown_region.pl           |   4 +-
 tp/t/results/latex_tests/brace_in_index.pl         |  16 +-
 tp/t/results/latex_tests/indices.pl                |  42 +-
 .../latex_tests/indices_disable_encoding.pl        |  42 +-
 tp/t/results/latex_tests/vbar_in_index.pl          |   8 +-
 tp/t/results/layout/no_monolithic.pl               |   4 +-
 tp/t/results/layout/no_monolithic_only_toc_out.pl  |   4 +-
 tp/t/results/macro/backslash_in_arg.pl             |  16 +-
 tp/t/results/macro/macro_in_def_delimiters.pl      |   4 +-
 tp/t/results/macro/macro_in_index_commands.pl      |  16 +-
 tp/t/results/menu/menu_in_deffn.pl                 |   4 +-
 .../misc_commands/comment_space_command_on_line.pl |   4 +-
 tp/t/results/misc_commands/index_entries.pl        |   8 +-
 tp/t/results/moresectioning/no_element.pl          |   4 +-
 .../moresectioning/placed_things_before_element.pl |   4 +-
 .../moresectioning/placed_things_before_node.pl    |   4 +-
 .../inter_item_commands_in_multitable.pl           |  12 +-
 .../at_commands_glued_in_example.pl                |   4 +-
 .../at_commands_glued_in_paragraph.pl              |   4 +-
 tp/t/results/preformatted/def_in_example.pl        |   4 +-
 ...dex_entries_relate_to_item_no_transformation.pl |  12 +-
 .../index_entries_relate_to_item_transformation.pl |  12 +-
 tp/t/results/value/value_in_index_commands.pl      |  16 +-
 tp/t/results/xml_tests/commands_and_spaces.pl      |   4 +-
 tp/t/results/xtable/block_commands_in_table.pl     |  20 +-
 tp/t/results/xtable/empty_item_itemx.pl            |  12 +-
 .../xtable/index_command_before_end_table.pl       |   4 +-
 .../results/xtable/inter_item_commands_in_table.pl |  84 +---
 .../inter_item_commands_in_table_in_example.pl     |   4 +-
 tp/t/results/xtable/table_nested.pl                |  48 +-
 217 files changed, 1682 insertions(+), 5037 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 289216643c..135fcdfc56 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,14 @@
+2023-02-16  Patrice Dumas  <pertusus@free.fr>
+
+       * tp/Texinfo/ParserNonXS.pm (_enter_index_entry),
+       tp/Texinfo/XS/parsetexi/api.c (build_single_index_data),
+       tp/Texinfo/XS/parsetexi/indices.c (enter_index_entry): remove
+       index_at_command and index_type_command entries from index entries.
+       Remove index_at_command argument of enter_index_entry, update callers.
+
+       * tp/Texinfo/Convert/Plaintext.pm (): determine @-command name
+       associated to index entry based on the tree element.
+
 2023-02-16  Patrice Dumas  <pertusus@free.fr>
 
        * tp/Texinfo/Structuring.pm (sort_indices): determine @-command name
diff --git a/tp/Texinfo/Convert/Plaintext.pm b/tp/Texinfo/Convert/Plaintext.pm
index 9e200eaec7..1d0d70cdff 100644
--- a/tp/Texinfo/Convert/Plaintext.pm
+++ b/tp/Texinfo/Convert/Plaintext.pm
@@ -1437,9 +1437,13 @@ sub process_printindex($$;$)
     # protected, however, as done below, such that : in the node are not
     # mistaken as being part of the index entry.
     if ($entry_text =~ /:/ and $self->get_conf('INDEX_SPECIAL_CHARS_WARNING')) 
{
+      my $entry_cmdname = $entry->{'entry_element'}->{'cmdname'};
+      $entry_cmdname
+        = $entry->{'entry_element'}->{'extra'}->{'original_def_cmdname'}
+           if (!defined($entry_cmdname));
       $self->converter_line_warn ($self,
         sprintf(__("Index entry in \@%s with : produces invalid Info: %s"),
-                $entry->{'index_at_command'},
+                $entry_cmdname,
                 Texinfo::Convert::Texinfo::convert_to_texinfo($entry_tree)),
                         $entry->{'entry_element'}->{'source_info'});
     }
diff --git a/tp/Texinfo/ParserNonXS.pm b/tp/Texinfo/ParserNonXS.pm
index 9d4ee7b7c7..6146f70bf3 100644
--- a/tp/Texinfo/ParserNonXS.pm
+++ b/tp/Texinfo/ParserNonXS.pm
@@ -3308,9 +3308,9 @@ sub _register_label($$$)
 # $CONTENT holds the actual content.  For index entries and v|ftable
 #  items, it is the index entry content, for def, it is the parsed
 #  arguments, based on the definition line arguments.
-sub _enter_index_entry($$$$$$$)
+sub _enter_index_entry($$$$$$)
 {
-  my ($self, $command_container, $command, $current, $content,
+  my ($self, $command_container, $current, $content,
       $content_normalized, $source_info) = @_;
 
   $content_normalized = $content if (!defined($content_normalized));
@@ -3324,12 +3324,7 @@ sub _enter_index_entry($$$$$$$)
 
   my $number = scalar(@{$index->{'index_entries'}}) + 1;
 
-  # FIXME index_type_command does not seems to be used anywhere.
-  # It appears in test results tree, so maybe it is worth keeping
-  # it to be able to understand changes.
   my $index_entry = { 'index_name'           => $index_name,
-                      'index_at_command'     => $command,
-                      'index_type_command'   => $command_container,
                       'entry_content'        => $content,
                       'content_normalized'   => $content_normalized,
                       'entry_element'        => $current,
@@ -3607,12 +3602,12 @@ sub _end_line_misc_line($$$)
           and $current->{'parent'}->{'cmdname'}
           and $self->{'command_index'}->{$current->{'parent'}->{'cmdname'}}) {
         _enter_index_entry($self, $current->{'parent'}->{'cmdname'},
-                           $command, $current,
+                           $current,
                            $current->{'args'}->[0]->{'contents'},
                            undef, $source_info);
       } elsif ($self->{'command_index'}->{$current->{'cmdname'}}) {
         _enter_index_entry($self, $current->{'cmdname'},
-                           $current->{'cmdname'}, $current,
+                           $current,
                            $current->{'args'}->[0]->{'contents'},
                            undef, $source_info);
         $current->{'type'} = 'index_entry_command';
@@ -3826,7 +3821,6 @@ sub _end_line_def_line($$$)
 
       _enter_index_entry($self,
         $current->{'extra'}->{'def_command'},
-        $current->{'extra'}->{'original_def_cmdname'},
         $current, $index_contents,
         $index_contents_normalized, $source_info)
            if $current->{'extra'}->{'def_command'} ne 'defline';
@@ -7625,28 +7619,12 @@ The keys of the index entry structures are
 
 The index name.
 
-=item index_at_command
-
-The name of the @-command associated with the index entry.
-
 =item index_ignore_chars
 
 A hash reference with characters as keys and 1 as value.  Corresponds to
 the characters flagged as ignored in key sorting in the document by
 setting flags such as I<txiindexbackslashignore>.
 
-=begin comment
-
-This is not used anywhere, do not document to be able to remove it
-anytime.
-
-=item index_type_command
-
-The name of the @-command associated with the index entry.  This
-should allow to find the index associated to the index entry.
-
-=end comment
-
 =item entry_content
 
 An array reference corresponding to the index entry content.
diff --git a/tp/Texinfo/XS/parsetexi/api.c b/tp/Texinfo/XS/parsetexi/api.c
index 2bd201003c..63769a1e6d 100644
--- a/tp/Texinfo/XS/parsetexi/api.c
+++ b/tp/Texinfo/XS/parsetexi/api.c
@@ -888,10 +888,6 @@ build_single_index_data (INDEX *i)
       entry = newHV ();
 
       STORE2("index_name", newSVpv_utf8 (i->name, 0));
-      STORE2("index_at_command",
-             newSVpv (command_name(e->index_at_command), 0));
-      STORE2("index_type_command",
-             newSVpv (command_name(e->index_type_command), 0));
       STORE2("entry_element",
              newRV_inc ((SV *)e->command->hv));
       STORE2("entry_number", newSViv (entry_number));
diff --git a/tp/Texinfo/XS/parsetexi/end_line.c 
b/tp/Texinfo/XS/parsetexi/end_line.c
index b09c89cf54..46a2a2cb3b 100644
--- a/tp/Texinfo/XS/parsetexi/end_line.c
+++ b/tp/Texinfo/XS/parsetexi/end_line.c
@@ -1907,7 +1907,6 @@ end_line_misc_line (ELEMENT *current)
               && (current->cmd == CM_item || current->cmd == CM_itemx))
             {
               enter_index_entry (current->parent->cmd,
-                                 current->cmd,
                                  current,
                                  current->args.list[0]);
             }
@@ -1920,7 +1919,7 @@ end_line_misc_line (ELEMENT *current)
           /* Index commands */
           if (command_flags(current) & CF_index_entry_command)
             {
-              enter_index_entry (current->cmd, current->cmd, current,
+              enter_index_entry (current->cmd, current,
                                  current->args.list[0]);
               current->type = ET_index_entry_command;
             }
@@ -2173,7 +2172,7 @@ end_line_def_line (ELEMENT *current)
                 add_to_contents_as_array (index_contents, index_entry);
             }
 
-          enter_index_entry (def_command, original_def_command,
+          enter_index_entry (def_command,
                              current, index_contents);
         }
       else
diff --git a/tp/Texinfo/XS/parsetexi/indices.c 
b/tp/Texinfo/XS/parsetexi/indices.c
index d28618122b..bc7038ec3e 100644
--- a/tp/Texinfo/XS/parsetexi/indices.c
+++ b/tp/Texinfo/XS/parsetexi/indices.c
@@ -261,8 +261,7 @@ typedef struct {
 } INDEX_ENTRY_REF;
 
 
-/* INDEX_TYPE_COMMAND is used to determine which index to enter the entry in.
-   INDEX_AT_COMMAND is the Texinfo @-command defining the index entry.
+/* INDEX_TYPE_CMD is used to determine which index to enter the entry in.
    CONTENT is an element whose contents represent the text of the
    index entry.  CURRENT is the element in the main body of the manual that
    the index entry refers to.
@@ -270,15 +269,14 @@ typedef struct {
    CONTENT_NORMALIZED would be "the index entry content, independent
    of the current language." */
 void
-enter_index_entry (enum command_id index_type_command,
-                   enum command_id index_at_command,
+enter_index_entry (enum command_id index_type_cmd,
                    ELEMENT *current, ELEMENT *content)
 {
   INDEX *idx;
   INDEX_ENTRY *entry;
   KEY_PAIR *k;
 
-  idx = index_of_command (index_type_command);
+  idx = index_of_command (index_type_cmd);
   if (idx->index_number == idx->index_space)
     {
       idx->index_entries = realloc (idx->index_entries,
@@ -290,8 +288,6 @@ enter_index_entry (enum command_id index_type_command,
   memset (entry, 0, sizeof (INDEX_ENTRY));
 
   entry->index_name = idx->name;
-  entry->index_at_command = index_at_command;
-  entry->index_type_command = index_type_command;
   entry->index_prefix = idx->prefix;
   entry->content = content;
   entry->command = current;
diff --git a/tp/Texinfo/XS/parsetexi/indices.h 
b/tp/Texinfo/XS/parsetexi/indices.h
index dc17890f39..7b61599a55 100644
--- a/tp/Texinfo/XS/parsetexi/indices.h
+++ b/tp/Texinfo/XS/parsetexi/indices.h
@@ -11,9 +11,8 @@ void init_index_commands (void);
 INDEX *index_by_name (char *name);
 void add_index (char *name, int in_code);
 INDEX *index_of_command (enum command_id cmd);
-void enter_index_entry (enum command_id index_type_command,
-                   enum command_id index_at_command, ELEMENT *current,
-                   ELEMENT *content);
+void enter_index_entry (enum command_id index_type_cmd,
+                        ELEMENT *current, ELEMENT *content);
 INDEX *ultimate_index (INDEX *index);
 void wipe_indices (void);
 void set_non_ignored_space_in_index_before_command (ELEMENT *content);
diff --git a/tp/Texinfo/XS/parsetexi/tree_types.h 
b/tp/Texinfo/XS/parsetexi/tree_types.h
index d0c1b084c2..8abec666fa 100644
--- a/tp/Texinfo/XS/parsetexi/tree_types.h
+++ b/tp/Texinfo/XS/parsetexi/tree_types.h
@@ -131,8 +131,6 @@ typedef struct IGNORED_CHARS {
 typedef struct {
     char *index_name;
     char *index_prefix;
-    enum command_id index_at_command;
-    enum command_id index_type_command;
 
     /* content->contents is the index entry text */
     ELEMENT *content;
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 71d8d6237c..441d178436 100644
--- a/tp/t/results/converters_tests/at_commands_in_raw.pl
+++ b/tp/t/results/converters_tests/at_commands_in_raw.pl
@@ -828,10 +828,8 @@ $result_trees{'at_commands_in_raw'} = {
                   'entry_node' => {},
                   'entry_number' => 1,
                   'in_code' => 1,
-                  'index_at_command' => 'findex',
                   'index_ignore_chars' => {},
-                  'index_name' => 'fn',
-                  'index_type_command' => 'findex'
+                  'index_name' => 'fn'
                 }
               },
               'info' => {
diff --git a/tp/t/results/converters_tests/complex_nestings.pl 
b/tp/t/results/converters_tests/complex_nestings.pl
index fa404a11ba..e48b8c5357 100644
--- a/tp/t/results/converters_tests/complex_nestings.pl
+++ b/tp/t/results/converters_tests/complex_nestings.pl
@@ -312,10 +312,8 @@ $result_trees{'complex_nestings'} = {
                       'entry_node' => {},
                       'entry_number' => 1,
                       'in_code' => 1,
-                      'index_at_command' => 'defun',
                       'index_ignore_chars' => {},
-                      'index_name' => 'fn',
-                      'index_type_command' => 'defun'
+                      'index_name' => 'fn'
                     },
                     'original_def_cmdname' => 'defun'
                   },
@@ -418,10 +416,8 @@ $result_trees{'complex_nestings'} = {
                       'entry_node' => {},
                       'entry_number' => 2,
                       'in_code' => 1,
-                      'index_at_command' => 'defunx',
                       'index_ignore_chars' => {},
-                      'index_name' => 'fn',
-                      'index_type_command' => 'defun'
+                      'index_name' => 'fn'
                     },
                     'original_def_cmdname' => 'defunx'
                   },
@@ -564,10 +560,8 @@ $result_trees{'complex_nestings'} = {
                               'entry_node' => {},
                               'entry_number' => 3,
                               'in_code' => 1,
-                              'index_at_command' => 'deffn',
                               'index_ignore_chars' => {},
-                              'index_name' => 'fn',
-                              'index_type_command' => 'deffn'
+                              'index_name' => 'fn'
                             },
                             'original_def_cmdname' => 'deffn'
                           },
@@ -661,10 +655,8 @@ $result_trees{'complex_nestings'} = {
                                       'entry_node' => {},
                                       'entry_number' => 1,
                                       'in_code' => 1,
-                                      'index_at_command' => 'defvar',
                                       'index_ignore_chars' => {},
-                                      'index_name' => 'vr',
-                                      'index_type_command' => 'defvar'
+                                      'index_name' => 'vr'
                                     },
                                     'original_def_cmdname' => 'defvar'
                                   },
@@ -769,10 +761,8 @@ $result_trees{'complex_nestings'} = {
                                       'entry_node' => {},
                                       'entry_number' => 2,
                                       'in_code' => 1,
-                                      'index_at_command' => 'defvarx',
                                       'index_ignore_chars' => {},
-                                      'index_name' => 'vr',
-                                      'index_type_command' => 'defvar'
+                                      'index_name' => 'vr'
                                     },
                                     'original_def_cmdname' => 'defvarx'
                                   },
diff --git a/tp/t/results/converters_tests/definition_commands.pl 
b/tp/t/results/converters_tests/definition_commands.pl
index 38b012b784..b0e3e8064b 100644
--- a/tp/t/results/converters_tests/definition_commands.pl
+++ b/tp/t/results/converters_tests/definition_commands.pl
@@ -242,10 +242,8 @@ $result_trees{'definition_commands'} = {
                   'entry_node' => {},
                   'entry_number' => 1,
                   'in_code' => 1,
-                  'index_at_command' => 'deffn',
                   'index_ignore_chars' => {},
-                  'index_name' => 'fn',
-                  'index_type_command' => 'deffn'
+                  'index_name' => 'fn'
                 },
                 'original_def_cmdname' => 'deffn'
               },
@@ -470,10 +468,8 @@ $result_trees{'definition_commands'} = {
                   'entry_node' => {},
                   'entry_number' => 2,
                   'in_code' => 1,
-                  'index_at_command' => 'deffn',
                   'index_ignore_chars' => {},
-                  'index_name' => 'fn',
-                  'index_type_command' => 'deffn'
+                  'index_name' => 'fn'
                 },
                 'original_def_cmdname' => 'deffn'
               },
@@ -728,10 +724,8 @@ $result_trees{'definition_commands'} = {
                   'entry_node' => {},
                   'entry_number' => 3,
                   'in_code' => 1,
-                  'index_at_command' => 'deffn',
                   'index_ignore_chars' => {},
-                  'index_name' => 'fn',
-                  'index_type_command' => 'deffn'
+                  'index_name' => 'fn'
                 },
                 'original_def_cmdname' => 'deffn'
               },
@@ -1012,10 +1006,8 @@ $result_trees{'definition_commands'} = {
                   'entry_node' => {},
                   'entry_number' => 4,
                   'in_code' => 1,
-                  'index_at_command' => 'defspec',
                   'index_ignore_chars' => {},
-                  'index_name' => 'fn',
-                  'index_type_command' => 'defspec'
+                  'index_name' => 'fn'
                 },
                 'original_def_cmdname' => 'defspec'
               },
@@ -1224,10 +1216,8 @@ $result_trees{'definition_commands'} = {
                   'entry_node' => {},
                   'entry_number' => 5,
                   'in_code' => 1,
-                  'index_at_command' => 'defspecx',
                   'index_ignore_chars' => {},
-                  'index_name' => 'fn',
-                  'index_type_command' => 'defspec'
+                  'index_name' => 'fn'
                 },
                 'original_def_cmdname' => 'defspecx'
               },
@@ -1441,10 +1431,8 @@ $result_trees{'definition_commands'} = {
                   'entry_node' => {},
                   'entry_number' => 6,
                   'in_code' => 1,
-                  'index_at_command' => 'defspecx',
                   'index_ignore_chars' => {},
-                  'index_name' => 'fn',
-                  'index_type_command' => 'defspec'
+                  'index_name' => 'fn'
                 },
                 'original_def_cmdname' => 'defspecx'
               },
@@ -1658,10 +1646,8 @@ $result_trees{'definition_commands'} = {
                   'entry_node' => {},
                   'entry_number' => 7,
                   'in_code' => 1,
-                  'index_at_command' => 'defspecx',
                   'index_ignore_chars' => {},
-                  'index_name' => 'fn',
-                  'index_type_command' => 'defspec'
+                  'index_name' => 'fn'
                 },
                 'original_def_cmdname' => 'defspecx'
               },
@@ -1875,10 +1861,8 @@ $result_trees{'definition_commands'} = {
                   'entry_node' => {},
                   'entry_number' => 8,
                   'in_code' => 1,
-                  'index_at_command' => 'defspecx',
                   'index_ignore_chars' => {},
-                  'index_name' => 'fn',
-                  'index_type_command' => 'defspec'
+                  'index_name' => 'fn'
                 },
                 'original_def_cmdname' => 'defspecx'
               },
@@ -2092,10 +2076,8 @@ $result_trees{'definition_commands'} = {
                   'entry_node' => {},
                   'entry_number' => 9,
                   'in_code' => 1,
-                  'index_at_command' => 'defspecx',
                   'index_ignore_chars' => {},
-                  'index_name' => 'fn',
-                  'index_type_command' => 'defspec'
+                  'index_name' => 'fn'
                 },
                 'original_def_cmdname' => 'defspecx'
               },
@@ -2354,10 +2336,8 @@ $result_trees{'definition_commands'} = {
                   'entry_node' => {},
                   'entry_number' => 10,
                   'in_code' => 1,
-                  'index_at_command' => 'defspecx',
                   'index_ignore_chars' => {},
-                  'index_name' => 'fn',
-                  'index_type_command' => 'defspec'
+                  'index_name' => 'fn'
                 },
                 'original_def_cmdname' => 'defspecx'
               },
@@ -2616,10 +2596,8 @@ $result_trees{'definition_commands'} = {
                   'entry_node' => {},
                   'entry_number' => 11,
                   'in_code' => 1,
-                  'index_at_command' => 'defspecx',
                   'index_ignore_chars' => {},
-                  'index_name' => 'fn',
-                  'index_type_command' => 'defspec'
+                  'index_name' => 'fn'
                 },
                 'original_def_cmdname' => 'defspecx'
               },
@@ -2878,10 +2856,8 @@ $result_trees{'definition_commands'} = {
                   'entry_node' => {},
                   'entry_number' => 12,
                   'in_code' => 1,
-                  'index_at_command' => 'defspecx',
                   'index_ignore_chars' => {},
-                  'index_name' => 'fn',
-                  'index_type_command' => 'defspec'
+                  'index_name' => 'fn'
                 },
                 'original_def_cmdname' => 'defspecx'
               },
@@ -3140,10 +3116,8 @@ $result_trees{'definition_commands'} = {
                   'entry_node' => {},
                   'entry_number' => 13,
                   'in_code' => 1,
-                  'index_at_command' => 'defspecx',
                   'index_ignore_chars' => {},
-                  'index_name' => 'fn',
-                  'index_type_command' => 'defspec'
+                  'index_name' => 'fn'
                 },
                 'original_def_cmdname' => 'defspecx'
               },
@@ -3402,10 +3376,8 @@ $result_trees{'definition_commands'} = {
                   'entry_node' => {},
                   'entry_number' => 14,
                   'in_code' => 1,
-                  'index_at_command' => 'defspecx',
                   'index_ignore_chars' => {},
-                  'index_name' => 'fn',
-                  'index_type_command' => 'defspec'
+                  'index_name' => 'fn'
                 },
                 'original_def_cmdname' => 'defspecx'
               },
@@ -3664,10 +3636,8 @@ $result_trees{'definition_commands'} = {
                   'entry_node' => {},
                   'entry_number' => 15,
                   'in_code' => 1,
-                  'index_at_command' => 'defspecx',
                   'index_ignore_chars' => {},
-                  'index_name' => 'fn',
-                  'index_type_command' => 'defspec'
+                  'index_name' => 'fn'
                 },
                 'original_def_cmdname' => 'defspecx'
               },
@@ -3926,10 +3896,8 @@ $result_trees{'definition_commands'} = {
                   'entry_node' => {},
                   'entry_number' => 16,
                   'in_code' => 1,
-                  'index_at_command' => 'defspecx',
                   'index_ignore_chars' => {},
-                  'index_name' => 'fn',
-                  'index_type_command' => 'defspec'
+                  'index_name' => 'fn'
                 },
                 'original_def_cmdname' => 'defspecx'
               },
@@ -4188,10 +4156,8 @@ $result_trees{'definition_commands'} = {
                   'entry_node' => {},
                   'entry_number' => 17,
                   'in_code' => 1,
-                  'index_at_command' => 'defspecx',
                   'index_ignore_chars' => {},
-                  'index_name' => 'fn',
-                  'index_type_command' => 'defspec'
+                  'index_name' => 'fn'
                 },
                 'original_def_cmdname' => 'defspecx'
               },
@@ -4450,10 +4416,8 @@ $result_trees{'definition_commands'} = {
                   'entry_node' => {},
                   'entry_number' => 18,
                   'in_code' => 1,
-                  'index_at_command' => 'defspecx',
                   'index_ignore_chars' => {},
-                  'index_name' => 'fn',
-                  'index_type_command' => 'defspec'
+                  'index_name' => 'fn'
                 },
                 'original_def_cmdname' => 'defspecx'
               },
@@ -4616,10 +4580,8 @@ $result_trees{'definition_commands'} = {
                   'entry_node' => {},
                   'entry_number' => 19,
                   'in_code' => 1,
-                  'index_at_command' => 'defspec',
                   'index_ignore_chars' => {},
-                  'index_name' => 'fn',
-                  'index_type_command' => 'defspec'
+                  'index_name' => 'fn'
                 },
                 'original_def_cmdname' => 'defspec'
               },
@@ -4727,10 +4689,8 @@ $result_trees{'definition_commands'} = {
                   'entry_node' => {},
                   'entry_number' => 20,
                   'in_code' => 1,
-                  'index_at_command' => 'defspecx',
                   'index_ignore_chars' => {},
-                  'index_name' => 'fn',
-                  'index_type_command' => 'defspec'
+                  'index_name' => 'fn'
                 },
                 'original_def_cmdname' => 'defspecx'
               },
@@ -4843,10 +4803,8 @@ $result_trees{'definition_commands'} = {
                   'entry_node' => {},
                   'entry_number' => 21,
                   'in_code' => 1,
-                  'index_at_command' => 'defspecx',
                   'index_ignore_chars' => {},
-                  'index_name' => 'fn',
-                  'index_type_command' => 'defspec'
+                  'index_name' => 'fn'
                 },
                 'original_def_cmdname' => 'defspecx'
               },
@@ -4959,10 +4917,8 @@ $result_trees{'definition_commands'} = {
                   'entry_node' => {},
                   'entry_number' => 22,
                   'in_code' => 1,
-                  'index_at_command' => 'defspecx',
                   'index_ignore_chars' => {},
-                  'index_name' => 'fn',
-                  'index_type_command' => 'defspec'
+                  'index_name' => 'fn'
                 },
                 'original_def_cmdname' => 'defspecx'
               },
@@ -5075,10 +5031,8 @@ $result_trees{'definition_commands'} = {
                   'entry_node' => {},
                   'entry_number' => 23,
                   'in_code' => 1,
-                  'index_at_command' => 'defspecx',
                   'index_ignore_chars' => {},
-                  'index_name' => 'fn',
-                  'index_type_command' => 'defspec'
+                  'index_name' => 'fn'
                 },
                 'original_def_cmdname' => 'defspecx'
               },
@@ -5191,10 +5145,8 @@ $result_trees{'definition_commands'} = {
                   'entry_node' => {},
                   'entry_number' => 24,
                   'in_code' => 1,
-                  'index_at_command' => 'defspecx',
                   'index_ignore_chars' => {},
-                  'index_name' => 'fn',
-                  'index_type_command' => 'defspec'
+                  'index_name' => 'fn'
                 },
                 'original_def_cmdname' => 'defspecx'
               },
@@ -5322,10 +5274,8 @@ $result_trees{'definition_commands'} = {
                   'entry_node' => {},
                   'entry_number' => 25,
                   'in_code' => 1,
-                  'index_at_command' => 'defspecx',
                   'index_ignore_chars' => {},
-                  'index_name' => 'fn',
-                  'index_type_command' => 'defspec'
+                  'index_name' => 'fn'
                 },
                 'original_def_cmdname' => 'defspecx'
               },
@@ -5453,10 +5403,8 @@ $result_trees{'definition_commands'} = {
                   'entry_node' => {},
                   'entry_number' => 26,
                   'in_code' => 1,
-                  'index_at_command' => 'defspecx',
                   'index_ignore_chars' => {},
-                  'index_name' => 'fn',
-                  'index_type_command' => 'defspec'
+                  'index_name' => 'fn'
                 },
                 'original_def_cmdname' => 'defspecx'
               },
@@ -5584,10 +5532,8 @@ $result_trees{'definition_commands'} = {
                   'entry_node' => {},
                   'entry_number' => 27,
                   'in_code' => 1,
-                  'index_at_command' => 'defspecx',
                   'index_ignore_chars' => {},
-                  'index_name' => 'fn',
-                  'index_type_command' => 'defspec'
+                  'index_name' => 'fn'
                 },
                 'original_def_cmdname' => 'defspecx'
               },
@@ -5715,10 +5661,8 @@ $result_trees{'definition_commands'} = {
                   'entry_node' => {},
                   'entry_number' => 28,
                   'in_code' => 1,
-                  'index_at_command' => 'defspecx',
                   'index_ignore_chars' => {},
-                  'index_name' => 'fn',
-                  'index_type_command' => 'defspec'
+                  'index_name' => 'fn'
                 },
                 'original_def_cmdname' => 'defspecx'
               },
@@ -5846,10 +5790,8 @@ $result_trees{'definition_commands'} = {
                   'entry_node' => {},
                   'entry_number' => 29,
                   'in_code' => 1,
-                  'index_at_command' => 'defspecx',
                   'index_ignore_chars' => {},
-                  'index_name' => 'fn',
-                  'index_type_command' => 'defspec'
+                  'index_name' => 'fn'
                 },
                 'original_def_cmdname' => 'defspecx'
               },
@@ -5977,10 +5919,8 @@ $result_trees{'definition_commands'} = {
                   'entry_node' => {},
                   'entry_number' => 30,
                   'in_code' => 1,
-                  'index_at_command' => 'defspecx',
                   'index_ignore_chars' => {},
-                  'index_name' => 'fn',
-                  'index_type_command' => 'defspec'
+                  'index_name' => 'fn'
                 },
                 'original_def_cmdname' => 'defspecx'
               },
@@ -6108,10 +6048,8 @@ $result_trees{'definition_commands'} = {
                   'entry_node' => {},
                   'entry_number' => 31,
                   'in_code' => 1,
-                  'index_at_command' => 'defspecx',
                   'index_ignore_chars' => {},
-                  'index_name' => 'fn',
-                  'index_type_command' => 'defspec'
+                  'index_name' => 'fn'
                 },
                 'original_def_cmdname' => 'defspecx'
               },
@@ -6239,10 +6177,8 @@ $result_trees{'definition_commands'} = {
                   'entry_node' => {},
                   'entry_number' => 32,
                   'in_code' => 1,
-                  'index_at_command' => 'defspecx',
                   'index_ignore_chars' => {},
-                  'index_name' => 'fn',
-                  'index_type_command' => 'defspec'
+                  'index_name' => 'fn'
                 },
                 'original_def_cmdname' => 'defspecx'
               },
@@ -6370,10 +6306,8 @@ $result_trees{'definition_commands'} = {
                   'entry_node' => {},
                   'entry_number' => 33,
                   'in_code' => 1,
-                  'index_at_command' => 'defspecx',
                   'index_ignore_chars' => {},
-                  'index_name' => 'fn',
-                  'index_type_command' => 'defspec'
+                  'index_name' => 'fn'
                 },
                 'original_def_cmdname' => 'defspecx'
               },
@@ -6577,10 +6511,8 @@ $result_trees{'definition_commands'} = {
                   'entry_node' => {},
                   'entry_number' => 34,
                   'in_code' => 1,
-                  'index_at_command' => 'deffn',
                   'index_ignore_chars' => {},
-                  'index_name' => 'fn',
-                  'index_type_command' => 'deffn'
+                  'index_name' => 'fn'
                 },
                 'original_def_cmdname' => 'deffn'
               },
@@ -6729,10 +6661,8 @@ $result_trees{'definition_commands'} = {
                   'entry_node' => {},
                   'entry_number' => 35,
                   'in_code' => 1,
-                  'index_at_command' => 'deffnx',
                   'index_ignore_chars' => {},
-                  'index_name' => 'fn',
-                  'index_type_command' => 'deffn'
+                  'index_name' => 'fn'
                 },
                 'original_def_cmdname' => 'deffnx'
               },
@@ -6886,10 +6816,8 @@ $result_trees{'definition_commands'} = {
                   'entry_node' => {},
                   'entry_number' => 36,
                   'in_code' => 1,
-                  'index_at_command' => 'deffnx',
                   'index_ignore_chars' => {},
-                  'index_name' => 'fn',
-                  'index_type_command' => 'deffn'
+                  'index_name' => 'fn'
                 },
                 'original_def_cmdname' => 'deffnx'
               },
@@ -7133,10 +7061,8 @@ $result_trees{'definition_commands'} = {
                   'entry_node' => {},
                   'entry_number' => 37,
                   'in_code' => 1,
-                  'index_at_command' => 'deffnx',
                   'index_ignore_chars' => {},
-                  'index_name' => 'fn',
-                  'index_type_command' => 'deffn'
+                  'index_name' => 'fn'
                 },
                 'original_def_cmdname' => 'deffnx'
               },
@@ -7218,10 +7144,8 @@ $result_trees{'definition_commands'} = {
                   'entry_node' => {},
                   'entry_number' => 38,
                   'in_code' => 1,
-                  'index_at_command' => 'deffnx',
                   'index_ignore_chars' => {},
-                  'index_name' => 'fn',
-                  'index_type_command' => 'deffn'
+                  'index_name' => 'fn'
                 },
                 'original_def_cmdname' => 'deffnx'
               },
@@ -8420,10 +8344,8 @@ $result_trees{'definition_commands'} = {
                   'entry_node' => {},
                   'entry_number' => 39,
                   'in_code' => 1,
-                  'index_at_command' => 'defspec',
                   'index_ignore_chars' => {},
-                  'index_name' => 'fn',
-                  'index_type_command' => 'defspec'
+                  'index_name' => 'fn'
                 },
                 'original_def_cmdname' => 'defspec'
               },
@@ -8767,10 +8689,8 @@ $result_trees{'definition_commands'} = {
                   'entry_node' => {},
                   'entry_number' => 40,
                   'in_code' => 1,
-                  'index_at_command' => 'defspecx',
                   'index_ignore_chars' => {},
-                  'index_name' => 'fn',
-                  'index_type_command' => 'defspec'
+                  'index_name' => 'fn'
                 },
                 'original_def_cmdname' => 'defspecx'
               },
@@ -9029,10 +8949,8 @@ $result_trees{'definition_commands'} = {
                   'entry_node' => {},
                   'entry_number' => 41,
                   'in_code' => 1,
-                  'index_at_command' => 'deftypefn',
                   'index_ignore_chars' => {},
-                  'index_name' => 'fn',
-                  'index_type_command' => 'deftypefn'
+                  'index_name' => 'fn'
                 },
                 'original_def_cmdname' => 'deftypefn'
               },
@@ -9371,10 +9289,8 @@ $result_trees{'definition_commands'} = {
                   'entry_node' => {},
                   'entry_number' => 42,
                   'in_code' => 1,
-                  'index_at_command' => 'deftypefn',
                   'index_ignore_chars' => {},
-                  'index_name' => 'fn',
-                  'index_type_command' => 'deftypefn'
+                  'index_name' => 'fn'
                 },
                 'original_def_cmdname' => 'deftypefn'
               },
@@ -9604,10 +9520,8 @@ $result_trees{'definition_commands'} = {
                   'entry_node' => {},
                   'entry_number' => 1,
                   'in_code' => 1,
-                  'index_at_command' => 'defcv',
                   'index_ignore_chars' => {},
-                  'index_name' => 'vr',
-                  'index_type_command' => 'defcv'
+                  'index_name' => 'vr'
                 },
                 'original_def_cmdname' => 'defcv'
               },
@@ -9808,10 +9722,8 @@ $result_trees{'definition_commands'} = {
                   'entry_node' => {},
                   'entry_number' => 2,
                   'in_code' => 1,
-                  'index_at_command' => 'deftypecv',
                   'index_ignore_chars' => {},
-                  'index_name' => 'vr',
-                  'index_type_command' => 'deftypecv'
+                  'index_name' => 'vr'
                 },
                 'original_def_cmdname' => 'deftypecv'
               },
@@ -10092,10 +10004,8 @@ $result_trees{'definition_commands'} = {
                       'entry_node' => {},
                       'entry_number' => 43,
                       'in_code' => 1,
-                      'index_at_command' => 'deftypefn',
                       'index_ignore_chars' => {},
-                      'index_name' => 'fn',
-                      'index_type_command' => 'deftypefn'
+                      'index_name' => 'fn'
                     },
                     'original_def_cmdname' => 'deftypefn'
                   },
@@ -10360,10 +10270,8 @@ $result_trees{'definition_commands'} = {
                   'entry_node' => {},
                   'entry_number' => 44,
                   'in_code' => 1,
-                  'index_at_command' => 'defun',
                   'index_ignore_chars' => {},
-                  'index_name' => 'fn',
-                  'index_type_command' => 'defun'
+                  'index_name' => 'fn'
                 },
                 'original_def_cmdname' => 'defun'
               },
@@ -10624,10 +10532,8 @@ $result_trees{'definition_commands'} = {
                   'entry_node' => {},
                   'entry_number' => 45,
                   'in_code' => 1,
-                  'index_at_command' => 'defun',
                   'index_ignore_chars' => {},
-                  'index_name' => 'fn',
-                  'index_type_command' => 'defun'
+                  'index_name' => 'fn'
                 },
                 'original_def_cmdname' => 'defun'
               },
@@ -11109,10 +11015,8 @@ $result_trees{'definition_commands'} = {
                   'entry_node' => {},
                   'entry_number' => 46,
                   'in_code' => 1,
-                  'index_at_command' => 'deffn',
                   'index_ignore_chars' => {},
-                  'index_name' => 'fn',
-                  'index_type_command' => 'deffn'
+                  'index_name' => 'fn'
                 },
                 'original_def_cmdname' => 'deffn'
               },
@@ -11393,10 +11297,8 @@ $result_trees{'definition_commands'} = {
                   'entry_node' => {},
                   'entry_number' => 47,
                   'in_code' => 1,
-                  'index_at_command' => 'deftypefn',
                   'index_ignore_chars' => {},
-                  'index_name' => 'fn',
-                  'index_type_command' => 'deftypefn'
+                  'index_name' => 'fn'
                 },
                 'original_def_cmdname' => 'deftypefn'
               },
@@ -11640,10 +11542,8 @@ $result_trees{'definition_commands'} = {
                   'entry_node' => {},
                   'entry_number' => 48,
                   'in_code' => 1,
-                  'index_at_command' => 'deftypefnx',
                   'index_ignore_chars' => {},
-                  'index_name' => 'fn',
-                  'index_type_command' => 'deftypefn'
+                  'index_name' => 'fn'
                 },
                 'original_def_cmdname' => 'deftypefnx'
               },
@@ -11892,10 +11792,8 @@ $result_trees{'definition_commands'} = {
                   'entry_node' => {},
                   'entry_number' => 49,
                   'in_code' => 1,
-                  'index_at_command' => 'deftypefnx',
                   'index_ignore_chars' => {},
-                  'index_name' => 'fn',
-                  'index_type_command' => 'deftypefn'
+                  'index_name' => 'fn'
                 },
                 'original_def_cmdname' => 'deftypefnx'
               },
@@ -12144,10 +12042,8 @@ $result_trees{'definition_commands'} = {
                   'entry_node' => {},
                   'entry_number' => 50,
                   'in_code' => 1,
-                  'index_at_command' => 'deftypefnx',
                   'index_ignore_chars' => {},
-                  'index_name' => 'fn',
-                  'index_type_command' => 'deftypefn'
+                  'index_name' => 'fn'
                 },
                 'original_def_cmdname' => 'deftypefnx'
               },
@@ -12396,10 +12292,8 @@ $result_trees{'definition_commands'} = {
                   'entry_node' => {},
                   'entry_number' => 51,
                   'in_code' => 1,
-                  'index_at_command' => 'deftypefnx',
                   'index_ignore_chars' => {},
-                  'index_name' => 'fn',
-                  'index_type_command' => 'deftypefn'
+                  'index_name' => 'fn'
                 },
                 'original_def_cmdname' => 'deftypefnx'
               },
@@ -12648,10 +12542,8 @@ $result_trees{'definition_commands'} = {
                   'entry_node' => {},
                   'entry_number' => 52,
                   'in_code' => 1,
-                  'index_at_command' => 'deftypefnx',
                   'index_ignore_chars' => {},
-                  'index_name' => 'fn',
-                  'index_type_command' => 'deftypefn'
+                  'index_name' => 'fn'
                 },
                 'original_def_cmdname' => 'deftypefnx'
               },
@@ -12930,10 +12822,8 @@ $result_trees{'definition_commands'} = {
                   'entry_node' => {},
                   'entry_number' => 53,
                   'in_code' => 1,
-                  'index_at_command' => 'deftypefnx',
                   'index_ignore_chars' => {},
-                  'index_name' => 'fn',
-                  'index_type_command' => 'deftypefn'
+                  'index_name' => 'fn'
                 },
                 'original_def_cmdname' => 'deftypefnx'
               },
@@ -13212,10 +13102,8 @@ $result_trees{'definition_commands'} = {
                   'entry_node' => {},
                   'entry_number' => 54,
                   'in_code' => 1,
-                  'index_at_command' => 'deftypefnx',
                   'index_ignore_chars' => {},
-                  'index_name' => 'fn',
-                  'index_type_command' => 'deftypefn'
+                  'index_name' => 'fn'
                 },
                 'original_def_cmdname' => 'deftypefnx'
               },
@@ -13494,10 +13382,8 @@ $result_trees{'definition_commands'} = {
                   'entry_node' => {},
                   'entry_number' => 55,
                   'in_code' => 1,
-                  'index_at_command' => 'deftypefnx',
                   'index_ignore_chars' => {},
-                  'index_name' => 'fn',
-                  'index_type_command' => 'deftypefn'
+                  'index_name' => 'fn'
                 },
                 'original_def_cmdname' => 'deftypefnx'
               },
@@ -13776,10 +13662,8 @@ $result_trees{'definition_commands'} = {
                   'entry_node' => {},
                   'entry_number' => 56,
                   'in_code' => 1,
-                  'index_at_command' => 'deftypefnx',
                   'index_ignore_chars' => {},
-                  'index_name' => 'fn',
-                  'index_type_command' => 'deftypefn'
+                  'index_name' => 'fn'
                 },
                 'original_def_cmdname' => 'deftypefnx'
               },
@@ -14058,10 +13942,8 @@ $result_trees{'definition_commands'} = {
                   'entry_node' => {},
                   'entry_number' => 57,
                   'in_code' => 1,
-                  'index_at_command' => 'deftypefnx',
                   'index_ignore_chars' => {},
-                  'index_name' => 'fn',
-                  'index_type_command' => 'deftypefn'
+                  'index_name' => 'fn'
                 },
                 'original_def_cmdname' => 'deftypefnx'
               },
@@ -14340,10 +14222,8 @@ $result_trees{'definition_commands'} = {
                   'entry_node' => {},
                   'entry_number' => 58,
                   'in_code' => 1,
-                  'index_at_command' => 'deftypefnx',
                   'index_ignore_chars' => {},
-                  'index_name' => 'fn',
-                  'index_type_command' => 'deftypefn'
+                  'index_name' => 'fn'
                 },
                 'original_def_cmdname' => 'deftypefnx'
               },
@@ -14622,10 +14502,8 @@ $result_trees{'definition_commands'} = {
                   'entry_node' => {},
                   'entry_number' => 59,
                   'in_code' => 1,
-                  'index_at_command' => 'deftypefnx',
                   'index_ignore_chars' => {},
-                  'index_name' => 'fn',
-                  'index_type_command' => 'deftypefn'
+                  'index_name' => 'fn'
                 },
                 'original_def_cmdname' => 'deftypefnx'
               },
@@ -14904,10 +14782,8 @@ $result_trees{'definition_commands'} = {
                   'entry_node' => {},
                   'entry_number' => 60,
                   'in_code' => 1,
-                  'index_at_command' => 'deftypefnx',
                   'index_ignore_chars' => {},
-                  'index_name' => 'fn',
-                  'index_type_command' => 'deftypefn'
+                  'index_name' => 'fn'
                 },
                 'original_def_cmdname' => 'deftypefnx'
               },
@@ -15186,10 +15062,8 @@ $result_trees{'definition_commands'} = {
                   'entry_node' => {},
                   'entry_number' => 61,
                   'in_code' => 1,
-                  'index_at_command' => 'deftypefnx',
                   'index_ignore_chars' => {},
-                  'index_name' => 'fn',
-                  'index_type_command' => 'deftypefn'
+                  'index_name' => 'fn'
                 },
                 'original_def_cmdname' => 'deftypefnx'
               },
@@ -15475,10 +15349,8 @@ $result_trees{'definition_commands'} = {
                   'entry_node' => {},
                   'entry_number' => 62,
                   'in_code' => 1,
-                  'index_at_command' => 'deftypefn',
                   'index_ignore_chars' => {},
-                  'index_name' => 'fn',
-                  'index_type_command' => 'deftypefn'
+                  'index_name' => 'fn'
                 },
                 'original_def_cmdname' => 'deftypefn'
               },
@@ -15709,10 +15581,8 @@ $result_trees{'definition_commands'} = {
                   'entry_node' => {},
                   'entry_number' => 63,
                   'in_code' => 1,
-                  'index_at_command' => 'deftypefnx',
                   'index_ignore_chars' => {},
-                  'index_name' => 'fn',
-                  'index_type_command' => 'deftypefn'
+                  'index_name' => 'fn'
                 },
                 'original_def_cmdname' => 'deftypefnx'
               },
@@ -15948,10 +15818,8 @@ $result_trees{'definition_commands'} = {
                   'entry_node' => {},
                   'entry_number' => 64,
                   'in_code' => 1,
-                  'index_at_command' => 'deftypefnx',
                   'index_ignore_chars' => {},
-                  'index_name' => 'fn',
-                  'index_type_command' => 'deftypefn'
+                  'index_name' => 'fn'
                 },
                 'original_def_cmdname' => 'deftypefnx'
               },
@@ -16187,10 +16055,8 @@ $result_trees{'definition_commands'} = {
                   'entry_node' => {},
                   'entry_number' => 65,
                   'in_code' => 1,
-                  'index_at_command' => 'deftypefnx',
                   'index_ignore_chars' => {},
-                  'index_name' => 'fn',
-                  'index_type_command' => 'deftypefn'
+                  'index_name' => 'fn'
                 },
                 'original_def_cmdname' => 'deftypefnx'
               },
@@ -16426,10 +16292,8 @@ $result_trees{'definition_commands'} = {
                   'entry_node' => {},
                   'entry_number' => 66,
                   'in_code' => 1,
-                  'index_at_command' => 'deftypefnx',
                   'index_ignore_chars' => {},
-                  'index_name' => 'fn',
-                  'index_type_command' => 'deftypefn'
+                  'index_name' => 'fn'
                 },
                 'original_def_cmdname' => 'deftypefnx'
               },
@@ -16665,10 +16529,8 @@ $result_trees{'definition_commands'} = {
                   'entry_node' => {},
                   'entry_number' => 67,
                   'in_code' => 1,
-                  'index_at_command' => 'deftypefnx',
                   'index_ignore_chars' => {},
-                  'index_name' => 'fn',
-                  'index_type_command' => 'deftypefn'
+                  'index_name' => 'fn'
                 },
                 'original_def_cmdname' => 'deftypefnx'
               },
@@ -16919,10 +16781,8 @@ $result_trees{'definition_commands'} = {
                   'entry_node' => {},
                   'entry_number' => 68,
                   'in_code' => 1,
-                  'index_at_command' => 'deftypefnx',
                   'index_ignore_chars' => {},
-                  'index_name' => 'fn',
-                  'index_type_command' => 'deftypefn'
+                  'index_name' => 'fn'
                 },
                 'original_def_cmdname' => 'deftypefnx'
               },
@@ -17173,10 +17033,8 @@ $result_trees{'definition_commands'} = {
                   'entry_node' => {},
                   'entry_number' => 69,
                   'in_code' => 1,
-                  'index_at_command' => 'deftypefnx',
                   'index_ignore_chars' => {},
-                  'index_name' => 'fn',
-                  'index_type_command' => 'deftypefn'
+                  'index_name' => 'fn'
                 },
                 'original_def_cmdname' => 'deftypefnx'
               },
@@ -17427,10 +17285,8 @@ $result_trees{'definition_commands'} = {
                   'entry_node' => {},
                   'entry_number' => 70,
                   'in_code' => 1,
-                  'index_at_command' => 'deftypefnx',
                   'index_ignore_chars' => {},
-                  'index_name' => 'fn',
-                  'index_type_command' => 'deftypefn'
+                  'index_name' => 'fn'
                 },
                 'original_def_cmdname' => 'deftypefnx'
               },
@@ -17681,10 +17537,8 @@ $result_trees{'definition_commands'} = {
                   'entry_node' => {},
                   'entry_number' => 71,
                   'in_code' => 1,
-                  'index_at_command' => 'deftypefnx',
                   'index_ignore_chars' => {},
-                  'index_name' => 'fn',
-                  'index_type_command' => 'deftypefn'
+                  'index_name' => 'fn'
                 },
                 'original_def_cmdname' => 'deftypefnx'
               },
@@ -17935,10 +17789,8 @@ $result_trees{'definition_commands'} = {
                   'entry_node' => {},
                   'entry_number' => 72,
                   'in_code' => 1,
-                  'index_at_command' => 'deftypefnx',
                   'index_ignore_chars' => {},
-                  'index_name' => 'fn',
-                  'index_type_command' => 'deftypefn'
+                  'index_name' => 'fn'
                 },
                 'original_def_cmdname' => 'deftypefnx'
               },
@@ -18189,10 +18041,8 @@ $result_trees{'definition_commands'} = {
                   'entry_node' => {},
                   'entry_number' => 73,
                   'in_code' => 1,
-                  'index_at_command' => 'deftypefnx',
                   'index_ignore_chars' => {},
-                  'index_name' => 'fn',
-                  'index_type_command' => 'deftypefn'
+                  'index_name' => 'fn'
                 },
                 'original_def_cmdname' => 'deftypefnx'
               },
@@ -18443,10 +18293,8 @@ $result_trees{'definition_commands'} = {
                   'entry_node' => {},
                   'entry_number' => 74,
                   'in_code' => 1,
-                  'index_at_command' => 'deftypefnx',
                   'index_ignore_chars' => {},
-                  'index_name' => 'fn',
-                  'index_type_command' => 'deftypefn'
+                  'index_name' => 'fn'
                 },
                 'original_def_cmdname' => 'deftypefnx'
               },
@@ -18697,10 +18545,8 @@ $result_trees{'definition_commands'} = {
                   'entry_node' => {},
                   'entry_number' => 75,
                   'in_code' => 1,
-                  'index_at_command' => 'deftypefnx',
                   'index_ignore_chars' => {},
-                  'index_name' => 'fn',
-                  'index_type_command' => 'deftypefn'
+                  'index_name' => 'fn'
                 },
                 'original_def_cmdname' => 'deftypefnx'
               },
@@ -18951,10 +18797,8 @@ $result_trees{'definition_commands'} = {
                   'entry_node' => {},
                   'entry_number' => 76,
                   'in_code' => 1,
-                  'index_at_command' => 'deftypefnx',
                   'index_ignore_chars' => {},
-                  'index_name' => 'fn',
-                  'index_type_command' => 'deftypefn'
+                  'index_name' => 'fn'
                 },
                 'original_def_cmdname' => 'deftypefnx'
               },
diff --git a/tp/t/results/converters_tests/form_feeds.pl 
b/tp/t/results/converters_tests/form_feeds.pl
index aa3c13066a..3d64a3c402 100644
--- a/tp/t/results/converters_tests/form_feeds.pl
+++ b/tp/t/results/converters_tests/form_feeds.pl
@@ -631,10 +631,8 @@ $result_trees{'form_feeds'} = {
                   'entry_node' => {},
                   'entry_number' => 1,
                   'in_code' => 1,
-                  'index_at_command' => 'deffn',
                   'index_ignore_chars' => {},
-                  'index_name' => 'fn',
-                  'index_type_command' => 'deffn'
+                  'index_name' => 'fn'
                 },
                 'original_def_cmdname' => 'deffn'
               },
@@ -825,10 +823,8 @@ $result_trees{'form_feeds'} = {
                   'entry_node' => {},
                   'entry_number' => 2,
                   'in_code' => 1,
-                  'index_at_command' => 'deffnx',
                   'index_ignore_chars' => {},
-                  'index_name' => 'fn',
-                  'index_type_command' => 'deffn'
+                  'index_name' => 'fn'
                 },
                 'original_def_cmdname' => 'deffnx'
               },
diff --git a/tp/t/results/converters_tests/frenchspacing_and_code.pl 
b/tp/t/results/converters_tests/frenchspacing_and_code.pl
index e9374eb79a..096b6fabe0 100644
--- a/tp/t/results/converters_tests/frenchspacing_and_code.pl
+++ b/tp/t/results/converters_tests/frenchspacing_and_code.pl
@@ -540,10 +540,8 @@ $result_trees{'frenchspacing_and_code'} = {
                   'entry_node' => {},
                   'entry_number' => 1,
                   'in_code' => 1,
-                  'index_at_command' => 'deftypeop',
                   'index_ignore_chars' => {},
-                  'index_name' => 'fn',
-                  'index_type_command' => 'deftypeop'
+                  'index_name' => 'fn'
                 },
                 'original_def_cmdname' => 'deftypeop'
               },
@@ -817,10 +815,8 @@ $result_trees{'frenchspacing_and_code'} = {
                   'entry_node' => {},
                   'entry_number' => 2,
                   'in_code' => 1,
-                  'index_at_command' => 'defop',
                   'index_ignore_chars' => {},
-                  'index_name' => 'fn',
-                  'index_type_command' => 'defop'
+                  'index_name' => 'fn'
                 },
                 'original_def_cmdname' => 'defop'
               },
@@ -1345,10 +1341,8 @@ $result_trees{'frenchspacing_and_code'} = {
                   'entry_node' => {},
                   'entry_number' => 3,
                   'in_code' => 1,
-                  'index_at_command' => 'deftypeop',
                   'index_ignore_chars' => {},
-                  'index_name' => 'fn',
-                  'index_type_command' => 'deftypeop'
+                  'index_name' => 'fn'
                 },
                 'original_def_cmdname' => 'deftypeop'
               },
@@ -1622,10 +1616,8 @@ $result_trees{'frenchspacing_and_code'} = {
                   'entry_node' => {},
                   'entry_number' => 4,
                   'in_code' => 1,
-                  'index_at_command' => 'defop',
                   'index_ignore_chars' => {},
-                  'index_name' => 'fn',
-                  'index_type_command' => 'defop'
+                  'index_name' => 'fn'
                 },
                 'original_def_cmdname' => 'defop'
               },
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 87a8aca559..de1d0587d3 100644
--- a/tp/t/results/converters_tests/index_entry_in_preformatted.pl
+++ b/tp/t/results/converters_tests/index_entry_in_preformatted.pl
@@ -199,10 +199,8 @@ $result_trees{'index_entry_in_preformatted'} = {
                       'entry_node' => {},
                       'entry_number' => 1,
                       'in_code' => 0,
-                      'index_at_command' => 'cindex',
                       'index_ignore_chars' => {},
-                      'index_name' => 'cp',
-                      'index_type_command' => 'cindex'
+                      'index_name' => 'cp'
                     }
                   },
                   'info' => {
@@ -267,10 +265,8 @@ $result_trees{'index_entry_in_preformatted'} = {
                       'entry_node' => {},
                       'entry_number' => 2,
                       'in_code' => 0,
-                      'index_at_command' => 'cindex',
                       'index_ignore_chars' => {},
-                      'index_name' => 'cp',
-                      'index_type_command' => 'cindex'
+                      'index_name' => 'cp'
                     }
                   },
                   'info' => {
@@ -315,10 +311,8 @@ $result_trees{'index_entry_in_preformatted'} = {
                       'entry_node' => {},
                       'entry_number' => 3,
                       'in_code' => 0,
-                      'index_at_command' => 'cindex',
                       'index_ignore_chars' => {},
-                      'index_name' => 'cp',
-                      'index_type_command' => 'cindex'
+                      'index_name' => 'cp'
                     }
                   },
                   'info' => {
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 60abb38f3d..b44087669f 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
@@ -247,10 +247,8 @@ $result_trees{'indices_in_begin_tables_lists'} = {
                       'entry_node' => {},
                       'entry_number' => 1,
                       'in_code' => 0,
-                      'index_at_command' => 'cindex',
                       'index_ignore_chars' => {},
-                      'index_name' => 'cp',
-                      'index_type_command' => 'cindex'
+                      'index_name' => 'cp'
                     }
                   },
                   'info' => {
@@ -399,10 +397,8 @@ $result_trees{'indices_in_begin_tables_lists'} = {
                       'entry_node' => {},
                       'entry_number' => 2,
                       'in_code' => 0,
-                      'index_at_command' => 'cindex',
                       'index_ignore_chars' => {},
-                      'index_name' => 'cp',
-                      'index_type_command' => 'cindex'
+                      'index_name' => 'cp'
                     }
                   },
                   'info' => {
@@ -485,10 +481,8 @@ $result_trees{'indices_in_begin_tables_lists'} = {
                       'entry_node' => {},
                       'entry_number' => 3,
                       'in_code' => 0,
-                      'index_at_command' => 'cindex',
                       'index_ignore_chars' => {},
-                      'index_name' => 'cp',
-                      'index_type_command' => 'cindex'
+                      'index_name' => 'cp'
                     }
                   },
                   'info' => {
@@ -644,10 +638,8 @@ $result_trees{'indices_in_begin_tables_lists'} = {
                           'entry_node' => {},
                           'entry_number' => 4,
                           'in_code' => 0,
-                          'index_at_command' => 'cindex',
                           'index_ignore_chars' => {},
-                          'index_name' => 'cp',
-                          'index_type_command' => 'cindex'
+                          'index_name' => 'cp'
                         }
                       },
                       'info' => {
@@ -901,10 +893,8 @@ $result_trees{'indices_in_begin_tables_lists'} = {
                       'entry_node' => {},
                       'entry_number' => 5,
                       'in_code' => 0,
-                      'index_at_command' => 'cindex',
                       'index_ignore_chars' => {},
-                      'index_name' => 'cp',
-                      'index_type_command' => 'cindex'
+                      'index_name' => 'cp'
                     }
                   },
                   'info' => {
@@ -1047,10 +1037,8 @@ $result_trees{'indices_in_begin_tables_lists'} = {
                       'entry_node' => {},
                       'entry_number' => 6,
                       'in_code' => 0,
-                      'index_at_command' => 'cindex',
                       'index_ignore_chars' => {},
-                      'index_name' => 'cp',
-                      'index_type_command' => 'cindex'
+                      'index_name' => 'cp'
                     }
                   },
                   'info' => {
@@ -1183,10 +1171,8 @@ $result_trees{'indices_in_begin_tables_lists'} = {
                       'entry_node' => {},
                       'entry_number' => 7,
                       'in_code' => 0,
-                      'index_at_command' => 'cindex',
                       'index_ignore_chars' => {},
-                      'index_name' => 'cp',
-                      'index_type_command' => 'cindex'
+                      'index_name' => 'cp'
                     }
                   },
                   'info' => {
@@ -1330,10 +1316,8 @@ $result_trees{'indices_in_begin_tables_lists'} = {
                           'entry_node' => {},
                           'entry_number' => 8,
                           'in_code' => 0,
-                          'index_at_command' => 'cindex',
                           'index_ignore_chars' => {},
-                          'index_name' => 'cp',
-                          'index_type_command' => 'cindex'
+                          'index_name' => 'cp'
                         }
                       },
                       'info' => {
@@ -1469,10 +1453,8 @@ $result_trees{'indices_in_begin_tables_lists'} = {
                       'entry_node' => {},
                       'entry_number' => 9,
                       'in_code' => 0,
-                      'index_at_command' => 'cindex',
                       'index_ignore_chars' => {},
-                      'index_name' => 'cp',
-                      'index_type_command' => 'cindex'
+                      'index_name' => 'cp'
                     }
                   },
                   'info' => {
@@ -1529,10 +1511,8 @@ $result_trees{'indices_in_begin_tables_lists'} = {
                       'entry_node' => {},
                       'entry_number' => 10,
                       'in_code' => 0,
-                      'index_at_command' => 'cindex',
                       'index_ignore_chars' => {},
-                      'index_name' => 'cp',
-                      'index_type_command' => 'cindex'
+                      'index_name' => 'cp'
                     }
                   },
                   'info' => {
@@ -1573,10 +1553,8 @@ $result_trees{'indices_in_begin_tables_lists'} = {
                       'entry_node' => {},
                       'entry_number' => 11,
                       'in_code' => 0,
-                      'index_at_command' => 'cindex',
                       'index_ignore_chars' => {},
-                      'index_name' => 'cp',
-                      'index_type_command' => 'cindex'
+                      'index_name' => 'cp'
                     }
                   },
                   'info' => {
@@ -1738,10 +1716,8 @@ $result_trees{'indices_in_begin_tables_lists'} = {
                           'entry_node' => {},
                           'entry_number' => 1,
                           'in_code' => 1,
-                          'index_at_command' => 'item',
                           'index_ignore_chars' => {},
-                          'index_name' => 'vr',
-                          'index_type_command' => 'vtable'
+                          'index_name' => 'vr'
                         }
                       },
                       'info' => {
@@ -1882,10 +1858,8 @@ $result_trees{'indices_in_begin_tables_lists'} = {
                           'entry_node' => {},
                           'entry_number' => 2,
                           'in_code' => 1,
-                          'index_at_command' => 'item',
                           'index_ignore_chars' => {},
-                          'index_name' => 'vr',
-                          'index_type_command' => 'vtable'
+                          'index_name' => 'vr'
                         }
                       },
                       'info' => {
@@ -1946,10 +1920,8 @@ $result_trees{'indices_in_begin_tables_lists'} = {
                           'entry_node' => {},
                           'entry_number' => 3,
                           'in_code' => 1,
-                          'index_at_command' => 'itemx',
                           'index_ignore_chars' => {},
-                          'index_name' => 'vr',
-                          'index_type_command' => 'vtable'
+                          'index_name' => 'vr'
                         }
                       },
                       'info' => {
@@ -2090,10 +2062,8 @@ $result_trees{'indices_in_begin_tables_lists'} = {
                           'entry_node' => {},
                           'entry_number' => 1,
                           'in_code' => 1,
-                          'index_at_command' => 'item',
                           'index_ignore_chars' => {},
-                          'index_name' => 'fn',
-                          'index_type_command' => 'ftable'
+                          'index_name' => 'fn'
                         }
                       },
                       'info' => {
@@ -2135,10 +2105,8 @@ $result_trees{'indices_in_begin_tables_lists'} = {
                               'entry_node' => {},
                               'entry_number' => 12,
                               'in_code' => 0,
-                              'index_at_command' => 'cindex',
                               'index_ignore_chars' => {},
-                              'index_name' => 'cp',
-                              'index_type_command' => 'cindex'
+                              'index_name' => 'cp'
                             }
                           },
                           'info' => {
@@ -2214,10 +2182,8 @@ $result_trees{'indices_in_begin_tables_lists'} = {
                           'entry_node' => {},
                           'entry_number' => 2,
                           'in_code' => 1,
-                          'index_at_command' => 'itemx',
                           'index_ignore_chars' => {},
-                          'index_name' => 'fn',
-                          'index_type_command' => 'ftable'
+                          'index_name' => 'fn'
                         }
                       },
                       'info' => {
@@ -2281,10 +2247,8 @@ $result_trees{'indices_in_begin_tables_lists'} = {
                           'entry_node' => {},
                           'entry_number' => 3,
                           'in_code' => 1,
-                          'index_at_command' => 'item',
                           'index_ignore_chars' => {},
-                          'index_name' => 'fn',
-                          'index_type_command' => 'ftable'
+                          'index_name' => 'fn'
                         }
                       },
                       'info' => {
@@ -2355,10 +2319,8 @@ $result_trees{'indices_in_begin_tables_lists'} = {
                           'entry_node' => {},
                           'entry_number' => 4,
                           'in_code' => 1,
-                          'index_at_command' => 'itemx',
                           'index_ignore_chars' => {},
-                          'index_name' => 'fn',
-                          'index_type_command' => 'ftable'
+                          'index_name' => 'fn'
                         }
                       },
                       'info' => {
@@ -2511,10 +2473,8 @@ $result_trees{'indices_in_begin_tables_lists'} = {
                           'entry_node' => {},
                           'entry_number' => 13,
                           'in_code' => 0,
-                          'index_at_command' => 'cindex',
                           'index_ignore_chars' => {},
-                          'index_name' => 'cp',
-                          'index_type_command' => 'cindex'
+                          'index_name' => 'cp'
                         }
                       },
                       'info' => {
@@ -2699,10 +2659,8 @@ $result_trees{'indices_in_begin_tables_lists'} = {
                       'entry_node' => {},
                       'entry_number' => 14,
                       'in_code' => 0,
-                      'index_at_command' => 'cindex',
                       'index_ignore_chars' => {},
-                      'index_name' => 'cp',
-                      'index_type_command' => 'cindex'
+                      'index_name' => 'cp'
                     }
                   },
                   'info' => {
@@ -2875,10 +2833,8 @@ $result_trees{'indices_in_begin_tables_lists'} = {
                           'entry_node' => {},
                           'entry_number' => 15,
                           'in_code' => 0,
-                          'index_at_command' => 'cindex',
                           'index_ignore_chars' => {},
-                          'index_name' => 'cp',
-                          'index_type_command' => 'cindex'
+                          'index_name' => 'cp'
                         }
                       },
                       'info' => {
@@ -3063,10 +3019,8 @@ $result_trees{'indices_in_begin_tables_lists'} = {
                       'entry_node' => {},
                       'entry_number' => 16,
                       'in_code' => 0,
-                      'index_at_command' => 'cindex',
                       'index_ignore_chars' => {},
-                      'index_name' => 'cp',
-                      'index_type_command' => 'cindex'
+                      'index_name' => 'cp'
                     }
                   },
                   'info' => {
@@ -3242,10 +3196,8 @@ $result_trees{'indices_in_begin_tables_lists'} = {
                       'entry_node' => {},
                       'entry_number' => 17,
                       'in_code' => 0,
-                      'index_at_command' => 'cindex',
                       'index_ignore_chars' => {},
-                      'index_name' => 'cp',
-                      'index_type_command' => 'cindex'
+                      'index_name' => 'cp'
                     }
                   },
                   'info' => {
@@ -3412,10 +3364,8 @@ $result_trees{'indices_in_begin_tables_lists'} = {
                       'entry_node' => {},
                       'entry_number' => 18,
                       'in_code' => 0,
-                      'index_at_command' => 'cindex',
                       'index_ignore_chars' => {},
-                      'index_name' => 'cp',
-                      'index_type_command' => 'cindex'
+                      'index_name' => 'cp'
                     }
                   },
                   'info' => {
@@ -3594,10 +3544,8 @@ $result_trees{'indices_in_begin_tables_lists'} = {
                           'entry_node' => {},
                           'entry_number' => 19,
                           'in_code' => 0,
-                          'index_at_command' => 'cindex',
                           'index_ignore_chars' => {},
-                          'index_name' => 'cp',
-                          'index_type_command' => 'cindex'
+                          'index_name' => 'cp'
                         }
                       },
                       'info' => {
@@ -3754,10 +3702,8 @@ $result_trees{'indices_in_begin_tables_lists'} = {
                           'entry_node' => {},
                           'entry_number' => 20,
                           'in_code' => 0,
-                          'index_at_command' => 'cindex',
                           'index_ignore_chars' => {},
-                          'index_name' => 'cp',
-                          'index_type_command' => 'cindex'
+                          'index_name' => 'cp'
                         }
                       },
                       'info' => {
@@ -3814,10 +3760,8 @@ $result_trees{'indices_in_begin_tables_lists'} = {
                           'entry_node' => {},
                           'entry_number' => 21,
                           'in_code' => 0,
-                          'index_at_command' => 'cindex',
                           'index_ignore_chars' => {},
-                          'index_name' => 'cp',
-                          'index_type_command' => 'cindex'
+                          'index_name' => 'cp'
                         }
                       },
                       'info' => {
@@ -3858,10 +3802,8 @@ $result_trees{'indices_in_begin_tables_lists'} = {
                           'entry_node' => {},
                           'entry_number' => 22,
                           'in_code' => 0,
-                          'index_at_command' => 'cindex',
                           'index_ignore_chars' => {},
-                          'index_name' => 'cp',
-                          'index_type_command' => 'cindex'
+                          'index_name' => 'cp'
                         }
                       },
                       'info' => {
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 365b95f21f..21ecbbc387 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
@@ -258,10 +258,8 @@ 
$result_trees{'indices_in_begin_tables_lists_entries_after_item'} = {
                       'entry_node' => {},
                       'entry_number' => 1,
                       'in_code' => 0,
-                      'index_at_command' => 'cindex',
                       'index_ignore_chars' => {},
-                      'index_name' => 'cp',
-                      'index_type_command' => 'cindex'
+                      'index_name' => 'cp'
                     }
                   },
                   'info' => {
@@ -410,10 +408,8 @@ 
$result_trees{'indices_in_begin_tables_lists_entries_after_item'} = {
                       'entry_node' => {},
                       'entry_number' => 2,
                       'in_code' => 0,
-                      'index_at_command' => 'cindex',
                       'index_ignore_chars' => {},
-                      'index_name' => 'cp',
-                      'index_type_command' => 'cindex'
+                      'index_name' => 'cp'
                     }
                   },
                   'info' => {
@@ -486,10 +482,8 @@ 
$result_trees{'indices_in_begin_tables_lists_entries_after_item'} = {
                       'entry_node' => {},
                       'entry_number' => 3,
                       'in_code' => 0,
-                      'index_at_command' => 'cindex',
                       'index_ignore_chars' => {},
-                      'index_name' => 'cp',
-                      'index_type_command' => 'cindex'
+                      'index_name' => 'cp'
                     }
                   },
                   'info' => {
@@ -659,10 +653,8 @@ 
$result_trees{'indices_in_begin_tables_lists_entries_after_item'} = {
                       'entry_node' => {},
                       'entry_number' => 4,
                       'in_code' => 0,
-                      'index_at_command' => 'cindex',
                       'index_ignore_chars' => {},
-                      'index_name' => 'cp',
-                      'index_type_command' => 'cindex'
+                      'index_name' => 'cp'
                     }
                   },
                   'info' => {
@@ -903,10 +895,8 @@ 
$result_trees{'indices_in_begin_tables_lists_entries_after_item'} = {
                       'entry_node' => {},
                       'entry_number' => 5,
                       'in_code' => 0,
-                      'index_at_command' => 'cindex',
                       'index_ignore_chars' => {},
-                      'index_name' => 'cp',
-                      'index_type_command' => 'cindex'
+                      'index_name' => 'cp'
                     }
                   },
                   'info' => {
@@ -1060,10 +1050,8 @@ 
$result_trees{'indices_in_begin_tables_lists_entries_after_item'} = {
                       'entry_node' => {},
                       'entry_number' => 6,
                       'in_code' => 0,
-                      'index_at_command' => 'cindex',
                       'index_ignore_chars' => {},
-                      'index_name' => 'cp',
-                      'index_type_command' => 'cindex'
+                      'index_name' => 'cp'
                     }
                   },
                   'info' => {
@@ -1186,10 +1174,8 @@ 
$result_trees{'indices_in_begin_tables_lists_entries_after_item'} = {
                       'entry_node' => {},
                       'entry_number' => 7,
                       'in_code' => 0,
-                      'index_at_command' => 'cindex',
                       'index_ignore_chars' => {},
-                      'index_name' => 'cp',
-                      'index_type_command' => 'cindex'
+                      'index_name' => 'cp'
                     }
                   },
                   'info' => {
@@ -1347,10 +1333,8 @@ 
$result_trees{'indices_in_begin_tables_lists_entries_after_item'} = {
                       'entry_node' => {},
                       'entry_number' => 8,
                       'in_code' => 0,
-                      'index_at_command' => 'cindex',
                       'index_ignore_chars' => {},
-                      'index_name' => 'cp',
-                      'index_type_command' => 'cindex'
+                      'index_name' => 'cp'
                     }
                   },
                   'info' => {
@@ -1483,10 +1467,8 @@ 
$result_trees{'indices_in_begin_tables_lists_entries_after_item'} = {
                       'entry_node' => {},
                       'entry_number' => 9,
                       'in_code' => 0,
-                      'index_at_command' => 'cindex',
                       'index_ignore_chars' => {},
-                      'index_name' => 'cp',
-                      'index_type_command' => 'cindex'
+                      'index_name' => 'cp'
                     }
                   },
                   'info' => {
@@ -1543,10 +1525,8 @@ 
$result_trees{'indices_in_begin_tables_lists_entries_after_item'} = {
                       'entry_node' => {},
                       'entry_number' => 10,
                       'in_code' => 0,
-                      'index_at_command' => 'cindex',
                       'index_ignore_chars' => {},
-                      'index_name' => 'cp',
-                      'index_type_command' => 'cindex'
+                      'index_name' => 'cp'
                     }
                   },
                   'info' => {
@@ -1587,10 +1567,8 @@ 
$result_trees{'indices_in_begin_tables_lists_entries_after_item'} = {
                       'entry_node' => {},
                       'entry_number' => 11,
                       'in_code' => 0,
-                      'index_at_command' => 'cindex',
                       'index_ignore_chars' => {},
-                      'index_name' => 'cp',
-                      'index_type_command' => 'cindex'
+                      'index_name' => 'cp'
                     }
                   },
                   'info' => {
@@ -1742,10 +1720,8 @@ 
$result_trees{'indices_in_begin_tables_lists_entries_after_item'} = {
                           'entry_node' => {},
                           'entry_number' => 1,
                           'in_code' => 1,
-                          'index_at_command' => 'item',
                           'index_ignore_chars' => {},
-                          'index_name' => 'vr',
-                          'index_type_command' => 'vtable'
+                          'index_name' => 'vr'
                         }
                       },
                       'info' => {
@@ -1886,10 +1862,8 @@ 
$result_trees{'indices_in_begin_tables_lists_entries_after_item'} = {
                           'entry_node' => {},
                           'entry_number' => 2,
                           'in_code' => 1,
-                          'index_at_command' => 'item',
                           'index_ignore_chars' => {},
-                          'index_name' => 'vr',
-                          'index_type_command' => 'vtable'
+                          'index_name' => 'vr'
                         }
                       },
                       'info' => {
@@ -1950,10 +1924,8 @@ 
$result_trees{'indices_in_begin_tables_lists_entries_after_item'} = {
                           'entry_node' => {},
                           'entry_number' => 3,
                           'in_code' => 1,
-                          'index_at_command' => 'itemx',
                           'index_ignore_chars' => {},
-                          'index_name' => 'vr',
-                          'index_type_command' => 'vtable'
+                          'index_name' => 'vr'
                         }
                       },
                       'info' => {
@@ -2094,10 +2066,8 @@ 
$result_trees{'indices_in_begin_tables_lists_entries_after_item'} = {
                           'entry_node' => {},
                           'entry_number' => 1,
                           'in_code' => 1,
-                          'index_at_command' => 'item',
                           'index_ignore_chars' => {},
-                          'index_name' => 'fn',
-                          'index_type_command' => 'ftable'
+                          'index_name' => 'fn'
                         }
                       },
                       'info' => {
@@ -2139,10 +2109,8 @@ 
$result_trees{'indices_in_begin_tables_lists_entries_after_item'} = {
                               'entry_node' => {},
                               'entry_number' => 12,
                               'in_code' => 0,
-                              'index_at_command' => 'cindex',
                               'index_ignore_chars' => {},
-                              'index_name' => 'cp',
-                              'index_type_command' => 'cindex'
+                              'index_name' => 'cp'
                             }
                           },
                           'info' => {
@@ -2218,10 +2186,8 @@ 
$result_trees{'indices_in_begin_tables_lists_entries_after_item'} = {
                           'entry_node' => {},
                           'entry_number' => 2,
                           'in_code' => 1,
-                          'index_at_command' => 'itemx',
                           'index_ignore_chars' => {},
-                          'index_name' => 'fn',
-                          'index_type_command' => 'ftable'
+                          'index_name' => 'fn'
                         }
                       },
                       'info' => {
@@ -2285,10 +2251,8 @@ 
$result_trees{'indices_in_begin_tables_lists_entries_after_item'} = {
                           'entry_node' => {},
                           'entry_number' => 3,
                           'in_code' => 1,
-                          'index_at_command' => 'item',
                           'index_ignore_chars' => {},
-                          'index_name' => 'fn',
-                          'index_type_command' => 'ftable'
+                          'index_name' => 'fn'
                         }
                       },
                       'info' => {
@@ -2359,10 +2323,8 @@ 
$result_trees{'indices_in_begin_tables_lists_entries_after_item'} = {
                           'entry_node' => {},
                           'entry_number' => 4,
                           'in_code' => 1,
-                          'index_at_command' => 'itemx',
                           'index_ignore_chars' => {},
-                          'index_name' => 'fn',
-                          'index_type_command' => 'ftable'
+                          'index_name' => 'fn'
                         }
                       },
                       'info' => {
@@ -2515,10 +2477,8 @@ 
$result_trees{'indices_in_begin_tables_lists_entries_after_item'} = {
                           'entry_node' => {},
                           'entry_number' => 13,
                           'in_code' => 0,
-                          'index_at_command' => 'cindex',
                           'index_ignore_chars' => {},
-                          'index_name' => 'cp',
-                          'index_type_command' => 'cindex'
+                          'index_name' => 'cp'
                         }
                       },
                       'info' => {
@@ -2703,10 +2663,8 @@ 
$result_trees{'indices_in_begin_tables_lists_entries_after_item'} = {
                       'entry_node' => {},
                       'entry_number' => 14,
                       'in_code' => 0,
-                      'index_at_command' => 'cindex',
                       'index_ignore_chars' => {},
-                      'index_name' => 'cp',
-                      'index_type_command' => 'cindex'
+                      'index_name' => 'cp'
                     }
                   },
                   'info' => {
@@ -2879,10 +2837,8 @@ 
$result_trees{'indices_in_begin_tables_lists_entries_after_item'} = {
                           'entry_node' => {},
                           'entry_number' => 15,
                           'in_code' => 0,
-                          'index_at_command' => 'cindex',
                           'index_ignore_chars' => {},
-                          'index_name' => 'cp',
-                          'index_type_command' => 'cindex'
+                          'index_name' => 'cp'
                         }
                       },
                       'info' => {
@@ -3067,10 +3023,8 @@ 
$result_trees{'indices_in_begin_tables_lists_entries_after_item'} = {
                       'entry_node' => {},
                       'entry_number' => 16,
                       'in_code' => 0,
-                      'index_at_command' => 'cindex',
                       'index_ignore_chars' => {},
-                      'index_name' => 'cp',
-                      'index_type_command' => 'cindex'
+                      'index_name' => 'cp'
                     }
                   },
                   'info' => {
@@ -3246,10 +3200,8 @@ 
$result_trees{'indices_in_begin_tables_lists_entries_after_item'} = {
                       'entry_node' => {},
                       'entry_number' => 17,
                       'in_code' => 0,
-                      'index_at_command' => 'cindex',
                       'index_ignore_chars' => {},
-                      'index_name' => 'cp',
-                      'index_type_command' => 'cindex'
+                      'index_name' => 'cp'
                     }
                   },
                   'info' => {
@@ -3416,10 +3368,8 @@ 
$result_trees{'indices_in_begin_tables_lists_entries_after_item'} = {
                       'entry_node' => {},
                       'entry_number' => 18,
                       'in_code' => 0,
-                      'index_at_command' => 'cindex',
                       'index_ignore_chars' => {},
-                      'index_name' => 'cp',
-                      'index_type_command' => 'cindex'
+                      'index_name' => 'cp'
                     }
                   },
                   'info' => {
@@ -3598,10 +3548,8 @@ 
$result_trees{'indices_in_begin_tables_lists_entries_after_item'} = {
                           'entry_node' => {},
                           'entry_number' => 19,
                           'in_code' => 0,
-                          'index_at_command' => 'cindex',
                           'index_ignore_chars' => {},
-                          'index_name' => 'cp',
-                          'index_type_command' => 'cindex'
+                          'index_name' => 'cp'
                         }
                       },
                       'info' => {
@@ -3758,10 +3706,8 @@ 
$result_trees{'indices_in_begin_tables_lists_entries_after_item'} = {
                           'entry_node' => {},
                           'entry_number' => 20,
                           'in_code' => 0,
-                          'index_at_command' => 'cindex',
                           'index_ignore_chars' => {},
-                          'index_name' => 'cp',
-                          'index_type_command' => 'cindex'
+                          'index_name' => 'cp'
                         }
                       },
                       'info' => {
@@ -3818,10 +3764,8 @@ 
$result_trees{'indices_in_begin_tables_lists_entries_after_item'} = {
                           'entry_node' => {},
                           'entry_number' => 21,
                           'in_code' => 0,
-                          'index_at_command' => 'cindex',
                           'index_ignore_chars' => {},
-                          'index_name' => 'cp',
-                          'index_type_command' => 'cindex'
+                          'index_name' => 'cp'
                         }
                       },
                       'info' => {
@@ -3862,10 +3806,8 @@ 
$result_trees{'indices_in_begin_tables_lists_entries_after_item'} = {
                           'entry_node' => {},
                           'entry_number' => 22,
                           'in_code' => 0,
-                          'index_at_command' => 'cindex',
                           'index_ignore_chars' => {},
-                          'index_name' => 'cp',
-                          'index_type_command' => 'cindex'
+                          'index_name' => 'cp'
                         }
                       },
                       'info' => {
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 e2510ffbdf..f8bee5500f 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
@@ -270,10 +270,8 @@ $result_trees{'printindex_merged_indices_code_style'} = {
               'entry_node' => {},
               'entry_number' => 1,
               'in_code' => 0,
-              'index_at_command' => 'cindex',
               'index_ignore_chars' => {},
-              'index_name' => 'cp',
-              'index_type_command' => 'cindex'
+              'index_name' => 'cp'
             }
           },
           'info' => {
@@ -319,10 +317,8 @@ $result_trees{'printindex_merged_indices_code_style'} = {
               'entry_node' => {},
               'entry_number' => 1,
               'in_code' => 0,
-              'index_at_command' => 'vindex',
               'index_ignore_chars' => {},
-              'index_name' => 'vr',
-              'index_type_command' => 'vindex'
+              'index_name' => 'vr'
             }
           },
           'info' => {
@@ -368,10 +364,8 @@ $result_trees{'printindex_merged_indices_code_style'} = {
               'entry_node' => {},
               'entry_number' => 1,
               'in_code' => 1,
-              'index_at_command' => 'findex',
               'index_ignore_chars' => {},
-              'index_name' => 'fn',
-              'index_type_command' => 'findex'
+              'index_name' => 'fn'
             }
           },
           'info' => {
@@ -496,10 +490,8 @@ $result_trees{'printindex_merged_indices_code_style'} = {
               'entry_node' => {},
               'entry_number' => 1,
               'in_code' => 0,
-              'index_at_command' => 'cdiindex',
               'index_ignore_chars' => {},
-              'index_name' => 'cdi',
-              'index_type_command' => 'cdiindex'
+              'index_name' => 'cdi'
             }
           },
           'info' => {
@@ -624,10 +616,8 @@ $result_trees{'printindex_merged_indices_code_style'} = {
               'entry_node' => {},
               'entry_number' => 1,
               'in_code' => 1,
-              'index_at_command' => 'ddiindex',
               'index_ignore_chars' => {},
-              'index_name' => 'ddi',
-              'index_type_command' => 'ddiindex'
+              'index_name' => 'ddi'
             }
           },
           'info' => {
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 3e16924eb8..d08b008416 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
@@ -616,10 +616,8 @@ $result_trees{'references_to_top_no_top_output'} = {
               'entry_node' => {},
               'entry_number' => 1,
               'in_code' => 0,
-              'index_at_command' => 'cindex',
               'index_ignore_chars' => {},
-              'index_name' => 'cp',
-              'index_type_command' => 'cindex'
+              'index_name' => 'cp'
             }
           },
           'info' => {
@@ -956,10 +954,8 @@ $result_trees{'references_to_top_no_top_output'} = {
               'entry_node' => {},
               'entry_number' => 2,
               'in_code' => 0,
-              'index_at_command' => 'cindex',
               'index_ignore_chars' => {},
-              'index_name' => 'cp',
-              'index_type_command' => 'cindex'
+              'index_name' => 'cp'
             }
           },
           'info' => {
diff --git a/tp/t/results/converters_tests/test_deftypefnnewline.pl 
b/tp/t/results/converters_tests/test_deftypefnnewline.pl
index 44170ed7c2..401ace01d1 100644
--- a/tp/t/results/converters_tests/test_deftypefnnewline.pl
+++ b/tp/t/results/converters_tests/test_deftypefnnewline.pl
@@ -320,10 +320,8 @@ $result_trees{'test_deftypefnnewline'} = {
                   'entry_node' => {},
                   'entry_number' => 1,
                   'in_code' => 1,
-                  'index_at_command' => 'deftypefun',
                   'index_ignore_chars' => {},
-                  'index_name' => 'fn',
-                  'index_type_command' => 'deftypefun'
+                  'index_name' => 'fn'
                 },
                 'original_def_cmdname' => 'deftypefun'
               },
@@ -464,10 +462,8 @@ $result_trees{'test_deftypefnnewline'} = {
                   'entry_node' => {},
                   'entry_number' => 2,
                   'in_code' => 1,
-                  'index_at_command' => 'deftypefn',
                   'index_ignore_chars' => {},
-                  'index_name' => 'fn',
-                  'index_type_command' => 'deftypefn'
+                  'index_name' => 'fn'
                 },
                 'original_def_cmdname' => 'deftypefn'
               },
@@ -643,10 +639,8 @@ $result_trees{'test_deftypefnnewline'} = {
                   'entry_node' => {},
                   'entry_number' => 3,
                   'in_code' => 1,
-                  'index_at_command' => 'deftypeop',
                   'index_ignore_chars' => {},
-                  'index_name' => 'fn',
-                  'index_type_command' => 'deftypeop'
+                  'index_name' => 'fn'
                 },
                 'original_def_cmdname' => 'deftypeop'
               },
@@ -809,10 +803,8 @@ $result_trees{'test_deftypefnnewline'} = {
                   'entry_node' => {},
                   'entry_number' => 4,
                   'in_code' => 1,
-                  'index_at_command' => 'deftypeop',
                   'index_ignore_chars' => {},
-                  'index_name' => 'fn',
-                  'index_type_command' => 'deftypeop'
+                  'index_name' => 'fn'
                 },
                 'original_def_cmdname' => 'deftypeop'
               },
@@ -975,10 +967,8 @@ $result_trees{'test_deftypefnnewline'} = {
                   'entry_node' => {},
                   'entry_number' => 1,
                   'in_code' => 1,
-                  'index_at_command' => 'deftypecv',
                   'index_ignore_chars' => {},
-                  'index_name' => 'vr',
-                  'index_type_command' => 'deftypecv'
+                  'index_name' => 'vr'
                 },
                 'original_def_cmdname' => 'deftypecv'
               },
@@ -1154,10 +1144,8 @@ $result_trees{'test_deftypefnnewline'} = {
                   'entry_node' => {},
                   'entry_number' => 2,
                   'in_code' => 1,
-                  'index_at_command' => 'deftypecv',
                   'index_ignore_chars' => {},
-                  'index_name' => 'vr',
-                  'index_type_command' => 'deftypecv'
+                  'index_name' => 'vr'
                 },
                 'original_def_cmdname' => 'deftypecv'
               },
@@ -1284,10 +1272,8 @@ $result_trees{'test_deftypefnnewline'} = {
                   'entry_node' => {},
                   'entry_number' => 5,
                   'in_code' => 1,
-                  'index_at_command' => 'deffn',
                   'index_ignore_chars' => {},
-                  'index_name' => 'fn',
-                  'index_type_command' => 'deffn'
+                  'index_name' => 'fn'
                 },
                 'original_def_cmdname' => 'deffn'
               },
@@ -1485,10 +1471,8 @@ $result_trees{'test_deftypefnnewline'} = {
                   'entry_node' => {},
                   'entry_number' => 6,
                   'in_code' => 1,
-                  'index_at_command' => 'deftypefun',
                   'index_ignore_chars' => {},
-                  'index_name' => 'fn',
-                  'index_type_command' => 'deftypefun'
+                  'index_name' => 'fn'
                 },
                 'original_def_cmdname' => 'deftypefun'
               },
@@ -1629,10 +1613,8 @@ $result_trees{'test_deftypefnnewline'} = {
                   'entry_node' => {},
                   'entry_number' => 7,
                   'in_code' => 1,
-                  'index_at_command' => 'deftypefn',
                   'index_ignore_chars' => {},
-                  'index_name' => 'fn',
-                  'index_type_command' => 'deftypefn'
+                  'index_name' => 'fn'
                 },
                 'original_def_cmdname' => 'deftypefn'
               },
@@ -1808,10 +1790,8 @@ $result_trees{'test_deftypefnnewline'} = {
                   'entry_node' => {},
                   'entry_number' => 8,
                   'in_code' => 1,
-                  'index_at_command' => 'deftypeop',
                   'index_ignore_chars' => {},
-                  'index_name' => 'fn',
-                  'index_type_command' => 'deftypeop'
+                  'index_name' => 'fn'
                 },
                 'original_def_cmdname' => 'deftypeop'
               },
@@ -1974,10 +1954,8 @@ $result_trees{'test_deftypefnnewline'} = {
                   'entry_node' => {},
                   'entry_number' => 9,
                   'in_code' => 1,
-                  'index_at_command' => 'deftypeop',
                   'index_ignore_chars' => {},
-                  'index_name' => 'fn',
-                  'index_type_command' => 'deftypeop'
+                  'index_name' => 'fn'
                 },
                 'original_def_cmdname' => 'deftypeop'
               },
@@ -2140,10 +2118,8 @@ $result_trees{'test_deftypefnnewline'} = {
                   'entry_node' => {},
                   'entry_number' => 3,
                   'in_code' => 1,
-                  'index_at_command' => 'deftypecv',
                   'index_ignore_chars' => {},
-                  'index_name' => 'vr',
-                  'index_type_command' => 'deftypecv'
+                  'index_name' => 'vr'
                 },
                 'original_def_cmdname' => 'deftypecv'
               },
@@ -2319,10 +2295,8 @@ $result_trees{'test_deftypefnnewline'} = {
                   'entry_node' => {},
                   'entry_number' => 4,
                   'in_code' => 1,
-                  'index_at_command' => 'deftypecv',
                   'index_ignore_chars' => {},
-                  'index_name' => 'vr',
-                  'index_type_command' => 'deftypecv'
+                  'index_name' => 'vr'
                 },
                 'original_def_cmdname' => 'deftypecv'
               },
@@ -2449,10 +2423,8 @@ $result_trees{'test_deftypefnnewline'} = {
                   'entry_node' => {},
                   'entry_number' => 10,
                   'in_code' => 1,
-                  'index_at_command' => 'deffn',
                   'index_ignore_chars' => {},
-                  'index_name' => 'fn',
-                  'index_type_command' => 'deffn'
+                  'index_name' => 'fn'
                 },
                 'original_def_cmdname' => 'deffn'
               },
diff --git a/tp/t/results/converters_tests/things_before_setfilename.pl 
b/tp/t/results/converters_tests/things_before_setfilename.pl
index 6d8c1d77b5..4432666068 100644
--- a/tp/t/results/converters_tests/things_before_setfilename.pl
+++ b/tp/t/results/converters_tests/things_before_setfilename.pl
@@ -692,10 +692,8 @@ $result_trees{'things_before_setfilename'} = {
                   'entry_element' => {},
                   'entry_number' => 1,
                   'in_code' => 0,
-                  'index_at_command' => 'cindex',
                   'index_ignore_chars' => {},
-                  'index_name' => 'cp',
-                  'index_type_command' => 'cindex'
+                  'index_name' => 'cp'
                 }
               },
               'info' => {
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 37bdb0b26d..63e74de7a2 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
@@ -692,10 +692,8 @@ $result_trees{'things_before_setfilename_no_element'} = {
                   'entry_element' => {},
                   'entry_number' => 1,
                   'in_code' => 0,
-                  'index_at_command' => 'cindex',
                   'index_ignore_chars' => {},
-                  'index_name' => 'cp',
-                  'index_type_command' => 'cindex'
+                  'index_name' => 'cp'
                 }
               },
               'info' => {
diff --git a/tp/t/results/coverage/commands.pl 
b/tp/t/results/coverage/commands.pl
index 74f06d9aee..12992ead34 100644
--- a/tp/t/results/coverage/commands.pl
+++ b/tp/t/results/coverage/commands.pl
@@ -321,10 +321,8 @@ $result_trees{'commands'} = {
               'entry_element' => {},
               'entry_number' => 1,
               'in_code' => 0,
-              'index_at_command' => 'cindex',
               'index_ignore_chars' => {},
-              'index_name' => 'cp',
-              'index_type_command' => 'cindex'
+              'index_name' => 'cp'
             }
           },
           'info' => {
diff --git a/tp/t/results/coverage/def.pl b/tp/t/results/coverage/def.pl
index 2728cd5c81..482b1ad1b8 100644
--- a/tp/t/results/coverage/def.pl
+++ b/tp/t/results/coverage/def.pl
@@ -89,10 +89,8 @@ $result_trees{'def'} = {
                   'entry_element' => {},
                   'entry_number' => 1,
                   'in_code' => 1,
-                  'index_at_command' => 'deffn',
                   'index_ignore_chars' => {},
-                  'index_name' => 'fn',
-                  'index_type_command' => 'deffn'
+                  'index_name' => 'fn'
                 },
                 'original_def_cmdname' => 'deffn'
               },
@@ -316,10 +314,8 @@ $result_trees{'def'} = {
                   'entry_element' => {},
                   'entry_number' => 2,
                   'in_code' => 1,
-                  'index_at_command' => 'deffn',
                   'index_ignore_chars' => {},
-                  'index_name' => 'fn',
-                  'index_type_command' => 'deffn'
+                  'index_name' => 'fn'
                 },
                 'original_def_cmdname' => 'deffn'
               },
@@ -486,10 +482,8 @@ $result_trees{'def'} = {
                   'entry_element' => {},
                   'entry_number' => 3,
                   'in_code' => 1,
-                  'index_at_command' => 'deffn',
                   'index_ignore_chars' => {},
-                  'index_name' => 'fn',
-                  'index_type_command' => 'deffn'
+                  'index_name' => 'fn'
                 },
                 'original_def_cmdname' => 'deffn'
               },
@@ -578,10 +572,8 @@ $result_trees{'def'} = {
                   'entry_element' => {},
                   'entry_number' => 4,
                   'in_code' => 1,
-                  'index_at_command' => 'deffnx',
                   'index_ignore_chars' => {},
-                  'index_name' => 'fn',
-                  'index_type_command' => 'deffn'
+                  'index_name' => 'fn'
                 },
                 'original_def_cmdname' => 'deffnx'
               },
@@ -675,10 +667,8 @@ $result_trees{'def'} = {
                   'entry_element' => {},
                   'entry_number' => 5,
                   'in_code' => 1,
-                  'index_at_command' => 'deffnx',
                   'index_ignore_chars' => {},
-                  'index_name' => 'fn',
-                  'index_type_command' => 'deffn'
+                  'index_name' => 'fn'
                 },
                 'original_def_cmdname' => 'deffnx'
               },
@@ -777,10 +767,8 @@ $result_trees{'def'} = {
                   'entry_element' => {},
                   'entry_number' => 6,
                   'in_code' => 1,
-                  'index_at_command' => 'deffnx',
                   'index_ignore_chars' => {},
-                  'index_name' => 'fn',
-                  'index_type_command' => 'deffn'
+                  'index_name' => 'fn'
                 },
                 'original_def_cmdname' => 'deffnx'
               },
@@ -879,10 +867,8 @@ $result_trees{'def'} = {
                   'entry_element' => {},
                   'entry_number' => 7,
                   'in_code' => 1,
-                  'index_at_command' => 'deffnx',
                   'index_ignore_chars' => {},
-                  'index_name' => 'fn',
-                  'index_type_command' => 'deffn'
+                  'index_name' => 'fn'
                 },
                 'original_def_cmdname' => 'deffnx'
               },
@@ -976,10 +962,8 @@ $result_trees{'def'} = {
                   'entry_element' => {},
                   'entry_number' => 8,
                   'in_code' => 1,
-                  'index_at_command' => 'deffnx',
                   'index_ignore_chars' => {},
-                  'index_name' => 'fn',
-                  'index_type_command' => 'deffn'
+                  'index_name' => 'fn'
                 },
                 'original_def_cmdname' => 'deffnx'
               },
@@ -1094,10 +1078,8 @@ $result_trees{'def'} = {
                   'entry_element' => {},
                   'entry_number' => 9,
                   'in_code' => 1,
-                  'index_at_command' => 'deffnx',
                   'index_ignore_chars' => {},
-                  'index_name' => 'fn',
-                  'index_type_command' => 'deffn'
+                  'index_name' => 'fn'
                 },
                 'original_def_cmdname' => 'deffnx'
               },
@@ -1168,10 +1150,8 @@ $result_trees{'def'} = {
                   'entry_element' => {},
                   'entry_number' => 10,
                   'in_code' => 1,
-                  'index_at_command' => 'deffnx',
                   'index_ignore_chars' => {},
-                  'index_name' => 'fn',
-                  'index_type_command' => 'deffn'
+                  'index_name' => 'fn'
                 },
                 'original_def_cmdname' => 'deffnx'
               },
@@ -1247,10 +1227,8 @@ $result_trees{'def'} = {
                   'entry_element' => {},
                   'entry_number' => 11,
                   'in_code' => 1,
-                  'index_at_command' => 'deffnx',
                   'index_ignore_chars' => {},
-                  'index_name' => 'fn',
-                  'index_type_command' => 'deffn'
+                  'index_name' => 'fn'
                 },
                 'original_def_cmdname' => 'deffnx'
               },
@@ -1321,10 +1299,8 @@ $result_trees{'def'} = {
                   'entry_element' => {},
                   'entry_number' => 12,
                   'in_code' => 1,
-                  'index_at_command' => 'deffnx',
                   'index_ignore_chars' => {},
-                  'index_name' => 'fn',
-                  'index_type_command' => 'deffn'
+                  'index_name' => 'fn'
                 },
                 'original_def_cmdname' => 'deffnx'
               },
@@ -1434,10 +1410,8 @@ $result_trees{'def'} = {
                   'entry_element' => {},
                   'entry_number' => 13,
                   'in_code' => 1,
-                  'index_at_command' => 'deffnx',
                   'index_ignore_chars' => {},
-                  'index_name' => 'fn',
-                  'index_type_command' => 'deffn'
+                  'index_name' => 'fn'
                 },
                 'original_def_cmdname' => 'deffnx'
               },
@@ -1573,10 +1547,8 @@ $result_trees{'def'} = {
                   'entry_element' => {},
                   'entry_number' => 14,
                   'in_code' => 1,
-                  'index_at_command' => 'deffnx',
                   'index_ignore_chars' => {},
-                  'index_name' => 'fn',
-                  'index_type_command' => 'deffn'
+                  'index_name' => 'fn'
                 },
                 'original_def_cmdname' => 'deffnx'
               },
@@ -1712,10 +1684,8 @@ $result_trees{'def'} = {
                   'entry_element' => {},
                   'entry_number' => 15,
                   'in_code' => 1,
-                  'index_at_command' => 'deffnx',
                   'index_ignore_chars' => {},
-                  'index_name' => 'fn',
-                  'index_type_command' => 'deffn'
+                  'index_name' => 'fn'
                 },
                 'original_def_cmdname' => 'deffnx'
               },
diff --git a/tp/t/results/coverage/formats_titles.pl 
b/tp/t/results/coverage/formats_titles.pl
index 5ebea700ae..18fb7116e9 100644
--- a/tp/t/results/coverage/formats_titles.pl
+++ b/tp/t/results/coverage/formats_titles.pl
@@ -415,10 +415,8 @@ $result_trees{'formats_titles'} = {
                           'entry_element' => {},
                           'entry_number' => 1,
                           'in_code' => 1,
-                          'index_at_command' => 'item',
                           'index_ignore_chars' => {},
-                          'index_name' => 'vr',
-                          'index_type_command' => 'vtable'
+                          'index_name' => 'vr'
                         }
                       },
                       'info' => {
diff --git a/tp/t/results/coverage/multitable.pl 
b/tp/t/results/coverage/multitable.pl
index 7a2495643e..904326f609 100644
--- a/tp/t/results/coverage/multitable.pl
+++ b/tp/t/results/coverage/multitable.pl
@@ -265,10 +265,8 @@ $result_trees{'multitable'} = {
                                   'entry_element' => {},
                                   'entry_number' => 1,
                                   'in_code' => 0,
-                                  'index_at_command' => 'cindex',
                                   'index_ignore_chars' => {},
-                                  'index_name' => 'cp',
-                                  'index_type_command' => 'cindex'
+                                  'index_name' => 'cp'
                                 }
                               },
                               'info' => {
diff --git a/tp/t/results/coverage/preformatted.pl 
b/tp/t/results/coverage/preformatted.pl
index 44e2627be8..e0ee2d2ffd 100644
--- a/tp/t/results/coverage/preformatted.pl
+++ b/tp/t/results/coverage/preformatted.pl
@@ -158,10 +158,8 @@ $result_trees{'preformatted'} = {
                               'entry_element' => {},
                               'entry_number' => 1,
                               'in_code' => 1,
-                              'index_at_command' => 'item',
                               'index_ignore_chars' => {},
-                              'index_name' => 'vr',
-                              'index_type_command' => 'vtable'
+                              'index_name' => 'vr'
                             }
                           },
                           'info' => {
diff --git a/tp/t/results/coverage/punctuation_in_line_commands.pl 
b/tp/t/results/coverage/punctuation_in_line_commands.pl
index 83a6e41ea8..78d09e5809 100644
--- a/tp/t/results/coverage/punctuation_in_line_commands.pl
+++ b/tp/t/results/coverage/punctuation_in_line_commands.pl
@@ -641,10 +641,8 @@ $result_trees{'punctuation_in_line_commands'} = {
               'entry_node' => {},
               'entry_number' => 1,
               'in_code' => 0,
-              'index_at_command' => 'cindex',
               'index_ignore_chars' => {},
-              'index_name' => 'cp',
-              'index_type_command' => 'cindex'
+              'index_name' => 'cp'
             }
           },
           'info' => {
diff --git a/tp/t/results/coverage/table.pl b/tp/t/results/coverage/table.pl
index 8569114ce0..ec45e24fcc 100644
--- a/tp/t/results/coverage/table.pl
+++ b/tp/t/results/coverage/table.pl
@@ -258,10 +258,8 @@ $result_trees{'table'} = {
                       'entry_element' => {},
                       'entry_number' => 1,
                       'in_code' => 0,
-                      'index_at_command' => 'cindex',
                       'index_ignore_chars' => {},
-                      'index_name' => 'cp',
-                      'index_type_command' => 'cindex'
+                      'index_name' => 'cp'
                     }
                   },
                   'info' => {
@@ -313,10 +311,8 @@ $result_trees{'table'} = {
                           'entry_element' => {},
                           'entry_number' => 1,
                           'in_code' => 1,
-                          'index_at_command' => 'item',
                           'index_ignore_chars' => {},
-                          'index_name' => 'vr',
-                          'index_type_command' => 'vtable'
+                          'index_name' => 'vr'
                         }
                       },
                       'info' => {
@@ -376,10 +372,8 @@ $result_trees{'table'} = {
                           'entry_element' => {},
                           'entry_number' => 1,
                           'in_code' => 1,
-                          'index_at_command' => 'kindex',
                           'index_ignore_chars' => {},
-                          'index_name' => 'ky',
-                          'index_type_command' => 'kindex'
+                          'index_name' => 'ky'
                         }
                       },
                       'info' => {
@@ -434,10 +428,8 @@ $result_trees{'table'} = {
                           'entry_element' => {},
                           'entry_number' => 2,
                           'in_code' => 1,
-                          'index_at_command' => 'itemx',
                           'index_ignore_chars' => {},
-                          'index_name' => 'vr',
-                          'index_type_command' => 'vtable'
+                          'index_name' => 'vr'
                         }
                       },
                       'info' => {
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 bd065ec36e..1f89e450d2 100644
--- a/tp/t/results/coverage_braces/contain_plain_text_nestings.pl
+++ b/tp/t/results/coverage_braces/contain_plain_text_nestings.pl
@@ -350,10 +350,8 @@ $result_trees{'contain_plain_text_nestings'} = {
                   'entry_node' => {},
                   'entry_number' => 1,
                   'in_code' => 0,
-                  'index_at_command' => 'cindex',
                   'index_ignore_chars' => {},
                   'index_name' => 'cp',
-                  'index_type_command' => 'cindex',
                   'sortas' => ' text'
                 },
                 'sortas' => ' text'
@@ -674,10 +672,8 @@ $result_trees{'contain_plain_text_nestings'} = {
                   'entry_node' => {},
                   'entry_number' => 2,
                   'in_code' => 0,
-                  'index_at_command' => 'cindex',
                   'index_ignore_chars' => {},
                   'index_name' => 'cp',
-                  'index_type_command' => 'cindex',
                   'sortas' => ' text'
                 },
                 'sortas' => ' text'
diff --git a/tp/t/results/coverage_braces/heading_in_footnote.pl 
b/tp/t/results/coverage_braces/heading_in_footnote.pl
index a8f5153ff6..5e880313a1 100644
--- a/tp/t/results/coverage_braces/heading_in_footnote.pl
+++ b/tp/t/results/coverage_braces/heading_in_footnote.pl
@@ -81,10 +81,8 @@ $result_trees{'heading_in_footnote'} = {
                           'entry_element' => {},
                           'entry_number' => 1,
                           'in_code' => 0,
-                          'index_at_command' => 'cindex',
                           'index_ignore_chars' => {},
-                          'index_name' => 'cp',
-                          'index_type_command' => 'cindex'
+                          'index_name' => 'cp'
                         }
                       },
                       'info' => {
diff --git a/tp/t/results/def/all_commands.pl b/tp/t/results/def/all_commands.pl
index 0df1da653c..b45e609ded 100644
--- a/tp/t/results/def/all_commands.pl
+++ b/tp/t/results/def/all_commands.pl
@@ -61,10 +61,8 @@ $result_trees{'all_commands'} = {
                   'entry_element' => {},
                   'entry_number' => 1,
                   'in_code' => 1,
-                  'index_at_command' => 'defvr',
                   'index_ignore_chars' => {},
-                  'index_name' => 'vr',
-                  'index_type_command' => 'defvr'
+                  'index_name' => 'vr'
                 },
                 'original_def_cmdname' => 'defvr'
               },
@@ -203,10 +201,8 @@ $result_trees{'all_commands'} = {
                   'entry_element' => {},
                   'entry_number' => 1,
                   'in_code' => 1,
-                  'index_at_command' => 'deffn',
                   'index_ignore_chars' => {},
-                  'index_name' => 'fn',
-                  'index_type_command' => 'deffn'
+                  'index_name' => 'fn'
                 },
                 'original_def_cmdname' => 'deffn'
               },
@@ -332,10 +328,8 @@ $result_trees{'all_commands'} = {
                   'entry_element' => {},
                   'entry_number' => 2,
                   'in_code' => 1,
-                  'index_at_command' => 'deffn',
                   'index_ignore_chars' => {},
-                  'index_name' => 'fn',
-                  'index_type_command' => 'deffn'
+                  'index_name' => 'fn'
                 },
                 'original_def_cmdname' => 'deffn'
               },
@@ -488,10 +482,8 @@ $result_trees{'all_commands'} = {
                   'entry_element' => {},
                   'entry_number' => 3,
                   'in_code' => 1,
-                  'index_at_command' => 'deftypefn',
                   'index_ignore_chars' => {},
-                  'index_name' => 'fn',
-                  'index_type_command' => 'deftypefn'
+                  'index_name' => 'fn'
                 },
                 'original_def_cmdname' => 'deftypefn'
               },
@@ -631,10 +623,8 @@ $result_trees{'all_commands'} = {
                   'entry_element' => {},
                   'entry_number' => 4,
                   'in_code' => 1,
-                  'index_at_command' => 'deftypefn',
                   'index_ignore_chars' => {},
-                  'index_name' => 'fn',
-                  'index_type_command' => 'deftypefn'
+                  'index_name' => 'fn'
                 },
                 'original_def_cmdname' => 'deftypefn'
               },
@@ -809,10 +799,8 @@ $result_trees{'all_commands'} = {
                   'entry_element' => {},
                   'entry_number' => 5,
                   'in_code' => 1,
-                  'index_at_command' => 'deftypeop',
                   'index_ignore_chars' => {},
-                  'index_name' => 'fn',
-                  'index_type_command' => 'deftypeop'
+                  'index_name' => 'fn'
                 },
                 'original_def_cmdname' => 'deftypeop'
               },
@@ -974,10 +962,8 @@ $result_trees{'all_commands'} = {
                   'entry_element' => {},
                   'entry_number' => 6,
                   'in_code' => 1,
-                  'index_at_command' => 'deftypeop',
                   'index_ignore_chars' => {},
-                  'index_name' => 'fn',
-                  'index_type_command' => 'deftypeop'
+                  'index_name' => 'fn'
                 },
                 'original_def_cmdname' => 'deftypeop'
               },
@@ -1117,10 +1103,8 @@ $result_trees{'all_commands'} = {
                   'entry_element' => {},
                   'entry_number' => 2,
                   'in_code' => 1,
-                  'index_at_command' => 'deftypevr',
                   'index_ignore_chars' => {},
-                  'index_name' => 'vr',
-                  'index_type_command' => 'deftypevr'
+                  'index_name' => 'vr'
                 },
                 'original_def_cmdname' => 'deftypevr'
               },
@@ -1260,10 +1244,8 @@ $result_trees{'all_commands'} = {
                   'entry_element' => {},
                   'entry_number' => 3,
                   'in_code' => 1,
-                  'index_at_command' => 'defcv',
                   'index_ignore_chars' => {},
-                  'index_name' => 'vr',
-                  'index_type_command' => 'defcv'
+                  'index_name' => 'vr'
                 },
                 'original_def_cmdname' => 'defcv'
               },
@@ -1416,10 +1398,8 @@ $result_trees{'all_commands'} = {
                   'entry_element' => {},
                   'entry_number' => 4,
                   'in_code' => 1,
-                  'index_at_command' => 'defcv',
                   'index_ignore_chars' => {},
-                  'index_name' => 'vr',
-                  'index_type_command' => 'defcv'
+                  'index_name' => 'vr'
                 },
                 'original_def_cmdname' => 'defcv'
               },
@@ -1581,10 +1561,8 @@ $result_trees{'all_commands'} = {
                   'entry_element' => {},
                   'entry_number' => 5,
                   'in_code' => 1,
-                  'index_at_command' => 'deftypecv',
                   'index_ignore_chars' => {},
-                  'index_name' => 'vr',
-                  'index_type_command' => 'deftypecv'
+                  'index_name' => 'vr'
                 },
                 'original_def_cmdname' => 'deftypecv'
               },
@@ -1759,10 +1737,8 @@ $result_trees{'all_commands'} = {
                   'entry_element' => {},
                   'entry_number' => 6,
                   'in_code' => 1,
-                  'index_at_command' => 'deftypecv',
                   'index_ignore_chars' => {},
-                  'index_name' => 'vr',
-                  'index_type_command' => 'deftypecv'
+                  'index_name' => 'vr'
                 },
                 'original_def_cmdname' => 'deftypecv'
               },
@@ -1923,10 +1899,8 @@ $result_trees{'all_commands'} = {
                   'entry_element' => {},
                   'entry_number' => 7,
                   'in_code' => 1,
-                  'index_at_command' => 'defop',
                   'index_ignore_chars' => {},
-                  'index_name' => 'fn',
-                  'index_type_command' => 'defop'
+                  'index_name' => 'fn'
                 },
                 'original_def_cmdname' => 'defop'
               },
@@ -2074,10 +2048,8 @@ $result_trees{'all_commands'} = {
                   'entry_element' => {},
                   'entry_number' => 8,
                   'in_code' => 1,
-                  'index_at_command' => 'defop',
                   'index_ignore_chars' => {},
-                  'index_name' => 'fn',
-                  'index_type_command' => 'defop'
+                  'index_name' => 'fn'
                 },
                 'original_def_cmdname' => 'defop'
               },
@@ -2216,10 +2188,8 @@ $result_trees{'all_commands'} = {
                   'entry_element' => {},
                   'entry_number' => 1,
                   'in_code' => 1,
-                  'index_at_command' => 'deftp',
                   'index_ignore_chars' => {},
-                  'index_name' => 'tp',
-                  'index_type_command' => 'deftp'
+                  'index_name' => 'tp'
                 },
                 'original_def_cmdname' => 'deftp'
               },
@@ -2363,10 +2333,8 @@ $result_trees{'all_commands'} = {
                   'entry_element' => {},
                   'entry_number' => 9,
                   'in_code' => 1,
-                  'index_at_command' => 'defun',
                   'index_ignore_chars' => {},
-                  'index_name' => 'fn',
-                  'index_type_command' => 'defun'
+                  'index_name' => 'fn'
                 },
                 'original_def_cmdname' => 'defun'
               },
@@ -2510,10 +2478,8 @@ $result_trees{'all_commands'} = {
                   'entry_element' => {},
                   'entry_number' => 10,
                   'in_code' => 1,
-                  'index_at_command' => 'defmac',
                   'index_ignore_chars' => {},
-                  'index_name' => 'fn',
-                  'index_type_command' => 'defmac'
+                  'index_name' => 'fn'
                 },
                 'original_def_cmdname' => 'defmac'
               },
@@ -2657,10 +2623,8 @@ $result_trees{'all_commands'} = {
                   'entry_element' => {},
                   'entry_number' => 11,
                   'in_code' => 1,
-                  'index_at_command' => 'defspec',
                   'index_ignore_chars' => {},
-                  'index_name' => 'fn',
-                  'index_type_command' => 'defspec'
+                  'index_name' => 'fn'
                 },
                 'original_def_cmdname' => 'defspec'
               },
@@ -2791,10 +2755,8 @@ $result_trees{'all_commands'} = {
                   'entry_element' => {},
                   'entry_number' => 7,
                   'in_code' => 1,
-                  'index_at_command' => 'defvar',
                   'index_ignore_chars' => {},
-                  'index_name' => 'vr',
-                  'index_type_command' => 'defvar'
+                  'index_name' => 'vr'
                 },
                 'original_def_cmdname' => 'defvar'
               },
@@ -2951,10 +2913,8 @@ $result_trees{'all_commands'} = {
                   'entry_element' => {},
                   'entry_number' => 8,
                   'in_code' => 1,
-                  'index_at_command' => 'defvar',
                   'index_ignore_chars' => {},
-                  'index_name' => 'vr',
-                  'index_type_command' => 'defvar'
+                  'index_name' => 'vr'
                 },
                 'original_def_cmdname' => 'defvar'
               },
@@ -3085,10 +3045,8 @@ $result_trees{'all_commands'} = {
                   'entry_element' => {},
                   'entry_number' => 9,
                   'in_code' => 1,
-                  'index_at_command' => 'defopt',
                   'index_ignore_chars' => {},
-                  'index_name' => 'vr',
-                  'index_type_command' => 'defopt'
+                  'index_name' => 'vr'
                 },
                 'original_def_cmdname' => 'defopt'
               },
@@ -3246,10 +3204,8 @@ $result_trees{'all_commands'} = {
                   'entry_element' => {},
                   'entry_number' => 12,
                   'in_code' => 1,
-                  'index_at_command' => 'deftypefun',
                   'index_ignore_chars' => {},
-                  'index_name' => 'fn',
-                  'index_type_command' => 'deftypefun'
+                  'index_name' => 'fn'
                 },
                 'original_def_cmdname' => 'deftypefun'
               },
@@ -3394,10 +3350,8 @@ $result_trees{'all_commands'} = {
                   'entry_element' => {},
                   'entry_number' => 10,
                   'in_code' => 1,
-                  'index_at_command' => 'deftypevar',
                   'index_ignore_chars' => {},
-                  'index_name' => 'vr',
-                  'index_type_command' => 'deftypevar'
+                  'index_name' => 'vr'
                 },
                 'original_def_cmdname' => 'deftypevar'
               },
@@ -3550,10 +3504,8 @@ $result_trees{'all_commands'} = {
                   'entry_element' => {},
                   'entry_number' => 11,
                   'in_code' => 1,
-                  'index_at_command' => 'defivar',
                   'index_ignore_chars' => {},
-                  'index_name' => 'vr',
-                  'index_type_command' => 'defivar'
+                  'index_name' => 'vr'
                 },
                 'original_def_cmdname' => 'defivar'
               },
@@ -3720,10 +3672,8 @@ $result_trees{'all_commands'} = {
                   'entry_element' => {},
                   'entry_number' => 12,
                   'in_code' => 1,
-                  'index_at_command' => 'deftypeivar',
                   'index_ignore_chars' => {},
-                  'index_name' => 'vr',
-                  'index_type_command' => 'deftypeivar'
+                  'index_name' => 'vr'
                 },
                 'original_def_cmdname' => 'deftypeivar'
               },
@@ -3889,10 +3839,8 @@ $result_trees{'all_commands'} = {
                   'entry_element' => {},
                   'entry_number' => 13,
                   'in_code' => 1,
-                  'index_at_command' => 'defmethod',
                   'index_ignore_chars' => {},
-                  'index_name' => 'fn',
-                  'index_type_command' => 'defmethod'
+                  'index_name' => 'fn'
                 },
                 'original_def_cmdname' => 'defmethod'
               },
@@ -4072,10 +4020,8 @@ $result_trees{'all_commands'} = {
                   'entry_element' => {},
                   'entry_number' => 14,
                   'in_code' => 1,
-                  'index_at_command' => 'deftypemethod',
                   'index_ignore_chars' => {},
-                  'index_name' => 'fn',
-                  'index_type_command' => 'deftypemethod'
+                  'index_name' => 'fn'
                 },
                 'original_def_cmdname' => 'deftypemethod'
               },
diff --git a/tp/t/results/def/all_commands_delimiters.pl 
b/tp/t/results/def/all_commands_delimiters.pl
index 9d8183db01..43ec6dfa6e 100644
--- a/tp/t/results/def/all_commands_delimiters.pl
+++ b/tp/t/results/def/all_commands_delimiters.pl
@@ -390,10 +390,8 @@ $result_trees{'all_commands_delimiters'} = {
                   'entry_element' => {},
                   'entry_number' => 1,
                   'in_code' => 1,
-                  'index_at_command' => 'deffn',
                   'index_ignore_chars' => {},
-                  'index_name' => 'fn',
-                  'index_type_command' => 'deffn'
+                  'index_name' => 'fn'
                 },
                 'original_def_cmdname' => 'deffn'
               },
@@ -791,10 +789,8 @@ $result_trees{'all_commands_delimiters'} = {
                   'entry_element' => {},
                   'entry_number' => 1,
                   'in_code' => 1,
-                  'index_at_command' => 'defvr',
                   'index_ignore_chars' => {},
-                  'index_name' => 'vr',
-                  'index_type_command' => 'defvr'
+                  'index_name' => 'vr'
                 },
                 'original_def_cmdname' => 'defvr'
               },
@@ -1033,10 +1029,8 @@ $result_trees{'all_commands_delimiters'} = {
                   'entry_element' => {},
                   'entry_number' => 2,
                   'in_code' => 1,
-                  'index_at_command' => 'deftypefn',
                   'index_ignore_chars' => {},
-                  'index_name' => 'fn',
-                  'index_type_command' => 'deftypefn'
+                  'index_name' => 'fn'
                 },
                 'original_def_cmdname' => 'deftypefn'
               },
@@ -1543,10 +1537,8 @@ $result_trees{'all_commands_delimiters'} = {
                   'entry_element' => {},
                   'entry_number' => 3,
                   'in_code' => 1,
-                  'index_at_command' => 'deftypefn',
                   'index_ignore_chars' => {},
-                  'index_name' => 'fn',
-                  'index_type_command' => 'deftypefn'
+                  'index_name' => 'fn'
                 },
                 'original_def_cmdname' => 'deftypefn'
               },
@@ -1705,10 +1697,8 @@ $result_trees{'all_commands_delimiters'} = {
                   'entry_element' => {},
                   'entry_number' => 4,
                   'in_code' => 1,
-                  'index_at_command' => 'deftypefn',
                   'index_ignore_chars' => {},
-                  'index_name' => 'fn',
-                  'index_type_command' => 'deftypefn'
+                  'index_name' => 'fn'
                 },
                 'original_def_cmdname' => 'deftypefn'
               },
@@ -2027,10 +2017,8 @@ $result_trees{'all_commands_delimiters'} = {
                   'entry_element' => {},
                   'entry_number' => 5,
                   'in_code' => 1,
-                  'index_at_command' => 'deftypefn',
                   'index_ignore_chars' => {},
-                  'index_name' => 'fn',
-                  'index_type_command' => 'deftypefn'
+                  'index_name' => 'fn'
                 },
                 'original_def_cmdname' => 'deftypefn'
               },
@@ -2406,10 +2394,8 @@ $result_trees{'all_commands_delimiters'} = {
                   'entry_element' => {},
                   'entry_number' => 2,
                   'in_code' => 1,
-                  'index_at_command' => 'deftypevr',
                   'index_ignore_chars' => {},
-                  'index_name' => 'vr',
-                  'index_type_command' => 'deftypevr'
+                  'index_name' => 'vr'
                 },
                 'original_def_cmdname' => 'deftypevr'
               },
@@ -2797,10 +2783,8 @@ $result_trees{'all_commands_delimiters'} = {
                   'entry_element' => {},
                   'entry_number' => 1,
                   'in_code' => 1,
-                  'index_at_command' => 'deftp',
                   'index_ignore_chars' => {},
-                  'index_name' => 'tp',
-                  'index_type_command' => 'deftp'
+                  'index_name' => 'tp'
                 },
                 'original_def_cmdname' => 'deftp'
               },
@@ -3176,10 +3160,8 @@ $result_trees{'all_commands_delimiters'} = {
                   'entry_element' => {},
                   'entry_number' => 3,
                   'in_code' => 1,
-                  'index_at_command' => 'defcv',
                   'index_ignore_chars' => {},
-                  'index_name' => 'vr',
-                  'index_type_command' => 'defcv'
+                  'index_name' => 'vr'
                 },
                 'original_def_cmdname' => 'defcv'
               },
@@ -3592,10 +3574,8 @@ $result_trees{'all_commands_delimiters'} = {
                   'entry_element' => {},
                   'entry_number' => 4,
                   'in_code' => 1,
-                  'index_at_command' => 'deftypecv',
                   'index_ignore_chars' => {},
-                  'index_name' => 'vr',
-                  'index_type_command' => 'deftypecv'
+                  'index_name' => 'vr'
                 },
                 'original_def_cmdname' => 'deftypecv'
               },
@@ -3969,10 +3949,8 @@ $result_trees{'all_commands_delimiters'} = {
                   'entry_element' => {},
                   'entry_number' => 6,
                   'in_code' => 1,
-                  'index_at_command' => 'defop',
                   'index_ignore_chars' => {},
-                  'index_name' => 'fn',
-                  'index_type_command' => 'defop'
+                  'index_name' => 'fn'
                 },
                 'original_def_cmdname' => 'defop'
               },
@@ -4375,10 +4353,8 @@ $result_trees{'all_commands_delimiters'} = {
                   'entry_element' => {},
                   'entry_number' => 7,
                   'in_code' => 1,
-                  'index_at_command' => 'deftypeop',
                   'index_ignore_chars' => {},
-                  'index_name' => 'fn',
-                  'index_type_command' => 'deftypeop'
+                  'index_name' => 'fn'
                 },
                 'original_def_cmdname' => 'deftypeop'
               },
@@ -4567,10 +4543,8 @@ $result_trees{'all_commands_delimiters'} = {
                   'entry_element' => {},
                   'entry_number' => 8,
                   'in_code' => 1,
-                  'index_at_command' => 'deftypeop',
                   'index_ignore_chars' => {},
-                  'index_name' => 'fn',
-                  'index_type_command' => 'deftypeop'
+                  'index_name' => 'fn'
                 },
                 'original_def_cmdname' => 'deftypeop'
               },
@@ -4779,10 +4753,8 @@ $result_trees{'all_commands_delimiters'} = {
                   'entry_element' => {},
                   'entry_number' => 9,
                   'in_code' => 1,
-                  'index_at_command' => 'deftypeop',
                   'index_ignore_chars' => {},
-                  'index_name' => 'fn',
-                  'index_type_command' => 'deftypeop'
+                  'index_name' => 'fn'
                 },
                 'original_def_cmdname' => 'deftypeop'
               },
@@ -4991,10 +4963,8 @@ $result_trees{'all_commands_delimiters'} = {
                   'entry_element' => {},
                   'entry_number' => 10,
                   'in_code' => 1,
-                  'index_at_command' => 'deftypeop',
                   'index_ignore_chars' => {},
-                  'index_name' => 'fn',
-                  'index_type_command' => 'deftypeop'
+                  'index_name' => 'fn'
                 },
                 'original_def_cmdname' => 'deftypeop'
               },
@@ -5183,10 +5153,8 @@ $result_trees{'all_commands_delimiters'} = {
                   'entry_element' => {},
                   'entry_number' => 11,
                   'in_code' => 1,
-                  'index_at_command' => 'deftypeop',
                   'index_ignore_chars' => {},
-                  'index_name' => 'fn',
-                  'index_type_command' => 'deftypeop'
+                  'index_name' => 'fn'
                 },
                 'original_def_cmdname' => 'deftypeop'
               },
@@ -5375,10 +5343,8 @@ $result_trees{'all_commands_delimiters'} = {
                   'entry_element' => {},
                   'entry_number' => 12,
                   'in_code' => 1,
-                  'index_at_command' => 'deftypeop',
                   'index_ignore_chars' => {},
-                  'index_name' => 'fn',
-                  'index_type_command' => 'deftypeop'
+                  'index_name' => 'fn'
                 },
                 'original_def_cmdname' => 'deftypeop'
               },
@@ -5587,10 +5553,8 @@ $result_trees{'all_commands_delimiters'} = {
                   'entry_element' => {},
                   'entry_number' => 13,
                   'in_code' => 1,
-                  'index_at_command' => 'deftypeop',
                   'index_ignore_chars' => {},
-                  'index_name' => 'fn',
-                  'index_type_command' => 'deftypeop'
+                  'index_name' => 'fn'
                 },
                 'original_def_cmdname' => 'deftypeop'
               },
@@ -5799,10 +5763,8 @@ $result_trees{'all_commands_delimiters'} = {
                   'entry_element' => {},
                   'entry_number' => 14,
                   'in_code' => 1,
-                  'index_at_command' => 'deftypeop',
                   'index_ignore_chars' => {},
-                  'index_name' => 'fn',
-                  'index_type_command' => 'deftypeop'
+                  'index_name' => 'fn'
                 },
                 'original_def_cmdname' => 'deftypeop'
               },
@@ -5991,10 +5953,8 @@ $result_trees{'all_commands_delimiters'} = {
                   'entry_element' => {},
                   'entry_number' => 15,
                   'in_code' => 1,
-                  'index_at_command' => 'deftypeop',
                   'index_ignore_chars' => {},
-                  'index_name' => 'fn',
-                  'index_type_command' => 'deftypeop'
+                  'index_name' => 'fn'
                 },
                 'original_def_cmdname' => 'deftypeop'
               },
@@ -6183,10 +6143,8 @@ $result_trees{'all_commands_delimiters'} = {
                   'entry_element' => {},
                   'entry_number' => 16,
                   'in_code' => 1,
-                  'index_at_command' => 'deftypeop',
                   'index_ignore_chars' => {},
-                  'index_name' => 'fn',
-                  'index_type_command' => 'deftypeop'
+                  'index_name' => 'fn'
                 },
                 'original_def_cmdname' => 'deftypeop'
               },
@@ -6395,10 +6353,8 @@ $result_trees{'all_commands_delimiters'} = {
                   'entry_element' => {},
                   'entry_number' => 17,
                   'in_code' => 1,
-                  'index_at_command' => 'deftypeop',
                   'index_ignore_chars' => {},
-                  'index_name' => 'fn',
-                  'index_type_command' => 'deftypeop'
+                  'index_name' => 'fn'
                 },
                 'original_def_cmdname' => 'deftypeop'
               },
@@ -6607,10 +6563,8 @@ $result_trees{'all_commands_delimiters'} = {
                   'entry_element' => {},
                   'entry_number' => 18,
                   'in_code' => 1,
-                  'index_at_command' => 'deftypeop',
                   'index_ignore_chars' => {},
-                  'index_name' => 'fn',
-                  'index_type_command' => 'deftypeop'
+                  'index_name' => 'fn'
                 },
                 'original_def_cmdname' => 'deftypeop'
               },
@@ -6799,10 +6753,8 @@ $result_trees{'all_commands_delimiters'} = {
                   'entry_element' => {},
                   'entry_number' => 19,
                   'in_code' => 1,
-                  'index_at_command' => 'deftypeop',
                   'index_ignore_chars' => {},
-                  'index_name' => 'fn',
-                  'index_type_command' => 'deftypeop'
+                  'index_name' => 'fn'
                 },
                 'original_def_cmdname' => 'deftypeop'
               },
@@ -6991,10 +6943,8 @@ $result_trees{'all_commands_delimiters'} = {
                   'entry_element' => {},
                   'entry_number' => 20,
                   'in_code' => 1,
-                  'index_at_command' => 'deftypeop',
                   'index_ignore_chars' => {},
-                  'index_name' => 'fn',
-                  'index_type_command' => 'deftypeop'
+                  'index_name' => 'fn'
                 },
                 'original_def_cmdname' => 'deftypeop'
               },
@@ -7216,10 +7166,8 @@ $result_trees{'all_commands_delimiters'} = {
                   'entry_element' => {},
                   'entry_number' => 21,
                   'in_code' => 1,
-                  'index_at_command' => 'deftypeop',
                   'index_ignore_chars' => {},
-                  'index_name' => 'fn',
-                  'index_type_command' => 'deftypeop'
+                  'index_name' => 'fn'
                 },
                 'original_def_cmdname' => 'deftypeop'
               },
@@ -7375,10 +7323,8 @@ $result_trees{'all_commands_delimiters'} = {
                   'entry_element' => {},
                   'entry_number' => 22,
                   'in_code' => 1,
-                  'index_at_command' => 'defun',
                   'index_ignore_chars' => {},
-                  'index_name' => 'fn',
-                  'index_type_command' => 'defun'
+                  'index_name' => 'fn'
                 },
                 'original_def_cmdname' => 'defun'
               },
@@ -7576,10 +7522,8 @@ $result_trees{'all_commands_delimiters'} = {
                   'entry_element' => {},
                   'entry_number' => 23,
                   'in_code' => 1,
-                  'index_at_command' => 'deffn',
                   'index_ignore_chars' => {},
-                  'index_name' => 'fn',
-                  'index_type_command' => 'deffn'
+                  'index_name' => 'fn'
                 },
                 'original_def_cmdname' => 'deffn'
               },
@@ -7777,10 +7721,8 @@ $result_trees{'all_commands_delimiters'} = {
                   'entry_element' => {},
                   'entry_number' => 24,
                   'in_code' => 1,
-                  'index_at_command' => 'deffn',
                   'index_ignore_chars' => {},
-                  'index_name' => 'fn',
-                  'index_type_command' => 'deffn'
+                  'index_name' => 'fn'
                 },
                 'original_def_cmdname' => 'deffn'
               },
@@ -7978,10 +7920,8 @@ $result_trees{'all_commands_delimiters'} = {
                   'entry_element' => {},
                   'entry_number' => 5,
                   'in_code' => 1,
-                  'index_at_command' => 'defvr',
                   'index_ignore_chars' => {},
-                  'index_name' => 'vr',
-                  'index_type_command' => 'defvr'
+                  'index_name' => 'vr'
                 },
                 'original_def_cmdname' => 'defvr'
               },
@@ -8179,10 +8119,8 @@ $result_trees{'all_commands_delimiters'} = {
                   'entry_element' => {},
                   'entry_number' => 6,
                   'in_code' => 1,
-                  'index_at_command' => 'defvr',
                   'index_ignore_chars' => {},
-                  'index_name' => 'vr',
-                  'index_type_command' => 'defvr'
+                  'index_name' => 'vr'
                 },
                 'original_def_cmdname' => 'defvr'
               },
@@ -8409,10 +8347,8 @@ $result_trees{'all_commands_delimiters'} = {
                   'entry_element' => {},
                   'entry_number' => 25,
                   'in_code' => 1,
-                  'index_at_command' => 'deftypefn',
                   'index_ignore_chars' => {},
-                  'index_name' => 'fn',
-                  'index_type_command' => 'deftypefn'
+                  'index_name' => 'fn'
                 },
                 'original_def_cmdname' => 'deftypefn'
               },
@@ -8639,10 +8575,8 @@ $result_trees{'all_commands_delimiters'} = {
                   'entry_element' => {},
                   'entry_number' => 26,
                   'in_code' => 1,
-                  'index_at_command' => 'deftypefn',
                   'index_ignore_chars' => {},
-                  'index_name' => 'fn',
-                  'index_type_command' => 'deftypefn'
+                  'index_name' => 'fn'
                 },
                 'original_def_cmdname' => 'deftypefn'
               },
@@ -8869,10 +8803,8 @@ $result_trees{'all_commands_delimiters'} = {
                   'entry_element' => {},
                   'entry_number' => 7,
                   'in_code' => 1,
-                  'index_at_command' => 'deftypevr',
                   'index_ignore_chars' => {},
-                  'index_name' => 'vr',
-                  'index_type_command' => 'deftypevr'
+                  'index_name' => 'vr'
                 },
                 'original_def_cmdname' => 'deftypevr'
               },
@@ -9099,10 +9031,8 @@ $result_trees{'all_commands_delimiters'} = {
                   'entry_element' => {},
                   'entry_number' => 8,
                   'in_code' => 1,
-                  'index_at_command' => 'deftypevr',
                   'index_ignore_chars' => {},
-                  'index_name' => 'vr',
-                  'index_type_command' => 'deftypevr'
+                  'index_name' => 'vr'
                 },
                 'original_def_cmdname' => 'deftypevr'
               },
@@ -9300,10 +9230,8 @@ $result_trees{'all_commands_delimiters'} = {
                   'entry_element' => {},
                   'entry_number' => 2,
                   'in_code' => 1,
-                  'index_at_command' => 'deftp',
                   'index_ignore_chars' => {},
-                  'index_name' => 'tp',
-                  'index_type_command' => 'deftp'
+                  'index_name' => 'tp'
                 },
                 'original_def_cmdname' => 'deftp'
               },
@@ -9501,10 +9429,8 @@ $result_trees{'all_commands_delimiters'} = {
                   'entry_element' => {},
                   'entry_number' => 3,
                   'in_code' => 1,
-                  'index_at_command' => 'deftp',
                   'index_ignore_chars' => {},
-                  'index_name' => 'tp',
-                  'index_type_command' => 'deftp'
+                  'index_name' => 'tp'
                 },
                 'original_def_cmdname' => 'deftp'
               },
@@ -9731,10 +9657,8 @@ $result_trees{'all_commands_delimiters'} = {
                   'entry_element' => {},
                   'entry_number' => 9,
                   'in_code' => 1,
-                  'index_at_command' => 'defcv',
                   'index_ignore_chars' => {},
-                  'index_name' => 'vr',
-                  'index_type_command' => 'defcv'
+                  'index_name' => 'vr'
                 },
                 'original_def_cmdname' => 'defcv'
               },
@@ -9960,10 +9884,8 @@ $result_trees{'all_commands_delimiters'} = {
                   'entry_element' => {},
                   'entry_number' => 4,
                   'in_code' => 1,
-                  'index_at_command' => 'deftp',
                   'index_ignore_chars' => {},
-                  'index_name' => 'tp',
-                  'index_type_command' => 'deftp'
+                  'index_name' => 'tp'
                 },
                 'original_def_cmdname' => 'deftp'
               },
@@ -10227,10 +10149,8 @@ $result_trees{'all_commands_delimiters'} = {
                   'entry_element' => {},
                   'entry_number' => 10,
                   'in_code' => 1,
-                  'index_at_command' => 'deftypecv',
                   'index_ignore_chars' => {},
-                  'index_name' => 'vr',
-                  'index_type_command' => 'deftypecv'
+                  'index_name' => 'vr'
                 },
                 'original_def_cmdname' => 'deftypecv'
               },
@@ -10494,10 +10414,8 @@ $result_trees{'all_commands_delimiters'} = {
                   'entry_element' => {},
                   'entry_number' => 11,
                   'in_code' => 1,
-                  'index_at_command' => 'deftypecv',
                   'index_ignore_chars' => {},
-                  'index_name' => 'vr',
-                  'index_type_command' => 'deftypecv'
+                  'index_name' => 'vr'
                 },
                 'original_def_cmdname' => 'deftypecv'
               },
@@ -10732,10 +10650,8 @@ $result_trees{'all_commands_delimiters'} = {
                   'entry_element' => {},
                   'entry_number' => 27,
                   'in_code' => 1,
-                  'index_at_command' => 'defop',
                   'index_ignore_chars' => {},
-                  'index_name' => 'fn',
-                  'index_type_command' => 'defop'
+                  'index_name' => 'fn'
                 },
                 'original_def_cmdname' => 'defop'
               },
@@ -10970,10 +10886,8 @@ $result_trees{'all_commands_delimiters'} = {
                   'entry_element' => {},
                   'entry_number' => 28,
                   'in_code' => 1,
-                  'index_at_command' => 'defop',
                   'index_ignore_chars' => {},
-                  'index_name' => 'fn',
-                  'index_type_command' => 'defop'
+                  'index_name' => 'fn'
                 },
                 'original_def_cmdname' => 'defop'
               },
@@ -11237,10 +11151,8 @@ $result_trees{'all_commands_delimiters'} = {
                   'entry_element' => {},
                   'entry_number' => 29,
                   'in_code' => 1,
-                  'index_at_command' => 'deftypeop',
                   'index_ignore_chars' => {},
-                  'index_name' => 'fn',
-                  'index_type_command' => 'deftypeop'
+                  'index_name' => 'fn'
                 },
                 'original_def_cmdname' => 'deftypeop'
               },
@@ -11504,10 +11416,8 @@ $result_trees{'all_commands_delimiters'} = {
                   'entry_element' => {},
                   'entry_number' => 30,
                   'in_code' => 1,
-                  'index_at_command' => 'deftypeop',
                   'index_ignore_chars' => {},
-                  'index_name' => 'fn',
-                  'index_type_command' => 'deftypeop'
+                  'index_name' => 'fn'
                 },
                 'original_def_cmdname' => 'deftypeop'
               },
@@ -11775,10 +11685,8 @@ $result_trees{'all_commands_delimiters'} = {
                   'entry_element' => {},
                   'entry_number' => 31,
                   'in_code' => 1,
-                  'index_at_command' => 'deftypefn',
                   'index_ignore_chars' => {},
-                  'index_name' => 'fn',
-                  'index_type_command' => 'deftypefn'
+                  'index_name' => 'fn'
                 },
                 'original_def_cmdname' => 'deftypefn'
               },
@@ -12046,10 +11954,8 @@ $result_trees{'all_commands_delimiters'} = {
                   'entry_element' => {},
                   'entry_number' => 32,
                   'in_code' => 1,
-                  'index_at_command' => 'deftypefn',
                   'index_ignore_chars' => {},
-                  'index_name' => 'fn',
-                  'index_type_command' => 'deftypefn'
+                  'index_name' => 'fn'
                 },
                 'original_def_cmdname' => 'deftypefn'
               },
diff --git a/tp/t/results/def/all_commands_delimiters_printindex.pl 
b/tp/t/results/def/all_commands_delimiters_printindex.pl
index dbe7ef6b34..1382a7812f 100644
--- a/tp/t/results/def/all_commands_delimiters_printindex.pl
+++ b/tp/t/results/def/all_commands_delimiters_printindex.pl
@@ -459,10 +459,8 @@ $result_trees{'all_commands_delimiters_printindex'} = {
                   'entry_node' => {},
                   'entry_number' => 1,
                   'in_code' => 1,
-                  'index_at_command' => 'deffn',
                   'index_ignore_chars' => {},
-                  'index_name' => 'fn',
-                  'index_type_command' => 'deffn'
+                  'index_name' => 'fn'
                 },
                 'original_def_cmdname' => 'deffn'
               },
@@ -861,10 +859,8 @@ $result_trees{'all_commands_delimiters_printindex'} = {
                   'entry_node' => {},
                   'entry_number' => 1,
                   'in_code' => 1,
-                  'index_at_command' => 'defvr',
                   'index_ignore_chars' => {},
-                  'index_name' => 'vr',
-                  'index_type_command' => 'defvr'
+                  'index_name' => 'vr'
                 },
                 'original_def_cmdname' => 'defvr'
               },
@@ -1104,10 +1100,8 @@ $result_trees{'all_commands_delimiters_printindex'} = {
                   'entry_node' => {},
                   'entry_number' => 2,
                   'in_code' => 1,
-                  'index_at_command' => 'deftypefn',
                   'index_ignore_chars' => {},
-                  'index_name' => 'fn',
-                  'index_type_command' => 'deftypefn'
+                  'index_name' => 'fn'
                 },
                 'original_def_cmdname' => 'deftypefn'
               },
@@ -1615,10 +1609,8 @@ $result_trees{'all_commands_delimiters_printindex'} = {
                   'entry_node' => {},
                   'entry_number' => 3,
                   'in_code' => 1,
-                  'index_at_command' => 'deftypefn',
                   'index_ignore_chars' => {},
-                  'index_name' => 'fn',
-                  'index_type_command' => 'deftypefn'
+                  'index_name' => 'fn'
                 },
                 'original_def_cmdname' => 'deftypefn'
               },
@@ -1778,10 +1770,8 @@ $result_trees{'all_commands_delimiters_printindex'} = {
                   'entry_node' => {},
                   'entry_number' => 4,
                   'in_code' => 1,
-                  'index_at_command' => 'deftypefn',
                   'index_ignore_chars' => {},
-                  'index_name' => 'fn',
-                  'index_type_command' => 'deftypefn'
+                  'index_name' => 'fn'
                 },
                 'original_def_cmdname' => 'deftypefn'
               },
@@ -2101,10 +2091,8 @@ $result_trees{'all_commands_delimiters_printindex'} = {
                   'entry_node' => {},
                   'entry_number' => 5,
                   'in_code' => 1,
-                  'index_at_command' => 'deftypefn',
                   'index_ignore_chars' => {},
-                  'index_name' => 'fn',
-                  'index_type_command' => 'deftypefn'
+                  'index_name' => 'fn'
                 },
                 'original_def_cmdname' => 'deftypefn'
               },
@@ -2481,10 +2469,8 @@ $result_trees{'all_commands_delimiters_printindex'} = {
                   'entry_node' => {},
                   'entry_number' => 2,
                   'in_code' => 1,
-                  'index_at_command' => 'deftypevr',
                   'index_ignore_chars' => {},
-                  'index_name' => 'vr',
-                  'index_type_command' => 'deftypevr'
+                  'index_name' => 'vr'
                 },
                 'original_def_cmdname' => 'deftypevr'
               },
@@ -2873,10 +2859,8 @@ $result_trees{'all_commands_delimiters_printindex'} = {
                   'entry_node' => {},
                   'entry_number' => 1,
                   'in_code' => 1,
-                  'index_at_command' => 'deftp',
                   'index_ignore_chars' => {},
-                  'index_name' => 'tp',
-                  'index_type_command' => 'deftp'
+                  'index_name' => 'tp'
                 },
                 'original_def_cmdname' => 'deftp'
               },
@@ -3253,10 +3237,8 @@ $result_trees{'all_commands_delimiters_printindex'} = {
                   'entry_node' => {},
                   'entry_number' => 3,
                   'in_code' => 1,
-                  'index_at_command' => 'defcv',
                   'index_ignore_chars' => {},
-                  'index_name' => 'vr',
-                  'index_type_command' => 'defcv'
+                  'index_name' => 'vr'
                 },
                 'original_def_cmdname' => 'defcv'
               },
@@ -3670,10 +3652,8 @@ $result_trees{'all_commands_delimiters_printindex'} = {
                   'entry_node' => {},
                   'entry_number' => 4,
                   'in_code' => 1,
-                  'index_at_command' => 'deftypecv',
                   'index_ignore_chars' => {},
-                  'index_name' => 'vr',
-                  'index_type_command' => 'deftypecv'
+                  'index_name' => 'vr'
                 },
                 'original_def_cmdname' => 'deftypecv'
               },
@@ -4048,10 +4028,8 @@ $result_trees{'all_commands_delimiters_printindex'} = {
                   'entry_node' => {},
                   'entry_number' => 6,
                   'in_code' => 1,
-                  'index_at_command' => 'defop',
                   'index_ignore_chars' => {},
-                  'index_name' => 'fn',
-                  'index_type_command' => 'defop'
+                  'index_name' => 'fn'
                 },
                 'original_def_cmdname' => 'defop'
               },
@@ -4455,10 +4433,8 @@ $result_trees{'all_commands_delimiters_printindex'} = {
                   'entry_node' => {},
                   'entry_number' => 7,
                   'in_code' => 1,
-                  'index_at_command' => 'deftypeop',
                   'index_ignore_chars' => {},
-                  'index_name' => 'fn',
-                  'index_type_command' => 'deftypeop'
+                  'index_name' => 'fn'
                 },
                 'original_def_cmdname' => 'deftypeop'
               },
@@ -4648,10 +4624,8 @@ $result_trees{'all_commands_delimiters_printindex'} = {
                   'entry_node' => {},
                   'entry_number' => 8,
                   'in_code' => 1,
-                  'index_at_command' => 'deftypeop',
                   'index_ignore_chars' => {},
-                  'index_name' => 'fn',
-                  'index_type_command' => 'deftypeop'
+                  'index_name' => 'fn'
                 },
                 'original_def_cmdname' => 'deftypeop'
               },
@@ -4861,10 +4835,8 @@ $result_trees{'all_commands_delimiters_printindex'} = {
                   'entry_node' => {},
                   'entry_number' => 9,
                   'in_code' => 1,
-                  'index_at_command' => 'deftypeop',
                   'index_ignore_chars' => {},
-                  'index_name' => 'fn',
-                  'index_type_command' => 'deftypeop'
+                  'index_name' => 'fn'
                 },
                 'original_def_cmdname' => 'deftypeop'
               },
@@ -5074,10 +5046,8 @@ $result_trees{'all_commands_delimiters_printindex'} = {
                   'entry_node' => {},
                   'entry_number' => 10,
                   'in_code' => 1,
-                  'index_at_command' => 'deftypeop',
                   'index_ignore_chars' => {},
-                  'index_name' => 'fn',
-                  'index_type_command' => 'deftypeop'
+                  'index_name' => 'fn'
                 },
                 'original_def_cmdname' => 'deftypeop'
               },
@@ -5267,10 +5237,8 @@ $result_trees{'all_commands_delimiters_printindex'} = {
                   'entry_node' => {},
                   'entry_number' => 11,
                   'in_code' => 1,
-                  'index_at_command' => 'deftypeop',
                   'index_ignore_chars' => {},
-                  'index_name' => 'fn',
-                  'index_type_command' => 'deftypeop'
+                  'index_name' => 'fn'
                 },
                 'original_def_cmdname' => 'deftypeop'
               },
@@ -5460,10 +5428,8 @@ $result_trees{'all_commands_delimiters_printindex'} = {
                   'entry_node' => {},
                   'entry_number' => 12,
                   'in_code' => 1,
-                  'index_at_command' => 'deftypeop',
                   'index_ignore_chars' => {},
-                  'index_name' => 'fn',
-                  'index_type_command' => 'deftypeop'
+                  'index_name' => 'fn'
                 },
                 'original_def_cmdname' => 'deftypeop'
               },
@@ -5673,10 +5639,8 @@ $result_trees{'all_commands_delimiters_printindex'} = {
                   'entry_node' => {},
                   'entry_number' => 13,
                   'in_code' => 1,
-                  'index_at_command' => 'deftypeop',
                   'index_ignore_chars' => {},
-                  'index_name' => 'fn',
-                  'index_type_command' => 'deftypeop'
+                  'index_name' => 'fn'
                 },
                 'original_def_cmdname' => 'deftypeop'
               },
@@ -5886,10 +5850,8 @@ $result_trees{'all_commands_delimiters_printindex'} = {
                   'entry_node' => {},
                   'entry_number' => 14,
                   'in_code' => 1,
-                  'index_at_command' => 'deftypeop',
                   'index_ignore_chars' => {},
-                  'index_name' => 'fn',
-                  'index_type_command' => 'deftypeop'
+                  'index_name' => 'fn'
                 },
                 'original_def_cmdname' => 'deftypeop'
               },
@@ -6079,10 +6041,8 @@ $result_trees{'all_commands_delimiters_printindex'} = {
                   'entry_node' => {},
                   'entry_number' => 15,
                   'in_code' => 1,
-                  'index_at_command' => 'deftypeop',
                   'index_ignore_chars' => {},
-                  'index_name' => 'fn',
-                  'index_type_command' => 'deftypeop'
+                  'index_name' => 'fn'
                 },
                 'original_def_cmdname' => 'deftypeop'
               },
@@ -6272,10 +6232,8 @@ $result_trees{'all_commands_delimiters_printindex'} = {
                   'entry_node' => {},
                   'entry_number' => 16,
                   'in_code' => 1,
-                  'index_at_command' => 'deftypeop',
                   'index_ignore_chars' => {},
-                  'index_name' => 'fn',
-                  'index_type_command' => 'deftypeop'
+                  'index_name' => 'fn'
                 },
                 'original_def_cmdname' => 'deftypeop'
               },
@@ -6485,10 +6443,8 @@ $result_trees{'all_commands_delimiters_printindex'} = {
                   'entry_node' => {},
                   'entry_number' => 17,
                   'in_code' => 1,
-                  'index_at_command' => 'deftypeop',
                   'index_ignore_chars' => {},
-                  'index_name' => 'fn',
-                  'index_type_command' => 'deftypeop'
+                  'index_name' => 'fn'
                 },
                 'original_def_cmdname' => 'deftypeop'
               },
@@ -6698,10 +6654,8 @@ $result_trees{'all_commands_delimiters_printindex'} = {
                   'entry_node' => {},
                   'entry_number' => 18,
                   'in_code' => 1,
-                  'index_at_command' => 'deftypeop',
                   'index_ignore_chars' => {},
-                  'index_name' => 'fn',
-                  'index_type_command' => 'deftypeop'
+                  'index_name' => 'fn'
                 },
                 'original_def_cmdname' => 'deftypeop'
               },
@@ -6891,10 +6845,8 @@ $result_trees{'all_commands_delimiters_printindex'} = {
                   'entry_node' => {},
                   'entry_number' => 19,
                   'in_code' => 1,
-                  'index_at_command' => 'deftypeop',
                   'index_ignore_chars' => {},
-                  'index_name' => 'fn',
-                  'index_type_command' => 'deftypeop'
+                  'index_name' => 'fn'
                 },
                 'original_def_cmdname' => 'deftypeop'
               },
@@ -7084,10 +7036,8 @@ $result_trees{'all_commands_delimiters_printindex'} = {
                   'entry_node' => {},
                   'entry_number' => 20,
                   'in_code' => 1,
-                  'index_at_command' => 'deftypeop',
                   'index_ignore_chars' => {},
-                  'index_name' => 'fn',
-                  'index_type_command' => 'deftypeop'
+                  'index_name' => 'fn'
                 },
                 'original_def_cmdname' => 'deftypeop'
               },
@@ -7310,10 +7260,8 @@ $result_trees{'all_commands_delimiters_printindex'} = {
                   'entry_node' => {},
                   'entry_number' => 21,
                   'in_code' => 1,
-                  'index_at_command' => 'deftypeop',
                   'index_ignore_chars' => {},
-                  'index_name' => 'fn',
-                  'index_type_command' => 'deftypeop'
+                  'index_name' => 'fn'
                 },
                 'original_def_cmdname' => 'deftypeop'
               },
@@ -7470,10 +7418,8 @@ $result_trees{'all_commands_delimiters_printindex'} = {
                   'entry_node' => {},
                   'entry_number' => 22,
                   'in_code' => 1,
-                  'index_at_command' => 'defun',
                   'index_ignore_chars' => {},
-                  'index_name' => 'fn',
-                  'index_type_command' => 'defun'
+                  'index_name' => 'fn'
                 },
                 'original_def_cmdname' => 'defun'
               },
@@ -7672,10 +7618,8 @@ $result_trees{'all_commands_delimiters_printindex'} = {
                   'entry_node' => {},
                   'entry_number' => 23,
                   'in_code' => 1,
-                  'index_at_command' => 'deffn',
                   'index_ignore_chars' => {},
-                  'index_name' => 'fn',
-                  'index_type_command' => 'deffn'
+                  'index_name' => 'fn'
                 },
                 'original_def_cmdname' => 'deffn'
               },
@@ -7874,10 +7818,8 @@ $result_trees{'all_commands_delimiters_printindex'} = {
                   'entry_node' => {},
                   'entry_number' => 24,
                   'in_code' => 1,
-                  'index_at_command' => 'deffn',
                   'index_ignore_chars' => {},
-                  'index_name' => 'fn',
-                  'index_type_command' => 'deffn'
+                  'index_name' => 'fn'
                 },
                 'original_def_cmdname' => 'deffn'
               },
@@ -8076,10 +8018,8 @@ $result_trees{'all_commands_delimiters_printindex'} = {
                   'entry_node' => {},
                   'entry_number' => 5,
                   'in_code' => 1,
-                  'index_at_command' => 'defvr',
                   'index_ignore_chars' => {},
-                  'index_name' => 'vr',
-                  'index_type_command' => 'defvr'
+                  'index_name' => 'vr'
                 },
                 'original_def_cmdname' => 'defvr'
               },
@@ -8278,10 +8218,8 @@ $result_trees{'all_commands_delimiters_printindex'} = {
                   'entry_node' => {},
                   'entry_number' => 6,
                   'in_code' => 1,
-                  'index_at_command' => 'defvr',
                   'index_ignore_chars' => {},
-                  'index_name' => 'vr',
-                  'index_type_command' => 'defvr'
+                  'index_name' => 'vr'
                 },
                 'original_def_cmdname' => 'defvr'
               },
@@ -8509,10 +8447,8 @@ $result_trees{'all_commands_delimiters_printindex'} = {
                   'entry_node' => {},
                   'entry_number' => 25,
                   'in_code' => 1,
-                  'index_at_command' => 'deftypefn',
                   'index_ignore_chars' => {},
-                  'index_name' => 'fn',
-                  'index_type_command' => 'deftypefn'
+                  'index_name' => 'fn'
                 },
                 'original_def_cmdname' => 'deftypefn'
               },
@@ -8740,10 +8676,8 @@ $result_trees{'all_commands_delimiters_printindex'} = {
                   'entry_node' => {},
                   'entry_number' => 26,
                   'in_code' => 1,
-                  'index_at_command' => 'deftypefn',
                   'index_ignore_chars' => {},
-                  'index_name' => 'fn',
-                  'index_type_command' => 'deftypefn'
+                  'index_name' => 'fn'
                 },
                 'original_def_cmdname' => 'deftypefn'
               },
@@ -8971,10 +8905,8 @@ $result_trees{'all_commands_delimiters_printindex'} = {
                   'entry_node' => {},
                   'entry_number' => 7,
                   'in_code' => 1,
-                  'index_at_command' => 'deftypevr',
                   'index_ignore_chars' => {},
-                  'index_name' => 'vr',
-                  'index_type_command' => 'deftypevr'
+                  'index_name' => 'vr'
                 },
                 'original_def_cmdname' => 'deftypevr'
               },
@@ -9202,10 +9134,8 @@ $result_trees{'all_commands_delimiters_printindex'} = {
                   'entry_node' => {},
                   'entry_number' => 8,
                   'in_code' => 1,
-                  'index_at_command' => 'deftypevr',
                   'index_ignore_chars' => {},
-                  'index_name' => 'vr',
-                  'index_type_command' => 'deftypevr'
+                  'index_name' => 'vr'
                 },
                 'original_def_cmdname' => 'deftypevr'
               },
@@ -9404,10 +9334,8 @@ $result_trees{'all_commands_delimiters_printindex'} = {
                   'entry_node' => {},
                   'entry_number' => 2,
                   'in_code' => 1,
-                  'index_at_command' => 'deftp',
                   'index_ignore_chars' => {},
-                  'index_name' => 'tp',
-                  'index_type_command' => 'deftp'
+                  'index_name' => 'tp'
                 },
                 'original_def_cmdname' => 'deftp'
               },
@@ -9606,10 +9534,8 @@ $result_trees{'all_commands_delimiters_printindex'} = {
                   'entry_node' => {},
                   'entry_number' => 3,
                   'in_code' => 1,
-                  'index_at_command' => 'deftp',
                   'index_ignore_chars' => {},
-                  'index_name' => 'tp',
-                  'index_type_command' => 'deftp'
+                  'index_name' => 'tp'
                 },
                 'original_def_cmdname' => 'deftp'
               },
@@ -9837,10 +9763,8 @@ $result_trees{'all_commands_delimiters_printindex'} = {
                   'entry_node' => {},
                   'entry_number' => 9,
                   'in_code' => 1,
-                  'index_at_command' => 'defcv',
                   'index_ignore_chars' => {},
-                  'index_name' => 'vr',
-                  'index_type_command' => 'defcv'
+                  'index_name' => 'vr'
                 },
                 'original_def_cmdname' => 'defcv'
               },
@@ -10067,10 +9991,8 @@ $result_trees{'all_commands_delimiters_printindex'} = {
                   'entry_node' => {},
                   'entry_number' => 4,
                   'in_code' => 1,
-                  'index_at_command' => 'deftp',
                   'index_ignore_chars' => {},
-                  'index_name' => 'tp',
-                  'index_type_command' => 'deftp'
+                  'index_name' => 'tp'
                 },
                 'original_def_cmdname' => 'deftp'
               },
@@ -10335,10 +10257,8 @@ $result_trees{'all_commands_delimiters_printindex'} = {
                   'entry_node' => {},
                   'entry_number' => 10,
                   'in_code' => 1,
-                  'index_at_command' => 'deftypecv',
                   'index_ignore_chars' => {},
-                  'index_name' => 'vr',
-                  'index_type_command' => 'deftypecv'
+                  'index_name' => 'vr'
                 },
                 'original_def_cmdname' => 'deftypecv'
               },
@@ -10603,10 +10523,8 @@ $result_trees{'all_commands_delimiters_printindex'} = {
                   'entry_node' => {},
                   'entry_number' => 11,
                   'in_code' => 1,
-                  'index_at_command' => 'deftypecv',
                   'index_ignore_chars' => {},
-                  'index_name' => 'vr',
-                  'index_type_command' => 'deftypecv'
+                  'index_name' => 'vr'
                 },
                 'original_def_cmdname' => 'deftypecv'
               },
@@ -10842,10 +10760,8 @@ $result_trees{'all_commands_delimiters_printindex'} = {
                   'entry_node' => {},
                   'entry_number' => 27,
                   'in_code' => 1,
-                  'index_at_command' => 'defop',
                   'index_ignore_chars' => {},
-                  'index_name' => 'fn',
-                  'index_type_command' => 'defop'
+                  'index_name' => 'fn'
                 },
                 'original_def_cmdname' => 'defop'
               },
@@ -11081,10 +10997,8 @@ $result_trees{'all_commands_delimiters_printindex'} = {
                   'entry_node' => {},
                   'entry_number' => 28,
                   'in_code' => 1,
-                  'index_at_command' => 'defop',
                   'index_ignore_chars' => {},
-                  'index_name' => 'fn',
-                  'index_type_command' => 'defop'
+                  'index_name' => 'fn'
                 },
                 'original_def_cmdname' => 'defop'
               },
@@ -11349,10 +11263,8 @@ $result_trees{'all_commands_delimiters_printindex'} = {
                   'entry_node' => {},
                   'entry_number' => 29,
                   'in_code' => 1,
-                  'index_at_command' => 'deftypeop',
                   'index_ignore_chars' => {},
-                  'index_name' => 'fn',
-                  'index_type_command' => 'deftypeop'
+                  'index_name' => 'fn'
                 },
                 'original_def_cmdname' => 'deftypeop'
               },
@@ -11617,10 +11529,8 @@ $result_trees{'all_commands_delimiters_printindex'} = {
                   'entry_node' => {},
                   'entry_number' => 30,
                   'in_code' => 1,
-                  'index_at_command' => 'deftypeop',
                   'index_ignore_chars' => {},
-                  'index_name' => 'fn',
-                  'index_type_command' => 'deftypeop'
+                  'index_name' => 'fn'
                 },
                 'original_def_cmdname' => 'deftypeop'
               },
@@ -11889,10 +11799,8 @@ $result_trees{'all_commands_delimiters_printindex'} = {
                   'entry_node' => {},
                   'entry_number' => 31,
                   'in_code' => 1,
-                  'index_at_command' => 'deftypefn',
                   'index_ignore_chars' => {},
-                  'index_name' => 'fn',
-                  'index_type_command' => 'deftypefn'
+                  'index_name' => 'fn'
                 },
                 'original_def_cmdname' => 'deftypefn'
               },
@@ -12161,10 +12069,8 @@ $result_trees{'all_commands_delimiters_printindex'} = {
                   'entry_node' => {},
                   'entry_number' => 32,
                   'in_code' => 1,
-                  'index_at_command' => 'deftypefn',
                   'index_ignore_chars' => {},
-                  'index_name' => 'fn',
-                  'index_type_command' => 'deftypefn'
+                  'index_name' => 'fn'
                 },
                 'original_def_cmdname' => 'deftypefn'
               },
diff --git a/tp/t/results/def/all_commands_printindex.pl 
b/tp/t/results/def/all_commands_printindex.pl
index b2bdf83b27..f0d3742435 100644
--- a/tp/t/results/def/all_commands_printindex.pl
+++ b/tp/t/results/def/all_commands_printindex.pl
@@ -130,10 +130,8 @@ $result_trees{'all_commands_printindex'} = {
                   'entry_node' => {},
                   'entry_number' => 1,
                   'in_code' => 1,
-                  'index_at_command' => 'defvr',
                   'index_ignore_chars' => {},
-                  'index_name' => 'vr',
-                  'index_type_command' => 'defvr'
+                  'index_name' => 'vr'
                 },
                 'original_def_cmdname' => 'defvr'
               },
@@ -273,10 +271,8 @@ $result_trees{'all_commands_printindex'} = {
                   'entry_node' => {},
                   'entry_number' => 1,
                   'in_code' => 1,
-                  'index_at_command' => 'deffn',
                   'index_ignore_chars' => {},
-                  'index_name' => 'fn',
-                  'index_type_command' => 'deffn'
+                  'index_name' => 'fn'
                 },
                 'original_def_cmdname' => 'deffn'
               },
@@ -403,10 +399,8 @@ $result_trees{'all_commands_printindex'} = {
                   'entry_node' => {},
                   'entry_number' => 2,
                   'in_code' => 1,
-                  'index_at_command' => 'deffn',
                   'index_ignore_chars' => {},
-                  'index_name' => 'fn',
-                  'index_type_command' => 'deffn'
+                  'index_name' => 'fn'
                 },
                 'original_def_cmdname' => 'deffn'
               },
@@ -560,10 +554,8 @@ $result_trees{'all_commands_printindex'} = {
                   'entry_node' => {},
                   'entry_number' => 3,
                   'in_code' => 1,
-                  'index_at_command' => 'deftypefn',
                   'index_ignore_chars' => {},
-                  'index_name' => 'fn',
-                  'index_type_command' => 'deftypefn'
+                  'index_name' => 'fn'
                 },
                 'original_def_cmdname' => 'deftypefn'
               },
@@ -704,10 +696,8 @@ $result_trees{'all_commands_printindex'} = {
                   'entry_node' => {},
                   'entry_number' => 4,
                   'in_code' => 1,
-                  'index_at_command' => 'deftypefn',
                   'index_ignore_chars' => {},
-                  'index_name' => 'fn',
-                  'index_type_command' => 'deftypefn'
+                  'index_name' => 'fn'
                 },
                 'original_def_cmdname' => 'deftypefn'
               },
@@ -883,10 +873,8 @@ $result_trees{'all_commands_printindex'} = {
                   'entry_node' => {},
                   'entry_number' => 5,
                   'in_code' => 1,
-                  'index_at_command' => 'deftypeop',
                   'index_ignore_chars' => {},
-                  'index_name' => 'fn',
-                  'index_type_command' => 'deftypeop'
+                  'index_name' => 'fn'
                 },
                 'original_def_cmdname' => 'deftypeop'
               },
@@ -1049,10 +1037,8 @@ $result_trees{'all_commands_printindex'} = {
                   'entry_node' => {},
                   'entry_number' => 6,
                   'in_code' => 1,
-                  'index_at_command' => 'deftypeop',
                   'index_ignore_chars' => {},
-                  'index_name' => 'fn',
-                  'index_type_command' => 'deftypeop'
+                  'index_name' => 'fn'
                 },
                 'original_def_cmdname' => 'deftypeop'
               },
@@ -1193,10 +1179,8 @@ $result_trees{'all_commands_printindex'} = {
                   'entry_node' => {},
                   'entry_number' => 2,
                   'in_code' => 1,
-                  'index_at_command' => 'deftypevr',
                   'index_ignore_chars' => {},
-                  'index_name' => 'vr',
-                  'index_type_command' => 'deftypevr'
+                  'index_name' => 'vr'
                 },
                 'original_def_cmdname' => 'deftypevr'
               },
@@ -1337,10 +1321,8 @@ $result_trees{'all_commands_printindex'} = {
                   'entry_node' => {},
                   'entry_number' => 3,
                   'in_code' => 1,
-                  'index_at_command' => 'defcv',
                   'index_ignore_chars' => {},
-                  'index_name' => 'vr',
-                  'index_type_command' => 'defcv'
+                  'index_name' => 'vr'
                 },
                 'original_def_cmdname' => 'defcv'
               },
@@ -1494,10 +1476,8 @@ $result_trees{'all_commands_printindex'} = {
                   'entry_node' => {},
                   'entry_number' => 4,
                   'in_code' => 1,
-                  'index_at_command' => 'defcv',
                   'index_ignore_chars' => {},
-                  'index_name' => 'vr',
-                  'index_type_command' => 'defcv'
+                  'index_name' => 'vr'
                 },
                 'original_def_cmdname' => 'defcv'
               },
@@ -1660,10 +1640,8 @@ $result_trees{'all_commands_printindex'} = {
                   'entry_node' => {},
                   'entry_number' => 5,
                   'in_code' => 1,
-                  'index_at_command' => 'deftypecv',
                   'index_ignore_chars' => {},
-                  'index_name' => 'vr',
-                  'index_type_command' => 'deftypecv'
+                  'index_name' => 'vr'
                 },
                 'original_def_cmdname' => 'deftypecv'
               },
@@ -1839,10 +1817,8 @@ $result_trees{'all_commands_printindex'} = {
                   'entry_node' => {},
                   'entry_number' => 6,
                   'in_code' => 1,
-                  'index_at_command' => 'deftypecv',
                   'index_ignore_chars' => {},
-                  'index_name' => 'vr',
-                  'index_type_command' => 'deftypecv'
+                  'index_name' => 'vr'
                 },
                 'original_def_cmdname' => 'deftypecv'
               },
@@ -2004,10 +1980,8 @@ $result_trees{'all_commands_printindex'} = {
                   'entry_node' => {},
                   'entry_number' => 7,
                   'in_code' => 1,
-                  'index_at_command' => 'defop',
                   'index_ignore_chars' => {},
-                  'index_name' => 'fn',
-                  'index_type_command' => 'defop'
+                  'index_name' => 'fn'
                 },
                 'original_def_cmdname' => 'defop'
               },
@@ -2156,10 +2130,8 @@ $result_trees{'all_commands_printindex'} = {
                   'entry_node' => {},
                   'entry_number' => 8,
                   'in_code' => 1,
-                  'index_at_command' => 'defop',
                   'index_ignore_chars' => {},
-                  'index_name' => 'fn',
-                  'index_type_command' => 'defop'
+                  'index_name' => 'fn'
                 },
                 'original_def_cmdname' => 'defop'
               },
@@ -2299,10 +2271,8 @@ $result_trees{'all_commands_printindex'} = {
                   'entry_node' => {},
                   'entry_number' => 1,
                   'in_code' => 1,
-                  'index_at_command' => 'deftp',
                   'index_ignore_chars' => {},
-                  'index_name' => 'tp',
-                  'index_type_command' => 'deftp'
+                  'index_name' => 'tp'
                 },
                 'original_def_cmdname' => 'deftp'
               },
@@ -2447,10 +2417,8 @@ $result_trees{'all_commands_printindex'} = {
                   'entry_node' => {},
                   'entry_number' => 9,
                   'in_code' => 1,
-                  'index_at_command' => 'defun',
                   'index_ignore_chars' => {},
-                  'index_name' => 'fn',
-                  'index_type_command' => 'defun'
+                  'index_name' => 'fn'
                 },
                 'original_def_cmdname' => 'defun'
               },
@@ -2595,10 +2563,8 @@ $result_trees{'all_commands_printindex'} = {
                   'entry_node' => {},
                   'entry_number' => 10,
                   'in_code' => 1,
-                  'index_at_command' => 'defmac',
                   'index_ignore_chars' => {},
-                  'index_name' => 'fn',
-                  'index_type_command' => 'defmac'
+                  'index_name' => 'fn'
                 },
                 'original_def_cmdname' => 'defmac'
               },
@@ -2743,10 +2709,8 @@ $result_trees{'all_commands_printindex'} = {
                   'entry_node' => {},
                   'entry_number' => 11,
                   'in_code' => 1,
-                  'index_at_command' => 'defspec',
                   'index_ignore_chars' => {},
-                  'index_name' => 'fn',
-                  'index_type_command' => 'defspec'
+                  'index_name' => 'fn'
                 },
                 'original_def_cmdname' => 'defspec'
               },
@@ -2878,10 +2842,8 @@ $result_trees{'all_commands_printindex'} = {
                   'entry_node' => {},
                   'entry_number' => 7,
                   'in_code' => 1,
-                  'index_at_command' => 'defvar',
                   'index_ignore_chars' => {},
-                  'index_name' => 'vr',
-                  'index_type_command' => 'defvar'
+                  'index_name' => 'vr'
                 },
                 'original_def_cmdname' => 'defvar'
               },
@@ -3039,10 +3001,8 @@ $result_trees{'all_commands_printindex'} = {
                   'entry_node' => {},
                   'entry_number' => 8,
                   'in_code' => 1,
-                  'index_at_command' => 'defvar',
                   'index_ignore_chars' => {},
-                  'index_name' => 'vr',
-                  'index_type_command' => 'defvar'
+                  'index_name' => 'vr'
                 },
                 'original_def_cmdname' => 'defvar'
               },
@@ -3174,10 +3134,8 @@ $result_trees{'all_commands_printindex'} = {
                   'entry_node' => {},
                   'entry_number' => 9,
                   'in_code' => 1,
-                  'index_at_command' => 'defopt',
                   'index_ignore_chars' => {},
-                  'index_name' => 'vr',
-                  'index_type_command' => 'defopt'
+                  'index_name' => 'vr'
                 },
                 'original_def_cmdname' => 'defopt'
               },
@@ -3336,10 +3294,8 @@ $result_trees{'all_commands_printindex'} = {
                   'entry_node' => {},
                   'entry_number' => 12,
                   'in_code' => 1,
-                  'index_at_command' => 'deftypefun',
                   'index_ignore_chars' => {},
-                  'index_name' => 'fn',
-                  'index_type_command' => 'deftypefun'
+                  'index_name' => 'fn'
                 },
                 'original_def_cmdname' => 'deftypefun'
               },
@@ -3485,10 +3441,8 @@ $result_trees{'all_commands_printindex'} = {
                   'entry_node' => {},
                   'entry_number' => 10,
                   'in_code' => 1,
-                  'index_at_command' => 'deftypevar',
                   'index_ignore_chars' => {},
-                  'index_name' => 'vr',
-                  'index_type_command' => 'deftypevar'
+                  'index_name' => 'vr'
                 },
                 'original_def_cmdname' => 'deftypevar'
               },
@@ -3642,10 +3596,8 @@ $result_trees{'all_commands_printindex'} = {
                   'entry_node' => {},
                   'entry_number' => 11,
                   'in_code' => 1,
-                  'index_at_command' => 'defivar',
                   'index_ignore_chars' => {},
-                  'index_name' => 'vr',
-                  'index_type_command' => 'defivar'
+                  'index_name' => 'vr'
                 },
                 'original_def_cmdname' => 'defivar'
               },
@@ -3813,10 +3765,8 @@ $result_trees{'all_commands_printindex'} = {
                   'entry_node' => {},
                   'entry_number' => 12,
                   'in_code' => 1,
-                  'index_at_command' => 'deftypeivar',
                   'index_ignore_chars' => {},
-                  'index_name' => 'vr',
-                  'index_type_command' => 'deftypeivar'
+                  'index_name' => 'vr'
                 },
                 'original_def_cmdname' => 'deftypeivar'
               },
@@ -3983,10 +3933,8 @@ $result_trees{'all_commands_printindex'} = {
                   'entry_node' => {},
                   'entry_number' => 13,
                   'in_code' => 1,
-                  'index_at_command' => 'defmethod',
                   'index_ignore_chars' => {},
-                  'index_name' => 'fn',
-                  'index_type_command' => 'defmethod'
+                  'index_name' => 'fn'
                 },
                 'original_def_cmdname' => 'defmethod'
               },
@@ -4167,10 +4115,8 @@ $result_trees{'all_commands_printindex'} = {
                   'entry_node' => {},
                   'entry_number' => 14,
                   'in_code' => 1,
-                  'index_at_command' => 'deftypemethod',
                   'index_ignore_chars' => {},
-                  'index_name' => 'fn',
-                  'index_type_command' => 'deftypemethod'
+                  'index_name' => 'fn'
                 },
                 'original_def_cmdname' => 'deftypemethod'
               },
diff --git a/tp/t/results/def/ampchar.pl b/tp/t/results/def/ampchar.pl
index 575bf7e0be..3888dffc83 100644
--- a/tp/t/results/def/ampchar.pl
+++ b/tp/t/results/def/ampchar.pl
@@ -138,10 +138,8 @@ $result_trees{'ampchar'} = {
                   'entry_element' => {},
                   'entry_number' => 1,
                   'in_code' => 1,
-                  'index_at_command' => 'defop',
                   'index_ignore_chars' => {},
-                  'index_name' => 'fn',
-                  'index_type_command' => 'defop'
+                  'index_name' => 'fn'
                 },
                 'original_def_cmdname' => 'defop'
               },
diff --git a/tp/t/results/def/code_in_def.pl b/tp/t/results/def/code_in_def.pl
index 9630f31856..f6282e0022 100644
--- a/tp/t/results/def/code_in_def.pl
+++ b/tp/t/results/def/code_in_def.pl
@@ -133,10 +133,8 @@ $result_trees{'code_in_def'} = {
                   'entry_element' => {},
                   'entry_number' => 1,
                   'in_code' => 1,
-                  'index_at_command' => 'deftypefn',
                   'index_ignore_chars' => {},
-                  'index_name' => 'fn',
-                  'index_type_command' => 'deftypefn'
+                  'index_name' => 'fn'
                 },
                 'original_def_cmdname' => 'deftypefn'
               },
diff --git a/tp/t/results/def/def_defx_mismatch.pl 
b/tp/t/results/def/def_defx_mismatch.pl
index ac98aed151..848385d337 100644
--- a/tp/t/results/def/def_defx_mismatch.pl
+++ b/tp/t/results/def/def_defx_mismatch.pl
@@ -140,10 +140,8 @@ $result_trees{'def_defx_mismatch'} = {
                   'entry_element' => {},
                   'entry_number' => 1,
                   'in_code' => 1,
-                  'index_at_command' => 'defun',
                   'index_ignore_chars' => {},
-                  'index_name' => 'fn',
-                  'index_type_command' => 'defun'
+                  'index_name' => 'fn'
                 },
                 'original_def_cmdname' => 'defun'
               },
@@ -276,10 +274,8 @@ $result_trees{'def_defx_mismatch'} = {
                   'entry_element' => {},
                   'entry_number' => 2,
                   'in_code' => 1,
-                  'index_at_command' => 'deffnx',
                   'index_ignore_chars' => {},
-                  'index_name' => 'fn',
-                  'index_type_command' => 'deffn'
+                  'index_name' => 'fn'
                 },
                 'not_after_command' => 1,
                 'original_def_cmdname' => 'deffnx'
diff --git a/tp/t/results/def/defx_after_comment.pl 
b/tp/t/results/def/defx_after_comment.pl
index 53974fa59a..baf4f0be5b 100644
--- a/tp/t/results/def/defx_after_comment.pl
+++ b/tp/t/results/def/defx_after_comment.pl
@@ -102,10 +102,8 @@ $result_trees{'defx_after_comment'} = {
                   'entry_element' => {},
                   'entry_number' => 1,
                   'in_code' => 1,
-                  'index_at_command' => 'deffn',
                   'index_ignore_chars' => {},
-                  'index_name' => 'fn',
-                  'index_type_command' => 'deffn'
+                  'index_name' => 'fn'
                 },
                 'original_def_cmdname' => 'deffn'
               },
@@ -210,10 +208,8 @@ $result_trees{'defx_after_comment'} = {
                   'entry_element' => {},
                   'entry_number' => 2,
                   'in_code' => 1,
-                  'index_at_command' => 'deffnx',
                   'index_ignore_chars' => {},
-                  'index_name' => 'fn',
-                  'index_type_command' => 'deffn'
+                  'index_name' => 'fn'
                 },
                 'original_def_cmdname' => 'deffnx'
               },
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 60c199e622..7abd7a7c91 100644
--- a/tp/t/results/def/defx_after_comment_in_example.pl
+++ b/tp/t/results/def/defx_after_comment_in_example.pl
@@ -116,10 +116,8 @@ $result_trees{'defx_after_comment_in_example'} = {
                       'entry_element' => {},
                       'entry_number' => 1,
                       'in_code' => 1,
-                      'index_at_command' => 'deffn',
                       'index_ignore_chars' => {},
-                      'index_name' => 'fn',
-                      'index_type_command' => 'deffn'
+                      'index_name' => 'fn'
                     },
                     'original_def_cmdname' => 'deffn'
                   },
@@ -229,10 +227,8 @@ $result_trees{'defx_after_comment_in_example'} = {
                       'entry_element' => {},
                       'entry_number' => 2,
                       'in_code' => 1,
-                      'index_at_command' => 'deffnx',
                       'index_ignore_chars' => {},
-                      'index_name' => 'fn',
-                      'index_type_command' => 'deffn'
+                      'index_name' => 'fn'
                     },
                     'original_def_cmdname' => 'deffnx'
                   },
diff --git a/tp/t/results/def/defx_after_empty_line.pl 
b/tp/t/results/def/defx_after_empty_line.pl
index ad6b3be73e..793da222c1 100644
--- a/tp/t/results/def/defx_after_empty_line.pl
+++ b/tp/t/results/def/defx_after_empty_line.pl
@@ -102,10 +102,8 @@ $result_trees{'defx_after_empty_line'} = {
                   'entry_element' => {},
                   'entry_number' => 1,
                   'in_code' => 1,
-                  'index_at_command' => 'deffn',
                   'index_ignore_chars' => {},
-                  'index_name' => 'fn',
-                  'index_type_command' => 'deffn'
+                  'index_name' => 'fn'
                 },
                 'original_def_cmdname' => 'deffn'
               },
@@ -199,10 +197,8 @@ $result_trees{'defx_after_empty_line'} = {
                   'entry_element' => {},
                   'entry_number' => 2,
                   'in_code' => 1,
-                  'index_at_command' => 'deffnx',
                   'index_ignore_chars' => {},
-                  'index_name' => 'fn',
-                  'index_type_command' => 'deffn'
+                  'index_name' => 'fn'
                 },
                 'original_def_cmdname' => 'deffnx'
               },
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 db57622f5e..da27c764a6 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
@@ -116,10 +116,8 @@ $result_trees{'defx_after_empty_line_in_example'} = {
                       'entry_element' => {},
                       'entry_number' => 1,
                       'in_code' => 1,
-                      'index_at_command' => 'deffn',
                       'index_ignore_chars' => {},
-                      'index_name' => 'fn',
-                      'index_type_command' => 'deffn'
+                      'index_name' => 'fn'
                     },
                     'original_def_cmdname' => 'deffn'
                   },
@@ -255,10 +253,8 @@ $result_trees{'defx_after_empty_line_in_example'} = {
                       'entry_element' => {},
                       'entry_number' => 2,
                       'in_code' => 1,
-                      'index_at_command' => 'deffnx',
                       'index_ignore_chars' => {},
-                      'index_name' => 'fn',
-                      'index_type_command' => 'deffn'
+                      'index_name' => 'fn'
                     },
                     'original_def_cmdname' => 'deffnx'
                   },
diff --git a/tp/t/results/def/defx_after_paragraph_end.pl 
b/tp/t/results/def/defx_after_paragraph_end.pl
index 7a1f746e18..d65f682dfb 100644
--- a/tp/t/results/def/defx_after_paragraph_end.pl
+++ b/tp/t/results/def/defx_after_paragraph_end.pl
@@ -102,10 +102,8 @@ $result_trees{'defx_after_paragraph_end'} = {
                   'entry_element' => {},
                   'entry_number' => 1,
                   'in_code' => 1,
-                  'index_at_command' => 'deffn',
                   'index_ignore_chars' => {},
-                  'index_name' => 'fn',
-                  'index_type_command' => 'deffn'
+                  'index_name' => 'fn'
                 },
                 'original_def_cmdname' => 'deffn'
               },
@@ -208,10 +206,8 @@ $result_trees{'defx_after_paragraph_end'} = {
                   'entry_element' => {},
                   'entry_number' => 2,
                   'in_code' => 1,
-                  'index_at_command' => 'deffnx',
                   'index_ignore_chars' => {},
-                  'index_name' => 'fn',
-                  'index_type_command' => 'deffn'
+                  'index_name' => 'fn'
                 },
                 'not_after_command' => 1,
                 'original_def_cmdname' => 'deffnx'
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 df311f134f..bde69f8e64 100644
--- a/tp/t/results/def/defx_after_preformatted_with_text.pl
+++ b/tp/t/results/def/defx_after_preformatted_with_text.pl
@@ -116,10 +116,8 @@ $result_trees{'defx_after_preformatted_with_text'} = {
                       'entry_element' => {},
                       'entry_number' => 1,
                       'in_code' => 1,
-                      'index_at_command' => 'deffn',
                       'index_ignore_chars' => {},
-                      'index_name' => 'fn',
-                      'index_type_command' => 'deffn'
+                      'index_name' => 'fn'
                     },
                     'original_def_cmdname' => 'deffn'
                   },
@@ -222,10 +220,8 @@ $result_trees{'defx_after_preformatted_with_text'} = {
                       'entry_element' => {},
                       'entry_number' => 2,
                       'in_code' => 1,
-                      'index_at_command' => 'deffnx',
                       'index_ignore_chars' => {},
-                      'index_name' => 'fn',
-                      'index_type_command' => 'deffn'
+                      'index_name' => 'fn'
                     },
                     'not_after_command' => 1,
                     'original_def_cmdname' => 'deffnx'
diff --git a/tp/t/results/def/defx_after_text.pl 
b/tp/t/results/def/defx_after_text.pl
index fbd8723864..4fd01c97a6 100644
--- a/tp/t/results/def/defx_after_text.pl
+++ b/tp/t/results/def/defx_after_text.pl
@@ -102,10 +102,8 @@ $result_trees{'defx_after_text'} = {
                   'entry_element' => {},
                   'entry_number' => 1,
                   'in_code' => 1,
-                  'index_at_command' => 'deffn',
                   'index_ignore_chars' => {},
-                  'index_name' => 'fn',
-                  'index_type_command' => 'deffn'
+                  'index_name' => 'fn'
                 },
                 'original_def_cmdname' => 'deffn'
               },
@@ -203,10 +201,8 @@ $result_trees{'defx_after_text'} = {
                   'entry_element' => {},
                   'entry_number' => 2,
                   'in_code' => 1,
-                  'index_at_command' => 'deffnx',
                   'index_ignore_chars' => {},
-                  'index_name' => 'fn',
-                  'index_type_command' => 'deffn'
+                  'index_name' => 'fn'
                 },
                 'not_after_command' => 1,
                 'original_def_cmdname' => 'deffnx'
diff --git a/tp/t/results/def/defx_in_example.pl 
b/tp/t/results/def/defx_in_example.pl
index d8e5f7b7d2..7311fd2c06 100644
--- a/tp/t/results/def/defx_in_example.pl
+++ b/tp/t/results/def/defx_in_example.pl
@@ -116,10 +116,8 @@ $result_trees{'defx_in_example'} = {
                       'entry_element' => {},
                       'entry_number' => 1,
                       'in_code' => 1,
-                      'index_at_command' => 'deffn',
                       'index_ignore_chars' => {},
-                      'index_name' => 'fn',
-                      'index_type_command' => 'deffn'
+                      'index_name' => 'fn'
                     },
                     'original_def_cmdname' => 'deffn'
                   },
@@ -203,10 +201,8 @@ $result_trees{'defx_in_example'} = {
                       'entry_element' => {},
                       'entry_number' => 2,
                       'in_code' => 1,
-                      'index_at_command' => 'deffnx',
                       'index_ignore_chars' => {},
-                      'index_name' => 'fn',
-                      'index_type_command' => 'deffn'
+                      'index_name' => 'fn'
                     },
                     'original_def_cmdname' => 'deffnx'
                   },
diff --git a/tp/t/results/def/double_command.pl 
b/tp/t/results/def/double_command.pl
index 49896ccf25..7b27819cc7 100644
--- a/tp/t/results/def/double_command.pl
+++ b/tp/t/results/def/double_command.pl
@@ -287,10 +287,8 @@ $result_trees{'double_command'} = {
                           'entry_element' => {},
                           'entry_number' => 1,
                           'in_code' => 1,
-                          'index_at_command' => 'deffnx',
                           'index_ignore_chars' => {},
-                          'index_name' => 'fn',
-                          'index_type_command' => 'deffn'
+                          'index_name' => 'fn'
                         },
                         'not_after_command' => 1,
                         'original_def_cmdname' => 'deffnx'
@@ -327,10 +325,8 @@ $result_trees{'double_command'} = {
                   'entry_element' => {},
                   'entry_number' => 2,
                   'in_code' => 1,
-                  'index_at_command' => 'deffn',
                   'index_ignore_chars' => {},
-                  'index_name' => 'fn',
-                  'index_type_command' => 'deffn'
+                  'index_name' => 'fn'
                 },
                 'original_def_cmdname' => 'deffn'
               },
@@ -502,10 +498,8 @@ $result_trees{'double_command'} = {
                               'entry_element' => {},
                               'entry_number' => 1,
                               'in_code' => 1,
-                              'index_at_command' => 'defvr',
                               'index_ignore_chars' => {},
-                              'index_name' => 'vr',
-                              'index_type_command' => 'defvr'
+                              'index_name' => 'vr'
                             },
                             'original_def_cmdname' => 'defvr'
                           },
@@ -551,10 +545,8 @@ $result_trees{'double_command'} = {
                   'entry_element' => {},
                   'entry_number' => 3,
                   'in_code' => 1,
-                  'index_at_command' => 'deffn',
                   'index_ignore_chars' => {},
-                  'index_name' => 'fn',
-                  'index_type_command' => 'deffn'
+                  'index_name' => 'fn'
                 },
                 'original_def_cmdname' => 'deffn'
               },
diff --git a/tp/t/results/def/empty_def_arguments.pl 
b/tp/t/results/def/empty_def_arguments.pl
index a0be7b61b5..adbf653e04 100644
--- a/tp/t/results/def/empty_def_arguments.pl
+++ b/tp/t/results/def/empty_def_arguments.pl
@@ -102,10 +102,8 @@ $result_trees{'empty_def_arguments'} = {
                   'entry_element' => {},
                   'entry_number' => 1,
                   'in_code' => 1,
-                  'index_at_command' => 'deffn',
                   'index_ignore_chars' => {},
-                  'index_name' => 'fn',
-                  'index_type_command' => 'deffn'
+                  'index_name' => 'fn'
                 },
                 'original_def_cmdname' => 'deffn'
               },
diff --git a/tp/t/results/def/empty_def_command.pl 
b/tp/t/results/def/empty_def_command.pl
index 778263ca29..aa88178a32 100644
--- a/tp/t/results/def/empty_def_command.pl
+++ b/tp/t/results/def/empty_def_command.pl
@@ -61,10 +61,8 @@ $result_trees{'empty_def_command'} = {
                   'entry_element' => {},
                   'entry_number' => 1,
                   'in_code' => 1,
-                  'index_at_command' => 'deffn',
                   'index_ignore_chars' => {},
-                  'index_name' => 'fn',
-                  'index_type_command' => 'deffn'
+                  'index_name' => 'fn'
                 },
                 'original_def_cmdname' => 'deffn'
               },
@@ -202,10 +200,8 @@ $result_trees{'empty_def_command'} = {
                   'entry_element' => {},
                   'entry_number' => 2,
                   'in_code' => 1,
-                  'index_at_command' => 'deffn',
                   'index_ignore_chars' => {},
-                  'index_name' => 'fn',
-                  'index_type_command' => 'deffn'
+                  'index_name' => 'fn'
                 },
                 'original_def_cmdname' => 'deffn'
               },
@@ -266,10 +262,8 @@ $result_trees{'empty_def_command'} = {
                   'entry_element' => {},
                   'entry_number' => 3,
                   'in_code' => 1,
-                  'index_at_command' => 'deffnx',
                   'index_ignore_chars' => {},
-                  'index_name' => 'fn',
-                  'index_type_command' => 'deffn'
+                  'index_name' => 'fn'
                 },
                 'original_def_cmdname' => 'deffnx'
               },
diff --git a/tp/t/results/def/empty_deftype.pl 
b/tp/t/results/def/empty_deftype.pl
index e105f16f60..a062dd4ed0 100644
--- a/tp/t/results/def/empty_deftype.pl
+++ b/tp/t/results/def/empty_deftype.pl
@@ -138,10 +138,8 @@ $result_trees{'empty_deftype'} = {
                   'entry_element' => {},
                   'entry_number' => 1,
                   'in_code' => 1,
-                  'index_at_command' => 'deftypefun',
                   'index_ignore_chars' => {},
-                  'index_name' => 'fn',
-                  'index_type_command' => 'deftypefun'
+                  'index_name' => 'fn'
                 },
                 'original_def_cmdname' => 'deftypefun'
               },
@@ -325,10 +323,8 @@ $result_trees{'empty_deftype'} = {
                   'entry_element' => {},
                   'entry_number' => 2,
                   'in_code' => 1,
-                  'index_at_command' => 'defun',
                   'index_ignore_chars' => {},
-                  'index_name' => 'fn',
-                  'index_type_command' => 'defun'
+                  'index_name' => 'fn'
                 },
                 'original_def_cmdname' => 'defun'
               },
@@ -553,10 +549,8 @@ $result_trees{'empty_deftype'} = {
                   'entry_element' => {},
                   'entry_number' => 3,
                   'in_code' => 1,
-                  'index_at_command' => 'deftypemethod',
                   'index_ignore_chars' => {},
-                  'index_name' => 'fn',
-                  'index_type_command' => 'deftypemethod'
+                  'index_name' => 'fn'
                 },
                 'original_def_cmdname' => 'deftypemethod'
               },
@@ -762,10 +756,8 @@ $result_trees{'empty_deftype'} = {
                   'entry_element' => {},
                   'entry_number' => 4,
                   'in_code' => 1,
-                  'index_at_command' => 'defmethod',
                   'index_ignore_chars' => {},
-                  'index_name' => 'fn',
-                  'index_type_command' => 'defmethod'
+                  'index_name' => 'fn'
                 },
                 'original_def_cmdname' => 'defmethod'
               },
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 2748b561a1..dea6672044 100644
--- a/tp/t/results/def/end_of_line_end_file.pl
+++ b/tp/t/results/def/end_of_line_end_file.pl
@@ -80,10 +80,8 @@ $result_trees{'end_of_line_end_file'} = {
                   'entry_element' => {},
                   'entry_number' => 1,
                   'in_code' => 1,
-                  'index_at_command' => 'deffn',
                   'index_ignore_chars' => {},
-                  'index_name' => 'fn',
-                  'index_type_command' => 'deffn'
+                  'index_name' => 'fn'
                 },
                 'original_def_cmdname' => 'deffn'
               },
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 8514200d8c..cedd64c694 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
@@ -78,10 +78,8 @@ $result_trees{'end_of_line_protect_at_end'} = {
                   'entry_element' => {},
                   'entry_number' => 1,
                   'in_code' => 1,
-                  'index_at_command' => 'deffn',
                   'index_ignore_chars' => {},
-                  'index_name' => 'fn',
-                  'index_type_command' => 'deffn'
+                  'index_name' => 'fn'
                 },
                 'original_def_cmdname' => 'deffn'
               },
diff --git a/tp/t/results/def/end_of_lines_protected.pl 
b/tp/t/results/def/end_of_lines_protected.pl
index 54c2f4c635..7e2579b21c 100644
--- a/tp/t/results/def/end_of_lines_protected.pl
+++ b/tp/t/results/def/end_of_lines_protected.pl
@@ -205,10 +205,8 @@ $result_trees{'end_of_lines_protected'} = {
                   'entry_element' => {},
                   'entry_number' => 1,
                   'in_code' => 1,
-                  'index_at_command' => 'deffn',
                   'index_ignore_chars' => {},
-                  'index_name' => 'fn',
-                  'index_type_command' => 'deffn'
+                  'index_name' => 'fn'
                 },
                 'original_def_cmdname' => '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 866f391f4e..e59cd463ca 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
@@ -224,10 +224,8 @@ $result_trees{'end_of_lines_protected_in_footnote'} = {
                               'entry_element' => {},
                               'entry_number' => 1,
                               'in_code' => 1,
-                              'index_at_command' => 'deffn',
                               'index_ignore_chars' => {},
-                              'index_name' => 'fn',
-                              'index_type_command' => 'deffn'
+                              'index_name' => 'fn'
                             },
                             'original_def_cmdname' => 'deffn'
                           },
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 3ace308ab4..794ec75ed1 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
@@ -219,10 +219,8 @@ $result_trees{'end_of_lines_protected_non_ascii'} = {
                   'entry_element' => {},
                   'entry_number' => 1,
                   'in_code' => 1,
-                  'index_at_command' => 'deffn',
                   'index_ignore_chars' => {},
-                  'index_name' => 'fn',
-                  'index_type_command' => 'deffn'
+                  'index_name' => 'fn'
                 },
                 'original_def_cmdname' => 'deffn'
               },
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 2166790544..ee4d6c3a06 100644
--- a/tp/t/results/def/inter_item_commands_in_def.pl
+++ b/tp/t/results/def/inter_item_commands_in_def.pl
@@ -102,10 +102,8 @@ $result_trees{'inter_item_commands_in_def'} = {
                   'entry_element' => {},
                   'entry_number' => 1,
                   'in_code' => 1,
-                  'index_at_command' => 'deffn',
                   'index_ignore_chars' => {},
-                  'index_name' => 'fn',
-                  'index_type_command' => 'deffn'
+                  'index_name' => 'fn'
                 },
                 'original_def_cmdname' => 'deffn'
               },
@@ -225,10 +223,8 @@ $result_trees{'inter_item_commands_in_def'} = {
                   'entry_element' => {},
                   'entry_number' => 2,
                   'in_code' => 1,
-                  'index_at_command' => 'deffnx',
                   'index_ignore_chars' => {},
-                  'index_name' => 'fn',
-                  'index_type_command' => 'deffn'
+                  'index_name' => 'fn'
                 },
                 'original_def_cmdname' => 'deffnx'
               },
@@ -271,10 +267,8 @@ $result_trees{'inter_item_commands_in_def'} = {
                       'entry_element' => {},
                       'entry_number' => 1,
                       'in_code' => 0,
-                      'index_at_command' => 'cindex',
                       'index_ignore_chars' => {},
-                      'index_name' => 'cp',
-                      'index_type_command' => 'cindex'
+                      'index_name' => 'cp'
                     }
                   },
                   'info' => {
@@ -391,10 +385,8 @@ $result_trees{'inter_item_commands_in_def'} = {
                   'entry_element' => {},
                   'entry_number' => 3,
                   'in_code' => 1,
-                  'index_at_command' => 'deffnx',
                   'index_ignore_chars' => {},
-                  'index_name' => 'fn',
-                  'index_type_command' => 'deffn'
+                  'index_name' => 'fn'
                 },
                 'original_def_cmdname' => 'deffnx'
               },
@@ -437,10 +429,8 @@ $result_trees{'inter_item_commands_in_def'} = {
                       'entry_element' => {},
                       'entry_number' => 2,
                       'in_code' => 0,
-                      'index_at_command' => 'cindex',
                       'index_ignore_chars' => {},
-                      'index_name' => 'cp',
-                      'index_type_command' => 'cindex'
+                      'index_name' => 'cp'
                     }
                   },
                   'info' => {
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 027a1a8747..afffe4b2b7 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
@@ -116,10 +116,8 @@ $result_trees{'inter_item_commands_in_def_in_example'} = {
                       'entry_element' => {},
                       'entry_number' => 1,
                       'in_code' => 1,
-                      'index_at_command' => 'deffn',
                       'index_ignore_chars' => {},
-                      'index_name' => 'fn',
-                      'index_type_command' => 'deffn'
+                      'index_name' => 'fn'
                     },
                     'original_def_cmdname' => 'deffn'
                   },
@@ -244,10 +242,8 @@ $result_trees{'inter_item_commands_in_def_in_example'} = {
                       'entry_element' => {},
                       'entry_number' => 2,
                       'in_code' => 1,
-                      'index_at_command' => 'deffnx',
                       'index_ignore_chars' => {},
-                      'index_name' => 'fn',
-                      'index_type_command' => 'deffn'
+                      'index_name' => 'fn'
                     },
                     'original_def_cmdname' => 'deffnx'
                   },
@@ -292,10 +288,8 @@ $result_trees{'inter_item_commands_in_def_in_example'} = {
                               'entry_element' => {},
                               'entry_number' => 1,
                               'in_code' => 0,
-                              'index_at_command' => 'cindex',
                               'index_ignore_chars' => {},
-                              'index_name' => 'cp',
-                              'index_type_command' => 'cindex'
+                              'index_name' => 'cp'
                             }
                           },
                           'info' => {
@@ -415,10 +409,8 @@ $result_trees{'inter_item_commands_in_def_in_example'} = {
                       'entry_element' => {},
                       'entry_number' => 3,
                       'in_code' => 1,
-                      'index_at_command' => 'deffnx',
                       'index_ignore_chars' => {},
-                      'index_name' => 'fn',
-                      'index_type_command' => 'deffn'
+                      'index_name' => 'fn'
                     },
                     'original_def_cmdname' => 'deffnx'
                   },
@@ -463,10 +455,8 @@ $result_trees{'inter_item_commands_in_def_in_example'} = {
                               'entry_element' => {},
                               'entry_number' => 2,
                               'in_code' => 0,
-                              'index_at_command' => 'cindex',
                               'index_ignore_chars' => {},
-                              'index_name' => 'cp',
-                              'index_type_command' => 'cindex'
+                              'index_name' => 'cp'
                             }
                           },
                           'info' => {
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 457281ca4e..b38fad54e2 100644
--- a/tp/t/results/def/leading_space_in_def_arg.pl
+++ b/tp/t/results/def/leading_space_in_def_arg.pl
@@ -89,10 +89,8 @@ $result_trees{'leading_space_in_def_arg'} = {
                   'entry_element' => {},
                   'entry_number' => 1,
                   'in_code' => 1,
-                  'index_at_command' => 'deffn',
                   'index_ignore_chars' => {},
-                  'index_name' => 'fn',
-                  'index_type_command' => 'deffn'
+                  'index_name' => 'fn'
                 },
                 'original_def_cmdname' => '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 2b54a369a1..209420d459 100644
--- a/tp/t/results/def/no_category_or_no_name.pl
+++ b/tp/t/results/def/no_category_or_no_name.pl
@@ -281,10 +281,8 @@ $result_trees{'no_category_or_no_name'} = {
                   'entry_element' => {},
                   'entry_number' => 1,
                   'in_code' => 1,
-                  'index_at_command' => 'deffn',
                   'index_ignore_chars' => {},
-                  'index_name' => 'fn',
-                  'index_type_command' => 'deffn'
+                  'index_name' => 'fn'
                 },
                 'original_def_cmdname' => 'deffn'
               },
diff --git a/tp/t/results/def/not_closed.pl b/tp/t/results/def/not_closed.pl
index 368928a2c0..37b6f1d7c3 100644
--- a/tp/t/results/def/not_closed.pl
+++ b/tp/t/results/def/not_closed.pl
@@ -74,10 +74,8 @@ $result_trees{'not_closed'} = {
                   'entry_element' => {},
                   'entry_number' => 1,
                   'in_code' => 1,
-                  'index_at_command' => 'deffn',
                   'index_ignore_chars' => {},
-                  'index_name' => 'fn',
-                  'index_type_command' => 'deffn'
+                  'index_name' => 'fn'
                 },
                 'original_def_cmdname' => 'deffn'
               },
@@ -151,10 +149,8 @@ $result_trees{'not_closed'} = {
                   'entry_element' => {},
                   'entry_number' => 2,
                   'in_code' => 1,
-                  'index_at_command' => 'deffnx',
                   'index_ignore_chars' => {},
-                  'index_name' => 'fn',
-                  'index_type_command' => 'deffn'
+                  'index_name' => 'fn'
                 },
                 'original_def_cmdname' => 'deffnx'
               },
@@ -255,10 +251,8 @@ $result_trees{'not_closed'} = {
                           'entry_element' => {},
                           'entry_number' => 1,
                           'in_code' => 1,
-                          'index_at_command' => 'defvar',
                           'index_ignore_chars' => {},
-                          'index_name' => 'vr',
-                          'index_type_command' => 'defvar'
+                          'index_name' => 'vr'
                         },
                         'original_def_cmdname' => 'defvar'
                       },
diff --git a/tp/t/results/def/omit_def_space.pl 
b/tp/t/results/def/omit_def_space.pl
index 3afebb6087..bf9fb2d514 100644
--- a/tp/t/results/def/omit_def_space.pl
+++ b/tp/t/results/def/omit_def_space.pl
@@ -217,10 +217,8 @@ $result_trees{'omit_def_space'} = {
                   'entry_node' => {},
                   'entry_number' => 1,
                   'in_code' => 1,
-                  'index_at_command' => 'defun',
                   'index_ignore_chars' => {},
-                  'index_name' => 'fn',
-                  'index_type_command' => 'defun'
+                  'index_name' => 'fn'
                 },
                 'omit_def_name_space' => 1,
                 'original_def_cmdname' => 'defun'
@@ -315,10 +313,8 @@ $result_trees{'omit_def_space'} = {
                   'entry_node' => {},
                   'entry_number' => 2,
                   'in_code' => 1,
-                  'index_at_command' => 'defunx',
                   'index_ignore_chars' => {},
-                  'index_name' => 'fn',
-                  'index_type_command' => 'defun'
+                  'index_name' => 'fn'
                 },
                 'omit_def_name_space' => 1,
                 'original_def_cmdname' => 'defunx'
diff --git a/tp/t/results/def/protected_brace.pl 
b/tp/t/results/def/protected_brace.pl
index 290045966b..0f9cae5b7e 100644
--- a/tp/t/results/def/protected_brace.pl
+++ b/tp/t/results/def/protected_brace.pl
@@ -61,10 +61,8 @@ $result_trees{'protected_brace'} = {
                   'entry_element' => {},
                   'entry_number' => 1,
                   'in_code' => 1,
-                  'index_at_command' => 'deffn',
                   'index_ignore_chars' => {},
-                  'index_name' => 'fn',
-                  'index_type_command' => 'deffn'
+                  'index_name' => 'fn'
                 },
                 'original_def_cmdname' => 'deffn'
               },
diff --git a/tp/t/results/def/ref_in_def.pl b/tp/t/results/def/ref_in_def.pl
index 794ef002e4..1d9839eedc 100644
--- a/tp/t/results/def/ref_in_def.pl
+++ b/tp/t/results/def/ref_in_def.pl
@@ -278,10 +278,8 @@ $result_trees{'ref_in_def'} = {
                   'entry_node' => {},
                   'entry_number' => 1,
                   'in_code' => 1,
-                  'index_at_command' => 'deffn',
                   'index_ignore_chars' => {},
-                  'index_name' => 'fn',
-                  'index_type_command' => 'deffn'
+                  'index_name' => 'fn'
                 },
                 'original_def_cmdname' => 'deffn'
               },
@@ -504,10 +502,8 @@ $result_trees{'ref_in_def'} = {
                   'entry_node' => {},
                   'entry_number' => 2,
                   'in_code' => 1,
-                  'index_at_command' => 'deffnx',
                   'index_ignore_chars' => {},
-                  'index_name' => 'fn',
-                  'index_type_command' => 'deffn'
+                  'index_name' => 'fn'
                 },
                 'original_def_cmdname' => 'deffnx'
               },
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 cba1337b0d..c16c014ee9 100644
--- a/tp/t/results/def/space_in_def_for_index.pl
+++ b/tp/t/results/def/space_in_def_for_index.pl
@@ -210,10 +210,8 @@ $result_trees{'space_in_def_for_index'} = {
                   'entry_node' => {},
                   'entry_number' => 1,
                   'in_code' => 1,
-                  'index_at_command' => 'deffn',
                   'index_ignore_chars' => {},
-                  'index_name' => 'fn',
-                  'index_type_command' => 'deffn'
+                  'index_name' => 'fn'
                 },
                 'original_def_cmdname' => 'deffn'
               },
@@ -308,10 +306,8 @@ $result_trees{'space_in_def_for_index'} = {
                   'entry_node' => {},
                   'entry_number' => 2,
                   'in_code' => 1,
-                  'index_at_command' => 'deffnx',
                   'index_ignore_chars' => {},
-                  'index_name' => 'fn',
-                  'index_type_command' => 'deffn'
+                  'index_name' => 'fn'
                 },
                 'original_def_cmdname' => 'deffnx'
               },
diff --git a/tp/t/results/def/wrong_braces_simple.pl 
b/tp/t/results/def/wrong_braces_simple.pl
index f97cacbe9a..b2b5f94795 100644
--- a/tp/t/results/def/wrong_braces_simple.pl
+++ b/tp/t/results/def/wrong_braces_simple.pl
@@ -100,10 +100,8 @@ $result_trees{'wrong_braces_simple'} = {
                   'entry_element' => {},
                   'entry_number' => 1,
                   'in_code' => 1,
-                  'index_at_command' => 'deffn',
                   'index_ignore_chars' => {},
-                  'index_name' => 'fn',
-                  'index_type_command' => 'deffn'
+                  'index_name' => 'fn'
                 },
                 'original_def_cmdname' => 'deffn'
               },
@@ -267,10 +265,8 @@ $result_trees{'wrong_braces_simple'} = {
                   'entry_element' => {},
                   'entry_number' => 2,
                   'in_code' => 1,
-                  'index_at_command' => 'deffn',
                   'index_ignore_chars' => {},
-                  'index_name' => 'fn',
-                  'index_type_command' => 'deffn'
+                  'index_name' => 'fn'
                 },
                 'original_def_cmdname' => 'deffn'
               },
@@ -439,10 +435,8 @@ $result_trees{'wrong_braces_simple'} = {
                   'entry_element' => {},
                   'entry_number' => 3,
                   'in_code' => 1,
-                  'index_at_command' => 'deffn',
                   'index_ignore_chars' => {},
-                  'index_name' => 'fn',
-                  'index_type_command' => 'deffn'
+                  'index_name' => 'fn'
                 },
                 'original_def_cmdname' => 'deffn'
               },
@@ -619,10 +613,8 @@ $result_trees{'wrong_braces_simple'} = {
                   'entry_element' => {},
                   'entry_number' => 4,
                   'in_code' => 1,
-                  'index_at_command' => 'deffn',
                   'index_ignore_chars' => {},
-                  'index_name' => 'fn',
-                  'index_type_command' => 'deffn'
+                  'index_name' => 'fn'
                 },
                 'original_def_cmdname' => 'deffn'
               },
@@ -773,10 +765,8 @@ $result_trees{'wrong_braces_simple'} = {
                   'entry_element' => {},
                   'entry_number' => 5,
                   'in_code' => 1,
-                  'index_at_command' => 'deffn',
                   'index_ignore_chars' => {},
-                  'index_name' => 'fn',
-                  'index_type_command' => 'deffn'
+                  'index_name' => 'fn'
                 },
                 'original_def_cmdname' => 'deffn'
               },
@@ -876,10 +866,8 @@ $result_trees{'wrong_braces_simple'} = {
                   'entry_element' => {},
                   'entry_number' => 6,
                   'in_code' => 1,
-                  'index_at_command' => 'deffnx',
                   'index_ignore_chars' => {},
-                  'index_name' => 'fn',
-                  'index_type_command' => 'deffn'
+                  'index_name' => 'fn'
                 },
                 'original_def_cmdname' => 'deffnx'
               },
@@ -997,10 +985,8 @@ $result_trees{'wrong_braces_simple'} = {
                   'entry_element' => {},
                   'entry_number' => 7,
                   'in_code' => 1,
-                  'index_at_command' => 'deffnx',
                   'index_ignore_chars' => {},
-                  'index_name' => 'fn',
-                  'index_type_command' => 'deffn'
+                  'index_name' => 'fn'
                 },
                 'original_def_cmdname' => 'deffnx'
               },
@@ -1123,10 +1109,8 @@ $result_trees{'wrong_braces_simple'} = {
                   'entry_element' => {},
                   'entry_number' => 8,
                   'in_code' => 1,
-                  'index_at_command' => 'deffnx',
                   'index_ignore_chars' => {},
-                  'index_name' => 'fn',
-                  'index_type_command' => 'deffn'
+                  'index_name' => 'fn'
                 },
                 'original_def_cmdname' => 'deffnx'
               },
@@ -1257,10 +1241,8 @@ $result_trees{'wrong_braces_simple'} = {
                   'entry_element' => {},
                   'entry_number' => 9,
                   'in_code' => 1,
-                  'index_at_command' => 'deffnx',
                   'index_ignore_chars' => {},
-                  'index_name' => 'fn',
-                  'index_type_command' => 'deffn'
+                  'index_name' => 'fn'
                 },
                 'original_def_cmdname' => 'deffnx'
               },
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 4a2b7fc270..c92a606284 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
@@ -107,10 +107,8 @@ $result_trees{'wrong_braces_with_end_of_lines'} = {
                   'entry_element' => {},
                   'entry_number' => 1,
                   'in_code' => 1,
-                  'index_at_command' => 'deffn',
                   'index_ignore_chars' => {},
-                  'index_name' => 'fn',
-                  'index_type_command' => 'deffn'
+                  'index_name' => 'fn'
                 },
                 'original_def_cmdname' => 'deffn'
               },
@@ -288,10 +286,8 @@ $result_trees{'wrong_braces_with_end_of_lines'} = {
                   'entry_element' => {},
                   'entry_number' => 2,
                   'in_code' => 1,
-                  'index_at_command' => 'deffn',
                   'index_ignore_chars' => {},
-                  'index_name' => 'fn',
-                  'index_type_command' => 'deffn'
+                  'index_name' => 'fn'
                 },
                 'original_def_cmdname' => 'deffn'
               },
diff --git a/tp/t/results/float/cindex_in_caption.pl 
b/tp/t/results/float/cindex_in_caption.pl
index cf57acb439..a1d1549308 100644
--- a/tp/t/results/float/cindex_in_caption.pl
+++ b/tp/t/results/float/cindex_in_caption.pl
@@ -200,10 +200,8 @@ $result_trees{'cindex_in_caption'} = {
                               'entry_node' => {},
                               'entry_number' => 1,
                               'in_code' => 0,
-                              'index_at_command' => 'cindex',
                               'index_ignore_chars' => {},
-                              'index_name' => 'cp',
-                              'index_type_command' => 'cindex'
+                              'index_name' => 'cp'
                             }
                           },
                           'info' => {
diff --git a/tp/t/results/float/complex_float.pl 
b/tp/t/results/float/complex_float.pl
index cfe0f17383..f75b8361d2 100644
--- a/tp/t/results/float/complex_float.pl
+++ b/tp/t/results/float/complex_float.pl
@@ -481,10 +481,8 @@ $result_trees{'complex_float'} = {
                       'entry_node' => {},
                       'entry_number' => 1,
                       'in_code' => 0,
-                      'index_at_command' => 'cindex',
                       'index_ignore_chars' => {},
-                      'index_name' => 'cp',
-                      'index_type_command' => 'cindex'
+                      'index_name' => 'cp'
                     }
                   },
                   'info' => {
@@ -1594,10 +1592,8 @@ $result_trees{'complex_float'} = {
                               'entry_node' => {},
                               'entry_number' => 2,
                               'in_code' => 0,
-                              'index_at_command' => 'cindex',
                               'index_ignore_chars' => {},
-                              'index_name' => 'cp',
-                              'index_type_command' => 'cindex'
+                              'index_name' => 'cp'
                             }
                           },
                           'info' => {
@@ -2988,10 +2984,8 @@ $result_trees{'complex_float'} = {
                               'entry_node' => {},
                               'entry_number' => 3,
                               'in_code' => 0,
-                              'index_at_command' => 'cindex',
                               'index_ignore_chars' => {},
-                              'index_name' => 'cp',
-                              'index_type_command' => 'cindex'
+                              'index_name' => 'cp'
                             }
                           },
                           'info' => {
diff --git a/tp/t/results/float/float_copying.pl 
b/tp/t/results/float/float_copying.pl
index 5a67970cf6..147a357cea 100644
--- a/tp/t/results/float/float_copying.pl
+++ b/tp/t/results/float/float_copying.pl
@@ -168,10 +168,8 @@ $result_trees{'float_copying'} = {
                                               'entry_number' => 1,
                                               'entry_region' => 'copying',
                                               'in_code' => 0,
-                                              'index_at_command' => 'cindex',
                                               'index_ignore_chars' => {},
-                                              'index_name' => 'cp',
-                                              'index_type_command' => 'cindex'
+                                              'index_name' => 'cp'
                                             }
                                           },
                                           'info' => {
@@ -212,10 +210,8 @@ $result_trees{'float_copying'} = {
                                               'entry_number' => 1,
                                               'entry_region' => 'copying',
                                               'in_code' => 1,
-                                              'index_at_command' => 'findex',
                                               'index_ignore_chars' => {},
-                                              'index_name' => 'fn',
-                                              'index_type_command' => 'findex'
+                                              'index_name' => 'fn'
                                             }
                                           },
                                           'info' => {
@@ -409,10 +405,8 @@ $result_trees{'float_copying'} = {
                                   'entry_number' => 2,
                                   'entry_region' => 'copying',
                                   'in_code' => 0,
-                                  'index_at_command' => 'cindex',
                                   'index_ignore_chars' => {},
-                                  'index_name' => 'cp',
-                                  'index_type_command' => 'cindex'
+                                  'index_name' => 'cp'
                                 }
                               },
                               'info' => {
@@ -453,10 +447,8 @@ $result_trees{'float_copying'} = {
                                   'entry_number' => 2,
                                   'entry_region' => 'copying',
                                   'in_code' => 1,
-                                  'index_at_command' => 'findex',
                                   'index_ignore_chars' => {},
-                                  'index_name' => 'fn',
-                                  'index_type_command' => 'findex'
+                                  'index_name' => 'fn'
                                 }
                               },
                               'info' => {
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 729bc0493e..a0099e0f5d 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
@@ -1067,10 +1067,8 @@ $result_trees{'char_latin1_latin1_in_refs'} = {
               'entry_node' => {},
               'entry_number' => 1,
               'in_code' => 0,
-              'index_at_command' => 'cindex',
               'index_ignore_chars' => {},
-              'index_name' => 'cp',
-              'index_type_command' => 'cindex'
+              'index_name' => 'cp'
             }
           },
           'info' => {
@@ -1111,10 +1109,8 @@ $result_trees{'char_latin1_latin1_in_refs'} = {
               'entry_node' => {},
               'entry_number' => 2,
               'in_code' => 0,
-              'index_at_command' => 'cindex',
               'index_ignore_chars' => {},
-              'index_name' => 'cp',
-              'index_type_command' => 'cindex'
+              'index_name' => 'cp'
             }
           },
           'info' => {
@@ -1155,10 +1151,8 @@ $result_trees{'char_latin1_latin1_in_refs'} = {
               'entry_node' => {},
               'entry_number' => 3,
               'in_code' => 0,
-              'index_at_command' => 'cindex',
               'index_ignore_chars' => {},
-              'index_name' => 'cp',
-              'index_type_command' => 'cindex'
+              'index_name' => 'cp'
             }
           },
           'info' => {
@@ -1199,10 +1193,8 @@ $result_trees{'char_latin1_latin1_in_refs'} = {
               'entry_node' => {},
               'entry_number' => 4,
               'in_code' => 0,
-              'index_at_command' => 'cindex',
               'index_ignore_chars' => {},
-              'index_name' => 'cp',
-              'index_type_command' => 'cindex'
+              'index_name' => 'cp'
             }
           },
           'info' => {
@@ -1243,10 +1235,8 @@ $result_trees{'char_latin1_latin1_in_refs'} = {
               'entry_node' => {},
               'entry_number' => 5,
               'in_code' => 0,
-              'index_at_command' => 'cindex',
               'index_ignore_chars' => {},
-              'index_name' => 'cp',
-              'index_type_command' => 'cindex'
+              'index_name' => 'cp'
             }
           },
           'info' => {
@@ -1287,10 +1277,8 @@ $result_trees{'char_latin1_latin1_in_refs'} = {
               'entry_node' => {},
               'entry_number' => 6,
               'in_code' => 0,
-              'index_at_command' => 'cindex',
               'index_ignore_chars' => {},
-              'index_name' => 'cp',
-              'index_type_command' => 'cindex'
+              'index_name' => 'cp'
             }
           },
           'info' => {
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 ccc291821c..2e808d8c9a 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
@@ -1067,10 +1067,8 @@ $result_trees{'char_latin1_utf8_in_refs'} = {
               'entry_node' => {},
               'entry_number' => 1,
               'in_code' => 0,
-              'index_at_command' => 'cindex',
               'index_ignore_chars' => {},
-              'index_name' => 'cp',
-              'index_type_command' => 'cindex'
+              'index_name' => 'cp'
             }
           },
           'info' => {
@@ -1111,10 +1109,8 @@ $result_trees{'char_latin1_utf8_in_refs'} = {
               'entry_node' => {},
               'entry_number' => 2,
               'in_code' => 0,
-              'index_at_command' => 'cindex',
               'index_ignore_chars' => {},
-              'index_name' => 'cp',
-              'index_type_command' => 'cindex'
+              'index_name' => 'cp'
             }
           },
           'info' => {
@@ -1155,10 +1151,8 @@ $result_trees{'char_latin1_utf8_in_refs'} = {
               'entry_node' => {},
               'entry_number' => 3,
               'in_code' => 0,
-              'index_at_command' => 'cindex',
               'index_ignore_chars' => {},
-              'index_name' => 'cp',
-              'index_type_command' => 'cindex'
+              'index_name' => 'cp'
             }
           },
           'info' => {
@@ -1199,10 +1193,8 @@ $result_trees{'char_latin1_utf8_in_refs'} = {
               'entry_node' => {},
               'entry_number' => 4,
               'in_code' => 0,
-              'index_at_command' => 'cindex',
               'index_ignore_chars' => {},
-              'index_name' => 'cp',
-              'index_type_command' => 'cindex'
+              'index_name' => 'cp'
             }
           },
           'info' => {
@@ -1243,10 +1235,8 @@ $result_trees{'char_latin1_utf8_in_refs'} = {
               'entry_node' => {},
               'entry_number' => 5,
               'in_code' => 0,
-              'index_at_command' => 'cindex',
               'index_ignore_chars' => {},
-              'index_name' => 'cp',
-              'index_type_command' => 'cindex'
+              'index_name' => 'cp'
             }
           },
           'info' => {
@@ -1287,10 +1277,8 @@ $result_trees{'char_latin1_utf8_in_refs'} = {
               'entry_node' => {},
               'entry_number' => 6,
               'in_code' => 0,
-              'index_at_command' => 'cindex',
               'index_ignore_chars' => {},
-              'index_name' => 'cp',
-              'index_type_command' => 'cindex'
+              'index_name' => 'cp'
             }
           },
           'info' => {
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 02d530d2ab..228431dba5 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
@@ -447,10 +447,8 @@ $result_trees{'char_latin2_latin2_in_refs'} = {
               'entry_node' => {},
               'entry_number' => 1,
               'in_code' => 0,
-              'index_at_command' => 'cindex',
               'index_ignore_chars' => {},
-              'index_name' => 'cp',
-              'index_type_command' => 'cindex'
+              'index_name' => 'cp'
             }
           },
           'info' => {
diff --git a/tp/t/results/formats_encodings/sample_utf8.pl 
b/tp/t/results/formats_encodings/sample_utf8.pl
index 0b423bb7d3..c492155a69 100644
--- a/tp/t/results/formats_encodings/sample_utf8.pl
+++ b/tp/t/results/formats_encodings/sample_utf8.pl
@@ -892,10 +892,8 @@ $result_trees{'sample_utf8'} = {
               'entry_node' => {},
               'entry_number' => 1,
               'in_code' => 0,
-              'index_at_command' => 'cindex',
               'index_ignore_chars' => {},
-              'index_name' => 'cp',
-              'index_type_command' => 'cindex'
+              'index_name' => 'cp'
             }
           },
           'info' => {
@@ -947,10 +945,8 @@ $result_trees{'sample_utf8'} = {
                   'entry_node' => {},
                   'entry_number' => 2,
                   'in_code' => 0,
-                  'index_at_command' => 'cindex',
                   'index_ignore_chars' => {},
-                  'index_name' => 'cp',
-                  'index_type_command' => 'cindex'
+                  'index_name' => 'cp'
                 }
               },
               'info' => {
@@ -991,10 +987,8 @@ $result_trees{'sample_utf8'} = {
                   'entry_node' => {},
                   'entry_number' => 3,
                   'in_code' => 0,
-                  'index_at_command' => 'cindex',
                   'index_ignore_chars' => {},
-                  'index_name' => 'cp',
-                  'index_type_command' => 'cindex'
+                  'index_name' => 'cp'
                 }
               },
               'info' => {
@@ -1035,10 +1029,8 @@ $result_trees{'sample_utf8'} = {
                   'entry_node' => {},
                   'entry_number' => 4,
                   'in_code' => 0,
-                  'index_at_command' => 'cindex',
                   'index_ignore_chars' => {},
-                  'index_name' => 'cp',
-                  'index_type_command' => 'cindex'
+                  'index_name' => 'cp'
                 }
               },
               'info' => {
diff --git a/tp/t/results/heading/heading_in_copying.pl 
b/tp/t/results/heading/heading_in_copying.pl
index d3af87f6a9..422bfe6ac9 100644
--- a/tp/t/results/heading/heading_in_copying.pl
+++ b/tp/t/results/heading/heading_in_copying.pl
@@ -107,10 +107,8 @@ $result_trees{'heading_in_copying'} = {
                   'entry_number' => 1,
                   'entry_region' => 'copying',
                   'in_code' => 0,
-                  'index_at_command' => 'cindex',
                   'index_ignore_chars' => {},
-                  'index_name' => 'cp',
-                  'index_type_command' => 'cindex'
+                  'index_name' => 'cp'
                 }
               },
               'info' => {
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 9c79533122..4dc237daa8 100644
--- a/tp/t/results/html_tests/deftypefnnewline_for_copying_after.pl
+++ b/tp/t/results/html_tests/deftypefnnewline_for_copying_after.pl
@@ -108,10 +108,8 @@ $result_trees{'deftypefnnewline_for_copying_after'} = {
                       'entry_number' => 1,
                       'entry_region' => 'copying',
                       'in_code' => 1,
-                      'index_at_command' => 'deftypefun',
                       'index_ignore_chars' => {},
-                      'index_name' => 'fn',
-                      'index_type_command' => 'deftypefun'
+                      'index_name' => 'fn'
                     },
                     'original_def_cmdname' => 'deftypefun'
                   },
@@ -538,10 +536,8 @@ $result_trees{'deftypefnnewline_for_copying_after'} = {
                   'entry_node' => {},
                   'entry_number' => 2,
                   'in_code' => 1,
-                  'index_at_command' => 'deftypefun',
                   'index_ignore_chars' => {},
-                  'index_name' => 'fn',
-                  'index_type_command' => 'deftypefun'
+                  'index_name' => 'fn'
                 },
                 'original_def_cmdname' => 'deftypefun'
               },
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 6c9bdcab6e..245a0fcec4 100644
--- a/tp/t/results/html_tests/deftypefnnewline_for_copying_before.pl
+++ b/tp/t/results/html_tests/deftypefnnewline_for_copying_before.pl
@@ -152,10 +152,8 @@ $result_trees{'deftypefnnewline_for_copying_before'} = {
                       'entry_number' => 1,
                       'entry_region' => 'copying',
                       'in_code' => 1,
-                      'index_at_command' => 'deftypefun',
                       'index_ignore_chars' => {},
-                      'index_name' => 'fn',
-                      'index_type_command' => 'deftypefun'
+                      'index_name' => 'fn'
                     },
                     'original_def_cmdname' => 'deftypefun'
                   },
@@ -503,10 +501,8 @@ $result_trees{'deftypefnnewline_for_copying_before'} = {
                   'entry_node' => {},
                   'entry_number' => 2,
                   'in_code' => 1,
-                  'index_at_command' => 'deftypefun',
                   'index_ignore_chars' => {},
-                  'index_name' => 'fn',
-                  'index_type_command' => 'deftypefun'
+                  'index_name' => 'fn'
                 },
                 'original_def_cmdname' => 'deftypefun'
               },
diff --git a/tp/t/results/html_tests/float_copying.pl 
b/tp/t/results/html_tests/float_copying.pl
index b50091a3ac..5703581db4 100644
--- a/tp/t/results/html_tests/float_copying.pl
+++ b/tp/t/results/html_tests/float_copying.pl
@@ -225,10 +225,8 @@ $result_trees{'float_copying'} = {
                                               'entry_number' => 1,
                                               'entry_region' => 'copying',
                                               'in_code' => 0,
-                                              'index_at_command' => 'cindex',
                                               'index_ignore_chars' => {},
-                                              'index_name' => 'cp',
-                                              'index_type_command' => 'cindex'
+                                              'index_name' => 'cp'
                                             }
                                           },
                                           'info' => {
@@ -269,10 +267,8 @@ $result_trees{'float_copying'} = {
                                               'entry_number' => 1,
                                               'entry_region' => 'copying',
                                               'in_code' => 1,
-                                              'index_at_command' => 'findex',
                                               'index_ignore_chars' => {},
-                                              'index_name' => 'fn',
-                                              'index_type_command' => 'findex'
+                                              'index_name' => 'fn'
                                             }
                                           },
                                           'info' => {
@@ -466,10 +462,8 @@ $result_trees{'float_copying'} = {
                                   'entry_number' => 2,
                                   'entry_region' => 'copying',
                                   'in_code' => 0,
-                                  'index_at_command' => 'cindex',
                                   'index_ignore_chars' => {},
-                                  'index_name' => 'cp',
-                                  'index_type_command' => 'cindex'
+                                  'index_name' => 'cp'
                                 }
                               },
                               'info' => {
@@ -510,10 +504,8 @@ $result_trees{'float_copying'} = {
                                   'entry_number' => 2,
                                   'entry_region' => 'copying',
                                   'in_code' => 1,
-                                  'index_at_command' => 'findex',
                                   'index_ignore_chars' => {},
-                                  'index_name' => 'fn',
-                                  'index_type_command' => 'findex'
+                                  'index_name' => 'fn'
                                 }
                               },
                               'info' => {
@@ -747,10 +739,8 @@ $result_trees{'float_copying'} = {
               'entry_node' => {},
               'entry_number' => 3,
               'in_code' => 0,
-              'index_at_command' => 'cindex',
               'index_ignore_chars' => {},
-              'index_name' => 'cp',
-              'index_type_command' => 'cindex'
+              'index_name' => 'cp'
             }
           },
           'info' => {
@@ -1154,10 +1144,8 @@ $result_trees{'float_copying'} = {
               'entry_node' => {},
               'entry_number' => 4,
               'in_code' => 0,
-              'index_at_command' => 'cindex',
               'index_ignore_chars' => {},
-              'index_name' => 'cp',
-              'index_type_command' => 'cindex'
+              'index_name' => 'cp'
             }
           },
           'info' => {
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 95d81f6407..51ae219ec9 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
@@ -89,10 +89,8 @@ $result_trees{'index_and_node_same_name'} = {
               'entry_node' => {},
               'entry_number' => 1,
               'in_code' => 0,
-              'index_at_command' => 'cindex',
               'index_ignore_chars' => {},
-              'index_name' => 'cp',
-              'index_type_command' => 'cindex'
+              'index_name' => 'cp'
             }
           },
           'info' => {
diff --git a/tp/t/results/html_tests/index_below.pl 
b/tp/t/results/html_tests/index_below.pl
index 675cfbd590..fffb52c72a 100644
--- a/tp/t/results/html_tests/index_below.pl
+++ b/tp/t/results/html_tests/index_below.pl
@@ -148,10 +148,8 @@ $result_trees{'index_below'} = [
                 'entry_element' => {},
                 'entry_number' => 1,
                 'in_code' => 0,
-                'index_at_command' => 'cindex',
                 'index_ignore_chars' => {},
-                'index_name' => 'cp',
-                'index_type_command' => 'cindex'
+                'index_name' => 'cp'
               }
             },
             'info' => {
diff --git a/tp/t/results/indices/complex_recursive_synindex.pl 
b/tp/t/results/indices/complex_recursive_synindex.pl
index a9abfaa8c1..30df350cc1 100644
--- a/tp/t/results/indices/complex_recursive_synindex.pl
+++ b/tp/t/results/indices/complex_recursive_synindex.pl
@@ -417,10 +417,8 @@ $result_trees{'complex_recursive_synindex'} = {
               'entry_node' => {},
               'entry_number' => 1,
               'in_code' => 0,
-              'index_at_command' => 'eeeindex',
               'index_ignore_chars' => {},
-              'index_name' => 'eee',
-              'index_type_command' => 'eeeindex'
+              'index_name' => 'eee'
             }
           },
           'info' => {
@@ -535,10 +533,8 @@ $result_trees{'complex_recursive_synindex'} = {
               'entry_node' => {},
               'entry_number' => 1,
               'in_code' => 0,
-              'index_at_command' => 'cccindex',
               'index_ignore_chars' => {},
-              'index_name' => 'ccc',
-              'index_type_command' => 'cccindex'
+              'index_name' => 'ccc'
             }
           },
           'info' => {
@@ -579,10 +575,8 @@ $result_trees{'complex_recursive_synindex'} = {
               'entry_node' => {},
               'entry_number' => 1,
               'in_code' => 0,
-              'index_at_command' => 'bbbindex',
               'index_ignore_chars' => {},
-              'index_name' => 'bbb',
-              'index_type_command' => 'bbbindex'
+              'index_name' => 'bbb'
             }
           },
           'info' => {
@@ -623,10 +617,8 @@ $result_trees{'complex_recursive_synindex'} = {
               'entry_node' => {},
               'entry_number' => 1,
               'in_code' => 0,
-              'index_at_command' => 'aaaindex',
               'index_ignore_chars' => {},
-              'index_name' => 'aaa',
-              'index_type_command' => 'aaaindex'
+              'index_name' => 'aaa'
             }
           },
           'info' => {
@@ -667,10 +659,8 @@ $result_trees{'complex_recursive_synindex'} = {
               'entry_node' => {},
               'entry_number' => 1,
               'in_code' => 0,
-              'index_at_command' => 'dddindex',
               'index_ignore_chars' => {},
-              'index_name' => 'ddd',
-              'index_type_command' => 'dddindex'
+              'index_name' => 'ddd'
             }
           },
           'info' => {
@@ -711,10 +701,8 @@ $result_trees{'complex_recursive_synindex'} = {
               'entry_node' => {},
               'entry_number' => 2,
               'in_code' => 0,
-              'index_at_command' => 'eeeindex',
               'index_ignore_chars' => {},
-              'index_name' => 'eee',
-              'index_type_command' => 'eeeindex'
+              'index_name' => 'eee'
             }
           },
           'info' => {
diff --git a/tp/t/results/indices/def_syn_indices.pl 
b/tp/t/results/indices/def_syn_indices.pl
index 21a77b2d07..2db6433d77 100644
--- a/tp/t/results/indices/def_syn_indices.pl
+++ b/tp/t/results/indices/def_syn_indices.pl
@@ -283,10 +283,8 @@ $result_trees{'def_syn_indices'} = {
               'entry_node' => {},
               'entry_number' => 1,
               'in_code' => 0,
-              'index_at_command' => 'trucindex',
               'index_ignore_chars' => {},
-              'index_name' => 'truc',
-              'index_type_command' => 'trucindex'
+              'index_name' => 'truc'
             }
           },
           'info' => {
@@ -446,10 +444,8 @@ $result_trees{'def_syn_indices'} = {
               'entry_node' => {},
               'entry_number' => 1,
               'in_code' => 1,
-              'index_at_command' => 'codeidxindex',
               'index_ignore_chars' => {},
-              'index_name' => 'codeidx',
-              'index_type_command' => 'codeidxindex'
+              'index_name' => 'codeidx'
             }
           },
           'info' => {
@@ -495,10 +491,8 @@ $result_trees{'def_syn_indices'} = {
               'entry_node' => {},
               'entry_number' => 1,
               'in_code' => 1,
-              'index_at_command' => 'cindex',
               'index_ignore_chars' => {},
-              'index_name' => 'cp',
-              'index_type_command' => 'cindex'
+              'index_name' => 'cp'
             }
           },
           'info' => {
@@ -584,10 +578,8 @@ $result_trees{'def_syn_indices'} = {
               'entry_node' => {},
               'entry_number' => 1,
               'in_code' => 1,
-              'index_at_command' => 'kindex',
               'index_ignore_chars' => {},
-              'index_name' => 'ky',
-              'index_type_command' => 'kindex'
+              'index_name' => 'ky'
             }
           },
           'info' => {
@@ -628,10 +620,8 @@ $result_trees{'def_syn_indices'} = {
               'entry_node' => {},
               'entry_number' => 1,
               'in_code' => 1,
-              'index_at_command' => 'pindex',
               'index_ignore_chars' => {},
-              'index_name' => 'pg',
-              'index_type_command' => 'pindex'
+              'index_name' => 'pg'
             }
           },
           'info' => {
@@ -865,10 +855,8 @@ $result_trees{'def_syn_indices'} = {
               'entry_node' => {},
               'entry_number' => 1,
               'in_code' => 0,
-              'index_at_command' => 'defgindex',
               'index_ignore_chars' => {},
-              'index_name' => 'defg',
-              'index_type_command' => 'defgindex'
+              'index_name' => 'defg'
             }
           },
           'info' => {
@@ -914,10 +902,8 @@ $result_trees{'def_syn_indices'} = {
               'entry_node' => {},
               'entry_number' => 1,
               'in_code' => 0,
-              'index_at_command' => 'abcindex',
               'index_ignore_chars' => {},
-              'index_name' => 'abc',
-              'index_type_command' => 'abcindex'
+              'index_name' => 'abc'
             }
           },
           'info' => {
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 a1de235d0c..6e75741ddc 100644
--- a/tp/t/results/indices/default_cp_index_and_one_letter_syncodeindex.pl
+++ b/tp/t/results/indices/default_cp_index_and_one_letter_syncodeindex.pl
@@ -149,10 +149,8 @@ 
$result_trees{'default_cp_index_and_one_letter_syncodeindex'} = {
               'entry_node' => {},
               'entry_number' => 1,
               'in_code' => 1,
-              'index_at_command' => 'cindex',
               'index_ignore_chars' => {},
-              'index_name' => 'cp',
-              'index_type_command' => 'cindex'
+              'index_name' => 'cp'
             }
           },
           'info' => {
@@ -193,10 +191,8 @@ 
$result_trees{'default_cp_index_and_one_letter_syncodeindex'} = {
               'entry_node' => {},
               'entry_number' => 2,
               'in_code' => 1,
-              'index_at_command' => 'cpindex',
               'index_ignore_chars' => {},
-              'index_name' => 'cp',
-              'index_type_command' => 'cpindex'
+              'index_name' => 'cp'
             }
           },
           'info' => {
diff --git a/tp/t/results/indices/double_index_entry.pl 
b/tp/t/results/indices/double_index_entry.pl
index d8a6c46fe6..5efbc29859 100644
--- a/tp/t/results/indices/double_index_entry.pl
+++ b/tp/t/results/indices/double_index_entry.pl
@@ -66,10 +66,8 @@ $result_trees{'double_index_entry'} = {
               'entry_node' => {},
               'entry_number' => 1,
               'in_code' => 0,
-              'index_at_command' => 'cindex',
               'index_ignore_chars' => {},
-              'index_name' => 'cp',
-              'index_type_command' => 'cindex'
+              'index_name' => 'cp'
             }
           },
           'info' => {
@@ -129,10 +127,8 @@ $result_trees{'double_index_entry'} = {
               'entry_node' => {},
               'entry_number' => 2,
               'in_code' => 0,
-              'index_at_command' => 'cindex',
               'index_ignore_chars' => {},
-              'index_name' => 'cp',
-              'index_type_command' => 'cindex'
+              'index_name' => 'cp'
             }
           },
           'info' => {
@@ -348,10 +344,8 @@ $result_trees{'double_index_entry'} = {
               'entry_node' => {},
               'entry_number' => 3,
               'in_code' => 0,
-              'index_at_command' => 'cindex',
               'index_ignore_chars' => {},
-              'index_name' => 'cp',
-              'index_type_command' => 'cindex'
+              'index_name' => 'cp'
             }
           },
           'info' => {
diff --git a/tp/t/results/indices/double_seeentry_seealso.pl 
b/tp/t/results/indices/double_seeentry_seealso.pl
index 7e11d73132..46c0374894 100644
--- a/tp/t/results/indices/double_seeentry_seealso.pl
+++ b/tp/t/results/indices/double_seeentry_seealso.pl
@@ -234,10 +234,8 @@ $result_trees{'double_seeentry_seealso'} = {
               'entry_node' => {},
               'entry_number' => 1,
               'in_code' => 0,
-              'index_at_command' => 'cindex',
               'index_ignore_chars' => {},
-              'index_name' => 'cp',
-              'index_type_command' => 'cindex'
+              'index_name' => 'cp'
             },
             'seeentry' => {}
           },
@@ -323,10 +321,8 @@ $result_trees{'double_seeentry_seealso'} = {
               'entry_node' => {},
               'entry_number' => 2,
               'in_code' => 0,
-              'index_at_command' => 'cindex',
               'index_ignore_chars' => {},
-              'index_name' => 'cp',
-              'index_type_command' => 'cindex'
+              'index_name' => 'cp'
             },
             'seealso' => {}
           },
@@ -412,10 +408,8 @@ $result_trees{'double_seeentry_seealso'} = {
               'entry_node' => {},
               'entry_number' => 3,
               'in_code' => 0,
-              'index_at_command' => 'cindex',
               'index_ignore_chars' => {},
-              'index_name' => 'cp',
-              'index_type_command' => 'cindex'
+              'index_name' => 'cp'
             },
             'seealso' => {},
             'seeentry' => {}
@@ -472,10 +466,8 @@ $result_trees{'double_seeentry_seealso'} = {
               'entry_node' => {},
               'entry_number' => 4,
               'in_code' => 0,
-              'index_at_command' => 'cindex',
               'index_ignore_chars' => {},
-              'index_name' => 'cp',
-              'index_type_command' => 'cindex'
+              'index_name' => 'cp'
             },
             'seealso' => {},
             'subentry' => {
diff --git a/tp/t/results/indices/double_syncodeindex.pl 
b/tp/t/results/indices/double_syncodeindex.pl
index d25aff50ff..38a3f29ec5 100644
--- a/tp/t/results/indices/double_syncodeindex.pl
+++ b/tp/t/results/indices/double_syncodeindex.pl
@@ -185,10 +185,8 @@ $result_trees{'double_syncodeindex'} = {
               'entry_node' => {},
               'entry_number' => 1,
               'in_code' => 1,
-              'index_at_command' => 'cindex',
               'index_ignore_chars' => {},
-              'index_name' => 'cp',
-              'index_type_command' => 'cindex'
+              'index_name' => 'cp'
             }
           },
           'info' => {
@@ -229,10 +227,8 @@ $result_trees{'double_syncodeindex'} = {
               'entry_node' => {},
               'entry_number' => 1,
               'in_code' => 1,
-              'index_at_command' => 'findex',
               'index_ignore_chars' => {},
-              'index_name' => 'fn',
-              'index_type_command' => 'findex'
+              'index_name' => 'fn'
             }
           },
           'info' => {
diff --git a/tp/t/results/indices/empty_string_index_entry.pl 
b/tp/t/results/indices/empty_string_index_entry.pl
index eb37cd3911..4b31d2aefc 100644
--- a/tp/t/results/indices/empty_string_index_entry.pl
+++ b/tp/t/results/indices/empty_string_index_entry.pl
@@ -119,10 +119,8 @@ $result_trees{'empty_string_index_entry'} = {
               'entry_node' => {},
               'entry_number' => 1,
               'in_code' => 1,
-              'index_at_command' => 'findex',
               'index_ignore_chars' => {},
-              'index_name' => 'fn',
-              'index_type_command' => 'findex'
+              'index_name' => 'fn'
             }
           },
           'info' => {
@@ -207,10 +205,8 @@ $result_trees{'empty_string_index_entry'} = {
                           'entry_node' => {},
                           'entry_number' => 2,
                           'in_code' => 1,
-                          'index_at_command' => 'item',
                           'index_ignore_chars' => {},
-                          'index_name' => 'fn',
-                          'index_type_command' => 'ftable'
+                          'index_name' => 'fn'
                         }
                       },
                       'info' => {
@@ -396,10 +392,8 @@ $result_trees{'empty_string_index_entry'} = {
                   'entry_node' => {},
                   'entry_number' => 3,
                   'in_code' => 1,
-                  'index_at_command' => 'defun',
                   'index_ignore_chars' => {},
-                  'index_name' => 'fn',
-                  'index_type_command' => 'defun'
+                  'index_name' => 'fn'
                 },
                 'original_def_cmdname' => 'defun'
               },
@@ -522,10 +516,8 @@ $result_trees{'empty_string_index_entry'} = {
                   'entry_node' => {},
                   'entry_number' => 4,
                   'in_code' => 1,
-                  'index_at_command' => 'defunx',
                   'index_ignore_chars' => {},
-                  'index_name' => 'fn',
-                  'index_type_command' => 'defun'
+                  'index_name' => 'fn'
                 },
                 'original_def_cmdname' => 'defunx'
               },
diff --git a/tp/t/results/indices/encoding_index_ascii.pl 
b/tp/t/results/indices/encoding_index_ascii.pl
index c01ec10696..0aa6c428f9 100644
--- a/tp/t/results/indices/encoding_index_ascii.pl
+++ b/tp/t/results/indices/encoding_index_ascii.pl
@@ -262,10 +262,8 @@ $result_trees{'encoding_index_ascii'} = {
               'entry_node' => {},
               'entry_number' => 1,
               'in_code' => 0,
-              'index_at_command' => 'cindex',
               'index_ignore_chars' => {},
-              'index_name' => 'cp',
-              'index_type_command' => 'cindex'
+              'index_name' => 'cp'
             }
           },
           'info' => {
@@ -378,10 +376,8 @@ $result_trees{'encoding_index_ascii'} = {
               'entry_node' => {},
               'entry_number' => 2,
               'in_code' => 0,
-              'index_at_command' => 'cindex',
               'index_ignore_chars' => {},
-              'index_name' => 'cp',
-              'index_type_command' => 'cindex'
+              'index_name' => 'cp'
             }
           },
           'info' => {
@@ -512,10 +508,8 @@ $result_trees{'encoding_index_ascii'} = {
               'entry_node' => {},
               'entry_number' => 3,
               'in_code' => 0,
-              'index_at_command' => 'cindex',
               'index_ignore_chars' => {},
-              'index_name' => 'cp',
-              'index_type_command' => 'cindex'
+              'index_name' => 'cp'
             }
           },
           'info' => {
@@ -556,10 +550,8 @@ $result_trees{'encoding_index_ascii'} = {
               'entry_node' => {},
               'entry_number' => 4,
               'in_code' => 0,
-              'index_at_command' => 'cindex',
               'index_ignore_chars' => {},
-              'index_name' => 'cp',
-              'index_type_command' => 'cindex'
+              'index_name' => 'cp'
             }
           },
           'info' => {
@@ -600,10 +592,8 @@ $result_trees{'encoding_index_ascii'} = {
               'entry_node' => {},
               'entry_number' => 5,
               'in_code' => 0,
-              'index_at_command' => 'cindex',
               'index_ignore_chars' => {},
-              'index_name' => 'cp',
-              'index_type_command' => 'cindex'
+              'index_name' => 'cp'
             }
           },
           'info' => {
@@ -644,10 +634,8 @@ $result_trees{'encoding_index_ascii'} = {
               'entry_node' => {},
               'entry_number' => 6,
               'in_code' => 0,
-              'index_at_command' => 'cindex',
               'index_ignore_chars' => {},
-              'index_name' => 'cp',
-              'index_type_command' => 'cindex'
+              'index_name' => 'cp'
             }
           },
           'info' => {
@@ -688,10 +676,8 @@ $result_trees{'encoding_index_ascii'} = {
               'entry_node' => {},
               'entry_number' => 7,
               'in_code' => 0,
-              'index_at_command' => 'cindex',
               'index_ignore_chars' => {},
-              'index_name' => 'cp',
-              'index_type_command' => 'cindex'
+              'index_name' => 'cp'
             }
           },
           'info' => {
@@ -732,10 +718,8 @@ $result_trees{'encoding_index_ascii'} = {
               'entry_node' => {},
               'entry_number' => 8,
               'in_code' => 0,
-              'index_at_command' => 'cindex',
               'index_ignore_chars' => {},
-              'index_name' => 'cp',
-              'index_type_command' => 'cindex'
+              'index_name' => 'cp'
             }
           },
           'info' => {
@@ -776,10 +760,8 @@ $result_trees{'encoding_index_ascii'} = {
               'entry_node' => {},
               'entry_number' => 9,
               'in_code' => 0,
-              'index_at_command' => 'cindex',
               'index_ignore_chars' => {},
-              'index_name' => 'cp',
-              'index_type_command' => 'cindex'
+              'index_name' => 'cp'
             }
           },
           'info' => {
@@ -820,10 +802,8 @@ $result_trees{'encoding_index_ascii'} = {
               'entry_node' => {},
               'entry_number' => 10,
               'in_code' => 0,
-              'index_at_command' => 'cindex',
               'index_ignore_chars' => {},
-              'index_name' => 'cp',
-              'index_type_command' => 'cindex'
+              'index_name' => 'cp'
             }
           },
           'info' => {
@@ -864,10 +844,8 @@ $result_trees{'encoding_index_ascii'} = {
               'entry_node' => {},
               'entry_number' => 11,
               'in_code' => 0,
-              'index_at_command' => 'cindex',
               'index_ignore_chars' => {},
-              'index_name' => 'cp',
-              'index_type_command' => 'cindex'
+              'index_name' => 'cp'
             }
           },
           'info' => {
@@ -908,10 +886,8 @@ $result_trees{'encoding_index_ascii'} = {
               'entry_node' => {},
               'entry_number' => 12,
               'in_code' => 0,
-              'index_at_command' => 'cindex',
               'index_ignore_chars' => {},
-              'index_name' => 'cp',
-              'index_type_command' => 'cindex'
+              'index_name' => 'cp'
             }
           },
           'info' => {
@@ -952,10 +928,8 @@ $result_trees{'encoding_index_ascii'} = {
               'entry_node' => {},
               'entry_number' => 13,
               'in_code' => 0,
-              'index_at_command' => 'cindex',
               'index_ignore_chars' => {},
-              'index_name' => 'cp',
-              'index_type_command' => 'cindex'
+              'index_name' => 'cp'
             }
           },
           'info' => {
@@ -996,10 +970,8 @@ $result_trees{'encoding_index_ascii'} = {
               'entry_node' => {},
               'entry_number' => 14,
               'in_code' => 0,
-              'index_at_command' => 'cindex',
               'index_ignore_chars' => {},
-              'index_name' => 'cp',
-              'index_type_command' => 'cindex'
+              'index_name' => 'cp'
             }
           },
           'info' => {
@@ -1040,10 +1012,8 @@ $result_trees{'encoding_index_ascii'} = {
               'entry_node' => {},
               'entry_number' => 15,
               'in_code' => 0,
-              'index_at_command' => 'cindex',
               'index_ignore_chars' => {},
-              'index_name' => 'cp',
-              'index_type_command' => 'cindex'
+              'index_name' => 'cp'
             }
           },
           'info' => {
@@ -1084,10 +1054,8 @@ $result_trees{'encoding_index_ascii'} = {
               'entry_node' => {},
               'entry_number' => 16,
               'in_code' => 0,
-              'index_at_command' => 'cindex',
               'index_ignore_chars' => {},
-              'index_name' => 'cp',
-              'index_type_command' => 'cindex'
+              'index_name' => 'cp'
             }
           },
           'info' => {
@@ -1128,10 +1096,8 @@ $result_trees{'encoding_index_ascii'} = {
               'entry_node' => {},
               'entry_number' => 17,
               'in_code' => 0,
-              'index_at_command' => 'cindex',
               'index_ignore_chars' => {},
-              'index_name' => 'cp',
-              'index_type_command' => 'cindex'
+              'index_name' => 'cp'
             }
           },
           'info' => {
@@ -1172,10 +1138,8 @@ $result_trees{'encoding_index_ascii'} = {
               'entry_node' => {},
               'entry_number' => 18,
               'in_code' => 0,
-              'index_at_command' => 'cindex',
               'index_ignore_chars' => {},
-              'index_name' => 'cp',
-              'index_type_command' => 'cindex'
+              'index_name' => 'cp'
             }
           },
           'info' => {
@@ -1216,10 +1180,8 @@ $result_trees{'encoding_index_ascii'} = {
               'entry_node' => {},
               'entry_number' => 19,
               'in_code' => 0,
-              'index_at_command' => 'cindex',
               'index_ignore_chars' => {},
-              'index_name' => 'cp',
-              'index_type_command' => 'cindex'
+              'index_name' => 'cp'
             }
           },
           'info' => {
@@ -1260,10 +1222,8 @@ $result_trees{'encoding_index_ascii'} = {
               'entry_node' => {},
               'entry_number' => 20,
               'in_code' => 0,
-              'index_at_command' => 'cindex',
               'index_ignore_chars' => {},
-              'index_name' => 'cp',
-              'index_type_command' => 'cindex'
+              'index_name' => 'cp'
             }
           },
           'info' => {
@@ -1304,10 +1264,8 @@ $result_trees{'encoding_index_ascii'} = {
               'entry_node' => {},
               'entry_number' => 21,
               'in_code' => 0,
-              'index_at_command' => 'cindex',
               'index_ignore_chars' => {},
-              'index_name' => 'cp',
-              'index_type_command' => 'cindex'
+              'index_name' => 'cp'
             }
           },
           'info' => {
@@ -1348,10 +1306,8 @@ $result_trees{'encoding_index_ascii'} = {
               'entry_node' => {},
               'entry_number' => 22,
               'in_code' => 0,
-              'index_at_command' => 'cindex',
               'index_ignore_chars' => {},
-              'index_name' => 'cp',
-              'index_type_command' => 'cindex'
+              'index_name' => 'cp'
             }
           },
           'info' => {
@@ -1392,10 +1348,8 @@ $result_trees{'encoding_index_ascii'} = {
               'entry_node' => {},
               'entry_number' => 23,
               'in_code' => 0,
-              'index_at_command' => 'cindex',
               'index_ignore_chars' => {},
-              'index_name' => 'cp',
-              'index_type_command' => 'cindex'
+              'index_name' => 'cp'
             }
           },
           'info' => {
@@ -1436,10 +1390,8 @@ $result_trees{'encoding_index_ascii'} = {
               'entry_node' => {},
               'entry_number' => 24,
               'in_code' => 0,
-              'index_at_command' => 'cindex',
               'index_ignore_chars' => {},
-              'index_name' => 'cp',
-              'index_type_command' => 'cindex'
+              'index_name' => 'cp'
             }
           },
           'info' => {
@@ -1480,10 +1432,8 @@ $result_trees{'encoding_index_ascii'} = {
               'entry_node' => {},
               'entry_number' => 25,
               'in_code' => 0,
-              'index_at_command' => 'cindex',
               'index_ignore_chars' => {},
-              'index_name' => 'cp',
-              'index_type_command' => 'cindex'
+              'index_name' => 'cp'
             }
           },
           'info' => {
@@ -1524,10 +1474,8 @@ $result_trees{'encoding_index_ascii'} = {
               'entry_node' => {},
               'entry_number' => 26,
               'in_code' => 0,
-              'index_at_command' => 'cindex',
               'index_ignore_chars' => {},
-              'index_name' => 'cp',
-              'index_type_command' => 'cindex'
+              'index_name' => 'cp'
             }
           },
           'info' => {
@@ -1568,10 +1516,8 @@ $result_trees{'encoding_index_ascii'} = {
               'entry_node' => {},
               'entry_number' => 27,
               'in_code' => 0,
-              'index_at_command' => 'cindex',
               'index_ignore_chars' => {},
-              'index_name' => 'cp',
-              'index_type_command' => 'cindex'
+              'index_name' => 'cp'
             }
           },
           'info' => {
@@ -1612,10 +1558,8 @@ $result_trees{'encoding_index_ascii'} = {
               'entry_node' => {},
               'entry_number' => 28,
               'in_code' => 0,
-              'index_at_command' => 'cindex',
               'index_ignore_chars' => {},
-              'index_name' => 'cp',
-              'index_type_command' => 'cindex'
+              'index_name' => 'cp'
             }
           },
           'info' => {
@@ -1656,10 +1600,8 @@ $result_trees{'encoding_index_ascii'} = {
               'entry_node' => {},
               'entry_number' => 29,
               'in_code' => 0,
-              'index_at_command' => 'cindex',
               'index_ignore_chars' => {},
-              'index_name' => 'cp',
-              'index_type_command' => 'cindex'
+              'index_name' => 'cp'
             }
           },
           'info' => {
@@ -1700,10 +1642,8 @@ $result_trees{'encoding_index_ascii'} = {
               'entry_node' => {},
               'entry_number' => 30,
               'in_code' => 0,
-              'index_at_command' => 'cindex',
               'index_ignore_chars' => {},
-              'index_name' => 'cp',
-              'index_type_command' => 'cindex'
+              'index_name' => 'cp'
             }
           },
           'info' => {
@@ -1744,10 +1684,8 @@ $result_trees{'encoding_index_ascii'} = {
               'entry_node' => {},
               'entry_number' => 31,
               'in_code' => 0,
-              'index_at_command' => 'cindex',
               'index_ignore_chars' => {},
-              'index_name' => 'cp',
-              'index_type_command' => 'cindex'
+              'index_name' => 'cp'
             }
           },
           'info' => {
@@ -1798,10 +1736,8 @@ $result_trees{'encoding_index_ascii'} = {
               'entry_node' => {},
               'entry_number' => 32,
               'in_code' => 0,
-              'index_at_command' => 'cindex',
               'index_ignore_chars' => {},
-              'index_name' => 'cp',
-              'index_type_command' => 'cindex'
+              'index_name' => 'cp'
             }
           },
           'info' => {
@@ -1852,10 +1788,8 @@ $result_trees{'encoding_index_ascii'} = {
               'entry_node' => {},
               'entry_number' => 33,
               'in_code' => 0,
-              'index_at_command' => 'cindex',
               'index_ignore_chars' => {},
-              'index_name' => 'cp',
-              'index_type_command' => 'cindex'
+              'index_name' => 'cp'
             }
           },
           'info' => {
@@ -1935,10 +1869,8 @@ $result_trees{'encoding_index_ascii'} = {
               'entry_node' => {},
               'entry_number' => 34,
               'in_code' => 0,
-              'index_at_command' => 'cindex',
               'index_ignore_chars' => {},
-              'index_name' => 'cp',
-              'index_type_command' => 'cindex'
+              'index_name' => 'cp'
             }
           },
           'info' => {
@@ -2048,10 +1980,8 @@ $result_trees{'encoding_index_ascii'} = {
               'entry_node' => {},
               'entry_number' => 35,
               'in_code' => 0,
-              'index_at_command' => 'cindex',
               'index_ignore_chars' => {},
-              'index_name' => 'cp',
-              'index_type_command' => 'cindex'
+              'index_name' => 'cp'
             }
           },
           'info' => {
@@ -2102,10 +2032,8 @@ $result_trees{'encoding_index_ascii'} = {
               'entry_node' => {},
               'entry_number' => 36,
               'in_code' => 0,
-              'index_at_command' => 'cindex',
               'index_ignore_chars' => {},
-              'index_name' => 'cp',
-              'index_type_command' => 'cindex'
+              'index_name' => 'cp'
             }
           },
           'info' => {
@@ -2156,10 +2084,8 @@ $result_trees{'encoding_index_ascii'} = {
               'entry_node' => {},
               'entry_number' => 37,
               'in_code' => 0,
-              'index_at_command' => 'cindex',
               'index_ignore_chars' => {},
-              'index_name' => 'cp',
-              'index_type_command' => 'cindex'
+              'index_name' => 'cp'
             }
           },
           'info' => {
@@ -2210,10 +2136,8 @@ $result_trees{'encoding_index_ascii'} = {
               'entry_node' => {},
               'entry_number' => 38,
               'in_code' => 0,
-              'index_at_command' => 'cindex',
               'index_ignore_chars' => {},
-              'index_name' => 'cp',
-              'index_type_command' => 'cindex'
+              'index_name' => 'cp'
             }
           },
           'info' => {
@@ -2264,10 +2188,8 @@ $result_trees{'encoding_index_ascii'} = {
               'entry_node' => {},
               'entry_number' => 39,
               'in_code' => 0,
-              'index_at_command' => 'cindex',
               'index_ignore_chars' => {},
-              'index_name' => 'cp',
-              'index_type_command' => 'cindex'
+              'index_name' => 'cp'
             }
           },
           'info' => {
@@ -2318,10 +2240,8 @@ $result_trees{'encoding_index_ascii'} = {
               'entry_node' => {},
               'entry_number' => 40,
               'in_code' => 0,
-              'index_at_command' => 'cindex',
               'index_ignore_chars' => {},
-              'index_name' => 'cp',
-              'index_type_command' => 'cindex'
+              'index_name' => 'cp'
             }
           },
           'info' => {
@@ -2372,10 +2292,8 @@ $result_trees{'encoding_index_ascii'} = {
               'entry_node' => {},
               'entry_number' => 41,
               'in_code' => 0,
-              'index_at_command' => 'cindex',
               'index_ignore_chars' => {},
-              'index_name' => 'cp',
-              'index_type_command' => 'cindex'
+              'index_name' => 'cp'
             }
           },
           'info' => {
@@ -2426,10 +2344,8 @@ $result_trees{'encoding_index_ascii'} = {
               'entry_node' => {},
               'entry_number' => 42,
               'in_code' => 0,
-              'index_at_command' => 'cindex',
               'index_ignore_chars' => {},
-              'index_name' => 'cp',
-              'index_type_command' => 'cindex'
+              'index_name' => 'cp'
             }
           },
           'info' => {
@@ -2470,10 +2386,8 @@ $result_trees{'encoding_index_ascii'} = {
               'entry_node' => {},
               'entry_number' => 43,
               'in_code' => 0,
-              'index_at_command' => 'cindex',
               'index_ignore_chars' => {},
-              'index_name' => 'cp',
-              'index_type_command' => 'cindex'
+              'index_name' => 'cp'
             }
           },
           'info' => {
@@ -2514,10 +2428,8 @@ $result_trees{'encoding_index_ascii'} = {
               'entry_node' => {},
               'entry_number' => 44,
               'in_code' => 0,
-              'index_at_command' => 'cindex',
               'index_ignore_chars' => {},
-              'index_name' => 'cp',
-              'index_type_command' => 'cindex'
+              'index_name' => 'cp'
             }
           },
           'info' => {
@@ -2568,10 +2480,8 @@ $result_trees{'encoding_index_ascii'} = {
               'entry_node' => {},
               'entry_number' => 45,
               'in_code' => 0,
-              'index_at_command' => 'cindex',
               'index_ignore_chars' => {},
-              'index_name' => 'cp',
-              'index_type_command' => 'cindex'
+              'index_name' => 'cp'
             }
           },
           'info' => {
@@ -2622,10 +2532,8 @@ $result_trees{'encoding_index_ascii'} = {
               'entry_node' => {},
               'entry_number' => 46,
               'in_code' => 0,
-              'index_at_command' => 'cindex',
               'index_ignore_chars' => {},
-              'index_name' => 'cp',
-              'index_type_command' => 'cindex'
+              'index_name' => 'cp'
             }
           },
           'info' => {
@@ -2676,10 +2584,8 @@ $result_trees{'encoding_index_ascii'} = {
               'entry_node' => {},
               'entry_number' => 47,
               'in_code' => 0,
-              'index_at_command' => 'cindex',
               'index_ignore_chars' => {},
-              'index_name' => 'cp',
-              'index_type_command' => 'cindex'
+              'index_name' => 'cp'
             }
           },
           'info' => {
@@ -2720,10 +2626,8 @@ $result_trees{'encoding_index_ascii'} = {
               'entry_node' => {},
               'entry_number' => 48,
               'in_code' => 0,
-              'index_at_command' => 'cindex',
               'index_ignore_chars' => {},
-              'index_name' => 'cp',
-              'index_type_command' => 'cindex'
+              'index_name' => 'cp'
             }
           },
           'info' => {
@@ -2764,10 +2668,8 @@ $result_trees{'encoding_index_ascii'} = {
               'entry_node' => {},
               'entry_number' => 49,
               'in_code' => 0,
-              'index_at_command' => 'cindex',
               'index_ignore_chars' => {},
-              'index_name' => 'cp',
-              'index_type_command' => 'cindex'
+              'index_name' => 'cp'
             }
           },
           'info' => {
@@ -2808,10 +2710,8 @@ $result_trees{'encoding_index_ascii'} = {
               'entry_node' => {},
               'entry_number' => 50,
               'in_code' => 0,
-              'index_at_command' => 'cindex',
               'index_ignore_chars' => {},
-              'index_name' => 'cp',
-              'index_type_command' => 'cindex'
+              'index_name' => 'cp'
             }
           },
           'info' => {
@@ -2852,10 +2752,8 @@ $result_trees{'encoding_index_ascii'} = {
               'entry_node' => {},
               'entry_number' => 51,
               'in_code' => 0,
-              'index_at_command' => 'cindex',
               'index_ignore_chars' => {},
-              'index_name' => 'cp',
-              'index_type_command' => 'cindex'
+              'index_name' => 'cp'
             }
           },
           'info' => {
@@ -2896,10 +2794,8 @@ $result_trees{'encoding_index_ascii'} = {
               'entry_node' => {},
               'entry_number' => 52,
               'in_code' => 0,
-              'index_at_command' => 'cindex',
               'index_ignore_chars' => {},
-              'index_name' => 'cp',
-              'index_type_command' => 'cindex'
+              'index_name' => 'cp'
             }
           },
           'info' => {
@@ -2940,10 +2836,8 @@ $result_trees{'encoding_index_ascii'} = {
               'entry_node' => {},
               'entry_number' => 53,
               'in_code' => 0,
-              'index_at_command' => 'cindex',
               'index_ignore_chars' => {},
-              'index_name' => 'cp',
-              'index_type_command' => 'cindex'
+              'index_name' => 'cp'
             }
           },
           'info' => {
@@ -2984,10 +2878,8 @@ $result_trees{'encoding_index_ascii'} = {
               'entry_node' => {},
               'entry_number' => 54,
               'in_code' => 0,
-              'index_at_command' => 'cindex',
               'index_ignore_chars' => {},
-              'index_name' => 'cp',
-              'index_type_command' => 'cindex'
+              'index_name' => 'cp'
             }
           },
           'info' => {
@@ -3028,10 +2920,8 @@ $result_trees{'encoding_index_ascii'} = {
               'entry_node' => {},
               'entry_number' => 55,
               'in_code' => 0,
-              'index_at_command' => 'cindex',
               'index_ignore_chars' => {},
-              'index_name' => 'cp',
-              'index_type_command' => 'cindex'
+              'index_name' => 'cp'
             }
           },
           '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 95a33660c8..4b6716b5e6 100644
--- a/tp/t/results/indices/encoding_index_ascii_enable_encoding.pl
+++ b/tp/t/results/indices/encoding_index_ascii_enable_encoding.pl
@@ -262,10 +262,8 @@ $result_trees{'encoding_index_ascii_enable_encoding'} = {
               'entry_node' => {},
               'entry_number' => 1,
               'in_code' => 0,
-              'index_at_command' => 'cindex',
               'index_ignore_chars' => {},
-              'index_name' => 'cp',
-              'index_type_command' => 'cindex'
+              'index_name' => 'cp'
             }
           },
           'info' => {
@@ -378,10 +376,8 @@ $result_trees{'encoding_index_ascii_enable_encoding'} = {
               'entry_node' => {},
               'entry_number' => 2,
               'in_code' => 0,
-              'index_at_command' => 'cindex',
               'index_ignore_chars' => {},
-              'index_name' => 'cp',
-              'index_type_command' => 'cindex'
+              'index_name' => 'cp'
             }
           },
           'info' => {
@@ -512,10 +508,8 @@ $result_trees{'encoding_index_ascii_enable_encoding'} = {
               'entry_node' => {},
               'entry_number' => 3,
               'in_code' => 0,
-              'index_at_command' => 'cindex',
               'index_ignore_chars' => {},
-              'index_name' => 'cp',
-              'index_type_command' => 'cindex'
+              'index_name' => 'cp'
             }
           },
           'info' => {
@@ -556,10 +550,8 @@ $result_trees{'encoding_index_ascii_enable_encoding'} = {
               'entry_node' => {},
               'entry_number' => 4,
               'in_code' => 0,
-              'index_at_command' => 'cindex',
               'index_ignore_chars' => {},
-              'index_name' => 'cp',
-              'index_type_command' => 'cindex'
+              'index_name' => 'cp'
             }
           },
           'info' => {
@@ -600,10 +592,8 @@ $result_trees{'encoding_index_ascii_enable_encoding'} = {
               'entry_node' => {},
               'entry_number' => 5,
               'in_code' => 0,
-              'index_at_command' => 'cindex',
               'index_ignore_chars' => {},
-              'index_name' => 'cp',
-              'index_type_command' => 'cindex'
+              'index_name' => 'cp'
             }
           },
           'info' => {
@@ -644,10 +634,8 @@ $result_trees{'encoding_index_ascii_enable_encoding'} = {
               'entry_node' => {},
               'entry_number' => 6,
               'in_code' => 0,
-              'index_at_command' => 'cindex',
               'index_ignore_chars' => {},
-              'index_name' => 'cp',
-              'index_type_command' => 'cindex'
+              'index_name' => 'cp'
             }
           },
           'info' => {
@@ -688,10 +676,8 @@ $result_trees{'encoding_index_ascii_enable_encoding'} = {
               'entry_node' => {},
               'entry_number' => 7,
               'in_code' => 0,
-              'index_at_command' => 'cindex',
               'index_ignore_chars' => {},
-              'index_name' => 'cp',
-              'index_type_command' => 'cindex'
+              'index_name' => 'cp'
             }
           },
           'info' => {
@@ -732,10 +718,8 @@ $result_trees{'encoding_index_ascii_enable_encoding'} = {
               'entry_node' => {},
               'entry_number' => 8,
               'in_code' => 0,
-              'index_at_command' => 'cindex',
               'index_ignore_chars' => {},
-              'index_name' => 'cp',
-              'index_type_command' => 'cindex'
+              'index_name' => 'cp'
             }
           },
           'info' => {
@@ -776,10 +760,8 @@ $result_trees{'encoding_index_ascii_enable_encoding'} = {
               'entry_node' => {},
               'entry_number' => 9,
               'in_code' => 0,
-              'index_at_command' => 'cindex',
               'index_ignore_chars' => {},
-              'index_name' => 'cp',
-              'index_type_command' => 'cindex'
+              'index_name' => 'cp'
             }
           },
           'info' => {
@@ -820,10 +802,8 @@ $result_trees{'encoding_index_ascii_enable_encoding'} = {
               'entry_node' => {},
               'entry_number' => 10,
               'in_code' => 0,
-              'index_at_command' => 'cindex',
               'index_ignore_chars' => {},
-              'index_name' => 'cp',
-              'index_type_command' => 'cindex'
+              'index_name' => 'cp'
             }
           },
           'info' => {
@@ -864,10 +844,8 @@ $result_trees{'encoding_index_ascii_enable_encoding'} = {
               'entry_node' => {},
               'entry_number' => 11,
               'in_code' => 0,
-              'index_at_command' => 'cindex',
               'index_ignore_chars' => {},
-              'index_name' => 'cp',
-              'index_type_command' => 'cindex'
+              'index_name' => 'cp'
             }
           },
           'info' => {
@@ -908,10 +886,8 @@ $result_trees{'encoding_index_ascii_enable_encoding'} = {
               'entry_node' => {},
               'entry_number' => 12,
               'in_code' => 0,
-              'index_at_command' => 'cindex',
               'index_ignore_chars' => {},
-              'index_name' => 'cp',
-              'index_type_command' => 'cindex'
+              'index_name' => 'cp'
             }
           },
           'info' => {
@@ -952,10 +928,8 @@ $result_trees{'encoding_index_ascii_enable_encoding'} = {
               'entry_node' => {},
               'entry_number' => 13,
               'in_code' => 0,
-              'index_at_command' => 'cindex',
               'index_ignore_chars' => {},
-              'index_name' => 'cp',
-              'index_type_command' => 'cindex'
+              'index_name' => 'cp'
             }
           },
           'info' => {
@@ -996,10 +970,8 @@ $result_trees{'encoding_index_ascii_enable_encoding'} = {
               'entry_node' => {},
               'entry_number' => 14,
               'in_code' => 0,
-              'index_at_command' => 'cindex',
               'index_ignore_chars' => {},
-              'index_name' => 'cp',
-              'index_type_command' => 'cindex'
+              'index_name' => 'cp'
             }
           },
           'info' => {
@@ -1040,10 +1012,8 @@ $result_trees{'encoding_index_ascii_enable_encoding'} = {
               'entry_node' => {},
               'entry_number' => 15,
               'in_code' => 0,
-              'index_at_command' => 'cindex',
               'index_ignore_chars' => {},
-              'index_name' => 'cp',
-              'index_type_command' => 'cindex'
+              'index_name' => 'cp'
             }
           },
           'info' => {
@@ -1084,10 +1054,8 @@ $result_trees{'encoding_index_ascii_enable_encoding'} = {
               'entry_node' => {},
               'entry_number' => 16,
               'in_code' => 0,
-              'index_at_command' => 'cindex',
               'index_ignore_chars' => {},
-              'index_name' => 'cp',
-              'index_type_command' => 'cindex'
+              'index_name' => 'cp'
             }
           },
           'info' => {
@@ -1128,10 +1096,8 @@ $result_trees{'encoding_index_ascii_enable_encoding'} = {
               'entry_node' => {},
               'entry_number' => 17,
               'in_code' => 0,
-              'index_at_command' => 'cindex',
               'index_ignore_chars' => {},
-              'index_name' => 'cp',
-              'index_type_command' => 'cindex'
+              'index_name' => 'cp'
             }
           },
           'info' => {
@@ -1172,10 +1138,8 @@ $result_trees{'encoding_index_ascii_enable_encoding'} = {
               'entry_node' => {},
               'entry_number' => 18,
               'in_code' => 0,
-              'index_at_command' => 'cindex',
               'index_ignore_chars' => {},
-              'index_name' => 'cp',
-              'index_type_command' => 'cindex'
+              'index_name' => 'cp'
             }
           },
           'info' => {
@@ -1216,10 +1180,8 @@ $result_trees{'encoding_index_ascii_enable_encoding'} = {
               'entry_node' => {},
               'entry_number' => 19,
               'in_code' => 0,
-              'index_at_command' => 'cindex',
               'index_ignore_chars' => {},
-              'index_name' => 'cp',
-              'index_type_command' => 'cindex'
+              'index_name' => 'cp'
             }
           },
           'info' => {
@@ -1260,10 +1222,8 @@ $result_trees{'encoding_index_ascii_enable_encoding'} = {
               'entry_node' => {},
               'entry_number' => 20,
               'in_code' => 0,
-              'index_at_command' => 'cindex',
               'index_ignore_chars' => {},
-              'index_name' => 'cp',
-              'index_type_command' => 'cindex'
+              'index_name' => 'cp'
             }
           },
           'info' => {
@@ -1304,10 +1264,8 @@ $result_trees{'encoding_index_ascii_enable_encoding'} = {
               'entry_node' => {},
               'entry_number' => 21,
               'in_code' => 0,
-              'index_at_command' => 'cindex',
               'index_ignore_chars' => {},
-              'index_name' => 'cp',
-              'index_type_command' => 'cindex'
+              'index_name' => 'cp'
             }
           },
           'info' => {
@@ -1348,10 +1306,8 @@ $result_trees{'encoding_index_ascii_enable_encoding'} = {
               'entry_node' => {},
               'entry_number' => 22,
               'in_code' => 0,
-              'index_at_command' => 'cindex',
               'index_ignore_chars' => {},
-              'index_name' => 'cp',
-              'index_type_command' => 'cindex'
+              'index_name' => 'cp'
             }
           },
           'info' => {
@@ -1392,10 +1348,8 @@ $result_trees{'encoding_index_ascii_enable_encoding'} = {
               'entry_node' => {},
               'entry_number' => 23,
               'in_code' => 0,
-              'index_at_command' => 'cindex',
               'index_ignore_chars' => {},
-              'index_name' => 'cp',
-              'index_type_command' => 'cindex'
+              'index_name' => 'cp'
             }
           },
           'info' => {
@@ -1436,10 +1390,8 @@ $result_trees{'encoding_index_ascii_enable_encoding'} = {
               'entry_node' => {},
               'entry_number' => 24,
               'in_code' => 0,
-              'index_at_command' => 'cindex',
               'index_ignore_chars' => {},
-              'index_name' => 'cp',
-              'index_type_command' => 'cindex'
+              'index_name' => 'cp'
             }
           },
           'info' => {
@@ -1480,10 +1432,8 @@ $result_trees{'encoding_index_ascii_enable_encoding'} = {
               'entry_node' => {},
               'entry_number' => 25,
               'in_code' => 0,
-              'index_at_command' => 'cindex',
               'index_ignore_chars' => {},
-              'index_name' => 'cp',
-              'index_type_command' => 'cindex'
+              'index_name' => 'cp'
             }
           },
           'info' => {
@@ -1524,10 +1474,8 @@ $result_trees{'encoding_index_ascii_enable_encoding'} = {
               'entry_node' => {},
               'entry_number' => 26,
               'in_code' => 0,
-              'index_at_command' => 'cindex',
               'index_ignore_chars' => {},
-              'index_name' => 'cp',
-              'index_type_command' => 'cindex'
+              'index_name' => 'cp'
             }
           },
           'info' => {
@@ -1568,10 +1516,8 @@ $result_trees{'encoding_index_ascii_enable_encoding'} = {
               'entry_node' => {},
               'entry_number' => 27,
               'in_code' => 0,
-              'index_at_command' => 'cindex',
               'index_ignore_chars' => {},
-              'index_name' => 'cp',
-              'index_type_command' => 'cindex'
+              'index_name' => 'cp'
             }
           },
           'info' => {
@@ -1612,10 +1558,8 @@ $result_trees{'encoding_index_ascii_enable_encoding'} = {
               'entry_node' => {},
               'entry_number' => 28,
               'in_code' => 0,
-              'index_at_command' => 'cindex',
               'index_ignore_chars' => {},
-              'index_name' => 'cp',
-              'index_type_command' => 'cindex'
+              'index_name' => 'cp'
             }
           },
           'info' => {
@@ -1656,10 +1600,8 @@ $result_trees{'encoding_index_ascii_enable_encoding'} = {
               'entry_node' => {},
               'entry_number' => 29,
               'in_code' => 0,
-              'index_at_command' => 'cindex',
               'index_ignore_chars' => {},
-              'index_name' => 'cp',
-              'index_type_command' => 'cindex'
+              'index_name' => 'cp'
             }
           },
           'info' => {
@@ -1700,10 +1642,8 @@ $result_trees{'encoding_index_ascii_enable_encoding'} = {
               'entry_node' => {},
               'entry_number' => 30,
               'in_code' => 0,
-              'index_at_command' => 'cindex',
               'index_ignore_chars' => {},
-              'index_name' => 'cp',
-              'index_type_command' => 'cindex'
+              'index_name' => 'cp'
             }
           },
           'info' => {
@@ -1744,10 +1684,8 @@ $result_trees{'encoding_index_ascii_enable_encoding'} = {
               'entry_node' => {},
               'entry_number' => 31,
               'in_code' => 0,
-              'index_at_command' => 'cindex',
               'index_ignore_chars' => {},
-              'index_name' => 'cp',
-              'index_type_command' => 'cindex'
+              'index_name' => 'cp'
             }
           },
           'info' => {
@@ -1798,10 +1736,8 @@ $result_trees{'encoding_index_ascii_enable_encoding'} = {
               'entry_node' => {},
               'entry_number' => 32,
               'in_code' => 0,
-              'index_at_command' => 'cindex',
               'index_ignore_chars' => {},
-              'index_name' => 'cp',
-              'index_type_command' => 'cindex'
+              'index_name' => 'cp'
             }
           },
           'info' => {
@@ -1852,10 +1788,8 @@ $result_trees{'encoding_index_ascii_enable_encoding'} = {
               'entry_node' => {},
               'entry_number' => 33,
               'in_code' => 0,
-              'index_at_command' => 'cindex',
               'index_ignore_chars' => {},
-              'index_name' => 'cp',
-              'index_type_command' => 'cindex'
+              'index_name' => 'cp'
             }
           },
           'info' => {
@@ -1935,10 +1869,8 @@ $result_trees{'encoding_index_ascii_enable_encoding'} = {
               'entry_node' => {},
               'entry_number' => 34,
               'in_code' => 0,
-              'index_at_command' => 'cindex',
               'index_ignore_chars' => {},
-              'index_name' => 'cp',
-              'index_type_command' => 'cindex'
+              'index_name' => 'cp'
             }
           },
           'info' => {
@@ -2048,10 +1980,8 @@ $result_trees{'encoding_index_ascii_enable_encoding'} = {
               'entry_node' => {},
               'entry_number' => 35,
               'in_code' => 0,
-              'index_at_command' => 'cindex',
               'index_ignore_chars' => {},
-              'index_name' => 'cp',
-              'index_type_command' => 'cindex'
+              'index_name' => 'cp'
             }
           },
           'info' => {
@@ -2102,10 +2032,8 @@ $result_trees{'encoding_index_ascii_enable_encoding'} = {
               'entry_node' => {},
               'entry_number' => 36,
               'in_code' => 0,
-              'index_at_command' => 'cindex',
               'index_ignore_chars' => {},
-              'index_name' => 'cp',
-              'index_type_command' => 'cindex'
+              'index_name' => 'cp'
             }
           },
           'info' => {
@@ -2156,10 +2084,8 @@ $result_trees{'encoding_index_ascii_enable_encoding'} = {
               'entry_node' => {},
               'entry_number' => 37,
               'in_code' => 0,
-              'index_at_command' => 'cindex',
               'index_ignore_chars' => {},
-              'index_name' => 'cp',
-              'index_type_command' => 'cindex'
+              'index_name' => 'cp'
             }
           },
           'info' => {
@@ -2210,10 +2136,8 @@ $result_trees{'encoding_index_ascii_enable_encoding'} = {
               'entry_node' => {},
               'entry_number' => 38,
               'in_code' => 0,
-              'index_at_command' => 'cindex',
               'index_ignore_chars' => {},
-              'index_name' => 'cp',
-              'index_type_command' => 'cindex'
+              'index_name' => 'cp'
             }
           },
           'info' => {
@@ -2264,10 +2188,8 @@ $result_trees{'encoding_index_ascii_enable_encoding'} = {
               'entry_node' => {},
               'entry_number' => 39,
               'in_code' => 0,
-              'index_at_command' => 'cindex',
               'index_ignore_chars' => {},
-              'index_name' => 'cp',
-              'index_type_command' => 'cindex'
+              'index_name' => 'cp'
             }
           },
           'info' => {
@@ -2318,10 +2240,8 @@ $result_trees{'encoding_index_ascii_enable_encoding'} = {
               'entry_node' => {},
               'entry_number' => 40,
               'in_code' => 0,
-              'index_at_command' => 'cindex',
               'index_ignore_chars' => {},
-              'index_name' => 'cp',
-              'index_type_command' => 'cindex'
+              'index_name' => 'cp'
             }
           },
           'info' => {
@@ -2372,10 +2292,8 @@ $result_trees{'encoding_index_ascii_enable_encoding'} = {
               'entry_node' => {},
               'entry_number' => 41,
               'in_code' => 0,
-              'index_at_command' => 'cindex',
               'index_ignore_chars' => {},
-              'index_name' => 'cp',
-              'index_type_command' => 'cindex'
+              'index_name' => 'cp'
             }
           },
           'info' => {
@@ -2426,10 +2344,8 @@ $result_trees{'encoding_index_ascii_enable_encoding'} = {
               'entry_node' => {},
               'entry_number' => 42,
               'in_code' => 0,
-              'index_at_command' => 'cindex',
               'index_ignore_chars' => {},
-              'index_name' => 'cp',
-              'index_type_command' => 'cindex'
+              'index_name' => 'cp'
             }
           },
           'info' => {
@@ -2470,10 +2386,8 @@ $result_trees{'encoding_index_ascii_enable_encoding'} = {
               'entry_node' => {},
               'entry_number' => 43,
               'in_code' => 0,
-              'index_at_command' => 'cindex',
               'index_ignore_chars' => {},
-              'index_name' => 'cp',
-              'index_type_command' => 'cindex'
+              'index_name' => 'cp'
             }
           },
           'info' => {
@@ -2514,10 +2428,8 @@ $result_trees{'encoding_index_ascii_enable_encoding'} = {
               'entry_node' => {},
               'entry_number' => 44,
               'in_code' => 0,
-              'index_at_command' => 'cindex',
               'index_ignore_chars' => {},
-              'index_name' => 'cp',
-              'index_type_command' => 'cindex'
+              'index_name' => 'cp'
             }
           },
           'info' => {
@@ -2568,10 +2480,8 @@ $result_trees{'encoding_index_ascii_enable_encoding'} = {
               'entry_node' => {},
               'entry_number' => 45,
               'in_code' => 0,
-              'index_at_command' => 'cindex',
               'index_ignore_chars' => {},
-              'index_name' => 'cp',
-              'index_type_command' => 'cindex'
+              'index_name' => 'cp'
             }
           },
           'info' => {
@@ -2622,10 +2532,8 @@ $result_trees{'encoding_index_ascii_enable_encoding'} = {
               'entry_node' => {},
               'entry_number' => 46,
               'in_code' => 0,
-              'index_at_command' => 'cindex',
               'index_ignore_chars' => {},
-              'index_name' => 'cp',
-              'index_type_command' => 'cindex'
+              'index_name' => 'cp'
             }
           },
           'info' => {
@@ -2676,10 +2584,8 @@ $result_trees{'encoding_index_ascii_enable_encoding'} = {
               'entry_node' => {},
               'entry_number' => 47,
               'in_code' => 0,
-              'index_at_command' => 'cindex',
               'index_ignore_chars' => {},
-              'index_name' => 'cp',
-              'index_type_command' => 'cindex'
+              'index_name' => 'cp'
             }
           },
           'info' => {
@@ -2720,10 +2626,8 @@ $result_trees{'encoding_index_ascii_enable_encoding'} = {
               'entry_node' => {},
               'entry_number' => 48,
               'in_code' => 0,
-              'index_at_command' => 'cindex',
               'index_ignore_chars' => {},
-              'index_name' => 'cp',
-              'index_type_command' => 'cindex'
+              'index_name' => 'cp'
             }
           },
           'info' => {
@@ -2764,10 +2668,8 @@ $result_trees{'encoding_index_ascii_enable_encoding'} = {
               'entry_node' => {},
               'entry_number' => 49,
               'in_code' => 0,
-              'index_at_command' => 'cindex',
               'index_ignore_chars' => {},
-              'index_name' => 'cp',
-              'index_type_command' => 'cindex'
+              'index_name' => 'cp'
             }
           },
           'info' => {
@@ -2808,10 +2710,8 @@ $result_trees{'encoding_index_ascii_enable_encoding'} = {
               'entry_node' => {},
               'entry_number' => 50,
               'in_code' => 0,
-              'index_at_command' => 'cindex',
               'index_ignore_chars' => {},
-              'index_name' => 'cp',
-              'index_type_command' => 'cindex'
+              'index_name' => 'cp'
             }
           },
           'info' => {
@@ -2852,10 +2752,8 @@ $result_trees{'encoding_index_ascii_enable_encoding'} = {
               'entry_node' => {},
               'entry_number' => 51,
               'in_code' => 0,
-              'index_at_command' => 'cindex',
               'index_ignore_chars' => {},
-              'index_name' => 'cp',
-              'index_type_command' => 'cindex'
+              'index_name' => 'cp'
             }
           },
           'info' => {
@@ -2896,10 +2794,8 @@ $result_trees{'encoding_index_ascii_enable_encoding'} = {
               'entry_node' => {},
               'entry_number' => 52,
               'in_code' => 0,
-              'index_at_command' => 'cindex',
               'index_ignore_chars' => {},
-              'index_name' => 'cp',
-              'index_type_command' => 'cindex'
+              'index_name' => 'cp'
             }
           },
           'info' => {
@@ -2940,10 +2836,8 @@ $result_trees{'encoding_index_ascii_enable_encoding'} = {
               'entry_node' => {},
               'entry_number' => 53,
               'in_code' => 0,
-              'index_at_command' => 'cindex',
               'index_ignore_chars' => {},
-              'index_name' => 'cp',
-              'index_type_command' => 'cindex'
+              'index_name' => 'cp'
             }
           },
           'info' => {
@@ -2984,10 +2878,8 @@ $result_trees{'encoding_index_ascii_enable_encoding'} = {
               'entry_node' => {},
               'entry_number' => 54,
               'in_code' => 0,
-              'index_at_command' => 'cindex',
               'index_ignore_chars' => {},
-              'index_name' => 'cp',
-              'index_type_command' => 'cindex'
+              'index_name' => 'cp'
             }
           },
           'info' => {
@@ -3028,10 +2920,8 @@ $result_trees{'encoding_index_ascii_enable_encoding'} = {
               'entry_node' => {},
               'entry_number' => 55,
               'in_code' => 0,
-              'index_at_command' => 'cindex',
               'index_ignore_chars' => {},
-              'index_name' => 'cp',
-              'index_type_command' => 'cindex'
+              'index_name' => 'cp'
             }
           },
           'info' => {
diff --git a/tp/t/results/indices/encoding_index_latin1.pl 
b/tp/t/results/indices/encoding_index_latin1.pl
index 3b58139398..53570112e7 100644
--- a/tp/t/results/indices/encoding_index_latin1.pl
+++ b/tp/t/results/indices/encoding_index_latin1.pl
@@ -196,10 +196,8 @@ $result_trees{'encoding_index_latin1'} = {
               'entry_node' => {},
               'entry_number' => 1,
               'in_code' => 0,
-              'index_at_command' => 'cindex',
               'index_ignore_chars' => {},
-              'index_name' => 'cp',
-              'index_type_command' => 'cindex'
+              'index_name' => 'cp'
             }
           },
           'info' => {
@@ -312,10 +310,8 @@ $result_trees{'encoding_index_latin1'} = {
               'entry_node' => {},
               'entry_number' => 2,
               'in_code' => 0,
-              'index_at_command' => 'cindex',
               'index_ignore_chars' => {},
-              'index_name' => 'cp',
-              'index_type_command' => 'cindex'
+              'index_name' => 'cp'
             }
           },
           'info' => {
@@ -446,10 +442,8 @@ $result_trees{'encoding_index_latin1'} = {
               'entry_node' => {},
               'entry_number' => 3,
               'in_code' => 0,
-              'index_at_command' => 'cindex',
               'index_ignore_chars' => {},
-              'index_name' => 'cp',
-              'index_type_command' => 'cindex'
+              'index_name' => 'cp'
             }
           },
           'info' => {
@@ -490,10 +484,8 @@ $result_trees{'encoding_index_latin1'} = {
               'entry_node' => {},
               'entry_number' => 4,
               'in_code' => 0,
-              'index_at_command' => 'cindex',
               'index_ignore_chars' => {},
-              'index_name' => 'cp',
-              'index_type_command' => 'cindex'
+              'index_name' => 'cp'
             }
           },
           'info' => {
@@ -534,10 +526,8 @@ $result_trees{'encoding_index_latin1'} = {
               'entry_node' => {},
               'entry_number' => 5,
               'in_code' => 0,
-              'index_at_command' => 'cindex',
               'index_ignore_chars' => {},
-              'index_name' => 'cp',
-              'index_type_command' => 'cindex'
+              'index_name' => 'cp'
             }
           },
           'info' => {
@@ -578,10 +568,8 @@ $result_trees{'encoding_index_latin1'} = {
               'entry_node' => {},
               'entry_number' => 6,
               'in_code' => 0,
-              'index_at_command' => 'cindex',
               'index_ignore_chars' => {},
-              'index_name' => 'cp',
-              'index_type_command' => 'cindex'
+              'index_name' => 'cp'
             }
           },
           'info' => {
@@ -622,10 +610,8 @@ $result_trees{'encoding_index_latin1'} = {
               'entry_node' => {},
               'entry_number' => 7,
               'in_code' => 0,
-              'index_at_command' => 'cindex',
               'index_ignore_chars' => {},
-              'index_name' => 'cp',
-              'index_type_command' => 'cindex'
+              'index_name' => 'cp'
             }
           },
           'info' => {
@@ -666,10 +652,8 @@ $result_trees{'encoding_index_latin1'} = {
               'entry_node' => {},
               'entry_number' => 8,
               'in_code' => 0,
-              'index_at_command' => 'cindex',
               'index_ignore_chars' => {},
-              'index_name' => 'cp',
-              'index_type_command' => 'cindex'
+              'index_name' => 'cp'
             }
           },
           'info' => {
@@ -710,10 +694,8 @@ $result_trees{'encoding_index_latin1'} = {
               'entry_node' => {},
               'entry_number' => 9,
               'in_code' => 0,
-              'index_at_command' => 'cindex',
               'index_ignore_chars' => {},
-              'index_name' => 'cp',
-              'index_type_command' => 'cindex'
+              'index_name' => 'cp'
             }
           },
           'info' => {
@@ -754,10 +736,8 @@ $result_trees{'encoding_index_latin1'} = {
               'entry_node' => {},
               'entry_number' => 10,
               'in_code' => 0,
-              'index_at_command' => 'cindex',
               'index_ignore_chars' => {},
-              'index_name' => 'cp',
-              'index_type_command' => 'cindex'
+              'index_name' => 'cp'
             }
           },
           'info' => {
@@ -798,10 +778,8 @@ $result_trees{'encoding_index_latin1'} = {
               'entry_node' => {},
               'entry_number' => 11,
               'in_code' => 0,
-              'index_at_command' => 'cindex',
               'index_ignore_chars' => {},
-              'index_name' => 'cp',
-              'index_type_command' => 'cindex'
+              'index_name' => 'cp'
             }
           },
           'info' => {
@@ -842,10 +820,8 @@ $result_trees{'encoding_index_latin1'} = {
               'entry_node' => {},
               'entry_number' => 12,
               'in_code' => 0,
-              'index_at_command' => 'cindex',
               'index_ignore_chars' => {},
-              'index_name' => 'cp',
-              'index_type_command' => 'cindex'
+              'index_name' => 'cp'
             }
           },
           'info' => {
@@ -886,10 +862,8 @@ $result_trees{'encoding_index_latin1'} = {
               'entry_node' => {},
               'entry_number' => 13,
               'in_code' => 0,
-              'index_at_command' => 'cindex',
               'index_ignore_chars' => {},
-              'index_name' => 'cp',
-              'index_type_command' => 'cindex'
+              'index_name' => 'cp'
             }
           },
           'info' => {
@@ -930,10 +904,8 @@ $result_trees{'encoding_index_latin1'} = {
               'entry_node' => {},
               'entry_number' => 14,
               'in_code' => 0,
-              'index_at_command' => 'cindex',
               'index_ignore_chars' => {},
-              'index_name' => 'cp',
-              'index_type_command' => 'cindex'
+              'index_name' => 'cp'
             }
           },
           'info' => {
@@ -974,10 +946,8 @@ $result_trees{'encoding_index_latin1'} = {
               'entry_node' => {},
               'entry_number' => 15,
               'in_code' => 0,
-              'index_at_command' => 'cindex',
               'index_ignore_chars' => {},
-              'index_name' => 'cp',
-              'index_type_command' => 'cindex'
+              'index_name' => 'cp'
             }
           },
           'info' => {
@@ -1018,10 +988,8 @@ $result_trees{'encoding_index_latin1'} = {
               'entry_node' => {},
               'entry_number' => 16,
               'in_code' => 0,
-              'index_at_command' => 'cindex',
               'index_ignore_chars' => {},
-              'index_name' => 'cp',
-              'index_type_command' => 'cindex'
+              'index_name' => 'cp'
             }
           },
           'info' => {
@@ -1062,10 +1030,8 @@ $result_trees{'encoding_index_latin1'} = {
               'entry_node' => {},
               'entry_number' => 17,
               'in_code' => 0,
-              'index_at_command' => 'cindex',
               'index_ignore_chars' => {},
-              'index_name' => 'cp',
-              'index_type_command' => 'cindex'
+              'index_name' => 'cp'
             }
           },
           'info' => {
@@ -1106,10 +1072,8 @@ $result_trees{'encoding_index_latin1'} = {
               'entry_node' => {},
               'entry_number' => 18,
               'in_code' => 0,
-              'index_at_command' => 'cindex',
               'index_ignore_chars' => {},
-              'index_name' => 'cp',
-              'index_type_command' => 'cindex'
+              'index_name' => 'cp'
             }
           },
           'info' => {
@@ -1150,10 +1114,8 @@ $result_trees{'encoding_index_latin1'} = {
               'entry_node' => {},
               'entry_number' => 19,
               'in_code' => 0,
-              'index_at_command' => 'cindex',
               'index_ignore_chars' => {},
-              'index_name' => 'cp',
-              'index_type_command' => 'cindex'
+              'index_name' => 'cp'
             }
           },
           'info' => {
@@ -1194,10 +1156,8 @@ $result_trees{'encoding_index_latin1'} = {
               'entry_node' => {},
               'entry_number' => 20,
               'in_code' => 0,
-              'index_at_command' => 'cindex',
               'index_ignore_chars' => {},
-              'index_name' => 'cp',
-              'index_type_command' => 'cindex'
+              'index_name' => 'cp'
             }
           },
           'info' => {
@@ -1238,10 +1198,8 @@ $result_trees{'encoding_index_latin1'} = {
               'entry_node' => {},
               'entry_number' => 21,
               'in_code' => 0,
-              'index_at_command' => 'cindex',
               'index_ignore_chars' => {},
-              'index_name' => 'cp',
-              'index_type_command' => 'cindex'
+              'index_name' => 'cp'
             }
           },
           'info' => {
@@ -1282,10 +1240,8 @@ $result_trees{'encoding_index_latin1'} = {
               'entry_node' => {},
               'entry_number' => 22,
               'in_code' => 0,
-              'index_at_command' => 'cindex',
               'index_ignore_chars' => {},
-              'index_name' => 'cp',
-              'index_type_command' => 'cindex'
+              'index_name' => 'cp'
             }
           },
           'info' => {
@@ -1326,10 +1282,8 @@ $result_trees{'encoding_index_latin1'} = {
               'entry_node' => {},
               'entry_number' => 23,
               'in_code' => 0,
-              'index_at_command' => 'cindex',
               'index_ignore_chars' => {},
-              'index_name' => 'cp',
-              'index_type_command' => 'cindex'
+              'index_name' => 'cp'
             }
           },
           'info' => {
@@ -1370,10 +1324,8 @@ $result_trees{'encoding_index_latin1'} = {
               'entry_node' => {},
               'entry_number' => 24,
               'in_code' => 0,
-              'index_at_command' => 'cindex',
               'index_ignore_chars' => {},
-              'index_name' => 'cp',
-              'index_type_command' => 'cindex'
+              'index_name' => 'cp'
             }
           },
           'info' => {
@@ -1414,10 +1366,8 @@ $result_trees{'encoding_index_latin1'} = {
               'entry_node' => {},
               'entry_number' => 25,
               'in_code' => 0,
-              'index_at_command' => 'cindex',
               'index_ignore_chars' => {},
-              'index_name' => 'cp',
-              'index_type_command' => 'cindex'
+              'index_name' => 'cp'
             }
           },
           'info' => {
@@ -1458,10 +1408,8 @@ $result_trees{'encoding_index_latin1'} = {
               'entry_node' => {},
               'entry_number' => 26,
               'in_code' => 0,
-              'index_at_command' => 'cindex',
               'index_ignore_chars' => {},
-              'index_name' => 'cp',
-              'index_type_command' => 'cindex'
+              'index_name' => 'cp'
             }
           },
           'info' => {
@@ -1502,10 +1450,8 @@ $result_trees{'encoding_index_latin1'} = {
               'entry_node' => {},
               'entry_number' => 27,
               'in_code' => 0,
-              'index_at_command' => 'cindex',
               'index_ignore_chars' => {},
-              'index_name' => 'cp',
-              'index_type_command' => 'cindex'
+              'index_name' => 'cp'
             }
           },
           'info' => {
@@ -1546,10 +1492,8 @@ $result_trees{'encoding_index_latin1'} = {
               'entry_node' => {},
               'entry_number' => 28,
               'in_code' => 0,
-              'index_at_command' => 'cindex',
               'index_ignore_chars' => {},
-              'index_name' => 'cp',
-              'index_type_command' => 'cindex'
+              'index_name' => 'cp'
             }
           },
           'info' => {
@@ -1590,10 +1534,8 @@ $result_trees{'encoding_index_latin1'} = {
               'entry_node' => {},
               'entry_number' => 29,
               'in_code' => 0,
-              'index_at_command' => 'cindex',
               'index_ignore_chars' => {},
-              'index_name' => 'cp',
-              'index_type_command' => 'cindex'
+              'index_name' => 'cp'
             }
           },
           'info' => {
@@ -1634,10 +1576,8 @@ $result_trees{'encoding_index_latin1'} = {
               'entry_node' => {},
               'entry_number' => 30,
               'in_code' => 0,
-              'index_at_command' => 'cindex',
               'index_ignore_chars' => {},
-              'index_name' => 'cp',
-              'index_type_command' => 'cindex'
+              'index_name' => 'cp'
             }
           },
           'info' => {
@@ -1678,10 +1618,8 @@ $result_trees{'encoding_index_latin1'} = {
               'entry_node' => {},
               'entry_number' => 31,
               'in_code' => 0,
-              'index_at_command' => 'cindex',
               'index_ignore_chars' => {},
-              'index_name' => 'cp',
-              'index_type_command' => 'cindex'
+              'index_name' => 'cp'
             }
           },
           'info' => {
@@ -1732,10 +1670,8 @@ $result_trees{'encoding_index_latin1'} = {
               'entry_node' => {},
               'entry_number' => 32,
               'in_code' => 0,
-              'index_at_command' => 'cindex',
               'index_ignore_chars' => {},
-              'index_name' => 'cp',
-              'index_type_command' => 'cindex'
+              'index_name' => 'cp'
             }
           },
           'info' => {
@@ -1786,10 +1722,8 @@ $result_trees{'encoding_index_latin1'} = {
               'entry_node' => {},
               'entry_number' => 33,
               'in_code' => 0,
-              'index_at_command' => 'cindex',
               'index_ignore_chars' => {},
-              'index_name' => 'cp',
-              'index_type_command' => 'cindex'
+              'index_name' => 'cp'
             }
           },
           'info' => {
@@ -1869,10 +1803,8 @@ $result_trees{'encoding_index_latin1'} = {
               'entry_node' => {},
               'entry_number' => 34,
               'in_code' => 0,
-              'index_at_command' => 'cindex',
               'index_ignore_chars' => {},
-              'index_name' => 'cp',
-              'index_type_command' => 'cindex'
+              'index_name' => 'cp'
             }
           },
           'info' => {
@@ -1982,10 +1914,8 @@ $result_trees{'encoding_index_latin1'} = {
               'entry_node' => {},
               'entry_number' => 35,
               'in_code' => 0,
-              'index_at_command' => 'cindex',
               'index_ignore_chars' => {},
-              'index_name' => 'cp',
-              'index_type_command' => 'cindex'
+              'index_name' => 'cp'
             }
           },
           'info' => {
@@ -2036,10 +1966,8 @@ $result_trees{'encoding_index_latin1'} = {
               'entry_node' => {},
               'entry_number' => 36,
               'in_code' => 0,
-              'index_at_command' => 'cindex',
               'index_ignore_chars' => {},
-              'index_name' => 'cp',
-              'index_type_command' => 'cindex'
+              'index_name' => 'cp'
             }
           },
           'info' => {
@@ -2090,10 +2018,8 @@ $result_trees{'encoding_index_latin1'} = {
               'entry_node' => {},
               'entry_number' => 37,
               'in_code' => 0,
-              'index_at_command' => 'cindex',
               'index_ignore_chars' => {},
-              'index_name' => 'cp',
-              'index_type_command' => 'cindex'
+              'index_name' => 'cp'
             }
           },
           'info' => {
@@ -2144,10 +2070,8 @@ $result_trees{'encoding_index_latin1'} = {
               'entry_node' => {},
               'entry_number' => 38,
               'in_code' => 0,
-              'index_at_command' => 'cindex',
               'index_ignore_chars' => {},
-              'index_name' => 'cp',
-              'index_type_command' => 'cindex'
+              'index_name' => 'cp'
             }
           },
           'info' => {
@@ -2198,10 +2122,8 @@ $result_trees{'encoding_index_latin1'} = {
               'entry_node' => {},
               'entry_number' => 39,
               'in_code' => 0,
-              'index_at_command' => 'cindex',
               'index_ignore_chars' => {},
-              'index_name' => 'cp',
-              'index_type_command' => 'cindex'
+              'index_name' => 'cp'
             }
           },
           'info' => {
@@ -2252,10 +2174,8 @@ $result_trees{'encoding_index_latin1'} = {
               'entry_node' => {},
               'entry_number' => 40,
               'in_code' => 0,
-              'index_at_command' => 'cindex',
               'index_ignore_chars' => {},
-              'index_name' => 'cp',
-              'index_type_command' => 'cindex'
+              'index_name' => 'cp'
             }
           },
           'info' => {
@@ -2306,10 +2226,8 @@ $result_trees{'encoding_index_latin1'} = {
               'entry_node' => {},
               'entry_number' => 41,
               'in_code' => 0,
-              'index_at_command' => 'cindex',
               'index_ignore_chars' => {},
-              'index_name' => 'cp',
-              'index_type_command' => 'cindex'
+              'index_name' => 'cp'
             }
           },
           'info' => {
@@ -2360,10 +2278,8 @@ $result_trees{'encoding_index_latin1'} = {
               'entry_node' => {},
               'entry_number' => 42,
               'in_code' => 0,
-              'index_at_command' => 'cindex',
               'index_ignore_chars' => {},
-              'index_name' => 'cp',
-              'index_type_command' => 'cindex'
+              'index_name' => 'cp'
             }
           },
           'info' => {
@@ -2404,10 +2320,8 @@ $result_trees{'encoding_index_latin1'} = {
               'entry_node' => {},
               'entry_number' => 43,
               'in_code' => 0,
-              'index_at_command' => 'cindex',
               'index_ignore_chars' => {},
-              'index_name' => 'cp',
-              'index_type_command' => 'cindex'
+              'index_name' => 'cp'
             }
           },
           'info' => {
@@ -2448,10 +2362,8 @@ $result_trees{'encoding_index_latin1'} = {
               'entry_node' => {},
               'entry_number' => 44,
               'in_code' => 0,
-              'index_at_command' => 'cindex',
               'index_ignore_chars' => {},
-              'index_name' => 'cp',
-              'index_type_command' => 'cindex'
+              'index_name' => 'cp'
             }
           },
           'info' => {
@@ -2502,10 +2414,8 @@ $result_trees{'encoding_index_latin1'} = {
               'entry_node' => {},
               'entry_number' => 45,
               'in_code' => 0,
-              'index_at_command' => 'cindex',
               'index_ignore_chars' => {},
-              'index_name' => 'cp',
-              'index_type_command' => 'cindex'
+              'index_name' => 'cp'
             }
           },
           'info' => {
@@ -2556,10 +2466,8 @@ $result_trees{'encoding_index_latin1'} = {
               'entry_node' => {},
               'entry_number' => 46,
               'in_code' => 0,
-              'index_at_command' => 'cindex',
               'index_ignore_chars' => {},
-              'index_name' => 'cp',
-              'index_type_command' => 'cindex'
+              'index_name' => 'cp'
             }
           },
           'info' => {
@@ -2610,10 +2518,8 @@ $result_trees{'encoding_index_latin1'} = {
               'entry_node' => {},
               'entry_number' => 47,
               'in_code' => 0,
-              'index_at_command' => 'cindex',
               'index_ignore_chars' => {},
-              'index_name' => 'cp',
-              'index_type_command' => 'cindex'
+              'index_name' => 'cp'
             }
           },
           'info' => {
@@ -2654,10 +2560,8 @@ $result_trees{'encoding_index_latin1'} = {
               'entry_node' => {},
               'entry_number' => 48,
               'in_code' => 0,
-              'index_at_command' => 'cindex',
               'index_ignore_chars' => {},
-              'index_name' => 'cp',
-              'index_type_command' => 'cindex'
+              'index_name' => 'cp'
             }
           },
           'info' => {
@@ -2698,10 +2602,8 @@ $result_trees{'encoding_index_latin1'} = {
               'entry_node' => {},
               'entry_number' => 49,
               'in_code' => 0,
-              'index_at_command' => 'cindex',
               'index_ignore_chars' => {},
-              'index_name' => 'cp',
-              'index_type_command' => 'cindex'
+              'index_name' => 'cp'
             }
           },
           'info' => {
@@ -2742,10 +2644,8 @@ $result_trees{'encoding_index_latin1'} = {
               'entry_node' => {},
               'entry_number' => 50,
               'in_code' => 0,
-              'index_at_command' => 'cindex',
               'index_ignore_chars' => {},
-              'index_name' => 'cp',
-              'index_type_command' => 'cindex'
+              'index_name' => 'cp'
             }
           },
           'info' => {
@@ -2786,10 +2686,8 @@ $result_trees{'encoding_index_latin1'} = {
               'entry_node' => {},
               'entry_number' => 51,
               'in_code' => 0,
-              'index_at_command' => 'cindex',
               'index_ignore_chars' => {},
-              'index_name' => 'cp',
-              'index_type_command' => 'cindex'
+              'index_name' => 'cp'
             }
           },
           'info' => {
@@ -2830,10 +2728,8 @@ $result_trees{'encoding_index_latin1'} = {
               'entry_node' => {},
               'entry_number' => 52,
               'in_code' => 0,
-              'index_at_command' => 'cindex',
               'index_ignore_chars' => {},
-              'index_name' => 'cp',
-              'index_type_command' => 'cindex'
+              'index_name' => 'cp'
             }
           },
           'info' => {
@@ -2874,10 +2770,8 @@ $result_trees{'encoding_index_latin1'} = {
               'entry_node' => {},
               'entry_number' => 53,
               'in_code' => 0,
-              'index_at_command' => 'cindex',
               'index_ignore_chars' => {},
-              'index_name' => 'cp',
-              'index_type_command' => 'cindex'
+              'index_name' => 'cp'
             }
           },
           'info' => {
@@ -2918,10 +2812,8 @@ $result_trees{'encoding_index_latin1'} = {
               'entry_node' => {},
               'entry_number' => 54,
               'in_code' => 0,
-              'index_at_command' => 'cindex',
               'index_ignore_chars' => {},
-              'index_name' => 'cp',
-              'index_type_command' => 'cindex'
+              'index_name' => 'cp'
             }
           },
           'info' => {
@@ -2962,10 +2854,8 @@ $result_trees{'encoding_index_latin1'} = {
               'entry_node' => {},
               'entry_number' => 55,
               'in_code' => 0,
-              'index_at_command' => 'cindex',
               'index_ignore_chars' => {},
-              'index_name' => 'cp',
-              'index_type_command' => 'cindex'
+              'index_name' => 'cp'
             }
           },
           'info' => {
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 de4446347e..f0a6156f92 100644
--- a/tp/t/results/indices/encoding_index_latin1_enable_encoding.pl
+++ b/tp/t/results/indices/encoding_index_latin1_enable_encoding.pl
@@ -196,10 +196,8 @@ $result_trees{'encoding_index_latin1_enable_encoding'} = {
               'entry_node' => {},
               'entry_number' => 1,
               'in_code' => 0,
-              'index_at_command' => 'cindex',
               'index_ignore_chars' => {},
-              'index_name' => 'cp',
-              'index_type_command' => 'cindex'
+              'index_name' => 'cp'
             }
           },
           'info' => {
@@ -312,10 +310,8 @@ $result_trees{'encoding_index_latin1_enable_encoding'} = {
               'entry_node' => {},
               'entry_number' => 2,
               'in_code' => 0,
-              'index_at_command' => 'cindex',
               'index_ignore_chars' => {},
-              'index_name' => 'cp',
-              'index_type_command' => 'cindex'
+              'index_name' => 'cp'
             }
           },
           'info' => {
@@ -446,10 +442,8 @@ $result_trees{'encoding_index_latin1_enable_encoding'} = {
               'entry_node' => {},
               'entry_number' => 3,
               'in_code' => 0,
-              'index_at_command' => 'cindex',
               'index_ignore_chars' => {},
-              'index_name' => 'cp',
-              'index_type_command' => 'cindex'
+              'index_name' => 'cp'
             }
           },
           'info' => {
@@ -490,10 +484,8 @@ $result_trees{'encoding_index_latin1_enable_encoding'} = {
               'entry_node' => {},
               'entry_number' => 4,
               'in_code' => 0,
-              'index_at_command' => 'cindex',
               'index_ignore_chars' => {},
-              'index_name' => 'cp',
-              'index_type_command' => 'cindex'
+              'index_name' => 'cp'
             }
           },
           'info' => {
@@ -534,10 +526,8 @@ $result_trees{'encoding_index_latin1_enable_encoding'} = {
               'entry_node' => {},
               'entry_number' => 5,
               'in_code' => 0,
-              'index_at_command' => 'cindex',
               'index_ignore_chars' => {},
-              'index_name' => 'cp',
-              'index_type_command' => 'cindex'
+              'index_name' => 'cp'
             }
           },
           'info' => {
@@ -578,10 +568,8 @@ $result_trees{'encoding_index_latin1_enable_encoding'} = {
               'entry_node' => {},
               'entry_number' => 6,
               'in_code' => 0,
-              'index_at_command' => 'cindex',
               'index_ignore_chars' => {},
-              'index_name' => 'cp',
-              'index_type_command' => 'cindex'
+              'index_name' => 'cp'
             }
           },
           'info' => {
@@ -622,10 +610,8 @@ $result_trees{'encoding_index_latin1_enable_encoding'} = {
               'entry_node' => {},
               'entry_number' => 7,
               'in_code' => 0,
-              'index_at_command' => 'cindex',
               'index_ignore_chars' => {},
-              'index_name' => 'cp',
-              'index_type_command' => 'cindex'
+              'index_name' => 'cp'
             }
           },
           'info' => {
@@ -666,10 +652,8 @@ $result_trees{'encoding_index_latin1_enable_encoding'} = {
               'entry_node' => {},
               'entry_number' => 8,
               'in_code' => 0,
-              'index_at_command' => 'cindex',
               'index_ignore_chars' => {},
-              'index_name' => 'cp',
-              'index_type_command' => 'cindex'
+              'index_name' => 'cp'
             }
           },
           'info' => {
@@ -710,10 +694,8 @@ $result_trees{'encoding_index_latin1_enable_encoding'} = {
               'entry_node' => {},
               'entry_number' => 9,
               'in_code' => 0,
-              'index_at_command' => 'cindex',
               'index_ignore_chars' => {},
-              'index_name' => 'cp',
-              'index_type_command' => 'cindex'
+              'index_name' => 'cp'
             }
           },
           'info' => {
@@ -754,10 +736,8 @@ $result_trees{'encoding_index_latin1_enable_encoding'} = {
               'entry_node' => {},
               'entry_number' => 10,
               'in_code' => 0,
-              'index_at_command' => 'cindex',
               'index_ignore_chars' => {},
-              'index_name' => 'cp',
-              'index_type_command' => 'cindex'
+              'index_name' => 'cp'
             }
           },
           'info' => {
@@ -798,10 +778,8 @@ $result_trees{'encoding_index_latin1_enable_encoding'} = {
               'entry_node' => {},
               'entry_number' => 11,
               'in_code' => 0,
-              'index_at_command' => 'cindex',
               'index_ignore_chars' => {},
-              'index_name' => 'cp',
-              'index_type_command' => 'cindex'
+              'index_name' => 'cp'
             }
           },
           'info' => {
@@ -842,10 +820,8 @@ $result_trees{'encoding_index_latin1_enable_encoding'} = {
               'entry_node' => {},
               'entry_number' => 12,
               'in_code' => 0,
-              'index_at_command' => 'cindex',
               'index_ignore_chars' => {},
-              'index_name' => 'cp',
-              'index_type_command' => 'cindex'
+              'index_name' => 'cp'
             }
           },
           'info' => {
@@ -886,10 +862,8 @@ $result_trees{'encoding_index_latin1_enable_encoding'} = {
               'entry_node' => {},
               'entry_number' => 13,
               'in_code' => 0,
-              'index_at_command' => 'cindex',
               'index_ignore_chars' => {},
-              'index_name' => 'cp',
-              'index_type_command' => 'cindex'
+              'index_name' => 'cp'
             }
           },
           'info' => {
@@ -930,10 +904,8 @@ $result_trees{'encoding_index_latin1_enable_encoding'} = {
               'entry_node' => {},
               'entry_number' => 14,
               'in_code' => 0,
-              'index_at_command' => 'cindex',
               'index_ignore_chars' => {},
-              'index_name' => 'cp',
-              'index_type_command' => 'cindex'
+              'index_name' => 'cp'
             }
           },
           'info' => {
@@ -974,10 +946,8 @@ $result_trees{'encoding_index_latin1_enable_encoding'} = {
               'entry_node' => {},
               'entry_number' => 15,
               'in_code' => 0,
-              'index_at_command' => 'cindex',
               'index_ignore_chars' => {},
-              'index_name' => 'cp',
-              'index_type_command' => 'cindex'
+              'index_name' => 'cp'
             }
           },
           'info' => {
@@ -1018,10 +988,8 @@ $result_trees{'encoding_index_latin1_enable_encoding'} = {
               'entry_node' => {},
               'entry_number' => 16,
               'in_code' => 0,
-              'index_at_command' => 'cindex',
               'index_ignore_chars' => {},
-              'index_name' => 'cp',
-              'index_type_command' => 'cindex'
+              'index_name' => 'cp'
             }
           },
           'info' => {
@@ -1062,10 +1030,8 @@ $result_trees{'encoding_index_latin1_enable_encoding'} = 
{
               'entry_node' => {},
               'entry_number' => 17,
               'in_code' => 0,
-              'index_at_command' => 'cindex',
               'index_ignore_chars' => {},
-              'index_name' => 'cp',
-              'index_type_command' => 'cindex'
+              'index_name' => 'cp'
             }
           },
           'info' => {
@@ -1106,10 +1072,8 @@ $result_trees{'encoding_index_latin1_enable_encoding'} = 
{
               'entry_node' => {},
               'entry_number' => 18,
               'in_code' => 0,
-              'index_at_command' => 'cindex',
               'index_ignore_chars' => {},
-              'index_name' => 'cp',
-              'index_type_command' => 'cindex'
+              'index_name' => 'cp'
             }
           },
           'info' => {
@@ -1150,10 +1114,8 @@ $result_trees{'encoding_index_latin1_enable_encoding'} = 
{
               'entry_node' => {},
               'entry_number' => 19,
               'in_code' => 0,
-              'index_at_command' => 'cindex',
               'index_ignore_chars' => {},
-              'index_name' => 'cp',
-              'index_type_command' => 'cindex'
+              'index_name' => 'cp'
             }
           },
           'info' => {
@@ -1194,10 +1156,8 @@ $result_trees{'encoding_index_latin1_enable_encoding'} = 
{
               'entry_node' => {},
               'entry_number' => 20,
               'in_code' => 0,
-              'index_at_command' => 'cindex',
               'index_ignore_chars' => {},
-              'index_name' => 'cp',
-              'index_type_command' => 'cindex'
+              'index_name' => 'cp'
             }
           },
           'info' => {
@@ -1238,10 +1198,8 @@ $result_trees{'encoding_index_latin1_enable_encoding'} = 
{
               'entry_node' => {},
               'entry_number' => 21,
               'in_code' => 0,
-              'index_at_command' => 'cindex',
               'index_ignore_chars' => {},
-              'index_name' => 'cp',
-              'index_type_command' => 'cindex'
+              'index_name' => 'cp'
             }
           },
           'info' => {
@@ -1282,10 +1240,8 @@ $result_trees{'encoding_index_latin1_enable_encoding'} = 
{
               'entry_node' => {},
               'entry_number' => 22,
               'in_code' => 0,
-              'index_at_command' => 'cindex',
               'index_ignore_chars' => {},
-              'index_name' => 'cp',
-              'index_type_command' => 'cindex'
+              'index_name' => 'cp'
             }
           },
           'info' => {
@@ -1326,10 +1282,8 @@ $result_trees{'encoding_index_latin1_enable_encoding'} = 
{
               'entry_node' => {},
               'entry_number' => 23,
               'in_code' => 0,
-              'index_at_command' => 'cindex',
               'index_ignore_chars' => {},
-              'index_name' => 'cp',
-              'index_type_command' => 'cindex'
+              'index_name' => 'cp'
             }
           },
           'info' => {
@@ -1370,10 +1324,8 @@ $result_trees{'encoding_index_latin1_enable_encoding'} = 
{
               'entry_node' => {},
               'entry_number' => 24,
               'in_code' => 0,
-              'index_at_command' => 'cindex',
               'index_ignore_chars' => {},
-              'index_name' => 'cp',
-              'index_type_command' => 'cindex'
+              'index_name' => 'cp'
             }
           },
           'info' => {
@@ -1414,10 +1366,8 @@ $result_trees{'encoding_index_latin1_enable_encoding'} = 
{
               'entry_node' => {},
               'entry_number' => 25,
               'in_code' => 0,
-              'index_at_command' => 'cindex',
               'index_ignore_chars' => {},
-              'index_name' => 'cp',
-              'index_type_command' => 'cindex'
+              'index_name' => 'cp'
             }
           },
           'info' => {
@@ -1458,10 +1408,8 @@ $result_trees{'encoding_index_latin1_enable_encoding'} = 
{
               'entry_node' => {},
               'entry_number' => 26,
               'in_code' => 0,
-              'index_at_command' => 'cindex',
               'index_ignore_chars' => {},
-              'index_name' => 'cp',
-              'index_type_command' => 'cindex'
+              'index_name' => 'cp'
             }
           },
           'info' => {
@@ -1502,10 +1450,8 @@ $result_trees{'encoding_index_latin1_enable_encoding'} = 
{
               'entry_node' => {},
               'entry_number' => 27,
               'in_code' => 0,
-              'index_at_command' => 'cindex',
               'index_ignore_chars' => {},
-              'index_name' => 'cp',
-              'index_type_command' => 'cindex'
+              'index_name' => 'cp'
             }
           },
           'info' => {
@@ -1546,10 +1492,8 @@ $result_trees{'encoding_index_latin1_enable_encoding'} = 
{
               'entry_node' => {},
               'entry_number' => 28,
               'in_code' => 0,
-              'index_at_command' => 'cindex',
               'index_ignore_chars' => {},
-              'index_name' => 'cp',
-              'index_type_command' => 'cindex'
+              'index_name' => 'cp'
             }
           },
           'info' => {
@@ -1590,10 +1534,8 @@ $result_trees{'encoding_index_latin1_enable_encoding'} = 
{
               'entry_node' => {},
               'entry_number' => 29,
               'in_code' => 0,
-              'index_at_command' => 'cindex',
               'index_ignore_chars' => {},
-              'index_name' => 'cp',
-              'index_type_command' => 'cindex'
+              'index_name' => 'cp'
             }
           },
           'info' => {
@@ -1634,10 +1576,8 @@ $result_trees{'encoding_index_latin1_enable_encoding'} = 
{
               'entry_node' => {},
               'entry_number' => 30,
               'in_code' => 0,
-              'index_at_command' => 'cindex',
               'index_ignore_chars' => {},
-              'index_name' => 'cp',
-              'index_type_command' => 'cindex'
+              'index_name' => 'cp'
             }
           },
           'info' => {
@@ -1678,10 +1618,8 @@ $result_trees{'encoding_index_latin1_enable_encoding'} = 
{
               'entry_node' => {},
               'entry_number' => 31,
               'in_code' => 0,
-              'index_at_command' => 'cindex',
               'index_ignore_chars' => {},
-              'index_name' => 'cp',
-              'index_type_command' => 'cindex'
+              'index_name' => 'cp'
             }
           },
           'info' => {
@@ -1732,10 +1670,8 @@ $result_trees{'encoding_index_latin1_enable_encoding'} = 
{
               'entry_node' => {},
               'entry_number' => 32,
               'in_code' => 0,
-              'index_at_command' => 'cindex',
               'index_ignore_chars' => {},
-              'index_name' => 'cp',
-              'index_type_command' => 'cindex'
+              'index_name' => 'cp'
             }
           },
           'info' => {
@@ -1786,10 +1722,8 @@ $result_trees{'encoding_index_latin1_enable_encoding'} = 
{
               'entry_node' => {},
               'entry_number' => 33,
               'in_code' => 0,
-              'index_at_command' => 'cindex',
               'index_ignore_chars' => {},
-              'index_name' => 'cp',
-              'index_type_command' => 'cindex'
+              'index_name' => 'cp'
             }
           },
           'info' => {
@@ -1869,10 +1803,8 @@ $result_trees{'encoding_index_latin1_enable_encoding'} = 
{
               'entry_node' => {},
               'entry_number' => 34,
               'in_code' => 0,
-              'index_at_command' => 'cindex',
               'index_ignore_chars' => {},
-              'index_name' => 'cp',
-              'index_type_command' => 'cindex'
+              'index_name' => 'cp'
             }
           },
           'info' => {
@@ -1982,10 +1914,8 @@ $result_trees{'encoding_index_latin1_enable_encoding'} = 
{
               'entry_node' => {},
               'entry_number' => 35,
               'in_code' => 0,
-              'index_at_command' => 'cindex',
               'index_ignore_chars' => {},
-              'index_name' => 'cp',
-              'index_type_command' => 'cindex'
+              'index_name' => 'cp'
             }
           },
           'info' => {
@@ -2036,10 +1966,8 @@ $result_trees{'encoding_index_latin1_enable_encoding'} = 
{
               'entry_node' => {},
               'entry_number' => 36,
               'in_code' => 0,
-              'index_at_command' => 'cindex',
               'index_ignore_chars' => {},
-              'index_name' => 'cp',
-              'index_type_command' => 'cindex'
+              'index_name' => 'cp'
             }
           },
           'info' => {
@@ -2090,10 +2018,8 @@ $result_trees{'encoding_index_latin1_enable_encoding'} = 
{
               'entry_node' => {},
               'entry_number' => 37,
               'in_code' => 0,
-              'index_at_command' => 'cindex',
               'index_ignore_chars' => {},
-              'index_name' => 'cp',
-              'index_type_command' => 'cindex'
+              'index_name' => 'cp'
             }
           },
           'info' => {
@@ -2144,10 +2070,8 @@ $result_trees{'encoding_index_latin1_enable_encoding'} = 
{
               'entry_node' => {},
               'entry_number' => 38,
               'in_code' => 0,
-              'index_at_command' => 'cindex',
               'index_ignore_chars' => {},
-              'index_name' => 'cp',
-              'index_type_command' => 'cindex'
+              'index_name' => 'cp'
             }
           },
           'info' => {
@@ -2198,10 +2122,8 @@ $result_trees{'encoding_index_latin1_enable_encoding'} = 
{
               'entry_node' => {},
               'entry_number' => 39,
               'in_code' => 0,
-              'index_at_command' => 'cindex',
               'index_ignore_chars' => {},
-              'index_name' => 'cp',
-              'index_type_command' => 'cindex'
+              'index_name' => 'cp'
             }
           },
           'info' => {
@@ -2252,10 +2174,8 @@ $result_trees{'encoding_index_latin1_enable_encoding'} = 
{
               'entry_node' => {},
               'entry_number' => 40,
               'in_code' => 0,
-              'index_at_command' => 'cindex',
               'index_ignore_chars' => {},
-              'index_name' => 'cp',
-              'index_type_command' => 'cindex'
+              'index_name' => 'cp'
             }
           },
           'info' => {
@@ -2306,10 +2226,8 @@ $result_trees{'encoding_index_latin1_enable_encoding'} = 
{
               'entry_node' => {},
               'entry_number' => 41,
               'in_code' => 0,
-              'index_at_command' => 'cindex',
               'index_ignore_chars' => {},
-              'index_name' => 'cp',
-              'index_type_command' => 'cindex'
+              'index_name' => 'cp'
             }
           },
           'info' => {
@@ -2360,10 +2278,8 @@ $result_trees{'encoding_index_latin1_enable_encoding'} = 
{
               'entry_node' => {},
               'entry_number' => 42,
               'in_code' => 0,
-              'index_at_command' => 'cindex',
               'index_ignore_chars' => {},
-              'index_name' => 'cp',
-              'index_type_command' => 'cindex'
+              'index_name' => 'cp'
             }
           },
           'info' => {
@@ -2404,10 +2320,8 @@ $result_trees{'encoding_index_latin1_enable_encoding'} = 
{
               'entry_node' => {},
               'entry_number' => 43,
               'in_code' => 0,
-              'index_at_command' => 'cindex',
               'index_ignore_chars' => {},
-              'index_name' => 'cp',
-              'index_type_command' => 'cindex'
+              'index_name' => 'cp'
             }
           },
           'info' => {
@@ -2448,10 +2362,8 @@ $result_trees{'encoding_index_latin1_enable_encoding'} = 
{
               'entry_node' => {},
               'entry_number' => 44,
               'in_code' => 0,
-              'index_at_command' => 'cindex',
               'index_ignore_chars' => {},
-              'index_name' => 'cp',
-              'index_type_command' => 'cindex'
+              'index_name' => 'cp'
             }
           },
           'info' => {
@@ -2502,10 +2414,8 @@ $result_trees{'encoding_index_latin1_enable_encoding'} = 
{
               'entry_node' => {},
               'entry_number' => 45,
               'in_code' => 0,
-              'index_at_command' => 'cindex',
               'index_ignore_chars' => {},
-              'index_name' => 'cp',
-              'index_type_command' => 'cindex'
+              'index_name' => 'cp'
             }
           },
           'info' => {
@@ -2556,10 +2466,8 @@ $result_trees{'encoding_index_latin1_enable_encoding'} = 
{
               'entry_node' => {},
               'entry_number' => 46,
               'in_code' => 0,
-              'index_at_command' => 'cindex',
               'index_ignore_chars' => {},
-              'index_name' => 'cp',
-              'index_type_command' => 'cindex'
+              'index_name' => 'cp'
             }
           },
           'info' => {
@@ -2610,10 +2518,8 @@ $result_trees{'encoding_index_latin1_enable_encoding'} = 
{
               'entry_node' => {},
               'entry_number' => 47,
               'in_code' => 0,
-              'index_at_command' => 'cindex',
               'index_ignore_chars' => {},
-              'index_name' => 'cp',
-              'index_type_command' => 'cindex'
+              'index_name' => 'cp'
             }
           },
           'info' => {
@@ -2654,10 +2560,8 @@ $result_trees{'encoding_index_latin1_enable_encoding'} = 
{
               'entry_node' => {},
               'entry_number' => 48,
               'in_code' => 0,
-              'index_at_command' => 'cindex',
               'index_ignore_chars' => {},
-              'index_name' => 'cp',
-              'index_type_command' => 'cindex'
+              'index_name' => 'cp'
             }
           },
           'info' => {
@@ -2698,10 +2602,8 @@ $result_trees{'encoding_index_latin1_enable_encoding'} = 
{
               'entry_node' => {},
               'entry_number' => 49,
               'in_code' => 0,
-              'index_at_command' => 'cindex',
               'index_ignore_chars' => {},
-              'index_name' => 'cp',
-              'index_type_command' => 'cindex'
+              'index_name' => 'cp'
             }
           },
           'info' => {
@@ -2742,10 +2644,8 @@ $result_trees{'encoding_index_latin1_enable_encoding'} = 
{
               'entry_node' => {},
               'entry_number' => 50,
               'in_code' => 0,
-              'index_at_command' => 'cindex',
               'index_ignore_chars' => {},
-              'index_name' => 'cp',
-              'index_type_command' => 'cindex'
+              'index_name' => 'cp'
             }
           },
           'info' => {
@@ -2786,10 +2686,8 @@ $result_trees{'encoding_index_latin1_enable_encoding'} = 
{
               'entry_node' => {},
               'entry_number' => 51,
               'in_code' => 0,
-              'index_at_command' => 'cindex',
               'index_ignore_chars' => {},
-              'index_name' => 'cp',
-              'index_type_command' => 'cindex'
+              'index_name' => 'cp'
             }
           },
           'info' => {
@@ -2830,10 +2728,8 @@ $result_trees{'encoding_index_latin1_enable_encoding'} = 
{
               'entry_node' => {},
               'entry_number' => 52,
               'in_code' => 0,
-              'index_at_command' => 'cindex',
               'index_ignore_chars' => {},
-              'index_name' => 'cp',
-              'index_type_command' => 'cindex'
+              'index_name' => 'cp'
             }
           },
           'info' => {
@@ -2874,10 +2770,8 @@ $result_trees{'encoding_index_latin1_enable_encoding'} = 
{
               'entry_node' => {},
               'entry_number' => 53,
               'in_code' => 0,
-              'index_at_command' => 'cindex',
               'index_ignore_chars' => {},
-              'index_name' => 'cp',
-              'index_type_command' => 'cindex'
+              'index_name' => 'cp'
             }
           },
           'info' => {
@@ -2918,10 +2812,8 @@ $result_trees{'encoding_index_latin1_enable_encoding'} = 
{
               'entry_node' => {},
               'entry_number' => 54,
               'in_code' => 0,
-              'index_at_command' => 'cindex',
               'index_ignore_chars' => {},
-              'index_name' => 'cp',
-              'index_type_command' => 'cindex'
+              'index_name' => 'cp'
             }
           },
           'info' => {
@@ -2962,10 +2854,8 @@ $result_trees{'encoding_index_latin1_enable_encoding'} = 
{
               'entry_node' => {},
               'entry_number' => 55,
               'in_code' => 0,
-              'index_at_command' => 'cindex',
               'index_ignore_chars' => {},
-              'index_name' => 'cp',
-              'index_type_command' => 'cindex'
+              'index_name' => 'cp'
             }
           },
           'info' => {
diff --git a/tp/t/results/indices/encoding_index_utf8.pl 
b/tp/t/results/indices/encoding_index_utf8.pl
index 53c1d44cce..3d9a294e6a 100644
--- a/tp/t/results/indices/encoding_index_utf8.pl
+++ b/tp/t/results/indices/encoding_index_utf8.pl
@@ -196,10 +196,8 @@ $result_trees{'encoding_index_utf8'} = {
               'entry_node' => {},
               'entry_number' => 1,
               'in_code' => 0,
-              'index_at_command' => 'cindex',
               'index_ignore_chars' => {},
-              'index_name' => 'cp',
-              'index_type_command' => 'cindex'
+              'index_name' => 'cp'
             }
           },
           'info' => {
@@ -312,10 +310,8 @@ $result_trees{'encoding_index_utf8'} = {
               'entry_node' => {},
               'entry_number' => 2,
               'in_code' => 0,
-              'index_at_command' => 'cindex',
               'index_ignore_chars' => {},
-              'index_name' => 'cp',
-              'index_type_command' => 'cindex'
+              'index_name' => 'cp'
             }
           },
           'info' => {
@@ -446,10 +442,8 @@ $result_trees{'encoding_index_utf8'} = {
               'entry_node' => {},
               'entry_number' => 3,
               'in_code' => 0,
-              'index_at_command' => 'cindex',
               'index_ignore_chars' => {},
-              'index_name' => 'cp',
-              'index_type_command' => 'cindex'
+              'index_name' => 'cp'
             }
           },
           'info' => {
@@ -490,10 +484,8 @@ $result_trees{'encoding_index_utf8'} = {
               'entry_node' => {},
               'entry_number' => 4,
               'in_code' => 0,
-              'index_at_command' => 'cindex',
               'index_ignore_chars' => {},
-              'index_name' => 'cp',
-              'index_type_command' => 'cindex'
+              'index_name' => 'cp'
             }
           },
           'info' => {
@@ -534,10 +526,8 @@ $result_trees{'encoding_index_utf8'} = {
               'entry_node' => {},
               'entry_number' => 5,
               'in_code' => 0,
-              'index_at_command' => 'cindex',
               'index_ignore_chars' => {},
-              'index_name' => 'cp',
-              'index_type_command' => 'cindex'
+              'index_name' => 'cp'
             }
           },
           'info' => {
@@ -578,10 +568,8 @@ $result_trees{'encoding_index_utf8'} = {
               'entry_node' => {},
               'entry_number' => 6,
               'in_code' => 0,
-              'index_at_command' => 'cindex',
               'index_ignore_chars' => {},
-              'index_name' => 'cp',
-              'index_type_command' => 'cindex'
+              'index_name' => 'cp'
             }
           },
           'info' => {
@@ -622,10 +610,8 @@ $result_trees{'encoding_index_utf8'} = {
               'entry_node' => {},
               'entry_number' => 7,
               'in_code' => 0,
-              'index_at_command' => 'cindex',
               'index_ignore_chars' => {},
-              'index_name' => 'cp',
-              'index_type_command' => 'cindex'
+              'index_name' => 'cp'
             }
           },
           'info' => {
@@ -666,10 +652,8 @@ $result_trees{'encoding_index_utf8'} = {
               'entry_node' => {},
               'entry_number' => 8,
               'in_code' => 0,
-              'index_at_command' => 'cindex',
               'index_ignore_chars' => {},
-              'index_name' => 'cp',
-              'index_type_command' => 'cindex'
+              'index_name' => 'cp'
             }
           },
           'info' => {
@@ -710,10 +694,8 @@ $result_trees{'encoding_index_utf8'} = {
               'entry_node' => {},
               'entry_number' => 9,
               'in_code' => 0,
-              'index_at_command' => 'cindex',
               'index_ignore_chars' => {},
-              'index_name' => 'cp',
-              'index_type_command' => 'cindex'
+              'index_name' => 'cp'
             }
           },
           'info' => {
@@ -754,10 +736,8 @@ $result_trees{'encoding_index_utf8'} = {
               'entry_node' => {},
               'entry_number' => 10,
               'in_code' => 0,
-              'index_at_command' => 'cindex',
               'index_ignore_chars' => {},
-              'index_name' => 'cp',
-              'index_type_command' => 'cindex'
+              'index_name' => 'cp'
             }
           },
           'info' => {
@@ -798,10 +778,8 @@ $result_trees{'encoding_index_utf8'} = {
               'entry_node' => {},
               'entry_number' => 11,
               'in_code' => 0,
-              'index_at_command' => 'cindex',
               'index_ignore_chars' => {},
-              'index_name' => 'cp',
-              'index_type_command' => 'cindex'
+              'index_name' => 'cp'
             }
           },
           'info' => {
@@ -842,10 +820,8 @@ $result_trees{'encoding_index_utf8'} = {
               'entry_node' => {},
               'entry_number' => 12,
               'in_code' => 0,
-              'index_at_command' => 'cindex',
               'index_ignore_chars' => {},
-              'index_name' => 'cp',
-              'index_type_command' => 'cindex'
+              'index_name' => 'cp'
             }
           },
           'info' => {
@@ -886,10 +862,8 @@ $result_trees{'encoding_index_utf8'} = {
               'entry_node' => {},
               'entry_number' => 13,
               'in_code' => 0,
-              'index_at_command' => 'cindex',
               'index_ignore_chars' => {},
-              'index_name' => 'cp',
-              'index_type_command' => 'cindex'
+              'index_name' => 'cp'
             }
           },
           'info' => {
@@ -930,10 +904,8 @@ $result_trees{'encoding_index_utf8'} = {
               'entry_node' => {},
               'entry_number' => 14,
               'in_code' => 0,
-              'index_at_command' => 'cindex',
               'index_ignore_chars' => {},
-              'index_name' => 'cp',
-              'index_type_command' => 'cindex'
+              'index_name' => 'cp'
             }
           },
           'info' => {
@@ -974,10 +946,8 @@ $result_trees{'encoding_index_utf8'} = {
               'entry_node' => {},
               'entry_number' => 15,
               'in_code' => 0,
-              'index_at_command' => 'cindex',
               'index_ignore_chars' => {},
-              'index_name' => 'cp',
-              'index_type_command' => 'cindex'
+              'index_name' => 'cp'
             }
           },
           'info' => {
@@ -1018,10 +988,8 @@ $result_trees{'encoding_index_utf8'} = {
               'entry_node' => {},
               'entry_number' => 16,
               'in_code' => 0,
-              'index_at_command' => 'cindex',
               'index_ignore_chars' => {},
-              'index_name' => 'cp',
-              'index_type_command' => 'cindex'
+              'index_name' => 'cp'
             }
           },
           'info' => {
@@ -1062,10 +1030,8 @@ $result_trees{'encoding_index_utf8'} = {
               'entry_node' => {},
               'entry_number' => 17,
               'in_code' => 0,
-              'index_at_command' => 'cindex',
               'index_ignore_chars' => {},
-              'index_name' => 'cp',
-              'index_type_command' => 'cindex'
+              'index_name' => 'cp'
             }
           },
           'info' => {
@@ -1106,10 +1072,8 @@ $result_trees{'encoding_index_utf8'} = {
               'entry_node' => {},
               'entry_number' => 18,
               'in_code' => 0,
-              'index_at_command' => 'cindex',
               'index_ignore_chars' => {},
-              'index_name' => 'cp',
-              'index_type_command' => 'cindex'
+              'index_name' => 'cp'
             }
           },
           'info' => {
@@ -1150,10 +1114,8 @@ $result_trees{'encoding_index_utf8'} = {
               'entry_node' => {},
               'entry_number' => 19,
               'in_code' => 0,
-              'index_at_command' => 'cindex',
               'index_ignore_chars' => {},
-              'index_name' => 'cp',
-              'index_type_command' => 'cindex'
+              'index_name' => 'cp'
             }
           },
           'info' => {
@@ -1194,10 +1156,8 @@ $result_trees{'encoding_index_utf8'} = {
               'entry_node' => {},
               'entry_number' => 20,
               'in_code' => 0,
-              'index_at_command' => 'cindex',
               'index_ignore_chars' => {},
-              'index_name' => 'cp',
-              'index_type_command' => 'cindex'
+              'index_name' => 'cp'
             }
           },
           'info' => {
@@ -1238,10 +1198,8 @@ $result_trees{'encoding_index_utf8'} = {
               'entry_node' => {},
               'entry_number' => 21,
               'in_code' => 0,
-              'index_at_command' => 'cindex',
               'index_ignore_chars' => {},
-              'index_name' => 'cp',
-              'index_type_command' => 'cindex'
+              'index_name' => 'cp'
             }
           },
           'info' => {
@@ -1282,10 +1240,8 @@ $result_trees{'encoding_index_utf8'} = {
               'entry_node' => {},
               'entry_number' => 22,
               'in_code' => 0,
-              'index_at_command' => 'cindex',
               'index_ignore_chars' => {},
-              'index_name' => 'cp',
-              'index_type_command' => 'cindex'
+              'index_name' => 'cp'
             }
           },
           'info' => {
@@ -1326,10 +1282,8 @@ $result_trees{'encoding_index_utf8'} = {
               'entry_node' => {},
               'entry_number' => 23,
               'in_code' => 0,
-              'index_at_command' => 'cindex',
               'index_ignore_chars' => {},
-              'index_name' => 'cp',
-              'index_type_command' => 'cindex'
+              'index_name' => 'cp'
             }
           },
           'info' => {
@@ -1370,10 +1324,8 @@ $result_trees{'encoding_index_utf8'} = {
               'entry_node' => {},
               'entry_number' => 24,
               'in_code' => 0,
-              'index_at_command' => 'cindex',
               'index_ignore_chars' => {},
-              'index_name' => 'cp',
-              'index_type_command' => 'cindex'
+              'index_name' => 'cp'
             }
           },
           'info' => {
@@ -1414,10 +1366,8 @@ $result_trees{'encoding_index_utf8'} = {
               'entry_node' => {},
               'entry_number' => 25,
               'in_code' => 0,
-              'index_at_command' => 'cindex',
               'index_ignore_chars' => {},
-              'index_name' => 'cp',
-              'index_type_command' => 'cindex'
+              'index_name' => 'cp'
             }
           },
           'info' => {
@@ -1458,10 +1408,8 @@ $result_trees{'encoding_index_utf8'} = {
               'entry_node' => {},
               'entry_number' => 26,
               'in_code' => 0,
-              'index_at_command' => 'cindex',
               'index_ignore_chars' => {},
-              'index_name' => 'cp',
-              'index_type_command' => 'cindex'
+              'index_name' => 'cp'
             }
           },
           'info' => {
@@ -1502,10 +1450,8 @@ $result_trees{'encoding_index_utf8'} = {
               'entry_node' => {},
               'entry_number' => 27,
               'in_code' => 0,
-              'index_at_command' => 'cindex',
               'index_ignore_chars' => {},
-              'index_name' => 'cp',
-              'index_type_command' => 'cindex'
+              'index_name' => 'cp'
             }
           },
           'info' => {
@@ -1546,10 +1492,8 @@ $result_trees{'encoding_index_utf8'} = {
               'entry_node' => {},
               'entry_number' => 28,
               'in_code' => 0,
-              'index_at_command' => 'cindex',
               'index_ignore_chars' => {},
-              'index_name' => 'cp',
-              'index_type_command' => 'cindex'
+              'index_name' => 'cp'
             }
           },
           'info' => {
@@ -1590,10 +1534,8 @@ $result_trees{'encoding_index_utf8'} = {
               'entry_node' => {},
               'entry_number' => 29,
               'in_code' => 0,
-              'index_at_command' => 'cindex',
               'index_ignore_chars' => {},
-              'index_name' => 'cp',
-              'index_type_command' => 'cindex'
+              'index_name' => 'cp'
             }
           },
           'info' => {
@@ -1634,10 +1576,8 @@ $result_trees{'encoding_index_utf8'} = {
               'entry_node' => {},
               'entry_number' => 30,
               'in_code' => 0,
-              'index_at_command' => 'cindex',
               'index_ignore_chars' => {},
-              'index_name' => 'cp',
-              'index_type_command' => 'cindex'
+              'index_name' => 'cp'
             }
           },
           'info' => {
@@ -1678,10 +1618,8 @@ $result_trees{'encoding_index_utf8'} = {
               'entry_node' => {},
               'entry_number' => 31,
               'in_code' => 0,
-              'index_at_command' => 'cindex',
               'index_ignore_chars' => {},
-              'index_name' => 'cp',
-              'index_type_command' => 'cindex'
+              'index_name' => 'cp'
             }
           },
           'info' => {
@@ -1732,10 +1670,8 @@ $result_trees{'encoding_index_utf8'} = {
               'entry_node' => {},
               'entry_number' => 32,
               'in_code' => 0,
-              'index_at_command' => 'cindex',
               'index_ignore_chars' => {},
-              'index_name' => 'cp',
-              'index_type_command' => 'cindex'
+              'index_name' => 'cp'
             }
           },
           'info' => {
@@ -1786,10 +1722,8 @@ $result_trees{'encoding_index_utf8'} = {
               'entry_node' => {},
               'entry_number' => 33,
               'in_code' => 0,
-              'index_at_command' => 'cindex',
               'index_ignore_chars' => {},
-              'index_name' => 'cp',
-              'index_type_command' => 'cindex'
+              'index_name' => 'cp'
             }
           },
           'info' => {
@@ -1869,10 +1803,8 @@ $result_trees{'encoding_index_utf8'} = {
               'entry_node' => {},
               'entry_number' => 34,
               'in_code' => 0,
-              'index_at_command' => 'cindex',
               'index_ignore_chars' => {},
-              'index_name' => 'cp',
-              'index_type_command' => 'cindex'
+              'index_name' => 'cp'
             }
           },
           'info' => {
@@ -1982,10 +1914,8 @@ $result_trees{'encoding_index_utf8'} = {
               'entry_node' => {},
               'entry_number' => 35,
               'in_code' => 0,
-              'index_at_command' => 'cindex',
               'index_ignore_chars' => {},
-              'index_name' => 'cp',
-              'index_type_command' => 'cindex'
+              'index_name' => 'cp'
             }
           },
           'info' => {
@@ -2036,10 +1966,8 @@ $result_trees{'encoding_index_utf8'} = {
               'entry_node' => {},
               'entry_number' => 36,
               'in_code' => 0,
-              'index_at_command' => 'cindex',
               'index_ignore_chars' => {},
-              'index_name' => 'cp',
-              'index_type_command' => 'cindex'
+              'index_name' => 'cp'
             }
           },
           'info' => {
@@ -2090,10 +2018,8 @@ $result_trees{'encoding_index_utf8'} = {
               'entry_node' => {},
               'entry_number' => 37,
               'in_code' => 0,
-              'index_at_command' => 'cindex',
               'index_ignore_chars' => {},
-              'index_name' => 'cp',
-              'index_type_command' => 'cindex'
+              'index_name' => 'cp'
             }
           },
           'info' => {
@@ -2144,10 +2070,8 @@ $result_trees{'encoding_index_utf8'} = {
               'entry_node' => {},
               'entry_number' => 38,
               'in_code' => 0,
-              'index_at_command' => 'cindex',
               'index_ignore_chars' => {},
-              'index_name' => 'cp',
-              'index_type_command' => 'cindex'
+              'index_name' => 'cp'
             }
           },
           'info' => {
@@ -2198,10 +2122,8 @@ $result_trees{'encoding_index_utf8'} = {
               'entry_node' => {},
               'entry_number' => 39,
               'in_code' => 0,
-              'index_at_command' => 'cindex',
               'index_ignore_chars' => {},
-              'index_name' => 'cp',
-              'index_type_command' => 'cindex'
+              'index_name' => 'cp'
             }
           },
           'info' => {
@@ -2252,10 +2174,8 @@ $result_trees{'encoding_index_utf8'} = {
               'entry_node' => {},
               'entry_number' => 40,
               'in_code' => 0,
-              'index_at_command' => 'cindex',
               'index_ignore_chars' => {},
-              'index_name' => 'cp',
-              'index_type_command' => 'cindex'
+              'index_name' => 'cp'
             }
           },
           'info' => {
@@ -2306,10 +2226,8 @@ $result_trees{'encoding_index_utf8'} = {
               'entry_node' => {},
               'entry_number' => 41,
               'in_code' => 0,
-              'index_at_command' => 'cindex',
               'index_ignore_chars' => {},
-              'index_name' => 'cp',
-              'index_type_command' => 'cindex'
+              'index_name' => 'cp'
             }
           },
           'info' => {
@@ -2360,10 +2278,8 @@ $result_trees{'encoding_index_utf8'} = {
               'entry_node' => {},
               'entry_number' => 42,
               'in_code' => 0,
-              'index_at_command' => 'cindex',
               'index_ignore_chars' => {},
-              'index_name' => 'cp',
-              'index_type_command' => 'cindex'
+              'index_name' => 'cp'
             }
           },
           'info' => {
@@ -2404,10 +2320,8 @@ $result_trees{'encoding_index_utf8'} = {
               'entry_node' => {},
               'entry_number' => 43,
               'in_code' => 0,
-              'index_at_command' => 'cindex',
               'index_ignore_chars' => {},
-              'index_name' => 'cp',
-              'index_type_command' => 'cindex'
+              'index_name' => 'cp'
             }
           },
           'info' => {
@@ -2448,10 +2362,8 @@ $result_trees{'encoding_index_utf8'} = {
               'entry_node' => {},
               'entry_number' => 44,
               'in_code' => 0,
-              'index_at_command' => 'cindex',
               'index_ignore_chars' => {},
-              'index_name' => 'cp',
-              'index_type_command' => 'cindex'
+              'index_name' => 'cp'
             }
           },
           'info' => {
@@ -2502,10 +2414,8 @@ $result_trees{'encoding_index_utf8'} = {
               'entry_node' => {},
               'entry_number' => 45,
               'in_code' => 0,
-              'index_at_command' => 'cindex',
               'index_ignore_chars' => {},
-              'index_name' => 'cp',
-              'index_type_command' => 'cindex'
+              'index_name' => 'cp'
             }
           },
           'info' => {
@@ -2556,10 +2466,8 @@ $result_trees{'encoding_index_utf8'} = {
               'entry_node' => {},
               'entry_number' => 46,
               'in_code' => 0,
-              'index_at_command' => 'cindex',
               'index_ignore_chars' => {},
-              'index_name' => 'cp',
-              'index_type_command' => 'cindex'
+              'index_name' => 'cp'
             }
           },
           'info' => {
@@ -2610,10 +2518,8 @@ $result_trees{'encoding_index_utf8'} = {
               'entry_node' => {},
               'entry_number' => 47,
               'in_code' => 0,
-              'index_at_command' => 'cindex',
               'index_ignore_chars' => {},
-              'index_name' => 'cp',
-              'index_type_command' => 'cindex'
+              'index_name' => 'cp'
             }
           },
           'info' => {
@@ -2654,10 +2560,8 @@ $result_trees{'encoding_index_utf8'} = {
               'entry_node' => {},
               'entry_number' => 48,
               'in_code' => 0,
-              'index_at_command' => 'cindex',
               'index_ignore_chars' => {},
-              'index_name' => 'cp',
-              'index_type_command' => 'cindex'
+              'index_name' => 'cp'
             }
           },
           'info' => {
@@ -2698,10 +2602,8 @@ $result_trees{'encoding_index_utf8'} = {
               'entry_node' => {},
               'entry_number' => 49,
               'in_code' => 0,
-              'index_at_command' => 'cindex',
               'index_ignore_chars' => {},
-              'index_name' => 'cp',
-              'index_type_command' => 'cindex'
+              'index_name' => 'cp'
             }
           },
           'info' => {
@@ -2742,10 +2644,8 @@ $result_trees{'encoding_index_utf8'} = {
               'entry_node' => {},
               'entry_number' => 50,
               'in_code' => 0,
-              'index_at_command' => 'cindex',
               'index_ignore_chars' => {},
-              'index_name' => 'cp',
-              'index_type_command' => 'cindex'
+              'index_name' => 'cp'
             }
           },
           'info' => {
@@ -2786,10 +2686,8 @@ $result_trees{'encoding_index_utf8'} = {
               'entry_node' => {},
               'entry_number' => 51,
               'in_code' => 0,
-              'index_at_command' => 'cindex',
               'index_ignore_chars' => {},
-              'index_name' => 'cp',
-              'index_type_command' => 'cindex'
+              'index_name' => 'cp'
             }
           },
           'info' => {
@@ -2830,10 +2728,8 @@ $result_trees{'encoding_index_utf8'} = {
               'entry_node' => {},
               'entry_number' => 52,
               'in_code' => 0,
-              'index_at_command' => 'cindex',
               'index_ignore_chars' => {},
-              'index_name' => 'cp',
-              'index_type_command' => 'cindex'
+              'index_name' => 'cp'
             }
           },
           'info' => {
@@ -2874,10 +2770,8 @@ $result_trees{'encoding_index_utf8'} = {
               'entry_node' => {},
               'entry_number' => 53,
               'in_code' => 0,
-              'index_at_command' => 'cindex',
               'index_ignore_chars' => {},
-              'index_name' => 'cp',
-              'index_type_command' => 'cindex'
+              'index_name' => 'cp'
             }
           },
           'info' => {
@@ -2918,10 +2812,8 @@ $result_trees{'encoding_index_utf8'} = {
               'entry_node' => {},
               'entry_number' => 54,
               'in_code' => 0,
-              'index_at_command' => 'cindex',
               'index_ignore_chars' => {},
-              'index_name' => 'cp',
-              'index_type_command' => 'cindex'
+              'index_name' => 'cp'
             }
           },
           'info' => {
@@ -2962,10 +2854,8 @@ $result_trees{'encoding_index_utf8'} = {
               'entry_node' => {},
               'entry_number' => 55,
               'in_code' => 0,
-              'index_at_command' => 'cindex',
               'index_ignore_chars' => {},
-              'index_name' => 'cp',
-              'index_type_command' => 'cindex'
+              'index_name' => 'cp'
             }
           },
           'info' => {
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 653891133e..cce73633fb 100644
--- a/tp/t/results/indices/encoding_index_utf8_enable_encoding.pl
+++ b/tp/t/results/indices/encoding_index_utf8_enable_encoding.pl
@@ -196,10 +196,8 @@ $result_trees{'encoding_index_utf8_enable_encoding'} = {
               'entry_node' => {},
               'entry_number' => 1,
               'in_code' => 0,
-              'index_at_command' => 'cindex',
               'index_ignore_chars' => {},
-              'index_name' => 'cp',
-              'index_type_command' => 'cindex'
+              'index_name' => 'cp'
             }
           },
           'info' => {
@@ -312,10 +310,8 @@ $result_trees{'encoding_index_utf8_enable_encoding'} = {
               'entry_node' => {},
               'entry_number' => 2,
               'in_code' => 0,
-              'index_at_command' => 'cindex',
               'index_ignore_chars' => {},
-              'index_name' => 'cp',
-              'index_type_command' => 'cindex'
+              'index_name' => 'cp'
             }
           },
           'info' => {
@@ -446,10 +442,8 @@ $result_trees{'encoding_index_utf8_enable_encoding'} = {
               'entry_node' => {},
               'entry_number' => 3,
               'in_code' => 0,
-              'index_at_command' => 'cindex',
               'index_ignore_chars' => {},
-              'index_name' => 'cp',
-              'index_type_command' => 'cindex'
+              'index_name' => 'cp'
             }
           },
           'info' => {
@@ -490,10 +484,8 @@ $result_trees{'encoding_index_utf8_enable_encoding'} = {
               'entry_node' => {},
               'entry_number' => 4,
               'in_code' => 0,
-              'index_at_command' => 'cindex',
               'index_ignore_chars' => {},
-              'index_name' => 'cp',
-              'index_type_command' => 'cindex'
+              'index_name' => 'cp'
             }
           },
           'info' => {
@@ -534,10 +526,8 @@ $result_trees{'encoding_index_utf8_enable_encoding'} = {
               'entry_node' => {},
               'entry_number' => 5,
               'in_code' => 0,
-              'index_at_command' => 'cindex',
               'index_ignore_chars' => {},
-              'index_name' => 'cp',
-              'index_type_command' => 'cindex'
+              'index_name' => 'cp'
             }
           },
           'info' => {
@@ -578,10 +568,8 @@ $result_trees{'encoding_index_utf8_enable_encoding'} = {
               'entry_node' => {},
               'entry_number' => 6,
               'in_code' => 0,
-              'index_at_command' => 'cindex',
               'index_ignore_chars' => {},
-              'index_name' => 'cp',
-              'index_type_command' => 'cindex'
+              'index_name' => 'cp'
             }
           },
           'info' => {
@@ -622,10 +610,8 @@ $result_trees{'encoding_index_utf8_enable_encoding'} = {
               'entry_node' => {},
               'entry_number' => 7,
               'in_code' => 0,
-              'index_at_command' => 'cindex',
               'index_ignore_chars' => {},
-              'index_name' => 'cp',
-              'index_type_command' => 'cindex'
+              'index_name' => 'cp'
             }
           },
           'info' => {
@@ -666,10 +652,8 @@ $result_trees{'encoding_index_utf8_enable_encoding'} = {
               'entry_node' => {},
               'entry_number' => 8,
               'in_code' => 0,
-              'index_at_command' => 'cindex',
               'index_ignore_chars' => {},
-              'index_name' => 'cp',
-              'index_type_command' => 'cindex'
+              'index_name' => 'cp'
             }
           },
           'info' => {
@@ -710,10 +694,8 @@ $result_trees{'encoding_index_utf8_enable_encoding'} = {
               'entry_node' => {},
               'entry_number' => 9,
               'in_code' => 0,
-              'index_at_command' => 'cindex',
               'index_ignore_chars' => {},
-              'index_name' => 'cp',
-              'index_type_command' => 'cindex'
+              'index_name' => 'cp'
             }
           },
           'info' => {
@@ -754,10 +736,8 @@ $result_trees{'encoding_index_utf8_enable_encoding'} = {
               'entry_node' => {},
               'entry_number' => 10,
               'in_code' => 0,
-              'index_at_command' => 'cindex',
               'index_ignore_chars' => {},
-              'index_name' => 'cp',
-              'index_type_command' => 'cindex'
+              'index_name' => 'cp'
             }
           },
           'info' => {
@@ -798,10 +778,8 @@ $result_trees{'encoding_index_utf8_enable_encoding'} = {
               'entry_node' => {},
               'entry_number' => 11,
               'in_code' => 0,
-              'index_at_command' => 'cindex',
               'index_ignore_chars' => {},
-              'index_name' => 'cp',
-              'index_type_command' => 'cindex'
+              'index_name' => 'cp'
             }
           },
           'info' => {
@@ -842,10 +820,8 @@ $result_trees{'encoding_index_utf8_enable_encoding'} = {
               'entry_node' => {},
               'entry_number' => 12,
               'in_code' => 0,
-              'index_at_command' => 'cindex',
               'index_ignore_chars' => {},
-              'index_name' => 'cp',
-              'index_type_command' => 'cindex'
+              'index_name' => 'cp'
             }
           },
           'info' => {
@@ -886,10 +862,8 @@ $result_trees{'encoding_index_utf8_enable_encoding'} = {
               'entry_node' => {},
               'entry_number' => 13,
               'in_code' => 0,
-              'index_at_command' => 'cindex',
               'index_ignore_chars' => {},
-              'index_name' => 'cp',
-              'index_type_command' => 'cindex'
+              'index_name' => 'cp'
             }
           },
           'info' => {
@@ -930,10 +904,8 @@ $result_trees{'encoding_index_utf8_enable_encoding'} = {
               'entry_node' => {},
               'entry_number' => 14,
               'in_code' => 0,
-              'index_at_command' => 'cindex',
               'index_ignore_chars' => {},
-              'index_name' => 'cp',
-              'index_type_command' => 'cindex'
+              'index_name' => 'cp'
             }
           },
           'info' => {
@@ -974,10 +946,8 @@ $result_trees{'encoding_index_utf8_enable_encoding'} = {
               'entry_node' => {},
               'entry_number' => 15,
               'in_code' => 0,
-              'index_at_command' => 'cindex',
               'index_ignore_chars' => {},
-              'index_name' => 'cp',
-              'index_type_command' => 'cindex'
+              'index_name' => 'cp'
             }
           },
           'info' => {
@@ -1018,10 +988,8 @@ $result_trees{'encoding_index_utf8_enable_encoding'} = {
               'entry_node' => {},
               'entry_number' => 16,
               'in_code' => 0,
-              'index_at_command' => 'cindex',
               'index_ignore_chars' => {},
-              'index_name' => 'cp',
-              'index_type_command' => 'cindex'
+              'index_name' => 'cp'
             }
           },
           'info' => {
@@ -1062,10 +1030,8 @@ $result_trees{'encoding_index_utf8_enable_encoding'} = {
               'entry_node' => {},
               'entry_number' => 17,
               'in_code' => 0,
-              'index_at_command' => 'cindex',
               'index_ignore_chars' => {},
-              'index_name' => 'cp',
-              'index_type_command' => 'cindex'
+              'index_name' => 'cp'
             }
           },
           'info' => {
@@ -1106,10 +1072,8 @@ $result_trees{'encoding_index_utf8_enable_encoding'} = {
               'entry_node' => {},
               'entry_number' => 18,
               'in_code' => 0,
-              'index_at_command' => 'cindex',
               'index_ignore_chars' => {},
-              'index_name' => 'cp',
-              'index_type_command' => 'cindex'
+              'index_name' => 'cp'
             }
           },
           'info' => {
@@ -1150,10 +1114,8 @@ $result_trees{'encoding_index_utf8_enable_encoding'} = {
               'entry_node' => {},
               'entry_number' => 19,
               'in_code' => 0,
-              'index_at_command' => 'cindex',
               'index_ignore_chars' => {},
-              'index_name' => 'cp',
-              'index_type_command' => 'cindex'
+              'index_name' => 'cp'
             }
           },
           'info' => {
@@ -1194,10 +1156,8 @@ $result_trees{'encoding_index_utf8_enable_encoding'} = {
               'entry_node' => {},
               'entry_number' => 20,
               'in_code' => 0,
-              'index_at_command' => 'cindex',
               'index_ignore_chars' => {},
-              'index_name' => 'cp',
-              'index_type_command' => 'cindex'
+              'index_name' => 'cp'
             }
           },
           'info' => {
@@ -1238,10 +1198,8 @@ $result_trees{'encoding_index_utf8_enable_encoding'} = {
               'entry_node' => {},
               'entry_number' => 21,
               'in_code' => 0,
-              'index_at_command' => 'cindex',
               'index_ignore_chars' => {},
-              'index_name' => 'cp',
-              'index_type_command' => 'cindex'
+              'index_name' => 'cp'
             }
           },
           'info' => {
@@ -1282,10 +1240,8 @@ $result_trees{'encoding_index_utf8_enable_encoding'} = {
               'entry_node' => {},
               'entry_number' => 22,
               'in_code' => 0,
-              'index_at_command' => 'cindex',
               'index_ignore_chars' => {},
-              'index_name' => 'cp',
-              'index_type_command' => 'cindex'
+              'index_name' => 'cp'
             }
           },
           'info' => {
@@ -1326,10 +1282,8 @@ $result_trees{'encoding_index_utf8_enable_encoding'} = {
               'entry_node' => {},
               'entry_number' => 23,
               'in_code' => 0,
-              'index_at_command' => 'cindex',
               'index_ignore_chars' => {},
-              'index_name' => 'cp',
-              'index_type_command' => 'cindex'
+              'index_name' => 'cp'
             }
           },
           'info' => {
@@ -1370,10 +1324,8 @@ $result_trees{'encoding_index_utf8_enable_encoding'} = {
               'entry_node' => {},
               'entry_number' => 24,
               'in_code' => 0,
-              'index_at_command' => 'cindex',
               'index_ignore_chars' => {},
-              'index_name' => 'cp',
-              'index_type_command' => 'cindex'
+              'index_name' => 'cp'
             }
           },
           'info' => {
@@ -1414,10 +1366,8 @@ $result_trees{'encoding_index_utf8_enable_encoding'} = {
               'entry_node' => {},
               'entry_number' => 25,
               'in_code' => 0,
-              'index_at_command' => 'cindex',
               'index_ignore_chars' => {},
-              'index_name' => 'cp',
-              'index_type_command' => 'cindex'
+              'index_name' => 'cp'
             }
           },
           'info' => {
@@ -1458,10 +1408,8 @@ $result_trees{'encoding_index_utf8_enable_encoding'} = {
               'entry_node' => {},
               'entry_number' => 26,
               'in_code' => 0,
-              'index_at_command' => 'cindex',
               'index_ignore_chars' => {},
-              'index_name' => 'cp',
-              'index_type_command' => 'cindex'
+              'index_name' => 'cp'
             }
           },
           'info' => {
@@ -1502,10 +1450,8 @@ $result_trees{'encoding_index_utf8_enable_encoding'} = {
               'entry_node' => {},
               'entry_number' => 27,
               'in_code' => 0,
-              'index_at_command' => 'cindex',
               'index_ignore_chars' => {},
-              'index_name' => 'cp',
-              'index_type_command' => 'cindex'
+              'index_name' => 'cp'
             }
           },
           'info' => {
@@ -1546,10 +1492,8 @@ $result_trees{'encoding_index_utf8_enable_encoding'} = {
               'entry_node' => {},
               'entry_number' => 28,
               'in_code' => 0,
-              'index_at_command' => 'cindex',
               'index_ignore_chars' => {},
-              'index_name' => 'cp',
-              'index_type_command' => 'cindex'
+              'index_name' => 'cp'
             }
           },
           'info' => {
@@ -1590,10 +1534,8 @@ $result_trees{'encoding_index_utf8_enable_encoding'} = {
               'entry_node' => {},
               'entry_number' => 29,
               'in_code' => 0,
-              'index_at_command' => 'cindex',
               'index_ignore_chars' => {},
-              'index_name' => 'cp',
-              'index_type_command' => 'cindex'
+              'index_name' => 'cp'
             }
           },
           'info' => {
@@ -1634,10 +1576,8 @@ $result_trees{'encoding_index_utf8_enable_encoding'} = {
               'entry_node' => {},
               'entry_number' => 30,
               'in_code' => 0,
-              'index_at_command' => 'cindex',
               'index_ignore_chars' => {},
-              'index_name' => 'cp',
-              'index_type_command' => 'cindex'
+              'index_name' => 'cp'
             }
           },
           'info' => {
@@ -1678,10 +1618,8 @@ $result_trees{'encoding_index_utf8_enable_encoding'} = {
               'entry_node' => {},
               'entry_number' => 31,
               'in_code' => 0,
-              'index_at_command' => 'cindex',
               'index_ignore_chars' => {},
-              'index_name' => 'cp',
-              'index_type_command' => 'cindex'
+              'index_name' => 'cp'
             }
           },
           'info' => {
@@ -1732,10 +1670,8 @@ $result_trees{'encoding_index_utf8_enable_encoding'} = {
               'entry_node' => {},
               'entry_number' => 32,
               'in_code' => 0,
-              'index_at_command' => 'cindex',
               'index_ignore_chars' => {},
-              'index_name' => 'cp',
-              'index_type_command' => 'cindex'
+              'index_name' => 'cp'
             }
           },
           'info' => {
@@ -1786,10 +1722,8 @@ $result_trees{'encoding_index_utf8_enable_encoding'} = {
               'entry_node' => {},
               'entry_number' => 33,
               'in_code' => 0,
-              'index_at_command' => 'cindex',
               'index_ignore_chars' => {},
-              'index_name' => 'cp',
-              'index_type_command' => 'cindex'
+              'index_name' => 'cp'
             }
           },
           'info' => {
@@ -1869,10 +1803,8 @@ $result_trees{'encoding_index_utf8_enable_encoding'} = {
               'entry_node' => {},
               'entry_number' => 34,
               'in_code' => 0,
-              'index_at_command' => 'cindex',
               'index_ignore_chars' => {},
-              'index_name' => 'cp',
-              'index_type_command' => 'cindex'
+              'index_name' => 'cp'
             }
           },
           'info' => {
@@ -1982,10 +1914,8 @@ $result_trees{'encoding_index_utf8_enable_encoding'} = {
               'entry_node' => {},
               'entry_number' => 35,
               'in_code' => 0,
-              'index_at_command' => 'cindex',
               'index_ignore_chars' => {},
-              'index_name' => 'cp',
-              'index_type_command' => 'cindex'
+              'index_name' => 'cp'
             }
           },
           'info' => {
@@ -2036,10 +1966,8 @@ $result_trees{'encoding_index_utf8_enable_encoding'} = {
               'entry_node' => {},
               'entry_number' => 36,
               'in_code' => 0,
-              'index_at_command' => 'cindex',
               'index_ignore_chars' => {},
-              'index_name' => 'cp',
-              'index_type_command' => 'cindex'
+              'index_name' => 'cp'
             }
           },
           'info' => {
@@ -2090,10 +2018,8 @@ $result_trees{'encoding_index_utf8_enable_encoding'} = {
               'entry_node' => {},
               'entry_number' => 37,
               'in_code' => 0,
-              'index_at_command' => 'cindex',
               'index_ignore_chars' => {},
-              'index_name' => 'cp',
-              'index_type_command' => 'cindex'
+              'index_name' => 'cp'
             }
           },
           'info' => {
@@ -2144,10 +2070,8 @@ $result_trees{'encoding_index_utf8_enable_encoding'} = {
               'entry_node' => {},
               'entry_number' => 38,
               'in_code' => 0,
-              'index_at_command' => 'cindex',
               'index_ignore_chars' => {},
-              'index_name' => 'cp',
-              'index_type_command' => 'cindex'
+              'index_name' => 'cp'
             }
           },
           'info' => {
@@ -2198,10 +2122,8 @@ $result_trees{'encoding_index_utf8_enable_encoding'} = {
               'entry_node' => {},
               'entry_number' => 39,
               'in_code' => 0,
-              'index_at_command' => 'cindex',
               'index_ignore_chars' => {},
-              'index_name' => 'cp',
-              'index_type_command' => 'cindex'
+              'index_name' => 'cp'
             }
           },
           'info' => {
@@ -2252,10 +2174,8 @@ $result_trees{'encoding_index_utf8_enable_encoding'} = {
               'entry_node' => {},
               'entry_number' => 40,
               'in_code' => 0,
-              'index_at_command' => 'cindex',
               'index_ignore_chars' => {},
-              'index_name' => 'cp',
-              'index_type_command' => 'cindex'
+              'index_name' => 'cp'
             }
           },
           'info' => {
@@ -2306,10 +2226,8 @@ $result_trees{'encoding_index_utf8_enable_encoding'} = {
               'entry_node' => {},
               'entry_number' => 41,
               'in_code' => 0,
-              'index_at_command' => 'cindex',
               'index_ignore_chars' => {},
-              'index_name' => 'cp',
-              'index_type_command' => 'cindex'
+              'index_name' => 'cp'
             }
           },
           'info' => {
@@ -2360,10 +2278,8 @@ $result_trees{'encoding_index_utf8_enable_encoding'} = {
               'entry_node' => {},
               'entry_number' => 42,
               'in_code' => 0,
-              'index_at_command' => 'cindex',
               'index_ignore_chars' => {},
-              'index_name' => 'cp',
-              'index_type_command' => 'cindex'
+              'index_name' => 'cp'
             }
           },
           'info' => {
@@ -2404,10 +2320,8 @@ $result_trees{'encoding_index_utf8_enable_encoding'} = {
               'entry_node' => {},
               'entry_number' => 43,
               'in_code' => 0,
-              'index_at_command' => 'cindex',
               'index_ignore_chars' => {},
-              'index_name' => 'cp',
-              'index_type_command' => 'cindex'
+              'index_name' => 'cp'
             }
           },
           'info' => {
@@ -2448,10 +2362,8 @@ $result_trees{'encoding_index_utf8_enable_encoding'} = {
               'entry_node' => {},
               'entry_number' => 44,
               'in_code' => 0,
-              'index_at_command' => 'cindex',
               'index_ignore_chars' => {},
-              'index_name' => 'cp',
-              'index_type_command' => 'cindex'
+              'index_name' => 'cp'
             }
           },
           'info' => {
@@ -2502,10 +2414,8 @@ $result_trees{'encoding_index_utf8_enable_encoding'} = {
               'entry_node' => {},
               'entry_number' => 45,
               'in_code' => 0,
-              'index_at_command' => 'cindex',
               'index_ignore_chars' => {},
-              'index_name' => 'cp',
-              'index_type_command' => 'cindex'
+              'index_name' => 'cp'
             }
           },
           'info' => {
@@ -2556,10 +2466,8 @@ $result_trees{'encoding_index_utf8_enable_encoding'} = {
               'entry_node' => {},
               'entry_number' => 46,
               'in_code' => 0,
-              'index_at_command' => 'cindex',
               'index_ignore_chars' => {},
-              'index_name' => 'cp',
-              'index_type_command' => 'cindex'
+              'index_name' => 'cp'
             }
           },
           'info' => {
@@ -2610,10 +2518,8 @@ $result_trees{'encoding_index_utf8_enable_encoding'} = {
               'entry_node' => {},
               'entry_number' => 47,
               'in_code' => 0,
-              'index_at_command' => 'cindex',
               'index_ignore_chars' => {},
-              'index_name' => 'cp',
-              'index_type_command' => 'cindex'
+              'index_name' => 'cp'
             }
           },
           'info' => {
@@ -2654,10 +2560,8 @@ $result_trees{'encoding_index_utf8_enable_encoding'} = {
               'entry_node' => {},
               'entry_number' => 48,
               'in_code' => 0,
-              'index_at_command' => 'cindex',
               'index_ignore_chars' => {},
-              'index_name' => 'cp',
-              'index_type_command' => 'cindex'
+              'index_name' => 'cp'
             }
           },
           'info' => {
@@ -2698,10 +2602,8 @@ $result_trees{'encoding_index_utf8_enable_encoding'} = {
               'entry_node' => {},
               'entry_number' => 49,
               'in_code' => 0,
-              'index_at_command' => 'cindex',
               'index_ignore_chars' => {},
-              'index_name' => 'cp',
-              'index_type_command' => 'cindex'
+              'index_name' => 'cp'
             }
           },
           'info' => {
@@ -2742,10 +2644,8 @@ $result_trees{'encoding_index_utf8_enable_encoding'} = {
               'entry_node' => {},
               'entry_number' => 50,
               'in_code' => 0,
-              'index_at_command' => 'cindex',
               'index_ignore_chars' => {},
-              'index_name' => 'cp',
-              'index_type_command' => 'cindex'
+              'index_name' => 'cp'
             }
           },
           'info' => {
@@ -2786,10 +2686,8 @@ $result_trees{'encoding_index_utf8_enable_encoding'} = {
               'entry_node' => {},
               'entry_number' => 51,
               'in_code' => 0,
-              'index_at_command' => 'cindex',
               'index_ignore_chars' => {},
-              'index_name' => 'cp',
-              'index_type_command' => 'cindex'
+              'index_name' => 'cp'
             }
           },
           'info' => {
@@ -2830,10 +2728,8 @@ $result_trees{'encoding_index_utf8_enable_encoding'} = {
               'entry_node' => {},
               'entry_number' => 52,
               'in_code' => 0,
-              'index_at_command' => 'cindex',
               'index_ignore_chars' => {},
-              'index_name' => 'cp',
-              'index_type_command' => 'cindex'
+              'index_name' => 'cp'
             }
           },
           'info' => {
@@ -2874,10 +2770,8 @@ $result_trees{'encoding_index_utf8_enable_encoding'} = {
               'entry_node' => {},
               'entry_number' => 53,
               'in_code' => 0,
-              'index_at_command' => 'cindex',
               'index_ignore_chars' => {},
-              'index_name' => 'cp',
-              'index_type_command' => 'cindex'
+              'index_name' => 'cp'
             }
           },
           'info' => {
@@ -2918,10 +2812,8 @@ $result_trees{'encoding_index_utf8_enable_encoding'} = {
               'entry_node' => {},
               'entry_number' => 54,
               'in_code' => 0,
-              'index_at_command' => 'cindex',
               'index_ignore_chars' => {},
-              'index_name' => 'cp',
-              'index_type_command' => 'cindex'
+              'index_name' => 'cp'
             }
           },
           'info' => {
@@ -2962,10 +2854,8 @@ $result_trees{'encoding_index_utf8_enable_encoding'} = {
               'entry_node' => {},
               'entry_number' => 55,
               'in_code' => 0,
-              'index_at_command' => 'cindex',
               'index_ignore_chars' => {},
-              'index_name' => 'cp',
-              'index_type_command' => 'cindex'
+              'index_name' => 'cp'
             }
           },
           'info' => {
diff --git a/tp/t/results/indices/explicit_sort_key.pl 
b/tp/t/results/indices/explicit_sort_key.pl
index 76dac3f4d3..68e1b4d964 100644
--- a/tp/t/results/indices/explicit_sort_key.pl
+++ b/tp/t/results/indices/explicit_sort_key.pl
@@ -197,10 +197,8 @@ $result_trees{'explicit_sort_key'} = {
               'entry_node' => {},
               'entry_number' => 1,
               'in_code' => 0,
-              'index_at_command' => 'SKindex',
               'index_ignore_chars' => {},
               'index_name' => 'SK',
-              'index_type_command' => 'SKindex',
               'sortas' => 'A'
             },
             'sortas' => 'A'
@@ -265,10 +263,8 @@ $result_trees{'explicit_sort_key'} = {
               'entry_node' => {},
               'entry_number' => 2,
               'in_code' => 0,
-              'index_at_command' => 'SKindex',
               'index_ignore_chars' => {},
               'index_name' => 'SK',
-              'index_type_command' => 'SKindex',
               'sortas' => 'B'
             },
             'sortas' => 'B'
@@ -333,10 +329,8 @@ $result_trees{'explicit_sort_key'} = {
               'entry_node' => {},
               'entry_number' => 3,
               'in_code' => 0,
-              'index_at_command' => 'SKindex',
               'index_ignore_chars' => {},
               'index_name' => 'SK',
-              'index_type_command' => 'SKindex',
               'sortas' => '0'
             },
             'sortas' => '0'
@@ -412,10 +406,8 @@ $result_trees{'explicit_sort_key'} = {
               'entry_node' => {},
               'entry_number' => 4,
               'in_code' => 0,
-              'index_at_command' => 'SKindex',
               'index_ignore_chars' => {},
-              'index_name' => 'SK',
-              'index_type_command' => 'SKindex'
+              'index_name' => 'SK'
             }
           },
           'info' => {
diff --git a/tp/t/results/indices/ftable_vtable.pl 
b/tp/t/results/indices/ftable_vtable.pl
index 2e7df69b8b..5135efb5a9 100644
--- a/tp/t/results/indices/ftable_vtable.pl
+++ b/tp/t/results/indices/ftable_vtable.pl
@@ -148,10 +148,8 @@ $result_trees{'ftable_vtable'} = {
                           'entry_node' => {},
                           'entry_number' => 1,
                           'in_code' => 1,
-                          'index_at_command' => 'item',
                           'index_ignore_chars' => {},
-                          'index_name' => 'fn',
-                          'index_type_command' => 'ftable'
+                          'index_name' => 'fn'
                         }
                       },
                       'info' => {
@@ -191,10 +189,8 @@ $result_trees{'ftable_vtable'} = {
                           'entry_node' => {},
                           'entry_number' => 2,
                           'in_code' => 1,
-                          'index_at_command' => 'itemx',
                           'index_ignore_chars' => {},
-                          'index_name' => 'fn',
-                          'index_type_command' => 'ftable'
+                          'index_name' => 'fn'
                         }
                       },
                       'info' => {
@@ -258,10 +254,8 @@ $result_trees{'ftable_vtable'} = {
                           'entry_node' => {},
                           'entry_number' => 3,
                           'in_code' => 1,
-                          'index_at_command' => 'item',
                           'index_ignore_chars' => {},
-                          'index_name' => 'fn',
-                          'index_type_command' => 'ftable'
+                          'index_name' => 'fn'
                         }
                       },
                       'info' => {
@@ -401,10 +395,8 @@ $result_trees{'ftable_vtable'} = {
                           'entry_node' => {},
                           'entry_number' => 1,
                           'in_code' => 1,
-                          'index_at_command' => 'item',
                           'index_ignore_chars' => {},
-                          'index_name' => 'vr',
-                          'index_type_command' => 'vtable'
+                          'index_name' => 'vr'
                         }
                       },
                       'info' => {
@@ -444,10 +436,8 @@ $result_trees{'ftable_vtable'} = {
                           'entry_node' => {},
                           'entry_number' => 2,
                           'in_code' => 1,
-                          'index_at_command' => 'itemx',
                           'index_ignore_chars' => {},
-                          'index_name' => 'vr',
-                          'index_type_command' => 'vtable'
+                          'index_name' => 'vr'
                         }
                       },
                       'info' => {
@@ -511,10 +501,8 @@ $result_trees{'ftable_vtable'} = {
                           'entry_node' => {},
                           'entry_number' => 3,
                           'in_code' => 1,
-                          'index_at_command' => 'item',
                           'index_ignore_chars' => {},
-                          'index_name' => 'vr',
-                          'index_type_command' => 'vtable'
+                          'index_name' => 'vr'
                         }
                       },
                       'info' => {
@@ -612,10 +600,8 @@ $result_trees{'ftable_vtable'} = {
               'entry_node' => {},
               'entry_number' => 4,
               'in_code' => 1,
-              'index_at_command' => 'findex',
               'index_ignore_chars' => {},
-              'index_name' => 'fn',
-              'index_type_command' => 'findex'
+              'index_name' => 'fn'
             }
           },
           'info' => {
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 672da4378e..912304352a 100644
--- a/tp/t/results/indices/ignored_sort_char_empty_entries.pl
+++ b/tp/t/results/indices/ignored_sort_char_empty_entries.pl
@@ -165,12 +165,10 @@ $result_trees{'ignored_sort_char_empty_entries'} = {
               'entry_node' => {},
               'entry_number' => 1,
               'in_code' => 1,
-              'index_at_command' => 'findex',
               'index_ignore_chars' => {
                 '-' => 1
               },
-              'index_name' => 'fn',
-              'index_type_command' => 'findex'
+              'index_name' => 'fn'
             }
           },
           'info' => {
@@ -211,12 +209,10 @@ $result_trees{'ignored_sort_char_empty_entries'} = {
               'entry_node' => {},
               'entry_number' => 2,
               'in_code' => 1,
-              'index_at_command' => 'findex',
               'index_ignore_chars' => {
                 '-' => 1
               },
-              'index_name' => 'fn',
-              'index_type_command' => 'findex'
+              'index_name' => 'fn'
             }
           },
           'info' => {
@@ -257,12 +253,10 @@ $result_trees{'ignored_sort_char_empty_entries'} = {
               'entry_node' => {},
               'entry_number' => 3,
               'in_code' => 1,
-              'index_at_command' => 'findex',
               'index_ignore_chars' => {
                 '-' => 1
               },
-              'index_name' => 'fn',
-              'index_type_command' => 'findex'
+              'index_name' => 'fn'
             }
           },
           'info' => {
@@ -325,12 +319,10 @@ $result_trees{'ignored_sort_char_empty_entries'} = {
               'entry_node' => {},
               'entry_number' => 4,
               'in_code' => 1,
-              'index_at_command' => 'findex',
               'index_ignore_chars' => {
                 '-' => 1
               },
               'index_name' => 'fn',
-              'index_type_command' => 'findex',
               'sortas' => '--'
             },
             'sortas' => '--'
diff --git a/tp/t/results/indices/image_lines_count.pl 
b/tp/t/results/indices/image_lines_count.pl
index 1882b9658d..78afb9807c 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 f0aafd1ff5..162c8ee305 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 b579d4f6c5..fb982cd879 100644
--- a/tp/t/results/indices/index_and_node_same_name.pl
+++ b/tp/t/results/indices/index_and_node_same_name.pl
@@ -123,10 +123,8 @@ $result_trees{'index_and_node_same_name'} = {
               'entry_node' => {},
               'entry_number' => 1,
               'in_code' => 0,
-              'index_at_command' => 'cindex',
               'index_ignore_chars' => {},
-              'index_name' => 'cp',
-              'index_type_command' => 'cindex'
+              'index_name' => 'cp'
             }
           },
           'info' => {
diff --git a/tp/t/results/indices/index_entries_locations.pl 
b/tp/t/results/indices/index_entries_locations.pl
index 8dcbcc805b..a9846da51e 100644
--- a/tp/t/results/indices/index_entries_locations.pl
+++ b/tp/t/results/indices/index_entries_locations.pl
@@ -139,10 +139,8 @@ $result_trees{'index_entries_locations'} = {
                   'entry_node' => {},
                   'entry_number' => 1,
                   'in_code' => 0,
-                  'index_at_command' => 'cindex',
                   'index_ignore_chars' => {},
-                  'index_name' => 'cp',
-                  'index_type_command' => 'cindex'
+                  'index_name' => 'cp'
                 }
               },
               'info' => {
@@ -187,10 +185,8 @@ $result_trees{'index_entries_locations'} = {
                   'entry_node' => {},
                   'entry_number' => 2,
                   'in_code' => 0,
-                  'index_at_command' => 'cindex',
                   'index_ignore_chars' => {},
-                  'index_name' => 'cp',
-                  'index_type_command' => 'cindex'
+                  'index_name' => 'cp'
                 }
               },
               'info' => {
@@ -253,10 +249,8 @@ $result_trees{'index_entries_locations'} = {
               'entry_node' => {},
               'entry_number' => 3,
               'in_code' => 0,
-              'index_at_command' => 'cindex',
               'index_ignore_chars' => {},
-              'index_name' => 'cp',
-              'index_type_command' => 'cindex'
+              'index_name' => 'cp'
             }
           },
           'info' => {
@@ -311,10 +305,8 @@ $result_trees{'index_entries_locations'} = {
               'entry_node' => {},
               'entry_number' => 4,
               'in_code' => 0,
-              'index_at_command' => 'cindex',
               'index_ignore_chars' => {},
-              'index_name' => 'cp',
-              'index_type_command' => 'cindex'
+              'index_name' => 'cp'
             }
           },
           'info' => {
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 6720c5a21b..d409129fb7 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 2b4cec4365..4f9b6c609a 100644
--- a/tp/t/results/indices/index_entry_before_node.pl
+++ b/tp/t/results/indices/index_entry_before_node.pl
@@ -303,10 +303,8 @@ $result_trees{'index_entry_before_node'} = {
               'entry_node' => {},
               'entry_number' => 1,
               'in_code' => 0,
-              'index_at_command' => 'cindex',
               'index_ignore_chars' => {},
-              'index_name' => 'cp',
-              'index_type_command' => 'cindex'
+              'index_name' => 'cp'
             }
           },
           'info' => {
diff --git a/tp/t/results/indices/index_entry_in_footnote.pl 
b/tp/t/results/indices/index_entry_in_footnote.pl
index fc7d5ad4bf..d3e9a46ef6 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 8398dbfb6c..188b40f9ef 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
@@ -285,10 +285,8 @@ 
$result_trees{'index_entry_in_footnote_different_node_end'} = {
                               'entry_node' => {},
                               'entry_number' => 1,
                               'in_code' => 0,
-                              'index_at_command' => 'cindex',
                               'index_ignore_chars' => {},
-                              'index_name' => 'cp',
-                              'index_type_command' => 'cindex'
+                              'index_name' => 'cp'
                             }
                           },
                           'info' => {
@@ -365,10 +363,8 @@ 
$result_trees{'index_entry_in_footnote_different_node_end'} = {
                           'entry_node' => {},
                           'entry_number' => 2,
                           'in_code' => 0,
-                          'index_at_command' => 'cindex',
                           'index_ignore_chars' => {},
-                          'index_name' => 'cp',
-                          'index_type_command' => 'cindex'
+                          'index_name' => 'cp'
                         }
                       },
                       'info' => {
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 d2f05e0a83..c81f88dfdf 100644
--- a/tp/t/results/indices/index_entry_in_footnote_sections.pl
+++ b/tp/t/results/indices/index_entry_in_footnote_sections.pl
@@ -138,10 +138,8 @@ $result_trees{'index_entry_in_footnote_sections'} = {
                               'entry_node' => {},
                               'entry_number' => 1,
                               'in_code' => 0,
-                              'index_at_command' => 'cindex',
                               'index_ignore_chars' => {},
-                              'index_name' => 'cp',
-                              'index_type_command' => 'cindex'
+                              'index_name' => 'cp'
                             }
                           },
                           'info' => {
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 620efd0d37..8a51d121dd 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
@@ -138,10 +138,8 @@ $result_trees{'index_entry_in_footnote_sections_separate'} 
= {
                               'entry_node' => {},
                               'entry_number' => 1,
                               'in_code' => 0,
-                              'index_at_command' => 'cindex',
                               'index_ignore_chars' => {},
-                              'index_name' => 'cp',
-                              'index_type_command' => 'cindex'
+                              'index_name' => 'cp'
                             }
                           },
                           'info' => {
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 ad29c468b2..521aa884c8 100644
--- a/tp/t/results/indices/index_entry_in_footnote_separate.pl
+++ b/tp/t/results/indices/index_entry_in_footnote_separate.pl
@@ -320,10 +320,8 @@ $result_trees{'index_entry_in_footnote_separate'} = {
                               'entry_node' => {},
                               'entry_number' => 1,
                               'in_code' => 0,
-                              'index_at_command' => 'cindex',
                               'index_ignore_chars' => {},
-                              'index_name' => 'cp',
-                              'index_type_command' => 'cindex'
+                              'index_name' => 'cp'
                             }
                           },
                           'info' => {
@@ -400,10 +398,8 @@ $result_trees{'index_entry_in_footnote_separate'} = {
                           'entry_node' => {},
                           'entry_number' => 2,
                           'in_code' => 0,
-                          'index_at_command' => 'cindex',
                           'index_ignore_chars' => {},
-                          'index_name' => 'cp',
-                          'index_type_command' => 'cindex'
+                          'index_name' => 'cp'
                         }
                       },
                       'info' => {
diff --git a/tp/t/results/indices/index_no_node.pl 
b/tp/t/results/indices/index_no_node.pl
index fbb44ea16a..b0b49601a6 100644
--- a/tp/t/results/indices/index_no_node.pl
+++ b/tp/t/results/indices/index_no_node.pl
@@ -96,10 +96,8 @@ $result_trees{'index_no_node'} = {
               'entry_element' => {},
               'entry_number' => 1,
               'in_code' => 0,
-              'index_at_command' => 'cindex',
               'index_ignore_chars' => {},
-              'index_name' => 'cp',
-              'index_type_command' => 'cindex'
+              'index_name' => 'cp'
             }
           },
           'info' => {
@@ -248,10 +246,8 @@ $result_trees{'index_no_node'} = {
               'entry_element' => {},
               'entry_number' => 2,
               'in_code' => 0,
-              'index_at_command' => 'cindex',
               'index_ignore_chars' => {},
-              'index_name' => 'cp',
-              'index_type_command' => 'cindex'
+              'index_name' => 'cp'
             }
           },
           'info' => {
@@ -297,10 +293,8 @@ $result_trees{'index_no_node'} = {
                   'entry_element' => {},
                   'entry_number' => 3,
                   'in_code' => 0,
-                  'index_at_command' => 'cindex',
                   'index_ignore_chars' => {},
-                  'index_name' => 'cp',
-                  'index_type_command' => 'cindex'
+                  'index_name' => 'cp'
                 }
               },
               'info' => {
@@ -423,10 +417,8 @@ $result_trees{'index_no_node'} = {
               'entry_element' => {},
               'entry_number' => 4,
               'in_code' => 0,
-              'index_at_command' => 'cindex',
               'index_ignore_chars' => {},
-              'index_name' => 'cp',
-              'index_type_command' => 'cindex'
+              'index_name' => 'cp'
             }
           },
           'info' => {
@@ -466,10 +458,8 @@ $result_trees{'index_no_node'} = {
               'entry_element' => {},
               'entry_number' => 5,
               'in_code' => 0,
-              'index_at_command' => 'cindex',
               'index_ignore_chars' => {},
-              'index_name' => 'cp',
-              'index_type_command' => 'cindex'
+              'index_name' => 'cp'
             }
           },
           'info' => {
@@ -509,10 +499,8 @@ $result_trees{'index_no_node'} = {
               'entry_element' => {},
               'entry_number' => 6,
               'in_code' => 0,
-              'index_at_command' => 'cindex',
               'index_ignore_chars' => {},
-              'index_name' => 'cp',
-              'index_type_command' => 'cindex'
+              'index_name' => 'cp'
             }
           },
           'info' => {
@@ -552,10 +540,8 @@ $result_trees{'index_no_node'} = {
               'entry_element' => {},
               'entry_number' => 7,
               'in_code' => 0,
-              'index_at_command' => 'cindex',
               'index_ignore_chars' => {},
-              'index_name' => 'cp',
-              'index_type_command' => 'cindex'
+              'index_name' => 'cp'
             }
           },
           'info' => {
@@ -595,10 +581,8 @@ $result_trees{'index_no_node'} = {
               'entry_element' => {},
               'entry_number' => 8,
               'in_code' => 0,
-              'index_at_command' => 'cindex',
               'index_ignore_chars' => {},
-              'index_name' => 'cp',
-              'index_type_command' => 'cindex'
+              'index_name' => 'cp'
             }
           },
           'info' => {
@@ -638,10 +622,8 @@ $result_trees{'index_no_node'} = {
               'entry_element' => {},
               'entry_number' => 9,
               'in_code' => 0,
-              'index_at_command' => 'cindex',
               'index_ignore_chars' => {},
-              'index_name' => 'cp',
-              'index_type_command' => 'cindex'
+              'index_name' => 'cp'
             }
           },
           'info' => {
@@ -734,10 +716,8 @@ $result_trees{'index_no_node'} = {
               'entry_element' => {},
               'entry_number' => 10,
               'in_code' => 0,
-              'index_at_command' => 'cindex',
               'index_ignore_chars' => {},
-              'index_name' => 'cp',
-              'index_type_command' => 'cindex'
+              'index_name' => 'cp'
             }
           },
           'info' => {
@@ -857,10 +837,8 @@ $result_trees{'index_no_node'} = {
               'entry_element' => {},
               'entry_number' => 11,
               'in_code' => 0,
-              'index_at_command' => 'cindex',
               'index_ignore_chars' => {},
-              'index_name' => 'cp',
-              'index_type_command' => 'cindex'
+              'index_name' => 'cp'
             }
           },
           'info' => {
@@ -906,10 +884,8 @@ $result_trees{'index_no_node'} = {
                   'entry_element' => {},
                   'entry_number' => 12,
                   'in_code' => 0,
-                  'index_at_command' => 'cindex',
                   'index_ignore_chars' => {},
-                  'index_name' => 'cp',
-                  'index_type_command' => 'cindex'
+                  'index_name' => 'cp'
                 }
               },
               'info' => {
@@ -1022,10 +998,8 @@ $result_trees{'index_no_node'} = {
               'entry_element' => {},
               'entry_number' => 13,
               'in_code' => 0,
-              'index_at_command' => 'cindex',
               'index_ignore_chars' => {},
-              'index_name' => 'cp',
-              'index_type_command' => 'cindex'
+              'index_name' => 'cp'
             }
           },
           'info' => {
@@ -1110,10 +1084,8 @@ $result_trees{'index_no_node'} = {
                   'entry_element' => {},
                   'entry_number' => 14,
                   'in_code' => 0,
-                  'index_at_command' => 'cindex',
                   'index_ignore_chars' => {},
-                  'index_name' => 'cp',
-                  'index_type_command' => 'cindex'
+                  'index_name' => 'cp'
                 }
               },
               'info' => {
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 105f3ad6be..e50b51f39b 100644
--- a/tp/t/results/indices/index_no_node_no_top.pl
+++ b/tp/t/results/indices/index_no_node_no_top.pl
@@ -53,10 +53,8 @@ $result_trees{'index_no_node_no_top'} = {
               'entry_element' => {},
               'entry_number' => 1,
               'in_code' => 0,
-              'index_at_command' => 'cindex',
               'index_ignore_chars' => {},
-              'index_name' => 'cp',
-              'index_type_command' => 'cindex'
+              'index_name' => 'cp'
             }
           },
           'info' => {
@@ -205,10 +203,8 @@ $result_trees{'index_no_node_no_top'} = {
               'entry_element' => {},
               'entry_number' => 2,
               'in_code' => 0,
-              'index_at_command' => 'cindex',
               'index_ignore_chars' => {},
-              'index_name' => 'cp',
-              'index_type_command' => 'cindex'
+              'index_name' => 'cp'
             }
           },
           'info' => {
@@ -254,10 +250,8 @@ $result_trees{'index_no_node_no_top'} = {
                   'entry_element' => {},
                   'entry_number' => 3,
                   'in_code' => 0,
-                  'index_at_command' => 'cindex',
                   'index_ignore_chars' => {},
-                  'index_name' => 'cp',
-                  'index_type_command' => 'cindex'
+                  'index_name' => 'cp'
                 }
               },
               'info' => {
@@ -380,10 +374,8 @@ $result_trees{'index_no_node_no_top'} = {
               'entry_element' => {},
               'entry_number' => 4,
               'in_code' => 0,
-              'index_at_command' => 'cindex',
               'index_ignore_chars' => {},
-              'index_name' => 'cp',
-              'index_type_command' => 'cindex'
+              'index_name' => 'cp'
             }
           },
           'info' => {
@@ -423,10 +415,8 @@ $result_trees{'index_no_node_no_top'} = {
               'entry_element' => {},
               'entry_number' => 5,
               'in_code' => 0,
-              'index_at_command' => 'cindex',
               'index_ignore_chars' => {},
-              'index_name' => 'cp',
-              'index_type_command' => 'cindex'
+              'index_name' => 'cp'
             }
           },
           'info' => {
@@ -466,10 +456,8 @@ $result_trees{'index_no_node_no_top'} = {
               'entry_element' => {},
               'entry_number' => 6,
               'in_code' => 0,
-              'index_at_command' => 'cindex',
               'index_ignore_chars' => {},
-              'index_name' => 'cp',
-              'index_type_command' => 'cindex'
+              'index_name' => 'cp'
             }
           },
           'info' => {
@@ -509,10 +497,8 @@ $result_trees{'index_no_node_no_top'} = {
               'entry_element' => {},
               'entry_number' => 7,
               'in_code' => 0,
-              'index_at_command' => 'cindex',
               'index_ignore_chars' => {},
-              'index_name' => 'cp',
-              'index_type_command' => 'cindex'
+              'index_name' => 'cp'
             }
           },
           'info' => {
@@ -552,10 +538,8 @@ $result_trees{'index_no_node_no_top'} = {
               'entry_element' => {},
               'entry_number' => 8,
               'in_code' => 0,
-              'index_at_command' => 'cindex',
               'index_ignore_chars' => {},
-              'index_name' => 'cp',
-              'index_type_command' => 'cindex'
+              'index_name' => 'cp'
             }
           },
           'info' => {
@@ -595,10 +579,8 @@ $result_trees{'index_no_node_no_top'} = {
               'entry_element' => {},
               'entry_number' => 9,
               'in_code' => 0,
-              'index_at_command' => 'cindex',
               'index_ignore_chars' => {},
-              'index_name' => 'cp',
-              'index_type_command' => 'cindex'
+              'index_name' => 'cp'
             }
           },
           'info' => {
@@ -691,10 +673,8 @@ $result_trees{'index_no_node_no_top'} = {
               'entry_element' => {},
               'entry_number' => 10,
               'in_code' => 0,
-              'index_at_command' => 'cindex',
               'index_ignore_chars' => {},
-              'index_name' => 'cp',
-              'index_type_command' => 'cindex'
+              'index_name' => 'cp'
             }
           },
           'info' => {
@@ -814,10 +794,8 @@ $result_trees{'index_no_node_no_top'} = {
               'entry_element' => {},
               'entry_number' => 11,
               'in_code' => 0,
-              'index_at_command' => 'cindex',
               'index_ignore_chars' => {},
-              'index_name' => 'cp',
-              'index_type_command' => 'cindex'
+              'index_name' => 'cp'
             }
           },
           'info' => {
@@ -863,10 +841,8 @@ $result_trees{'index_no_node_no_top'} = {
                   'entry_element' => {},
                   'entry_number' => 12,
                   'in_code' => 0,
-                  'index_at_command' => 'cindex',
                   'index_ignore_chars' => {},
-                  'index_name' => 'cp',
-                  'index_type_command' => 'cindex'
+                  'index_name' => 'cp'
                 }
               },
               'info' => {
@@ -979,10 +955,8 @@ $result_trees{'index_no_node_no_top'} = {
               'entry_element' => {},
               'entry_number' => 13,
               'in_code' => 0,
-              'index_at_command' => 'cindex',
               'index_ignore_chars' => {},
-              'index_name' => 'cp',
-              'index_type_command' => 'cindex'
+              'index_name' => 'cp'
             }
           },
           'info' => {
@@ -1067,10 +1041,8 @@ $result_trees{'index_no_node_no_top'} = {
                   'entry_element' => {},
                   'entry_number' => 14,
                   'in_code' => 0,
-                  'index_at_command' => 'cindex',
                   'index_ignore_chars' => {},
-                  'index_name' => 'cp',
-                  'index_type_command' => 'cindex'
+                  'index_name' => 'cp'
                 }
               },
               'info' => {
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 abda0cbe83..f61cb0c66c 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
@@ -53,10 +53,8 @@ $result_trees{'index_no_node_no_top_no_node'} = {
               'entry_element' => {},
               'entry_number' => 1,
               'in_code' => 0,
-              'index_at_command' => 'cindex',
               'index_ignore_chars' => {},
-              'index_name' => 'cp',
-              'index_type_command' => 'cindex'
+              'index_name' => 'cp'
             }
           },
           'info' => {
@@ -205,10 +203,8 @@ $result_trees{'index_no_node_no_top_no_node'} = {
               'entry_element' => {},
               'entry_number' => 2,
               'in_code' => 0,
-              'index_at_command' => 'cindex',
               'index_ignore_chars' => {},
-              'index_name' => 'cp',
-              'index_type_command' => 'cindex'
+              'index_name' => 'cp'
             }
           },
           'info' => {
@@ -254,10 +250,8 @@ $result_trees{'index_no_node_no_top_no_node'} = {
                   'entry_element' => {},
                   'entry_number' => 3,
                   'in_code' => 0,
-                  'index_at_command' => 'cindex',
                   'index_ignore_chars' => {},
-                  'index_name' => 'cp',
-                  'index_type_command' => 'cindex'
+                  'index_name' => 'cp'
                 }
               },
               'info' => {
@@ -380,10 +374,8 @@ $result_trees{'index_no_node_no_top_no_node'} = {
               'entry_element' => {},
               'entry_number' => 4,
               'in_code' => 0,
-              'index_at_command' => 'cindex',
               'index_ignore_chars' => {},
-              'index_name' => 'cp',
-              'index_type_command' => 'cindex'
+              'index_name' => 'cp'
             }
           },
           'info' => {
@@ -423,10 +415,8 @@ $result_trees{'index_no_node_no_top_no_node'} = {
               'entry_element' => {},
               'entry_number' => 5,
               'in_code' => 0,
-              'index_at_command' => 'cindex',
               'index_ignore_chars' => {},
-              'index_name' => 'cp',
-              'index_type_command' => 'cindex'
+              'index_name' => 'cp'
             }
           },
           'info' => {
@@ -466,10 +456,8 @@ $result_trees{'index_no_node_no_top_no_node'} = {
               'entry_element' => {},
               'entry_number' => 6,
               'in_code' => 0,
-              'index_at_command' => 'cindex',
               'index_ignore_chars' => {},
-              'index_name' => 'cp',
-              'index_type_command' => 'cindex'
+              'index_name' => 'cp'
             }
           },
           'info' => {
@@ -509,10 +497,8 @@ $result_trees{'index_no_node_no_top_no_node'} = {
               'entry_element' => {},
               'entry_number' => 7,
               'in_code' => 0,
-              'index_at_command' => 'cindex',
               'index_ignore_chars' => {},
-              'index_name' => 'cp',
-              'index_type_command' => 'cindex'
+              'index_name' => 'cp'
             }
           },
           'info' => {
@@ -552,10 +538,8 @@ $result_trees{'index_no_node_no_top_no_node'} = {
               'entry_element' => {},
               'entry_number' => 8,
               'in_code' => 0,
-              'index_at_command' => 'cindex',
               'index_ignore_chars' => {},
-              'index_name' => 'cp',
-              'index_type_command' => 'cindex'
+              'index_name' => 'cp'
             }
           },
           'info' => {
@@ -595,10 +579,8 @@ $result_trees{'index_no_node_no_top_no_node'} = {
               'entry_element' => {},
               'entry_number' => 9,
               'in_code' => 0,
-              'index_at_command' => 'cindex',
               'index_ignore_chars' => {},
-              'index_name' => 'cp',
-              'index_type_command' => 'cindex'
+              'index_name' => 'cp'
             }
           },
           'info' => {
@@ -691,10 +673,8 @@ $result_trees{'index_no_node_no_top_no_node'} = {
               'entry_element' => {},
               'entry_number' => 10,
               'in_code' => 0,
-              'index_at_command' => 'cindex',
               'index_ignore_chars' => {},
-              'index_name' => 'cp',
-              'index_type_command' => 'cindex'
+              'index_name' => 'cp'
             }
           },
           'info' => {
@@ -814,10 +794,8 @@ $result_trees{'index_no_node_no_top_no_node'} = {
               'entry_element' => {},
               'entry_number' => 11,
               'in_code' => 0,
-              'index_at_command' => 'cindex',
               'index_ignore_chars' => {},
-              'index_name' => 'cp',
-              'index_type_command' => 'cindex'
+              'index_name' => 'cp'
             }
           },
           'info' => {
@@ -863,10 +841,8 @@ $result_trees{'index_no_node_no_top_no_node'} = {
                   'entry_element' => {},
                   'entry_number' => 12,
                   'in_code' => 0,
-                  'index_at_command' => 'cindex',
                   'index_ignore_chars' => {},
-                  'index_name' => 'cp',
-                  'index_type_command' => 'cindex'
+                  'index_name' => 'cp'
                 }
               },
               'info' => {
@@ -979,10 +955,8 @@ $result_trees{'index_no_node_no_top_no_node'} = {
               'entry_element' => {},
               'entry_number' => 13,
               'in_code' => 0,
-              'index_at_command' => 'cindex',
               'index_ignore_chars' => {},
-              'index_name' => 'cp',
-              'index_type_command' => 'cindex'
+              'index_name' => 'cp'
             }
           },
           'info' => {
@@ -1067,10 +1041,8 @@ $result_trees{'index_no_node_no_top_no_node'} = {
                   'entry_element' => {},
                   'entry_number' => 14,
                   'in_code' => 0,
-                  'index_at_command' => 'cindex',
                   'index_ignore_chars' => {},
-                  'index_name' => 'cp',
-                  'index_type_command' => 'cindex'
+                  'index_name' => 'cp'
                 }
               },
               'info' => {
diff --git a/tp/t/results/indices/index_nodes.pl 
b/tp/t/results/indices/index_nodes.pl
index 8a60a0cbb5..c63d49810f 100644
--- a/tp/t/results/indices/index_nodes.pl
+++ b/tp/t/results/indices/index_nodes.pl
@@ -76,10 +76,8 @@ $result_trees{'index_nodes'} = {
               'entry_node' => {},
               'entry_number' => 1,
               'in_code' => 0,
-              'index_at_command' => 'cindex',
               'index_ignore_chars' => {},
-              'index_name' => 'cp',
-              'index_type_command' => 'cindex'
+              'index_name' => 'cp'
             }
           },
           'info' => {
@@ -436,10 +434,8 @@ $result_trees{'index_nodes'} = {
                   'entry_node' => {},
                   'entry_number' => 2,
                   'in_code' => 0,
-                  'index_at_command' => 'cindex',
                   'index_ignore_chars' => {},
-                  'index_name' => 'cp',
-                  'index_type_command' => 'cindex'
+                  'index_name' => 'cp'
                 }
               },
               'info' => {
@@ -480,10 +476,8 @@ $result_trees{'index_nodes'} = {
                   'entry_node' => {},
                   'entry_number' => 3,
                   'in_code' => 0,
-                  'index_at_command' => 'cindex',
                   'index_ignore_chars' => {},
-                  'index_name' => 'cp',
-                  'index_type_command' => 'cindex'
+                  'index_name' => 'cp'
                 }
               },
               'info' => {
@@ -524,10 +518,8 @@ $result_trees{'index_nodes'} = {
                   'entry_node' => {},
                   'entry_number' => 1,
                   'in_code' => 1,
-                  'index_at_command' => 'findex',
                   'index_ignore_chars' => {},
-                  'index_name' => 'fn',
-                  'index_type_command' => 'findex'
+                  'index_name' => 'fn'
                 }
               },
               'info' => {
@@ -568,10 +560,8 @@ $result_trees{'index_nodes'} = {
                   'entry_node' => {},
                   'entry_number' => 4,
                   'in_code' => 0,
-                  'index_at_command' => 'cindex',
                   'index_ignore_chars' => {},
-                  'index_name' => 'cp',
-                  'index_type_command' => 'cindex'
+                  'index_name' => 'cp'
                 }
               },
               'info' => {
@@ -1122,10 +1112,8 @@ $result_trees{'index_nodes'} = {
               'entry_node' => {},
               'entry_number' => 5,
               'in_code' => 0,
-              'index_at_command' => 'cindex',
               'index_ignore_chars' => {},
-              'index_name' => 'cp',
-              'index_type_command' => 'cindex'
+              'index_name' => 'cp'
             }
           },
           'info' => {
@@ -1166,10 +1154,8 @@ $result_trees{'index_nodes'} = {
               'entry_node' => {},
               'entry_number' => 2,
               'in_code' => 1,
-              'index_at_command' => 'findex',
               'index_ignore_chars' => {},
-              'index_name' => 'fn',
-              'index_type_command' => 'findex'
+              'index_name' => 'fn'
             }
           },
           'info' => {
@@ -1210,10 +1196,8 @@ $result_trees{'index_nodes'} = {
               'entry_node' => {},
               'entry_number' => 6,
               'in_code' => 0,
-              'index_at_command' => 'cindex',
               'index_ignore_chars' => {},
-              'index_name' => 'cp',
-              'index_type_command' => 'cindex'
+              'index_name' => 'cp'
             }
           },
           'info' => {
@@ -1346,10 +1330,8 @@ $result_trees{'index_nodes'} = {
               'entry_node' => {},
               'entry_number' => 7,
               'in_code' => 0,
-              'index_at_command' => 'cindex',
               'index_ignore_chars' => {},
-              'index_name' => 'cp',
-              'index_type_command' => 'cindex'
+              'index_name' => 'cp'
             }
           },
           'info' => {
@@ -1434,10 +1416,8 @@ $result_trees{'index_nodes'} = {
               'entry_node' => {},
               'entry_number' => 3,
               'in_code' => 1,
-              'index_at_command' => 'findex',
               'index_ignore_chars' => {},
-              'index_name' => 'fn',
-              'index_type_command' => 'findex'
+              'index_name' => 'fn'
             }
           },
           'info' => {
@@ -1478,10 +1458,8 @@ $result_trees{'index_nodes'} = {
               'entry_node' => {},
               'entry_number' => 8,
               'in_code' => 0,
-              'index_at_command' => 'cindex',
               'index_ignore_chars' => {},
-              'index_name' => 'cp',
-              'index_type_command' => 'cindex'
+              'index_name' => 'cp'
             }
           },
           'info' => {
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 a3a2de3664..b7ed7977e1 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
@@ -76,10 +76,8 @@ $result_trees{'index_nodes_no_split_no_use_nodes'} = {
               'entry_node' => {},
               'entry_number' => 1,
               'in_code' => 0,
-              'index_at_command' => 'cindex',
               'index_ignore_chars' => {},
-              'index_name' => 'cp',
-              'index_type_command' => 'cindex'
+              'index_name' => 'cp'
             }
           },
           'info' => {
@@ -436,10 +434,8 @@ $result_trees{'index_nodes_no_split_no_use_nodes'} = {
                   'entry_node' => {},
                   'entry_number' => 2,
                   'in_code' => 0,
-                  'index_at_command' => 'cindex',
                   'index_ignore_chars' => {},
-                  'index_name' => 'cp',
-                  'index_type_command' => 'cindex'
+                  'index_name' => 'cp'
                 }
               },
               'info' => {
@@ -480,10 +476,8 @@ $result_trees{'index_nodes_no_split_no_use_nodes'} = {
                   'entry_node' => {},
                   'entry_number' => 3,
                   'in_code' => 0,
-                  'index_at_command' => 'cindex',
                   'index_ignore_chars' => {},
-                  'index_name' => 'cp',
-                  'index_type_command' => 'cindex'
+                  'index_name' => 'cp'
                 }
               },
               'info' => {
@@ -524,10 +518,8 @@ $result_trees{'index_nodes_no_split_no_use_nodes'} = {
                   'entry_node' => {},
                   'entry_number' => 1,
                   'in_code' => 1,
-                  'index_at_command' => 'findex',
                   'index_ignore_chars' => {},
-                  'index_name' => 'fn',
-                  'index_type_command' => 'findex'
+                  'index_name' => 'fn'
                 }
               },
               'info' => {
@@ -568,10 +560,8 @@ $result_trees{'index_nodes_no_split_no_use_nodes'} = {
                   'entry_node' => {},
                   'entry_number' => 4,
                   'in_code' => 0,
-                  'index_at_command' => 'cindex',
                   'index_ignore_chars' => {},
-                  'index_name' => 'cp',
-                  'index_type_command' => 'cindex'
+                  'index_name' => 'cp'
                 }
               },
               'info' => {
@@ -1122,10 +1112,8 @@ $result_trees{'index_nodes_no_split_no_use_nodes'} = {
               'entry_node' => {},
               'entry_number' => 5,
               'in_code' => 0,
-              'index_at_command' => 'cindex',
               'index_ignore_chars' => {},
-              'index_name' => 'cp',
-              'index_type_command' => 'cindex'
+              'index_name' => 'cp'
             }
           },
           'info' => {
@@ -1166,10 +1154,8 @@ $result_trees{'index_nodes_no_split_no_use_nodes'} = {
               'entry_node' => {},
               'entry_number' => 2,
               'in_code' => 1,
-              'index_at_command' => 'findex',
               'index_ignore_chars' => {},
-              'index_name' => 'fn',
-              'index_type_command' => 'findex'
+              'index_name' => 'fn'
             }
           },
           'info' => {
@@ -1210,10 +1196,8 @@ $result_trees{'index_nodes_no_split_no_use_nodes'} = {
               'entry_node' => {},
               'entry_number' => 6,
               'in_code' => 0,
-              'index_at_command' => 'cindex',
               'index_ignore_chars' => {},
-              'index_name' => 'cp',
-              'index_type_command' => 'cindex'
+              'index_name' => 'cp'
             }
           },
           'info' => {
@@ -1346,10 +1330,8 @@ $result_trees{'index_nodes_no_split_no_use_nodes'} = {
               'entry_node' => {},
               'entry_number' => 7,
               'in_code' => 0,
-              'index_at_command' => 'cindex',
               'index_ignore_chars' => {},
-              'index_name' => 'cp',
-              'index_type_command' => 'cindex'
+              'index_name' => 'cp'
             }
           },
           'info' => {
@@ -1434,10 +1416,8 @@ $result_trees{'index_nodes_no_split_no_use_nodes'} = {
               'entry_node' => {},
               'entry_number' => 3,
               'in_code' => 1,
-              'index_at_command' => 'findex',
               'index_ignore_chars' => {},
-              'index_name' => 'fn',
-              'index_type_command' => 'findex'
+              'index_name' => 'fn'
             }
           },
           'info' => {
@@ -1478,10 +1458,8 @@ $result_trees{'index_nodes_no_split_no_use_nodes'} = {
               'entry_node' => {},
               'entry_number' => 8,
               'in_code' => 0,
-              'index_at_command' => 'cindex',
               'index_ignore_chars' => {},
-              'index_name' => 'cp',
-              'index_type_command' => 'cindex'
+              'index_name' => 'cp'
             }
           },
           'info' => {
diff --git a/tp/t/results/indices/index_special_region.pl 
b/tp/t/results/indices/index_special_region.pl
index d4fa8a22db..5684265a21 100644
--- a/tp/t/results/indices/index_special_region.pl
+++ b/tp/t/results/indices/index_special_region.pl
@@ -71,10 +71,8 @@ $result_trees{'index_special_region'} = {
                       'entry_number' => 1,
                       'entry_region' => 'copying',
                       'in_code' => 0,
-                      'index_at_command' => 'cindex',
                       'index_ignore_chars' => {},
-                      'index_name' => 'cp',
-                      'index_type_command' => 'cindex'
+                      'index_name' => 'cp'
                     }
                   },
                   'info' => {
@@ -214,10 +212,8 @@ $result_trees{'index_special_region'} = {
                                   'entry_number' => 2,
                                   'entry_region' => 'copying',
                                   'in_code' => 0,
-                                  'index_at_command' => 'cindex',
                                   'index_ignore_chars' => {},
-                                  'index_name' => 'cp',
-                                  'index_type_command' => 'cindex'
+                                  'index_name' => 'cp'
                                 }
                               },
                               'info' => {
@@ -383,10 +379,8 @@ $result_trees{'index_special_region'} = {
                       'entry_number' => 3,
                       'entry_region' => 'titlepage',
                       'in_code' => 0,
-                      'index_at_command' => 'cindex',
                       'index_ignore_chars' => {},
-                      'index_name' => 'cp',
-                      'index_type_command' => 'cindex'
+                      'index_name' => 'cp'
                     }
                   },
                   'info' => {
@@ -519,10 +513,8 @@ $result_trees{'index_special_region'} = {
                                   'entry_number' => 4,
                                   'entry_region' => 'titlepage',
                                   'in_code' => 0,
-                                  'index_at_command' => 'cindex',
                                   'index_ignore_chars' => {},
-                                  'index_name' => 'cp',
-                                  'index_type_command' => 'cindex'
+                                  'index_name' => 'cp'
                                 }
                               },
                               'info' => {
@@ -798,10 +790,8 @@ $result_trees{'index_special_region'} = {
               'entry_node' => {},
               'entry_number' => 1,
               'in_code' => 1,
-              'index_at_command' => 'findex',
               'index_ignore_chars' => {},
-              'index_name' => 'fn',
-              'index_type_command' => 'findex'
+              'index_name' => 'fn'
             }
           },
           'info' => {
@@ -1142,10 +1132,8 @@ $result_trees{'index_special_region'} = {
                           'entry_node' => {},
                           'entry_number' => 2,
                           'in_code' => 1,
-                          'index_at_command' => 'item',
                           'index_ignore_chars' => {},
-                          'index_name' => 'fn',
-                          'index_type_command' => 'ftable'
+                          'index_name' => 'fn'
                         }
                       },
                       'info' => {
@@ -1438,10 +1426,8 @@ $result_trees{'index_special_region'} = {
               'entry_node' => {},
               'entry_number' => 3,
               'in_code' => 1,
-              'index_at_command' => 'findex',
               'index_ignore_chars' => {},
-              'index_name' => 'fn',
-              'index_type_command' => 'findex'
+              'index_name' => 'fn'
             }
           },
           'info' => {
@@ -1487,10 +1473,8 @@ $result_trees{'index_special_region'} = {
               'entry_node' => {},
               'entry_number' => 5,
               'in_code' => 0,
-              'index_at_command' => 'cindex',
               'index_ignore_chars' => {},
-              'index_name' => 'cp',
-              'index_type_command' => 'cindex'
+              'index_name' => 'cp'
             }
           },
           'info' => {
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 40a5487e35..e02817fef7 100644
--- a/tp/t/results/indices/index_special_region_no_insertcopying.pl
+++ b/tp/t/results/indices/index_special_region_no_insertcopying.pl
@@ -71,10 +71,8 @@ $result_trees{'index_special_region_no_insertcopying'} = {
                       'entry_number' => 1,
                       'entry_region' => 'copying',
                       'in_code' => 0,
-                      'index_at_command' => 'cindex',
                       'index_ignore_chars' => {},
-                      'index_name' => 'cp',
-                      'index_type_command' => 'cindex'
+                      'index_name' => 'cp'
                     }
                   },
                   'info' => {
@@ -214,10 +212,8 @@ $result_trees{'index_special_region_no_insertcopying'} = {
                                   'entry_number' => 2,
                                   'entry_region' => 'copying',
                                   'in_code' => 0,
-                                  'index_at_command' => 'cindex',
                                   'index_ignore_chars' => {},
-                                  'index_name' => 'cp',
-                                  'index_type_command' => 'cindex'
+                                  'index_name' => 'cp'
                                 }
                               },
                               'info' => {
@@ -383,10 +379,8 @@ $result_trees{'index_special_region_no_insertcopying'} = {
                       'entry_number' => 3,
                       'entry_region' => 'titlepage',
                       'in_code' => 0,
-                      'index_at_command' => 'cindex',
                       'index_ignore_chars' => {},
-                      'index_name' => 'cp',
-                      'index_type_command' => 'cindex'
+                      'index_name' => 'cp'
                     }
                   },
                   'info' => {
@@ -519,10 +513,8 @@ $result_trees{'index_special_region_no_insertcopying'} = {
                                   'entry_number' => 4,
                                   'entry_region' => 'titlepage',
                                   'in_code' => 0,
-                                  'index_at_command' => 'cindex',
                                   'index_ignore_chars' => {},
-                                  'index_name' => 'cp',
-                                  'index_type_command' => 'cindex'
+                                  'index_name' => 'cp'
                                 }
                               },
                               'info' => {
@@ -799,10 +791,8 @@ $result_trees{'index_special_region_no_insertcopying'} = {
               'entry_node' => {},
               'entry_number' => 1,
               'in_code' => 1,
-              'index_at_command' => 'findex',
               'index_ignore_chars' => {},
-              'index_name' => 'fn',
-              'index_type_command' => 'findex'
+              'index_name' => 'fn'
             }
           },
           'info' => {
@@ -1143,10 +1133,8 @@ $result_trees{'index_special_region_no_insertcopying'} = 
{
                           'entry_node' => {},
                           'entry_number' => 2,
                           'in_code' => 1,
-                          'index_at_command' => 'item',
                           'index_ignore_chars' => {},
-                          'index_name' => 'fn',
-                          'index_type_command' => 'ftable'
+                          'index_name' => 'fn'
                         }
                       },
                       'info' => {
@@ -1439,10 +1427,8 @@ $result_trees{'index_special_region_no_insertcopying'} = 
{
               'entry_node' => {},
               'entry_number' => 3,
               'in_code' => 1,
-              'index_at_command' => 'findex',
               'index_ignore_chars' => {},
-              'index_name' => 'fn',
-              'index_type_command' => 'findex'
+              'index_name' => 'fn'
             }
           },
           'info' => {
@@ -1488,10 +1474,8 @@ $result_trees{'index_special_region_no_insertcopying'} = 
{
               'entry_node' => {},
               'entry_number' => 5,
               'in_code' => 0,
-              'index_at_command' => 'cindex',
               'index_ignore_chars' => {},
-              'index_name' => 'cp',
-              'index_type_command' => 'cindex'
+              'index_name' => 'cp'
             }
           },
           'info' => {
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 20aad8cd9c..e84599f5f5 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
@@ -71,10 +71,8 @@ 
$result_trees{'index_special_region_no_insertcopying_no_titlepage_no_nodes'} = {
                       'entry_number' => 1,
                       'entry_region' => 'copying',
                       'in_code' => 0,
-                      'index_at_command' => 'cindex',
                       'index_ignore_chars' => {},
-                      'index_name' => 'cp',
-                      'index_type_command' => 'cindex'
+                      'index_name' => 'cp'
                     }
                   },
                   'info' => {
@@ -214,10 +212,8 @@ 
$result_trees{'index_special_region_no_insertcopying_no_titlepage_no_nodes'} = {
                                   'entry_number' => 2,
                                   'entry_region' => 'copying',
                                   'in_code' => 0,
-                                  'index_at_command' => 'cindex',
                                   'index_ignore_chars' => {},
-                                  'index_name' => 'cp',
-                                  'index_type_command' => 'cindex'
+                                  'index_name' => 'cp'
                                 }
                               },
                               'info' => {
@@ -383,10 +379,8 @@ 
$result_trees{'index_special_region_no_insertcopying_no_titlepage_no_nodes'} = {
                       'entry_number' => 3,
                       'entry_region' => 'titlepage',
                       'in_code' => 0,
-                      'index_at_command' => 'cindex',
                       'index_ignore_chars' => {},
-                      'index_name' => 'cp',
-                      'index_type_command' => 'cindex'
+                      'index_name' => 'cp'
                     }
                   },
                   'info' => {
@@ -519,10 +513,8 @@ 
$result_trees{'index_special_region_no_insertcopying_no_titlepage_no_nodes'} = {
                                   'entry_number' => 4,
                                   'entry_region' => 'titlepage',
                                   'in_code' => 0,
-                                  'index_at_command' => 'cindex',
                                   'index_ignore_chars' => {},
-                                  'index_name' => 'cp',
-                                  'index_type_command' => 'cindex'
+                                  'index_name' => 'cp'
                                 }
                               },
                               'info' => {
@@ -799,10 +791,8 @@ 
$result_trees{'index_special_region_no_insertcopying_no_titlepage_no_nodes'} = {
               'entry_node' => {},
               'entry_number' => 1,
               'in_code' => 1,
-              'index_at_command' => 'findex',
               'index_ignore_chars' => {},
-              'index_name' => 'fn',
-              'index_type_command' => 'findex'
+              'index_name' => 'fn'
             }
           },
           'info' => {
@@ -1143,10 +1133,8 @@ 
$result_trees{'index_special_region_no_insertcopying_no_titlepage_no_nodes'} = {
                           'entry_node' => {},
                           'entry_number' => 2,
                           'in_code' => 1,
-                          'index_at_command' => 'item',
                           'index_ignore_chars' => {},
-                          'index_name' => 'fn',
-                          'index_type_command' => 'ftable'
+                          'index_name' => 'fn'
                         }
                       },
                       'info' => {
@@ -1439,10 +1427,8 @@ 
$result_trees{'index_special_region_no_insertcopying_no_titlepage_no_nodes'} = {
               'entry_node' => {},
               'entry_number' => 3,
               'in_code' => 1,
-              'index_at_command' => 'findex',
               'index_ignore_chars' => {},
-              'index_name' => 'fn',
-              'index_type_command' => 'findex'
+              'index_name' => 'fn'
             }
           },
           'info' => {
@@ -1488,10 +1474,8 @@ 
$result_trees{'index_special_region_no_insertcopying_no_titlepage_no_nodes'} = {
               'entry_node' => {},
               'entry_number' => 5,
               'in_code' => 0,
-              'index_at_command' => 'cindex',
               'index_ignore_chars' => {},
-              'index_name' => 'cp',
-              'index_type_command' => 'cindex'
+              'index_name' => 'cp'
             }
           },
           'info' => {
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 76698ee925..8622c3b69a 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
@@ -71,10 +71,8 @@ 
$result_trees{'index_special_region_no_insertcopying_titlepage_no_nodes'} = {
                       'entry_number' => 1,
                       'entry_region' => 'copying',
                       'in_code' => 0,
-                      'index_at_command' => 'cindex',
                       'index_ignore_chars' => {},
-                      'index_name' => 'cp',
-                      'index_type_command' => 'cindex'
+                      'index_name' => 'cp'
                     }
                   },
                   'info' => {
@@ -214,10 +212,8 @@ 
$result_trees{'index_special_region_no_insertcopying_titlepage_no_nodes'} = {
                                   'entry_number' => 2,
                                   'entry_region' => 'copying',
                                   'in_code' => 0,
-                                  'index_at_command' => 'cindex',
                                   'index_ignore_chars' => {},
-                                  'index_name' => 'cp',
-                                  'index_type_command' => 'cindex'
+                                  'index_name' => 'cp'
                                 }
                               },
                               'info' => {
@@ -383,10 +379,8 @@ 
$result_trees{'index_special_region_no_insertcopying_titlepage_no_nodes'} = {
                       'entry_number' => 3,
                       'entry_region' => 'titlepage',
                       'in_code' => 0,
-                      'index_at_command' => 'cindex',
                       'index_ignore_chars' => {},
-                      'index_name' => 'cp',
-                      'index_type_command' => 'cindex'
+                      'index_name' => 'cp'
                     }
                   },
                   'info' => {
@@ -519,10 +513,8 @@ 
$result_trees{'index_special_region_no_insertcopying_titlepage_no_nodes'} = {
                                   'entry_number' => 4,
                                   'entry_region' => 'titlepage',
                                   'in_code' => 0,
-                                  'index_at_command' => 'cindex',
                                   'index_ignore_chars' => {},
-                                  'index_name' => 'cp',
-                                  'index_type_command' => 'cindex'
+                                  'index_name' => 'cp'
                                 }
                               },
                               'info' => {
@@ -799,10 +791,8 @@ 
$result_trees{'index_special_region_no_insertcopying_titlepage_no_nodes'} = {
               'entry_node' => {},
               'entry_number' => 1,
               'in_code' => 1,
-              'index_at_command' => 'findex',
               'index_ignore_chars' => {},
-              'index_name' => 'fn',
-              'index_type_command' => 'findex'
+              'index_name' => 'fn'
             }
           },
           'info' => {
@@ -1143,10 +1133,8 @@ 
$result_trees{'index_special_region_no_insertcopying_titlepage_no_nodes'} = {
                           'entry_node' => {},
                           'entry_number' => 2,
                           'in_code' => 1,
-                          'index_at_command' => 'item',
                           'index_ignore_chars' => {},
-                          'index_name' => 'fn',
-                          'index_type_command' => 'ftable'
+                          'index_name' => 'fn'
                         }
                       },
                       'info' => {
@@ -1439,10 +1427,8 @@ 
$result_trees{'index_special_region_no_insertcopying_titlepage_no_nodes'} = {
               'entry_node' => {},
               'entry_number' => 3,
               'in_code' => 1,
-              'index_at_command' => 'findex',
               'index_ignore_chars' => {},
-              'index_name' => 'fn',
-              'index_type_command' => 'findex'
+              'index_name' => 'fn'
             }
           },
           'info' => {
@@ -1488,10 +1474,8 @@ 
$result_trees{'index_special_region_no_insertcopying_titlepage_no_nodes'} = {
               'entry_node' => {},
               'entry_number' => 5,
               'in_code' => 0,
-              'index_at_command' => 'cindex',
               'index_ignore_chars' => {},
-              'index_name' => 'cp',
-              'index_type_command' => 'cindex'
+              'index_name' => 'cp'
             }
           },
           'info' => {
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 526d00825b..83231f9c57 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
@@ -71,10 +71,8 @@ 
$result_trees{'index_special_region_no_insertcopying_titlepage_no_nodes_footnote
                       'entry_number' => 1,
                       'entry_region' => 'copying',
                       'in_code' => 0,
-                      'index_at_command' => 'cindex',
                       'index_ignore_chars' => {},
-                      'index_name' => 'cp',
-                      'index_type_command' => 'cindex'
+                      'index_name' => 'cp'
                     }
                   },
                   'info' => {
@@ -214,10 +212,8 @@ 
$result_trees{'index_special_region_no_insertcopying_titlepage_no_nodes_footnote
                                   'entry_number' => 2,
                                   'entry_region' => 'copying',
                                   'in_code' => 0,
-                                  'index_at_command' => 'cindex',
                                   'index_ignore_chars' => {},
-                                  'index_name' => 'cp',
-                                  'index_type_command' => 'cindex'
+                                  'index_name' => 'cp'
                                 }
                               },
                               'info' => {
@@ -383,10 +379,8 @@ 
$result_trees{'index_special_region_no_insertcopying_titlepage_no_nodes_footnote
                       'entry_number' => 3,
                       'entry_region' => 'titlepage',
                       'in_code' => 0,
-                      'index_at_command' => 'cindex',
                       'index_ignore_chars' => {},
-                      'index_name' => 'cp',
-                      'index_type_command' => 'cindex'
+                      'index_name' => 'cp'
                     }
                   },
                   'info' => {
@@ -519,10 +513,8 @@ 
$result_trees{'index_special_region_no_insertcopying_titlepage_no_nodes_footnote
                                   'entry_number' => 4,
                                   'entry_region' => 'titlepage',
                                   'in_code' => 0,
-                                  'index_at_command' => 'cindex',
                                   'index_ignore_chars' => {},
-                                  'index_name' => 'cp',
-                                  'index_type_command' => 'cindex'
+                                  'index_name' => 'cp'
                                 }
                               },
                               'info' => {
@@ -799,10 +791,8 @@ 
$result_trees{'index_special_region_no_insertcopying_titlepage_no_nodes_footnote
               'entry_node' => {},
               'entry_number' => 1,
               'in_code' => 1,
-              'index_at_command' => 'findex',
               'index_ignore_chars' => {},
-              'index_name' => 'fn',
-              'index_type_command' => 'findex'
+              'index_name' => 'fn'
             }
           },
           'info' => {
@@ -1143,10 +1133,8 @@ 
$result_trees{'index_special_region_no_insertcopying_titlepage_no_nodes_footnote
                           'entry_node' => {},
                           'entry_number' => 2,
                           'in_code' => 1,
-                          'index_at_command' => 'item',
                           'index_ignore_chars' => {},
-                          'index_name' => 'fn',
-                          'index_type_command' => 'ftable'
+                          'index_name' => 'fn'
                         }
                       },
                       'info' => {
@@ -1439,10 +1427,8 @@ 
$result_trees{'index_special_region_no_insertcopying_titlepage_no_nodes_footnote
               'entry_node' => {},
               'entry_number' => 3,
               'in_code' => 1,
-              'index_at_command' => 'findex',
               'index_ignore_chars' => {},
-              'index_name' => 'fn',
-              'index_type_command' => 'findex'
+              'index_name' => 'fn'
             }
           },
           'info' => {
@@ -1488,10 +1474,8 @@ 
$result_trees{'index_special_region_no_insertcopying_titlepage_no_nodes_footnote
               'entry_node' => {},
               'entry_number' => 5,
               'in_code' => 0,
-              'index_at_command' => 'cindex',
               'index_ignore_chars' => {},
-              'index_name' => 'cp',
-              'index_type_command' => 'cindex'
+              'index_name' => 'cp'
             }
           },
           'info' => {
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 af7580b20e..e8f9646db2 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
@@ -71,10 +71,8 @@ $result_trees{'index_special_region_no_titlepage_no_nodes'} 
= {
                       'entry_number' => 1,
                       'entry_region' => 'copying',
                       'in_code' => 0,
-                      'index_at_command' => 'cindex',
                       'index_ignore_chars' => {},
-                      'index_name' => 'cp',
-                      'index_type_command' => 'cindex'
+                      'index_name' => 'cp'
                     }
                   },
                   'info' => {
@@ -214,10 +212,8 @@ 
$result_trees{'index_special_region_no_titlepage_no_nodes'} = {
                                   'entry_number' => 2,
                                   'entry_region' => 'copying',
                                   'in_code' => 0,
-                                  'index_at_command' => 'cindex',
                                   'index_ignore_chars' => {},
-                                  'index_name' => 'cp',
-                                  'index_type_command' => 'cindex'
+                                  'index_name' => 'cp'
                                 }
                               },
                               'info' => {
@@ -383,10 +379,8 @@ 
$result_trees{'index_special_region_no_titlepage_no_nodes'} = {
                       'entry_number' => 3,
                       'entry_region' => 'titlepage',
                       'in_code' => 0,
-                      'index_at_command' => 'cindex',
                       'index_ignore_chars' => {},
-                      'index_name' => 'cp',
-                      'index_type_command' => 'cindex'
+                      'index_name' => 'cp'
                     }
                   },
                   'info' => {
@@ -519,10 +513,8 @@ 
$result_trees{'index_special_region_no_titlepage_no_nodes'} = {
                                   'entry_number' => 4,
                                   'entry_region' => 'titlepage',
                                   'in_code' => 0,
-                                  'index_at_command' => 'cindex',
                                   'index_ignore_chars' => {},
-                                  'index_name' => 'cp',
-                                  'index_type_command' => 'cindex'
+                                  'index_name' => 'cp'
                                 }
                               },
                               'info' => {
@@ -798,10 +790,8 @@ 
$result_trees{'index_special_region_no_titlepage_no_nodes'} = {
               'entry_node' => {},
               'entry_number' => 1,
               'in_code' => 1,
-              'index_at_command' => 'findex',
               'index_ignore_chars' => {},
-              'index_name' => 'fn',
-              'index_type_command' => 'findex'
+              'index_name' => 'fn'
             }
           },
           'info' => {
@@ -1142,10 +1132,8 @@ 
$result_trees{'index_special_region_no_titlepage_no_nodes'} = {
                           'entry_node' => {},
                           'entry_number' => 2,
                           'in_code' => 1,
-                          'index_at_command' => 'item',
                           'index_ignore_chars' => {},
-                          'index_name' => 'fn',
-                          'index_type_command' => 'ftable'
+                          'index_name' => 'fn'
                         }
                       },
                       'info' => {
@@ -1438,10 +1426,8 @@ 
$result_trees{'index_special_region_no_titlepage_no_nodes'} = {
               'entry_node' => {},
               'entry_number' => 3,
               'in_code' => 1,
-              'index_at_command' => 'findex',
               'index_ignore_chars' => {},
-              'index_name' => 'fn',
-              'index_type_command' => 'findex'
+              'index_name' => 'fn'
             }
           },
           'info' => {
@@ -1487,10 +1473,8 @@ 
$result_trees{'index_special_region_no_titlepage_no_nodes'} = {
               'entry_node' => {},
               'entry_number' => 5,
               'in_code' => 0,
-              'index_at_command' => 'cindex',
               'index_ignore_chars' => {},
-              'index_name' => 'cp',
-              'index_type_command' => 'cindex'
+              'index_name' => 'cp'
             }
           },
           'info' => {
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 8bdf31f7be..a83073d366 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
@@ -71,10 +71,8 @@ $result_trees{'index_special_region_titlepage_no_nodes'} = {
                       'entry_number' => 1,
                       'entry_region' => 'copying',
                       'in_code' => 0,
-                      'index_at_command' => 'cindex',
                       'index_ignore_chars' => {},
-                      'index_name' => 'cp',
-                      'index_type_command' => 'cindex'
+                      'index_name' => 'cp'
                     }
                   },
                   'info' => {
@@ -214,10 +212,8 @@ $result_trees{'index_special_region_titlepage_no_nodes'} = 
{
                                   'entry_number' => 2,
                                   'entry_region' => 'copying',
                                   'in_code' => 0,
-                                  'index_at_command' => 'cindex',
                                   'index_ignore_chars' => {},
-                                  'index_name' => 'cp',
-                                  'index_type_command' => 'cindex'
+                                  'index_name' => 'cp'
                                 }
                               },
                               'info' => {
@@ -383,10 +379,8 @@ $result_trees{'index_special_region_titlepage_no_nodes'} = 
{
                       'entry_number' => 3,
                       'entry_region' => 'titlepage',
                       'in_code' => 0,
-                      'index_at_command' => 'cindex',
                       'index_ignore_chars' => {},
-                      'index_name' => 'cp',
-                      'index_type_command' => 'cindex'
+                      'index_name' => 'cp'
                     }
                   },
                   'info' => {
@@ -519,10 +513,8 @@ $result_trees{'index_special_region_titlepage_no_nodes'} = 
{
                                   'entry_number' => 4,
                                   'entry_region' => 'titlepage',
                                   'in_code' => 0,
-                                  'index_at_command' => 'cindex',
                                   'index_ignore_chars' => {},
-                                  'index_name' => 'cp',
-                                  'index_type_command' => 'cindex'
+                                  'index_name' => 'cp'
                                 }
                               },
                               'info' => {
@@ -798,10 +790,8 @@ $result_trees{'index_special_region_titlepage_no_nodes'} = 
{
               'entry_node' => {},
               'entry_number' => 1,
               'in_code' => 1,
-              'index_at_command' => 'findex',
               'index_ignore_chars' => {},
-              'index_name' => 'fn',
-              'index_type_command' => 'findex'
+              'index_name' => 'fn'
             }
           },
           'info' => {
@@ -1142,10 +1132,8 @@ $result_trees{'index_special_region_titlepage_no_nodes'} 
= {
                           'entry_node' => {},
                           'entry_number' => 2,
                           'in_code' => 1,
-                          'index_at_command' => 'item',
                           'index_ignore_chars' => {},
-                          'index_name' => 'fn',
-                          'index_type_command' => 'ftable'
+                          'index_name' => 'fn'
                         }
                       },
                       'info' => {
@@ -1438,10 +1426,8 @@ $result_trees{'index_special_region_titlepage_no_nodes'} 
= {
               'entry_node' => {},
               'entry_number' => 3,
               'in_code' => 1,
-              'index_at_command' => 'findex',
               'index_ignore_chars' => {},
-              'index_name' => 'fn',
-              'index_type_command' => 'findex'
+              'index_name' => 'fn'
             }
           },
           'info' => {
@@ -1487,10 +1473,8 @@ $result_trees{'index_special_region_titlepage_no_nodes'} 
= {
               'entry_node' => {},
               'entry_number' => 5,
               'in_code' => 0,
-              'index_at_command' => 'cindex',
               'index_ignore_chars' => {},
-              'index_name' => 'cp',
-              'index_type_command' => 'cindex'
+              'index_name' => 'cp'
             }
           },
           'info' => {
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 55ad690fff..937c1969eb 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
@@ -71,10 +71,8 @@ 
$result_trees{'index_special_region_titlepage_no_nodes_footnotes_default'} = {
                       'entry_number' => 1,
                       'entry_region' => 'copying',
                       'in_code' => 0,
-                      'index_at_command' => 'cindex',
                       'index_ignore_chars' => {},
-                      'index_name' => 'cp',
-                      'index_type_command' => 'cindex'
+                      'index_name' => 'cp'
                     }
                   },
                   'info' => {
@@ -214,10 +212,8 @@ 
$result_trees{'index_special_region_titlepage_no_nodes_footnotes_default'} = {
                                   'entry_number' => 2,
                                   'entry_region' => 'copying',
                                   'in_code' => 0,
-                                  'index_at_command' => 'cindex',
                                   'index_ignore_chars' => {},
-                                  'index_name' => 'cp',
-                                  'index_type_command' => 'cindex'
+                                  'index_name' => 'cp'
                                 }
                               },
                               'info' => {
@@ -383,10 +379,8 @@ 
$result_trees{'index_special_region_titlepage_no_nodes_footnotes_default'} = {
                       'entry_number' => 3,
                       'entry_region' => 'titlepage',
                       'in_code' => 0,
-                      'index_at_command' => 'cindex',
                       'index_ignore_chars' => {},
-                      'index_name' => 'cp',
-                      'index_type_command' => 'cindex'
+                      'index_name' => 'cp'
                     }
                   },
                   'info' => {
@@ -519,10 +513,8 @@ 
$result_trees{'index_special_region_titlepage_no_nodes_footnotes_default'} = {
                                   'entry_number' => 4,
                                   'entry_region' => 'titlepage',
                                   'in_code' => 0,
-                                  'index_at_command' => 'cindex',
                                   'index_ignore_chars' => {},
-                                  'index_name' => 'cp',
-                                  'index_type_command' => 'cindex'
+                                  'index_name' => 'cp'
                                 }
                               },
                               'info' => {
@@ -798,10 +790,8 @@ 
$result_trees{'index_special_region_titlepage_no_nodes_footnotes_default'} = {
               'entry_node' => {},
               'entry_number' => 1,
               'in_code' => 1,
-              'index_at_command' => 'findex',
               'index_ignore_chars' => {},
-              'index_name' => 'fn',
-              'index_type_command' => 'findex'
+              'index_name' => 'fn'
             }
           },
           'info' => {
@@ -1142,10 +1132,8 @@ 
$result_trees{'index_special_region_titlepage_no_nodes_footnotes_default'} = {
                           'entry_node' => {},
                           'entry_number' => 2,
                           'in_code' => 1,
-                          'index_at_command' => 'item',
                           'index_ignore_chars' => {},
-                          'index_name' => 'fn',
-                          'index_type_command' => 'ftable'
+                          'index_name' => 'fn'
                         }
                       },
                       'info' => {
@@ -1438,10 +1426,8 @@ 
$result_trees{'index_special_region_titlepage_no_nodes_footnotes_default'} = {
               'entry_node' => {},
               'entry_number' => 3,
               'in_code' => 1,
-              'index_at_command' => 'findex',
               'index_ignore_chars' => {},
-              'index_name' => 'fn',
-              'index_type_command' => 'findex'
+              'index_name' => 'fn'
             }
           },
           'info' => {
@@ -1487,10 +1473,8 @@ 
$result_trees{'index_special_region_titlepage_no_nodes_footnotes_default'} = {
               'entry_node' => {},
               'entry_number' => 5,
               'in_code' => 0,
-              'index_at_command' => 'cindex',
               'index_ignore_chars' => {},
-              'index_name' => 'cp',
-              'index_type_command' => 'cindex'
+              'index_name' => 'cp'
             }
           },
           'info' => {
diff --git a/tp/t/results/indices/index_split.pl 
b/tp/t/results/indices/index_split.pl
index 53c025c57f..6b12a8de2d 100644
--- a/tp/t/results/indices/index_split.pl
+++ b/tp/t/results/indices/index_split.pl
@@ -120,10 +120,8 @@ $result_trees{'index_split'} = {
               'entry_node' => {},
               'entry_number' => 1,
               'in_code' => 0,
-              'index_at_command' => 'cindex',
               'index_ignore_chars' => {},
-              'index_name' => 'cp',
-              'index_type_command' => 'cindex'
+              'index_name' => 'cp'
             }
           },
           'info' => {
@@ -545,10 +543,8 @@ $result_trees{'index_split'} = {
                   'entry_node' => {},
                   'entry_number' => 2,
                   'in_code' => 0,
-                  'index_at_command' => 'cindex',
                   'index_ignore_chars' => {},
-                  'index_name' => 'cp',
-                  'index_type_command' => 'cindex'
+                  'index_name' => 'cp'
                 }
               },
               'info' => {
@@ -589,10 +585,8 @@ $result_trees{'index_split'} = {
                   'entry_node' => {},
                   'entry_number' => 3,
                   'in_code' => 0,
-                  'index_at_command' => 'cindex',
                   'index_ignore_chars' => {},
-                  'index_name' => 'cp',
-                  'index_type_command' => 'cindex'
+                  'index_name' => 'cp'
                 }
               },
               'info' => {
@@ -633,10 +627,8 @@ $result_trees{'index_split'} = {
                   'entry_node' => {},
                   'entry_number' => 1,
                   'in_code' => 1,
-                  'index_at_command' => 'findex',
                   'index_ignore_chars' => {},
-                  'index_name' => 'fn',
-                  'index_type_command' => 'findex'
+                  'index_name' => 'fn'
                 }
               },
               'info' => {
@@ -677,10 +669,8 @@ $result_trees{'index_split'} = {
                   'entry_node' => {},
                   'entry_number' => 4,
                   'in_code' => 0,
-                  'index_at_command' => 'cindex',
                   'index_ignore_chars' => {},
-                  'index_name' => 'cp',
-                  'index_type_command' => 'cindex'
+                  'index_name' => 'cp'
                 }
               },
               'info' => {
@@ -807,10 +797,8 @@ $result_trees{'index_split'} = {
               'entry_node' => {},
               'entry_number' => 5,
               'in_code' => 0,
-              'index_at_command' => 'cindex',
               'index_ignore_chars' => {},
-              'index_name' => 'cp',
-              'index_type_command' => 'cindex'
+              'index_name' => 'cp'
             }
           },
           'info' => {
@@ -902,10 +890,8 @@ $result_trees{'index_split'} = {
               'entry_node' => {},
               'entry_number' => 2,
               'in_code' => 1,
-              'index_at_command' => 'findex',
               'index_ignore_chars' => {},
-              'index_name' => 'fn',
-              'index_type_command' => 'findex'
+              'index_name' => 'fn'
             }
           },
           'info' => {
@@ -946,10 +932,8 @@ $result_trees{'index_split'} = {
               'entry_node' => {},
               'entry_number' => 6,
               'in_code' => 0,
-              'index_at_command' => 'cindex',
               'index_ignore_chars' => {},
-              'index_name' => 'cp',
-              'index_type_command' => 'cindex'
+              'index_name' => 'cp'
             }
           },
           'info' => {
@@ -990,10 +974,8 @@ $result_trees{'index_split'} = {
               'entry_node' => {},
               'entry_number' => 3,
               'in_code' => 1,
-              'index_at_command' => 'findex',
               'index_ignore_chars' => {},
-              'index_name' => 'fn',
-              'index_type_command' => 'findex'
+              'index_name' => 'fn'
             }
           },
           'info' => {
@@ -1466,10 +1448,8 @@ $result_trees{'index_split'} = {
               'entry_node' => {},
               'entry_number' => 7,
               'in_code' => 0,
-              'index_at_command' => 'cindex',
               'index_ignore_chars' => {},
-              'index_name' => 'cp',
-              'index_type_command' => 'cindex'
+              'index_name' => 'cp'
             }
           },
           'info' => {
@@ -1717,10 +1697,8 @@ $result_trees{'index_split'} = {
               'entry_node' => {},
               'entry_number' => 8,
               'in_code' => 0,
-              'index_at_command' => 'cindex',
               'index_ignore_chars' => {},
-              'index_name' => 'cp',
-              'index_type_command' => 'cindex'
+              'index_name' => 'cp'
             }
           },
           'info' => {
@@ -1955,10 +1933,8 @@ $result_trees{'index_split'} = {
               'entry_node' => {},
               'entry_number' => 9,
               'in_code' => 0,
-              'index_at_command' => 'cindex',
               'index_ignore_chars' => {},
-              'index_name' => 'cp',
-              'index_type_command' => 'cindex'
+              'index_name' => 'cp'
             }
           },
           'info' => {
@@ -2043,10 +2019,8 @@ $result_trees{'index_split'} = {
               'entry_node' => {},
               'entry_number' => 10,
               'in_code' => 0,
-              'index_at_command' => 'cindex',
               'index_ignore_chars' => {},
-              'index_name' => 'cp',
-              'index_type_command' => 'cindex'
+              'index_name' => 'cp'
             }
           },
           'info' => {
@@ -2267,10 +2241,8 @@ $result_trees{'index_split'} = {
               'entry_node' => {},
               'entry_number' => 11,
               'in_code' => 0,
-              'index_at_command' => 'cindex',
               'index_ignore_chars' => {},
-              'index_name' => 'cp',
-              'index_type_command' => 'cindex'
+              'index_name' => 'cp'
             }
           },
           'info' => {
@@ -2411,10 +2383,8 @@ $result_trees{'index_split'} = {
               'entry_node' => {},
               'entry_number' => 12,
               'in_code' => 0,
-              'index_at_command' => 'cindex',
               'index_ignore_chars' => {},
-              'index_name' => 'cp',
-              'index_type_command' => 'cindex'
+              'index_name' => 'cp'
             }
           },
           'info' => {
@@ -2546,10 +2516,8 @@ $result_trees{'index_split'} = {
               'entry_node' => {},
               'entry_number' => 13,
               'in_code' => 0,
-              'index_at_command' => 'cindex',
               'index_ignore_chars' => {},
-              'index_name' => 'cp',
-              'index_type_command' => 'cindex'
+              'index_name' => 'cp'
             }
           },
           'info' => {
@@ -2643,10 +2611,8 @@ $result_trees{'index_split'} = {
               'entry_node' => {},
               'entry_number' => 14,
               'in_code' => 0,
-              'index_at_command' => 'cindex',
               'index_ignore_chars' => {},
-              'index_name' => 'cp',
-              'index_type_command' => 'cindex'
+              'index_name' => 'cp'
             }
           },
           'info' => {
@@ -2731,10 +2697,8 @@ $result_trees{'index_split'} = {
               'entry_node' => {},
               'entry_number' => 15,
               'in_code' => 0,
-              'index_at_command' => 'cindex',
               'index_ignore_chars' => {},
-              'index_name' => 'cp',
-              'index_type_command' => 'cindex'
+              'index_name' => 'cp'
             }
           },
           'info' => {
@@ -2853,10 +2817,8 @@ $result_trees{'index_split'} = {
               'entry_node' => {},
               'entry_number' => 16,
               'in_code' => 0,
-              'index_at_command' => 'cindex',
               'index_ignore_chars' => {},
-              'index_name' => 'cp',
-              'index_type_command' => 'cindex'
+              'index_name' => 'cp'
             }
           },
           'info' => {
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 1f433d7d2a..4d3d684826 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
@@ -120,10 +120,8 @@ $result_trees{'index_split_split_chapter_no_nodes'} = {
               'entry_node' => {},
               'entry_number' => 1,
               'in_code' => 0,
-              'index_at_command' => 'cindex',
               'index_ignore_chars' => {},
-              'index_name' => 'cp',
-              'index_type_command' => 'cindex'
+              'index_name' => 'cp'
             }
           },
           'info' => {
@@ -545,10 +543,8 @@ $result_trees{'index_split_split_chapter_no_nodes'} = {
                   'entry_node' => {},
                   'entry_number' => 2,
                   'in_code' => 0,
-                  'index_at_command' => 'cindex',
                   'index_ignore_chars' => {},
-                  'index_name' => 'cp',
-                  'index_type_command' => 'cindex'
+                  'index_name' => 'cp'
                 }
               },
               'info' => {
@@ -589,10 +585,8 @@ $result_trees{'index_split_split_chapter_no_nodes'} = {
                   'entry_node' => {},
                   'entry_number' => 3,
                   'in_code' => 0,
-                  'index_at_command' => 'cindex',
                   'index_ignore_chars' => {},
-                  'index_name' => 'cp',
-                  'index_type_command' => 'cindex'
+                  'index_name' => 'cp'
                 }
               },
               'info' => {
@@ -633,10 +627,8 @@ $result_trees{'index_split_split_chapter_no_nodes'} = {
                   'entry_node' => {},
                   'entry_number' => 1,
                   'in_code' => 1,
-                  'index_at_command' => 'findex',
                   'index_ignore_chars' => {},
-                  'index_name' => 'fn',
-                  'index_type_command' => 'findex'
+                  'index_name' => 'fn'
                 }
               },
               'info' => {
@@ -677,10 +669,8 @@ $result_trees{'index_split_split_chapter_no_nodes'} = {
                   'entry_node' => {},
                   'entry_number' => 4,
                   'in_code' => 0,
-                  'index_at_command' => 'cindex',
                   'index_ignore_chars' => {},
-                  'index_name' => 'cp',
-                  'index_type_command' => 'cindex'
+                  'index_name' => 'cp'
                 }
               },
               'info' => {
@@ -807,10 +797,8 @@ $result_trees{'index_split_split_chapter_no_nodes'} = {
               'entry_node' => {},
               'entry_number' => 5,
               'in_code' => 0,
-              'index_at_command' => 'cindex',
               'index_ignore_chars' => {},
-              'index_name' => 'cp',
-              'index_type_command' => 'cindex'
+              'index_name' => 'cp'
             }
           },
           'info' => {
@@ -902,10 +890,8 @@ $result_trees{'index_split_split_chapter_no_nodes'} = {
               'entry_node' => {},
               'entry_number' => 2,
               'in_code' => 1,
-              'index_at_command' => 'findex',
               'index_ignore_chars' => {},
-              'index_name' => 'fn',
-              'index_type_command' => 'findex'
+              'index_name' => 'fn'
             }
           },
           'info' => {
@@ -946,10 +932,8 @@ $result_trees{'index_split_split_chapter_no_nodes'} = {
               'entry_node' => {},
               'entry_number' => 6,
               'in_code' => 0,
-              'index_at_command' => 'cindex',
               'index_ignore_chars' => {},
-              'index_name' => 'cp',
-              'index_type_command' => 'cindex'
+              'index_name' => 'cp'
             }
           },
           'info' => {
@@ -990,10 +974,8 @@ $result_trees{'index_split_split_chapter_no_nodes'} = {
               'entry_node' => {},
               'entry_number' => 3,
               'in_code' => 1,
-              'index_at_command' => 'findex',
               'index_ignore_chars' => {},
-              'index_name' => 'fn',
-              'index_type_command' => 'findex'
+              'index_name' => 'fn'
             }
           },
           'info' => {
@@ -1466,10 +1448,8 @@ $result_trees{'index_split_split_chapter_no_nodes'} = {
               'entry_node' => {},
               'entry_number' => 7,
               'in_code' => 0,
-              'index_at_command' => 'cindex',
               'index_ignore_chars' => {},
-              'index_name' => 'cp',
-              'index_type_command' => 'cindex'
+              'index_name' => 'cp'
             }
           },
           'info' => {
@@ -1717,10 +1697,8 @@ $result_trees{'index_split_split_chapter_no_nodes'} = {
               'entry_node' => {},
               'entry_number' => 8,
               'in_code' => 0,
-              'index_at_command' => 'cindex',
               'index_ignore_chars' => {},
-              'index_name' => 'cp',
-              'index_type_command' => 'cindex'
+              'index_name' => 'cp'
             }
           },
           'info' => {
@@ -1955,10 +1933,8 @@ $result_trees{'index_split_split_chapter_no_nodes'} = {
               'entry_node' => {},
               'entry_number' => 9,
               'in_code' => 0,
-              'index_at_command' => 'cindex',
               'index_ignore_chars' => {},
-              'index_name' => 'cp',
-              'index_type_command' => 'cindex'
+              'index_name' => 'cp'
             }
           },
           'info' => {
@@ -2043,10 +2019,8 @@ $result_trees{'index_split_split_chapter_no_nodes'} = {
               'entry_node' => {},
               'entry_number' => 10,
               'in_code' => 0,
-              'index_at_command' => 'cindex',
               'index_ignore_chars' => {},
-              'index_name' => 'cp',
-              'index_type_command' => 'cindex'
+              'index_name' => 'cp'
             }
           },
           'info' => {
@@ -2267,10 +2241,8 @@ $result_trees{'index_split_split_chapter_no_nodes'} = {
               'entry_node' => {},
               'entry_number' => 11,
               'in_code' => 0,
-              'index_at_command' => 'cindex',
               'index_ignore_chars' => {},
-              'index_name' => 'cp',
-              'index_type_command' => 'cindex'
+              'index_name' => 'cp'
             }
           },
           'info' => {
@@ -2411,10 +2383,8 @@ $result_trees{'index_split_split_chapter_no_nodes'} = {
               'entry_node' => {},
               'entry_number' => 12,
               'in_code' => 0,
-              'index_at_command' => 'cindex',
               'index_ignore_chars' => {},
-              'index_name' => 'cp',
-              'index_type_command' => 'cindex'
+              'index_name' => 'cp'
             }
           },
           'info' => {
@@ -2546,10 +2516,8 @@ $result_trees{'index_split_split_chapter_no_nodes'} = {
               'entry_node' => {},
               'entry_number' => 13,
               'in_code' => 0,
-              'index_at_command' => 'cindex',
               'index_ignore_chars' => {},
-              'index_name' => 'cp',
-              'index_type_command' => 'cindex'
+              'index_name' => 'cp'
             }
           },
           'info' => {
@@ -2643,10 +2611,8 @@ $result_trees{'index_split_split_chapter_no_nodes'} = {
               'entry_node' => {},
               'entry_number' => 14,
               'in_code' => 0,
-              'index_at_command' => 'cindex',
               'index_ignore_chars' => {},
-              'index_name' => 'cp',
-              'index_type_command' => 'cindex'
+              'index_name' => 'cp'
             }
           },
           'info' => {
@@ -2731,10 +2697,8 @@ $result_trees{'index_split_split_chapter_no_nodes'} = {
               'entry_node' => {},
               'entry_number' => 15,
               'in_code' => 0,
-              'index_at_command' => 'cindex',
               'index_ignore_chars' => {},
-              'index_name' => 'cp',
-              'index_type_command' => 'cindex'
+              'index_name' => 'cp'
             }
           },
           'info' => {
@@ -2853,10 +2817,8 @@ $result_trees{'index_split_split_chapter_no_nodes'} = {
               'entry_node' => {},
               'entry_number' => 16,
               'in_code' => 0,
-              'index_at_command' => 'cindex',
               'index_ignore_chars' => {},
-              'index_name' => 'cp',
-              'index_type_command' => 'cindex'
+              'index_name' => 'cp'
             }
           },
           'info' => {
diff --git a/tp/t/results/indices/index_table.pl 
b/tp/t/results/indices/index_table.pl
index dfcf12b64b..dad30c5fe4 100644
--- a/tp/t/results/indices/index_table.pl
+++ b/tp/t/results/indices/index_table.pl
@@ -401,10 +401,8 @@ $result_trees{'index_table'} = {
               'entry_node' => {},
               'entry_number' => 1,
               'in_code' => 0,
-              'index_at_command' => 'cindex',
               'index_ignore_chars' => {},
-              'index_name' => 'cp',
-              'index_type_command' => 'cindex'
+              'index_name' => 'cp'
             }
           },
           'info' => {
@@ -456,10 +454,8 @@ $result_trees{'index_table'} = {
                   'entry_node' => {},
                   'entry_number' => 2,
                   'in_code' => 0,
-                  'index_at_command' => 'cindex',
                   'index_ignore_chars' => {},
-                  'index_name' => 'cp',
-                  'index_type_command' => 'cindex'
+                  'index_name' => 'cp'
                 }
               },
               'info' => {
@@ -551,10 +547,8 @@ $result_trees{'index_table'} = {
                           'entry_node' => {},
                           'entry_number' => 1,
                           'in_code' => 1,
-                          'index_at_command' => 'item',
                           'index_ignore_chars' => {},
-                          'index_name' => 'vr',
-                          'index_type_command' => 'vtable'
+                          'index_name' => 'vr'
                         }
                       },
                       'info' => {
@@ -594,10 +588,8 @@ $result_trees{'index_table'} = {
                           'entry_node' => {},
                           'entry_number' => 2,
                           'in_code' => 1,
-                          'index_at_command' => 'itemx',
                           'index_ignore_chars' => {},
-                          'index_name' => 'vr',
-                          'index_type_command' => 'vtable'
+                          'index_name' => 'vr'
                         }
                       },
                       'info' => {
@@ -751,10 +743,8 @@ $result_trees{'index_table'} = {
                           'entry_node' => {},
                           'entry_number' => 1,
                           'in_code' => 1,
-                          'index_at_command' => 'item',
                           'index_ignore_chars' => {},
-                          'index_name' => 'fn',
-                          'index_type_command' => 'ftable'
+                          'index_name' => 'fn'
                         }
                       },
                       'info' => {
@@ -794,10 +784,8 @@ $result_trees{'index_table'} = {
                           'entry_node' => {},
                           'entry_number' => 2,
                           'in_code' => 1,
-                          'index_at_command' => 'itemx',
                           'index_ignore_chars' => {},
-                          'index_name' => 'fn',
-                          'index_type_command' => 'ftable'
+                          'index_name' => 'fn'
                         }
                       },
                       'info' => {
@@ -861,10 +849,8 @@ $result_trees{'index_table'} = {
                           'entry_node' => {},
                           'entry_number' => 3,
                           'in_code' => 1,
-                          'index_at_command' => 'item',
                           'index_ignore_chars' => {},
-                          'index_name' => 'fn',
-                          'index_type_command' => 'ftable'
+                          'index_name' => 'fn'
                         }
                       },
                       'info' => {
@@ -1341,10 +1327,8 @@ $result_trees{'index_table'} = {
               'entry_node' => {},
               'entry_number' => 3,
               'in_code' => 0,
-              'index_at_command' => 'cindex',
               'index_ignore_chars' => {},
-              'index_name' => 'cp',
-              'index_type_command' => 'cindex'
+              'index_name' => 'cp'
             }
           },
           'info' => {
@@ -1385,10 +1369,8 @@ $result_trees{'index_table'} = {
               'entry_node' => {},
               'entry_number' => 4,
               'in_code' => 0,
-              'index_at_command' => 'cindex',
               'index_ignore_chars' => {},
-              'index_name' => 'cp',
-              'index_type_command' => 'cindex'
+              'index_name' => 'cp'
             }
           },
           'info' => {
@@ -1429,10 +1411,8 @@ $result_trees{'index_table'} = {
               'entry_node' => {},
               'entry_number' => 5,
               'in_code' => 0,
-              'index_at_command' => 'cindex',
               'index_ignore_chars' => {},
-              'index_name' => 'cp',
-              'index_type_command' => 'cindex'
+              'index_name' => 'cp'
             }
           },
           'info' => {
@@ -1473,10 +1453,8 @@ $result_trees{'index_table'} = {
               'entry_node' => {},
               'entry_number' => 6,
               'in_code' => 0,
-              'index_at_command' => 'cindex',
               'index_ignore_chars' => {},
-              'index_name' => 'cp',
-              'index_type_command' => 'cindex'
+              'index_name' => 'cp'
             }
           },
           'info' => {
@@ -1517,10 +1495,8 @@ $result_trees{'index_table'} = {
               'entry_node' => {},
               'entry_number' => 7,
               'in_code' => 0,
-              'index_at_command' => 'cindex',
               'index_ignore_chars' => {},
-              'index_name' => 'cp',
-              'index_type_command' => 'cindex'
+              'index_name' => 'cp'
             }
           },
           'info' => {
@@ -1561,10 +1537,8 @@ $result_trees{'index_table'} = {
               'entry_node' => {},
               'entry_number' => 8,
               'in_code' => 0,
-              'index_at_command' => 'cindex',
               'index_ignore_chars' => {},
-              'index_name' => 'cp',
-              'index_type_command' => 'cindex'
+              'index_name' => 'cp'
             }
           },
           'info' => {
@@ -1605,10 +1579,8 @@ $result_trees{'index_table'} = {
               'entry_node' => {},
               'entry_number' => 9,
               'in_code' => 0,
-              'index_at_command' => 'cindex',
               'index_ignore_chars' => {},
-              'index_name' => 'cp',
-              'index_type_command' => 'cindex'
+              'index_name' => 'cp'
             }
           },
           'info' => {
@@ -1649,10 +1621,8 @@ $result_trees{'index_table'} = {
               'entry_node' => {},
               'entry_number' => 10,
               'in_code' => 0,
-              'index_at_command' => 'cindex',
               'index_ignore_chars' => {},
-              'index_name' => 'cp',
-              'index_type_command' => 'cindex'
+              'index_name' => 'cp'
             }
           },
           'info' => {
@@ -1693,10 +1663,8 @@ $result_trees{'index_table'} = {
               'entry_node' => {},
               'entry_number' => 11,
               'in_code' => 0,
-              'index_at_command' => 'cindex',
               'index_ignore_chars' => {},
-              'index_name' => 'cp',
-              'index_type_command' => 'cindex'
+              'index_name' => 'cp'
             }
           },
           'info' => {
@@ -1737,10 +1705,8 @@ $result_trees{'index_table'} = {
               'entry_node' => {},
               'entry_number' => 12,
               'in_code' => 0,
-              'index_at_command' => 'cindex',
               'index_ignore_chars' => {},
-              'index_name' => 'cp',
-              'index_type_command' => 'cindex'
+              'index_name' => 'cp'
             }
           },
           'info' => {
@@ -1781,10 +1747,8 @@ $result_trees{'index_table'} = {
               'entry_node' => {},
               'entry_number' => 13,
               'in_code' => 0,
-              'index_at_command' => 'cindex',
               'index_ignore_chars' => {},
-              'index_name' => 'cp',
-              'index_type_command' => 'cindex'
+              'index_name' => 'cp'
             }
           },
           'info' => {
@@ -1825,10 +1789,8 @@ $result_trees{'index_table'} = {
               'entry_node' => {},
               'entry_number' => 14,
               'in_code' => 0,
-              'index_at_command' => 'cindex',
               'index_ignore_chars' => {},
-              'index_name' => 'cp',
-              'index_type_command' => 'cindex'
+              'index_name' => 'cp'
             }
           },
           'info' => {
@@ -1869,10 +1831,8 @@ $result_trees{'index_table'} = {
               'entry_node' => {},
               'entry_number' => 15,
               'in_code' => 0,
-              'index_at_command' => 'cindex',
               'index_ignore_chars' => {},
-              'index_name' => 'cp',
-              'index_type_command' => 'cindex'
+              'index_name' => 'cp'
             }
           },
           'info' => {
@@ -1913,10 +1873,8 @@ $result_trees{'index_table'} = {
               'entry_node' => {},
               'entry_number' => 16,
               'in_code' => 0,
-              'index_at_command' => 'cindex',
               'index_ignore_chars' => {},
-              'index_name' => 'cp',
-              'index_type_command' => 'cindex'
+              'index_name' => 'cp'
             }
           },
           'info' => {
@@ -1957,10 +1915,8 @@ $result_trees{'index_table'} = {
               'entry_node' => {},
               'entry_number' => 17,
               'in_code' => 0,
-              'index_at_command' => 'cindex',
               'index_ignore_chars' => {},
-              'index_name' => 'cp',
-              'index_type_command' => 'cindex'
+              'index_name' => 'cp'
             }
           },
           'info' => {
@@ -2001,10 +1957,8 @@ $result_trees{'index_table'} = {
               'entry_node' => {},
               'entry_number' => 18,
               'in_code' => 0,
-              'index_at_command' => 'cindex',
               'index_ignore_chars' => {},
-              'index_name' => 'cp',
-              'index_type_command' => 'cindex'
+              'index_name' => 'cp'
             }
           },
           'info' => {
@@ -2045,10 +1999,8 @@ $result_trees{'index_table'} = {
               'entry_node' => {},
               'entry_number' => 19,
               'in_code' => 0,
-              'index_at_command' => 'cindex',
               'index_ignore_chars' => {},
-              'index_name' => 'cp',
-              'index_type_command' => 'cindex'
+              'index_name' => 'cp'
             }
           },
           'info' => {
@@ -2089,10 +2041,8 @@ $result_trees{'index_table'} = {
               'entry_node' => {},
               'entry_number' => 20,
               'in_code' => 0,
-              'index_at_command' => 'cindex',
               'index_ignore_chars' => {},
-              'index_name' => 'cp',
-              'index_type_command' => 'cindex'
+              'index_name' => 'cp'
             }
           },
           'info' => {
@@ -2133,10 +2083,8 @@ $result_trees{'index_table'} = {
               'entry_node' => {},
               'entry_number' => 21,
               'in_code' => 0,
-              'index_at_command' => 'cindex',
               'index_ignore_chars' => {},
-              'index_name' => 'cp',
-              'index_type_command' => 'cindex'
+              'index_name' => 'cp'
             }
           },
           'info' => {
@@ -2177,10 +2125,8 @@ $result_trees{'index_table'} = {
               'entry_node' => {},
               'entry_number' => 22,
               'in_code' => 0,
-              'index_at_command' => 'cindex',
               'index_ignore_chars' => {},
-              'index_name' => 'cp',
-              'index_type_command' => 'cindex'
+              'index_name' => 'cp'
             }
           },
           'info' => {
@@ -2221,10 +2167,8 @@ $result_trees{'index_table'} = {
               'entry_node' => {},
               'entry_number' => 23,
               'in_code' => 0,
-              'index_at_command' => 'cindex',
               'index_ignore_chars' => {},
-              'index_name' => 'cp',
-              'index_type_command' => 'cindex'
+              'index_name' => 'cp'
             }
           },
           'info' => {
@@ -2265,10 +2209,8 @@ $result_trees{'index_table'} = {
               'entry_node' => {},
               'entry_number' => 24,
               'in_code' => 0,
-              'index_at_command' => 'cindex',
               'index_ignore_chars' => {},
-              'index_name' => 'cp',
-              'index_type_command' => 'cindex'
+              'index_name' => 'cp'
             }
           },
           'info' => {
@@ -2309,10 +2251,8 @@ $result_trees{'index_table'} = {
               'entry_node' => {},
               'entry_number' => 25,
               'in_code' => 0,
-              'index_at_command' => 'cindex',
               'index_ignore_chars' => {},
-              'index_name' => 'cp',
-              'index_type_command' => 'cindex'
+              'index_name' => 'cp'
             }
           },
           'info' => {
@@ -2353,10 +2293,8 @@ $result_trees{'index_table'} = {
               'entry_node' => {},
               'entry_number' => 26,
               'in_code' => 0,
-              'index_at_command' => 'cindex',
               'index_ignore_chars' => {},
-              'index_name' => 'cp',
-              'index_type_command' => 'cindex'
+              'index_name' => 'cp'
             }
           },
           'info' => {
@@ -2397,10 +2335,8 @@ $result_trees{'index_table'} = {
               'entry_node' => {},
               'entry_number' => 27,
               'in_code' => 0,
-              'index_at_command' => 'cindex',
               'index_ignore_chars' => {},
-              'index_name' => 'cp',
-              'index_type_command' => 'cindex'
+              'index_name' => 'cp'
             }
           },
           'info' => {
@@ -2441,10 +2377,8 @@ $result_trees{'index_table'} = {
               'entry_node' => {},
               'entry_number' => 28,
               'in_code' => 0,
-              'index_at_command' => 'cindex',
               'index_ignore_chars' => {},
-              'index_name' => 'cp',
-              'index_type_command' => 'cindex'
+              'index_name' => 'cp'
             }
           },
           'info' => {
@@ -2485,10 +2419,8 @@ $result_trees{'index_table'} = {
               'entry_node' => {},
               'entry_number' => 29,
               'in_code' => 0,
-              'index_at_command' => 'cindex',
               'index_ignore_chars' => {},
-              'index_name' => 'cp',
-              'index_type_command' => 'cindex'
+              'index_name' => 'cp'
             }
           },
           'info' => {
@@ -2529,10 +2461,8 @@ $result_trees{'index_table'} = {
               'entry_node' => {},
               'entry_number' => 30,
               'in_code' => 0,
-              'index_at_command' => 'cindex',
               'index_ignore_chars' => {},
-              'index_name' => 'cp',
-              'index_type_command' => 'cindex'
+              'index_name' => 'cp'
             }
           },
           'info' => {
@@ -2573,10 +2503,8 @@ $result_trees{'index_table'} = {
               'entry_node' => {},
               'entry_number' => 31,
               'in_code' => 0,
-              'index_at_command' => 'cindex',
               'index_ignore_chars' => {},
-              'index_name' => 'cp',
-              'index_type_command' => 'cindex'
+              'index_name' => 'cp'
             }
           },
           'info' => {
@@ -2617,10 +2545,8 @@ $result_trees{'index_table'} = {
               'entry_node' => {},
               'entry_number' => 32,
               'in_code' => 0,
-              'index_at_command' => 'cindex',
               'index_ignore_chars' => {},
-              'index_name' => 'cp',
-              'index_type_command' => 'cindex'
+              'index_name' => 'cp'
             }
           },
           'info' => {
@@ -2661,10 +2587,8 @@ $result_trees{'index_table'} = {
               'entry_node' => {},
               'entry_number' => 33,
               'in_code' => 0,
-              'index_at_command' => 'cindex',
               'index_ignore_chars' => {},
-              'index_name' => 'cp',
-              'index_type_command' => 'cindex'
+              'index_name' => 'cp'
             }
           },
           'info' => {
@@ -2705,10 +2629,8 @@ $result_trees{'index_table'} = {
               'entry_node' => {},
               'entry_number' => 34,
               'in_code' => 0,
-              'index_at_command' => 'cindex',
               'index_ignore_chars' => {},
-              'index_name' => 'cp',
-              'index_type_command' => 'cindex'
+              'index_name' => 'cp'
             }
           },
           'info' => {
@@ -2749,10 +2671,8 @@ $result_trees{'index_table'} = {
               'entry_node' => {},
               'entry_number' => 35,
               'in_code' => 0,
-              'index_at_command' => 'cindex',
               'index_ignore_chars' => {},
-              'index_name' => 'cp',
-              'index_type_command' => 'cindex'
+              'index_name' => 'cp'
             }
           },
           'info' => {
@@ -2793,10 +2713,8 @@ $result_trees{'index_table'} = {
               'entry_node' => {},
               'entry_number' => 36,
               'in_code' => 0,
-              'index_at_command' => 'cindex',
               'index_ignore_chars' => {},
-              'index_name' => 'cp',
-              'index_type_command' => 'cindex'
+              'index_name' => 'cp'
             }
           },
           'info' => {
@@ -2837,10 +2755,8 @@ $result_trees{'index_table'} = {
               'entry_node' => {},
               'entry_number' => 37,
               'in_code' => 0,
-              'index_at_command' => 'cindex',
               'index_ignore_chars' => {},
-              'index_name' => 'cp',
-              'index_type_command' => 'cindex'
+              'index_name' => 'cp'
             }
           },
           'info' => {
@@ -2881,10 +2797,8 @@ $result_trees{'index_table'} = {
               'entry_node' => {},
               'entry_number' => 38,
               'in_code' => 0,
-              'index_at_command' => 'cindex',
               'index_ignore_chars' => {},
-              'index_name' => 'cp',
-              'index_type_command' => 'cindex'
+              'index_name' => 'cp'
             }
           },
           'info' => {
@@ -2925,10 +2839,8 @@ $result_trees{'index_table'} = {
               'entry_node' => {},
               'entry_number' => 39,
               'in_code' => 0,
-              'index_at_command' => 'cindex',
               'index_ignore_chars' => {},
-              'index_name' => 'cp',
-              'index_type_command' => 'cindex'
+              'index_name' => 'cp'
             }
           },
           'info' => {
@@ -2969,10 +2881,8 @@ $result_trees{'index_table'} = {
               'entry_node' => {},
               'entry_number' => 40,
               'in_code' => 0,
-              'index_at_command' => 'cindex',
               'index_ignore_chars' => {},
-              'index_name' => 'cp',
-              'index_type_command' => 'cindex'
+              'index_name' => 'cp'
             }
           },
           'info' => {
@@ -3013,10 +2923,8 @@ $result_trees{'index_table'} = {
               'entry_node' => {},
               'entry_number' => 41,
               'in_code' => 0,
-              'index_at_command' => 'cindex',
               'index_ignore_chars' => {},
-              'index_name' => 'cp',
-              'index_type_command' => 'cindex'
+              'index_name' => 'cp'
             }
           },
           'info' => {
@@ -3057,10 +2965,8 @@ $result_trees{'index_table'} = {
               'entry_node' => {},
               'entry_number' => 42,
               'in_code' => 0,
-              'index_at_command' => 'cindex',
               'index_ignore_chars' => {},
-              'index_name' => 'cp',
-              'index_type_command' => 'cindex'
+              'index_name' => 'cp'
             }
           },
           'info' => {
@@ -3101,10 +3007,8 @@ $result_trees{'index_table'} = {
               'entry_node' => {},
               'entry_number' => 43,
               'in_code' => 0,
-              'index_at_command' => 'cindex',
               'index_ignore_chars' => {},
-              'index_name' => 'cp',
-              'index_type_command' => 'cindex'
+              'index_name' => 'cp'
             }
           },
           'info' => {
@@ -3145,10 +3049,8 @@ $result_trees{'index_table'} = {
               'entry_node' => {},
               'entry_number' => 44,
               'in_code' => 0,
-              'index_at_command' => 'cindex',
               'index_ignore_chars' => {},
-              'index_name' => 'cp',
-              'index_type_command' => 'cindex'
+              'index_name' => 'cp'
             }
           },
           'info' => {
@@ -3189,10 +3091,8 @@ $result_trees{'index_table'} = {
               'entry_node' => {},
               'entry_number' => 45,
               'in_code' => 0,
-              'index_at_command' => 'cindex',
               'index_ignore_chars' => {},
-              'index_name' => 'cp',
-              'index_type_command' => 'cindex'
+              'index_name' => 'cp'
             }
           },
           'info' => {
@@ -3233,10 +3133,8 @@ $result_trees{'index_table'} = {
               'entry_node' => {},
               'entry_number' => 46,
               'in_code' => 0,
-              'index_at_command' => 'cindex',
               'index_ignore_chars' => {},
-              'index_name' => 'cp',
-              'index_type_command' => 'cindex'
+              'index_name' => 'cp'
             }
           },
           'info' => {
@@ -3277,10 +3175,8 @@ $result_trees{'index_table'} = {
               'entry_node' => {},
               'entry_number' => 47,
               'in_code' => 0,
-              'index_at_command' => 'cindex',
               'index_ignore_chars' => {},
-              'index_name' => 'cp',
-              'index_type_command' => 'cindex'
+              'index_name' => 'cp'
             }
           },
           'info' => {
@@ -3321,10 +3217,8 @@ $result_trees{'index_table'} = {
               'entry_node' => {},
               'entry_number' => 48,
               'in_code' => 0,
-              'index_at_command' => 'cindex',
               'index_ignore_chars' => {},
-              'index_name' => 'cp',
-              'index_type_command' => 'cindex'
+              'index_name' => 'cp'
             }
           },
           'info' => {
@@ -3365,10 +3259,8 @@ $result_trees{'index_table'} = {
               'entry_node' => {},
               'entry_number' => 49,
               'in_code' => 0,
-              'index_at_command' => 'cindex',
               'index_ignore_chars' => {},
-              'index_name' => 'cp',
-              'index_type_command' => 'cindex'
+              'index_name' => 'cp'
             }
           },
           'info' => {
@@ -3409,10 +3301,8 @@ $result_trees{'index_table'} = {
               'entry_node' => {},
               'entry_number' => 50,
               'in_code' => 0,
-              'index_at_command' => 'cindex',
               'index_ignore_chars' => {},
-              'index_name' => 'cp',
-              'index_type_command' => 'cindex'
+              'index_name' => 'cp'
             }
           },
           'info' => {
@@ -3453,10 +3343,8 @@ $result_trees{'index_table'} = {
               'entry_node' => {},
               'entry_number' => 51,
               'in_code' => 0,
-              'index_at_command' => 'cindex',
               'index_ignore_chars' => {},
-              'index_name' => 'cp',
-              'index_type_command' => 'cindex'
+              'index_name' => 'cp'
             }
           },
           'info' => {
@@ -3497,10 +3385,8 @@ $result_trees{'index_table'} = {
               'entry_node' => {},
               'entry_number' => 52,
               'in_code' => 0,
-              'index_at_command' => 'cindex',
               'index_ignore_chars' => {},
-              'index_name' => 'cp',
-              'index_type_command' => 'cindex'
+              'index_name' => 'cp'
             }
           },
           'info' => {
@@ -3541,10 +3427,8 @@ $result_trees{'index_table'} = {
               'entry_node' => {},
               'entry_number' => 53,
               'in_code' => 0,
-              'index_at_command' => 'cindex',
               'index_ignore_chars' => {},
-              'index_name' => 'cp',
-              'index_type_command' => 'cindex'
+              'index_name' => 'cp'
             }
           },
           'info' => {
@@ -3585,10 +3469,8 @@ $result_trees{'index_table'} = {
               'entry_node' => {},
               'entry_number' => 54,
               'in_code' => 0,
-              'index_at_command' => 'cindex',
               'index_ignore_chars' => {},
-              'index_name' => 'cp',
-              'index_type_command' => 'cindex'
+              'index_name' => 'cp'
             }
           },
           'info' => {
@@ -3629,10 +3511,8 @@ $result_trees{'index_table'} = {
               'entry_node' => {},
               'entry_number' => 55,
               'in_code' => 0,
-              'index_at_command' => 'cindex',
               'index_ignore_chars' => {},
-              'index_name' => 'cp',
-              'index_type_command' => 'cindex'
+              'index_name' => 'cp'
             }
           },
           'info' => {
@@ -3673,10 +3553,8 @@ $result_trees{'index_table'} = {
               'entry_node' => {},
               'entry_number' => 56,
               'in_code' => 0,
-              'index_at_command' => 'cindex',
               'index_ignore_chars' => {},
-              'index_name' => 'cp',
-              'index_type_command' => 'cindex'
+              'index_name' => 'cp'
             }
           },
           'info' => {
@@ -3717,10 +3595,8 @@ $result_trees{'index_table'} = {
               'entry_node' => {},
               'entry_number' => 57,
               'in_code' => 0,
-              'index_at_command' => 'cindex',
               'index_ignore_chars' => {},
-              'index_name' => 'cp',
-              'index_type_command' => 'cindex'
+              'index_name' => 'cp'
             }
           },
           'info' => {
@@ -3761,10 +3637,8 @@ $result_trees{'index_table'} = {
               'entry_node' => {},
               'entry_number' => 58,
               'in_code' => 0,
-              'index_at_command' => 'cindex',
               'index_ignore_chars' => {},
-              'index_name' => 'cp',
-              'index_type_command' => 'cindex'
+              'index_name' => 'cp'
             }
           },
           'info' => {
@@ -3805,10 +3679,8 @@ $result_trees{'index_table'} = {
               'entry_node' => {},
               'entry_number' => 59,
               'in_code' => 0,
-              'index_at_command' => 'cindex',
               'index_ignore_chars' => {},
-              'index_name' => 'cp',
-              'index_type_command' => 'cindex'
+              'index_name' => 'cp'
             }
           },
           'info' => {
@@ -3849,10 +3721,8 @@ $result_trees{'index_table'} = {
               'entry_node' => {},
               'entry_number' => 60,
               'in_code' => 0,
-              'index_at_command' => 'cindex',
               'index_ignore_chars' => {},
-              'index_name' => 'cp',
-              'index_type_command' => 'cindex'
+              'index_name' => 'cp'
             }
           },
           'info' => {
@@ -3893,10 +3763,8 @@ $result_trees{'index_table'} = {
               'entry_node' => {},
               'entry_number' => 61,
               'in_code' => 0,
-              'index_at_command' => 'cindex',
               'index_ignore_chars' => {},
-              'index_name' => 'cp',
-              'index_type_command' => 'cindex'
+              'index_name' => 'cp'
             }
           },
           'info' => {
@@ -3937,10 +3805,8 @@ $result_trees{'index_table'} = {
               'entry_node' => {},
               'entry_number' => 62,
               'in_code' => 0,
-              'index_at_command' => 'cindex',
               'index_ignore_chars' => {},
-              'index_name' => 'cp',
-              'index_type_command' => 'cindex'
+              'index_name' => 'cp'
             }
           },
           'info' => {
@@ -3981,10 +3847,8 @@ $result_trees{'index_table'} = {
               'entry_node' => {},
               'entry_number' => 63,
               'in_code' => 0,
-              'index_at_command' => 'cindex',
               'index_ignore_chars' => {},
-              'index_name' => 'cp',
-              'index_type_command' => 'cindex'
+              'index_name' => 'cp'
             }
           },
           'info' => {
@@ -4025,10 +3889,8 @@ $result_trees{'index_table'} = {
               'entry_node' => {},
               'entry_number' => 64,
               'in_code' => 0,
-              'index_at_command' => 'cindex',
               'index_ignore_chars' => {},
-              'index_name' => 'cp',
-              'index_type_command' => 'cindex'
+              'index_name' => 'cp'
             }
           },
           'info' => {
@@ -4069,10 +3931,8 @@ $result_trees{'index_table'} = {
               'entry_node' => {},
               'entry_number' => 65,
               'in_code' => 0,
-              'index_at_command' => 'cindex',
               'index_ignore_chars' => {},
-              'index_name' => 'cp',
-              'index_type_command' => 'cindex'
+              'index_name' => 'cp'
             }
           },
           'info' => {
@@ -4113,10 +3973,8 @@ $result_trees{'index_table'} = {
               'entry_node' => {},
               'entry_number' => 66,
               'in_code' => 0,
-              'index_at_command' => 'cindex',
               'index_ignore_chars' => {},
-              'index_name' => 'cp',
-              'index_type_command' => 'cindex'
+              'index_name' => 'cp'
             }
           },
           'info' => {
@@ -4157,10 +4015,8 @@ $result_trees{'index_table'} = {
               'entry_node' => {},
               'entry_number' => 67,
               'in_code' => 0,
-              'index_at_command' => 'cindex',
               'index_ignore_chars' => {},
-              'index_name' => 'cp',
-              'index_type_command' => 'cindex'
+              'index_name' => 'cp'
             }
           },
           'info' => {
@@ -4201,10 +4057,8 @@ $result_trees{'index_table'} = {
               'entry_node' => {},
               'entry_number' => 68,
               'in_code' => 0,
-              'index_at_command' => 'cindex',
               'index_ignore_chars' => {},
-              'index_name' => 'cp',
-              'index_type_command' => 'cindex'
+              'index_name' => 'cp'
             }
           },
           'info' => {
@@ -4245,10 +4099,8 @@ $result_trees{'index_table'} = {
               'entry_node' => {},
               'entry_number' => 69,
               'in_code' => 0,
-              'index_at_command' => 'cindex',
               'index_ignore_chars' => {},
-              'index_name' => 'cp',
-              'index_type_command' => 'cindex'
+              'index_name' => 'cp'
             }
           },
           'info' => {
@@ -4289,10 +4141,8 @@ $result_trees{'index_table'} = {
               'entry_node' => {},
               'entry_number' => 70,
               'in_code' => 0,
-              'index_at_command' => 'cindex',
               'index_ignore_chars' => {},
-              'index_name' => 'cp',
-              'index_type_command' => 'cindex'
+              'index_name' => 'cp'
             }
           },
           'info' => {
@@ -4333,10 +4183,8 @@ $result_trees{'index_table'} = {
               'entry_node' => {},
               'entry_number' => 71,
               'in_code' => 0,
-              'index_at_command' => 'cindex',
               'index_ignore_chars' => {},
-              'index_name' => 'cp',
-              'index_type_command' => 'cindex'
+              'index_name' => 'cp'
             }
           },
           'info' => {
@@ -4377,10 +4225,8 @@ $result_trees{'index_table'} = {
               'entry_node' => {},
               'entry_number' => 72,
               'in_code' => 0,
-              'index_at_command' => 'cindex',
               'index_ignore_chars' => {},
-              'index_name' => 'cp',
-              'index_type_command' => 'cindex'
+              'index_name' => 'cp'
             }
           },
           'info' => {
@@ -4421,10 +4267,8 @@ $result_trees{'index_table'} = {
               'entry_node' => {},
               'entry_number' => 73,
               'in_code' => 0,
-              'index_at_command' => 'cindex',
               'index_ignore_chars' => {},
-              'index_name' => 'cp',
-              'index_type_command' => 'cindex'
+              'index_name' => 'cp'
             }
           },
           'info' => {
@@ -4465,10 +4309,8 @@ $result_trees{'index_table'} = {
               'entry_node' => {},
               'entry_number' => 74,
               'in_code' => 0,
-              'index_at_command' => 'cindex',
               'index_ignore_chars' => {},
-              'index_name' => 'cp',
-              'index_type_command' => 'cindex'
+              'index_name' => 'cp'
             }
           },
           'info' => {
@@ -4509,10 +4351,8 @@ $result_trees{'index_table'} = {
               'entry_node' => {},
               'entry_number' => 75,
               'in_code' => 0,
-              'index_at_command' => 'cindex',
               'index_ignore_chars' => {},
-              'index_name' => 'cp',
-              'index_type_command' => 'cindex'
+              'index_name' => 'cp'
             }
           },
           'info' => {
@@ -4553,10 +4393,8 @@ $result_trees{'index_table'} = {
               'entry_node' => {},
               'entry_number' => 76,
               'in_code' => 0,
-              'index_at_command' => 'cindex',
               'index_ignore_chars' => {},
-              'index_name' => 'cp',
-              'index_type_command' => 'cindex'
+              'index_name' => 'cp'
             }
           },
           'info' => {
@@ -4597,10 +4435,8 @@ $result_trees{'index_table'} = {
               'entry_node' => {},
               'entry_number' => 77,
               'in_code' => 0,
-              'index_at_command' => 'cindex',
               'index_ignore_chars' => {},
-              'index_name' => 'cp',
-              'index_type_command' => 'cindex'
+              'index_name' => 'cp'
             }
           },
           'info' => {
@@ -4641,10 +4477,8 @@ $result_trees{'index_table'} = {
               'entry_node' => {},
               'entry_number' => 78,
               'in_code' => 0,
-              'index_at_command' => 'cindex',
               'index_ignore_chars' => {},
-              'index_name' => 'cp',
-              'index_type_command' => 'cindex'
+              'index_name' => 'cp'
             }
           },
           'info' => {
@@ -4685,10 +4519,8 @@ $result_trees{'index_table'} = {
               'entry_node' => {},
               'entry_number' => 79,
               'in_code' => 0,
-              'index_at_command' => 'cindex',
               'index_ignore_chars' => {},
-              'index_name' => 'cp',
-              'index_type_command' => 'cindex'
+              'index_name' => 'cp'
             }
           },
           'info' => {
@@ -4729,10 +4561,8 @@ $result_trees{'index_table'} = {
               'entry_node' => {},
               'entry_number' => 80,
               'in_code' => 0,
-              'index_at_command' => 'cindex',
               'index_ignore_chars' => {},
-              'index_name' => 'cp',
-              'index_type_command' => 'cindex'
+              'index_name' => 'cp'
             }
           },
           'info' => {
@@ -4773,10 +4603,8 @@ $result_trees{'index_table'} = {
               'entry_node' => {},
               'entry_number' => 81,
               'in_code' => 0,
-              'index_at_command' => 'cindex',
               'index_ignore_chars' => {},
-              'index_name' => 'cp',
-              'index_type_command' => 'cindex'
+              'index_name' => 'cp'
             }
           },
           'info' => {
@@ -4817,10 +4645,8 @@ $result_trees{'index_table'} = {
               'entry_node' => {},
               'entry_number' => 82,
               'in_code' => 0,
-              'index_at_command' => 'cindex',
               'index_ignore_chars' => {},
-              'index_name' => 'cp',
-              'index_type_command' => 'cindex'
+              'index_name' => 'cp'
             }
           },
           'info' => {
@@ -4861,10 +4687,8 @@ $result_trees{'index_table'} = {
               'entry_node' => {},
               'entry_number' => 83,
               'in_code' => 0,
-              'index_at_command' => 'cindex',
               'index_ignore_chars' => {},
-              'index_name' => 'cp',
-              'index_type_command' => 'cindex'
+              'index_name' => 'cp'
             }
           },
           'info' => {
@@ -4905,10 +4729,8 @@ $result_trees{'index_table'} = {
               'entry_node' => {},
               'entry_number' => 84,
               'in_code' => 0,
-              'index_at_command' => 'cindex',
               'index_ignore_chars' => {},
-              'index_name' => 'cp',
-              'index_type_command' => 'cindex'
+              'index_name' => 'cp'
             }
           },
           'info' => {
@@ -4949,10 +4771,8 @@ $result_trees{'index_table'} = {
               'entry_node' => {},
               'entry_number' => 85,
               'in_code' => 0,
-              'index_at_command' => 'cindex',
               'index_ignore_chars' => {},
-              'index_name' => 'cp',
-              'index_type_command' => 'cindex'
+              'index_name' => 'cp'
             }
           },
           'info' => {
@@ -4993,10 +4813,8 @@ $result_trees{'index_table'} = {
               'entry_node' => {},
               'entry_number' => 86,
               'in_code' => 0,
-              'index_at_command' => 'cindex',
               'index_ignore_chars' => {},
-              'index_name' => 'cp',
-              'index_type_command' => 'cindex'
+              'index_name' => 'cp'
             }
           },
           'info' => {
@@ -5037,10 +4855,8 @@ $result_trees{'index_table'} = {
               'entry_node' => {},
               'entry_number' => 87,
               'in_code' => 0,
-              'index_at_command' => 'cindex',
               'index_ignore_chars' => {},
-              'index_name' => 'cp',
-              'index_type_command' => 'cindex'
+              'index_name' => 'cp'
             }
           },
           'info' => {
@@ -5081,10 +4897,8 @@ $result_trees{'index_table'} = {
               'entry_node' => {},
               'entry_number' => 88,
               'in_code' => 0,
-              'index_at_command' => 'cindex',
               'index_ignore_chars' => {},
-              'index_name' => 'cp',
-              'index_type_command' => 'cindex'
+              'index_name' => 'cp'
             }
           },
           'info' => {
@@ -5125,10 +4939,8 @@ $result_trees{'index_table'} = {
               'entry_node' => {},
               'entry_number' => 89,
               'in_code' => 0,
-              'index_at_command' => 'cindex',
               'index_ignore_chars' => {},
-              'index_name' => 'cp',
-              'index_type_command' => 'cindex'
+              'index_name' => 'cp'
             }
           },
           'info' => {
@@ -5169,10 +4981,8 @@ $result_trees{'index_table'} = {
               'entry_node' => {},
               'entry_number' => 90,
               'in_code' => 0,
-              'index_at_command' => 'cindex',
               'index_ignore_chars' => {},
-              'index_name' => 'cp',
-              'index_type_command' => 'cindex'
+              'index_name' => 'cp'
             }
           },
           'info' => {
@@ -5213,10 +5023,8 @@ $result_trees{'index_table'} = {
               'entry_node' => {},
               'entry_number' => 91,
               'in_code' => 0,
-              'index_at_command' => 'cindex',
               'index_ignore_chars' => {},
-              'index_name' => 'cp',
-              'index_type_command' => 'cindex'
+              'index_name' => 'cp'
             }
           },
           'info' => {
@@ -5257,10 +5065,8 @@ $result_trees{'index_table'} = {
               'entry_node' => {},
               'entry_number' => 92,
               'in_code' => 0,
-              'index_at_command' => 'cindex',
               'index_ignore_chars' => {},
-              'index_name' => 'cp',
-              'index_type_command' => 'cindex'
+              'index_name' => 'cp'
             }
           },
           'info' => {
@@ -5301,10 +5107,8 @@ $result_trees{'index_table'} = {
               'entry_node' => {},
               'entry_number' => 93,
               'in_code' => 0,
-              'index_at_command' => 'cindex',
               'index_ignore_chars' => {},
-              'index_name' => 'cp',
-              'index_type_command' => 'cindex'
+              'index_name' => 'cp'
             }
           },
           'info' => {
@@ -5345,10 +5149,8 @@ $result_trees{'index_table'} = {
               'entry_node' => {},
               'entry_number' => 94,
               'in_code' => 0,
-              'index_at_command' => 'cindex',
               'index_ignore_chars' => {},
-              'index_name' => 'cp',
-              'index_type_command' => 'cindex'
+              'index_name' => 'cp'
             }
           },
           'info' => {
@@ -5389,10 +5191,8 @@ $result_trees{'index_table'} = {
               'entry_node' => {},
               'entry_number' => 95,
               'in_code' => 0,
-              'index_at_command' => 'cindex',
               'index_ignore_chars' => {},
-              'index_name' => 'cp',
-              'index_type_command' => 'cindex'
+              'index_name' => 'cp'
             }
           },
           'info' => {
@@ -5433,10 +5233,8 @@ $result_trees{'index_table'} = {
               'entry_node' => {},
               'entry_number' => 96,
               'in_code' => 0,
-              'index_at_command' => 'cindex',
               'index_ignore_chars' => {},
-              'index_name' => 'cp',
-              'index_type_command' => 'cindex'
+              'index_name' => 'cp'
             }
           },
           'info' => {
@@ -5477,10 +5275,8 @@ $result_trees{'index_table'} = {
               'entry_node' => {},
               'entry_number' => 97,
               'in_code' => 0,
-              'index_at_command' => 'cindex',
               'index_ignore_chars' => {},
-              'index_name' => 'cp',
-              'index_type_command' => 'cindex'
+              'index_name' => 'cp'
             }
           },
           'info' => {
@@ -5521,10 +5317,8 @@ $result_trees{'index_table'} = {
               'entry_node' => {},
               'entry_number' => 98,
               'in_code' => 0,
-              'index_at_command' => 'cindex',
               'index_ignore_chars' => {},
-              'index_name' => 'cp',
-              'index_type_command' => 'cindex'
+              'index_name' => 'cp'
             }
           },
           'info' => {
@@ -5565,10 +5359,8 @@ $result_trees{'index_table'} = {
               'entry_node' => {},
               'entry_number' => 99,
               'in_code' => 0,
-              'index_at_command' => 'cindex',
               'index_ignore_chars' => {},
-              'index_name' => 'cp',
-              'index_type_command' => 'cindex'
+              'index_name' => 'cp'
             }
           },
           'info' => {
@@ -5609,10 +5401,8 @@ $result_trees{'index_table'} = {
               'entry_node' => {},
               'entry_number' => 100,
               'in_code' => 0,
-              'index_at_command' => 'cindex',
               'index_ignore_chars' => {},
-              'index_name' => 'cp',
-              'index_type_command' => 'cindex'
+              'index_name' => 'cp'
             }
           },
           'info' => {
@@ -5653,10 +5443,8 @@ $result_trees{'index_table'} = {
               'entry_node' => {},
               'entry_number' => 101,
               'in_code' => 0,
-              'index_at_command' => 'cindex',
               'index_ignore_chars' => {},
-              'index_name' => 'cp',
-              'index_type_command' => 'cindex'
+              'index_name' => 'cp'
             }
           },
           'info' => {
@@ -5697,10 +5485,8 @@ $result_trees{'index_table'} = {
               'entry_node' => {},
               'entry_number' => 102,
               'in_code' => 0,
-              'index_at_command' => 'cindex',
               'index_ignore_chars' => {},
-              'index_name' => 'cp',
-              'index_type_command' => 'cindex'
+              'index_name' => 'cp'
             }
           },
           'info' => {
@@ -5741,10 +5527,8 @@ $result_trees{'index_table'} = {
               'entry_node' => {},
               'entry_number' => 103,
               'in_code' => 0,
-              'index_at_command' => 'cindex',
               'index_ignore_chars' => {},
-              'index_name' => 'cp',
-              'index_type_command' => 'cindex'
+              'index_name' => 'cp'
             }
           },
           'info' => {
@@ -5785,10 +5569,8 @@ $result_trees{'index_table'} = {
               'entry_node' => {},
               'entry_number' => 104,
               'in_code' => 0,
-              'index_at_command' => 'cindex',
               'index_ignore_chars' => {},
-              'index_name' => 'cp',
-              'index_type_command' => 'cindex'
+              'index_name' => 'cp'
             }
           },
           'info' => {
@@ -5829,10 +5611,8 @@ $result_trees{'index_table'} = {
               'entry_node' => {},
               'entry_number' => 105,
               'in_code' => 0,
-              'index_at_command' => 'cindex',
               'index_ignore_chars' => {},
-              'index_name' => 'cp',
-              'index_type_command' => 'cindex'
+              'index_name' => 'cp'
             }
           },
           'info' => {
@@ -5873,10 +5653,8 @@ $result_trees{'index_table'} = {
               'entry_node' => {},
               'entry_number' => 106,
               'in_code' => 0,
-              'index_at_command' => 'cindex',
               'index_ignore_chars' => {},
-              'index_name' => 'cp',
-              'index_type_command' => 'cindex'
+              'index_name' => 'cp'
             }
           },
           'info' => {
@@ -5917,10 +5695,8 @@ $result_trees{'index_table'} = {
               'entry_node' => {},
               'entry_number' => 107,
               'in_code' => 0,
-              'index_at_command' => 'cindex',
               'index_ignore_chars' => {},
-              'index_name' => 'cp',
-              'index_type_command' => 'cindex'
+              'index_name' => 'cp'
             }
           },
           'info' => {
@@ -5961,10 +5737,8 @@ $result_trees{'index_table'} = {
               'entry_node' => {},
               'entry_number' => 108,
               'in_code' => 0,
-              'index_at_command' => 'cindex',
               'index_ignore_chars' => {},
-              'index_name' => 'cp',
-              'index_type_command' => 'cindex'
+              'index_name' => 'cp'
             }
           },
           'info' => {
@@ -6005,10 +5779,8 @@ $result_trees{'index_table'} = {
               'entry_node' => {},
               'entry_number' => 109,
               'in_code' => 0,
-              'index_at_command' => 'cindex',
               'index_ignore_chars' => {},
-              'index_name' => 'cp',
-              'index_type_command' => 'cindex'
+              'index_name' => 'cp'
             }
           },
           'info' => {
@@ -6049,10 +5821,8 @@ $result_trees{'index_table'} = {
               'entry_node' => {},
               'entry_number' => 110,
               'in_code' => 0,
-              'index_at_command' => 'cindex',
               'index_ignore_chars' => {},
-              'index_name' => 'cp',
-              'index_type_command' => 'cindex'
+              'index_name' => 'cp'
             }
           },
           'info' => {
@@ -6093,10 +5863,8 @@ $result_trees{'index_table'} = {
               'entry_node' => {},
               'entry_number' => 111,
               'in_code' => 0,
-              'index_at_command' => 'cindex',
               'index_ignore_chars' => {},
-              'index_name' => 'cp',
-              'index_type_command' => 'cindex'
+              'index_name' => 'cp'
             }
           },
           'info' => {
@@ -6137,10 +5905,8 @@ $result_trees{'index_table'} = {
               'entry_node' => {},
               'entry_number' => 112,
               'in_code' => 0,
-              'index_at_command' => 'cindex',
               'index_ignore_chars' => {},
-              'index_name' => 'cp',
-              'index_type_command' => 'cindex'
+              'index_name' => 'cp'
             }
           },
           'info' => {
@@ -6181,10 +5947,8 @@ $result_trees{'index_table'} = {
               'entry_node' => {},
               'entry_number' => 113,
               'in_code' => 0,
-              'index_at_command' => 'cindex',
               'index_ignore_chars' => {},
-              'index_name' => 'cp',
-              'index_type_command' => 'cindex'
+              'index_name' => 'cp'
             }
           },
           'info' => {
@@ -6225,10 +5989,8 @@ $result_trees{'index_table'} = {
               'entry_node' => {},
               'entry_number' => 114,
               'in_code' => 0,
-              'index_at_command' => 'cindex',
               'index_ignore_chars' => {},
-              'index_name' => 'cp',
-              'index_type_command' => 'cindex'
+              'index_name' => 'cp'
             }
           },
           'info' => {
@@ -6269,10 +6031,8 @@ $result_trees{'index_table'} = {
               'entry_node' => {},
               'entry_number' => 115,
               'in_code' => 0,
-              'index_at_command' => 'cindex',
               'index_ignore_chars' => {},
-              'index_name' => 'cp',
-              'index_type_command' => 'cindex'
+              'index_name' => 'cp'
             }
           },
           'info' => {
@@ -6313,10 +6073,8 @@ $result_trees{'index_table'} = {
               'entry_node' => {},
               'entry_number' => 116,
               'in_code' => 0,
-              'index_at_command' => 'cindex',
               'index_ignore_chars' => {},
-              'index_name' => 'cp',
-              'index_type_command' => 'cindex'
+              'index_name' => 'cp'
             }
           },
           'info' => {
@@ -6357,10 +6115,8 @@ $result_trees{'index_table'} = {
               'entry_node' => {},
               'entry_number' => 117,
               'in_code' => 0,
-              'index_at_command' => 'cindex',
               'index_ignore_chars' => {},
-              'index_name' => 'cp',
-              'index_type_command' => 'cindex'
+              'index_name' => 'cp'
             }
           },
           'info' => {
@@ -6401,10 +6157,8 @@ $result_trees{'index_table'} = {
               'entry_node' => {},
               'entry_number' => 118,
               'in_code' => 0,
-              'index_at_command' => 'cindex',
               'index_ignore_chars' => {},
-              'index_name' => 'cp',
-              'index_type_command' => 'cindex'
+              'index_name' => 'cp'
             }
           },
           'info' => {
@@ -6445,10 +6199,8 @@ $result_trees{'index_table'} = {
               'entry_node' => {},
               'entry_number' => 119,
               'in_code' => 0,
-              'index_at_command' => 'cindex',
               'index_ignore_chars' => {},
-              'index_name' => 'cp',
-              'index_type_command' => 'cindex'
+              'index_name' => 'cp'
             }
           },
           'info' => {
@@ -6489,10 +6241,8 @@ $result_trees{'index_table'} = {
               'entry_node' => {},
               'entry_number' => 120,
               'in_code' => 0,
-              'index_at_command' => 'cindex',
               'index_ignore_chars' => {},
-              'index_name' => 'cp',
-              'index_type_command' => 'cindex'
+              'index_name' => 'cp'
             }
           },
           'info' => {
@@ -6533,10 +6283,8 @@ $result_trees{'index_table'} = {
               'entry_node' => {},
               'entry_number' => 121,
               'in_code' => 0,
-              'index_at_command' => 'cindex',
               'index_ignore_chars' => {},
-              'index_name' => 'cp',
-              'index_type_command' => 'cindex'
+              'index_name' => 'cp'
             }
           },
           'info' => {
@@ -6577,10 +6325,8 @@ $result_trees{'index_table'} = {
               'entry_node' => {},
               'entry_number' => 122,
               'in_code' => 0,
-              'index_at_command' => 'cindex',
               'index_ignore_chars' => {},
-              'index_name' => 'cp',
-              'index_type_command' => 'cindex'
+              'index_name' => 'cp'
             }
           },
           'info' => {
@@ -6621,10 +6367,8 @@ $result_trees{'index_table'} = {
               'entry_node' => {},
               'entry_number' => 123,
               'in_code' => 0,
-              'index_at_command' => 'cindex',
               'index_ignore_chars' => {},
-              'index_name' => 'cp',
-              'index_type_command' => 'cindex'
+              'index_name' => 'cp'
             }
           },
           'info' => {
@@ -6665,10 +6409,8 @@ $result_trees{'index_table'} = {
               'entry_node' => {},
               'entry_number' => 124,
               'in_code' => 0,
-              'index_at_command' => 'cindex',
               'index_ignore_chars' => {},
-              'index_name' => 'cp',
-              'index_type_command' => 'cindex'
+              'index_name' => 'cp'
             }
           },
           'info' => {
@@ -6709,10 +6451,8 @@ $result_trees{'index_table'} = {
               'entry_node' => {},
               'entry_number' => 125,
               'in_code' => 0,
-              'index_at_command' => 'cindex',
               'index_ignore_chars' => {},
-              'index_name' => 'cp',
-              'index_type_command' => 'cindex'
+              'index_name' => 'cp'
             }
           },
           'info' => {
@@ -6753,10 +6493,8 @@ $result_trees{'index_table'} = {
               'entry_node' => {},
               'entry_number' => 126,
               'in_code' => 0,
-              'index_at_command' => 'cindex',
               'index_ignore_chars' => {},
-              'index_name' => 'cp',
-              'index_type_command' => 'cindex'
+              'index_name' => 'cp'
             }
           },
           'info' => {
@@ -6797,10 +6535,8 @@ $result_trees{'index_table'} = {
               'entry_node' => {},
               'entry_number' => 127,
               'in_code' => 0,
-              'index_at_command' => 'cindex',
               'index_ignore_chars' => {},
-              'index_name' => 'cp',
-              'index_type_command' => 'cindex'
+              'index_name' => 'cp'
             }
           },
           'info' => {
@@ -6841,10 +6577,8 @@ $result_trees{'index_table'} = {
               'entry_node' => {},
               'entry_number' => 128,
               'in_code' => 0,
-              'index_at_command' => 'cindex',
               'index_ignore_chars' => {},
-              'index_name' => 'cp',
-              'index_type_command' => 'cindex'
+              'index_name' => 'cp'
             }
           },
           'info' => {
@@ -6885,10 +6619,8 @@ $result_trees{'index_table'} = {
               'entry_node' => {},
               'entry_number' => 129,
               'in_code' => 0,
-              'index_at_command' => 'cindex',
               'index_ignore_chars' => {},
-              'index_name' => 'cp',
-              'index_type_command' => 'cindex'
+              'index_name' => 'cp'
             }
           },
           'info' => {
@@ -6929,10 +6661,8 @@ $result_trees{'index_table'} = {
               'entry_node' => {},
               'entry_number' => 130,
               'in_code' => 0,
-              'index_at_command' => 'cindex',
               'index_ignore_chars' => {},
-              'index_name' => 'cp',
-              'index_type_command' => 'cindex'
+              'index_name' => 'cp'
             }
           },
           'info' => {
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 9c57529ea8..3b8afd21ea 100644
--- a/tp/t/results/indices/index_table_chapter_no_node.pl
+++ b/tp/t/results/indices/index_table_chapter_no_node.pl
@@ -401,10 +401,8 @@ $result_trees{'index_table_chapter_no_node'} = {
               'entry_node' => {},
               'entry_number' => 1,
               'in_code' => 0,
-              'index_at_command' => 'cindex',
               'index_ignore_chars' => {},
-              'index_name' => 'cp',
-              'index_type_command' => 'cindex'
+              'index_name' => 'cp'
             }
           },
           'info' => {
@@ -456,10 +454,8 @@ $result_trees{'index_table_chapter_no_node'} = {
                   'entry_node' => {},
                   'entry_number' => 2,
                   'in_code' => 0,
-                  'index_at_command' => 'cindex',
                   'index_ignore_chars' => {},
-                  'index_name' => 'cp',
-                  'index_type_command' => 'cindex'
+                  'index_name' => 'cp'
                 }
               },
               'info' => {
@@ -551,10 +547,8 @@ $result_trees{'index_table_chapter_no_node'} = {
                           'entry_node' => {},
                           'entry_number' => 1,
                           'in_code' => 1,
-                          'index_at_command' => 'item',
                           'index_ignore_chars' => {},
-                          'index_name' => 'vr',
-                          'index_type_command' => 'vtable'
+                          'index_name' => 'vr'
                         }
                       },
                       'info' => {
@@ -594,10 +588,8 @@ $result_trees{'index_table_chapter_no_node'} = {
                           'entry_node' => {},
                           'entry_number' => 2,
                           'in_code' => 1,
-                          'index_at_command' => 'itemx',
                           'index_ignore_chars' => {},
-                          'index_name' => 'vr',
-                          'index_type_command' => 'vtable'
+                          'index_name' => 'vr'
                         }
                       },
                       'info' => {
@@ -751,10 +743,8 @@ $result_trees{'index_table_chapter_no_node'} = {
                           'entry_node' => {},
                           'entry_number' => 1,
                           'in_code' => 1,
-                          'index_at_command' => 'item',
                           'index_ignore_chars' => {},
-                          'index_name' => 'fn',
-                          'index_type_command' => 'ftable'
+                          'index_name' => 'fn'
                         }
                       },
                       'info' => {
@@ -794,10 +784,8 @@ $result_trees{'index_table_chapter_no_node'} = {
                           'entry_node' => {},
                           'entry_number' => 2,
                           'in_code' => 1,
-                          'index_at_command' => 'itemx',
                           'index_ignore_chars' => {},
-                          'index_name' => 'fn',
-                          'index_type_command' => 'ftable'
+                          'index_name' => 'fn'
                         }
                       },
                       'info' => {
@@ -861,10 +849,8 @@ $result_trees{'index_table_chapter_no_node'} = {
                           'entry_node' => {},
                           'entry_number' => 3,
                           'in_code' => 1,
-                          'index_at_command' => 'item',
                           'index_ignore_chars' => {},
-                          'index_name' => 'fn',
-                          'index_type_command' => 'ftable'
+                          'index_name' => 'fn'
                         }
                       },
                       'info' => {
@@ -1341,10 +1327,8 @@ $result_trees{'index_table_chapter_no_node'} = {
               'entry_node' => {},
               'entry_number' => 3,
               'in_code' => 0,
-              'index_at_command' => 'cindex',
               'index_ignore_chars' => {},
-              'index_name' => 'cp',
-              'index_type_command' => 'cindex'
+              'index_name' => 'cp'
             }
           },
           'info' => {
@@ -1385,10 +1369,8 @@ $result_trees{'index_table_chapter_no_node'} = {
               'entry_node' => {},
               'entry_number' => 4,
               'in_code' => 0,
-              'index_at_command' => 'cindex',
               'index_ignore_chars' => {},
-              'index_name' => 'cp',
-              'index_type_command' => 'cindex'
+              'index_name' => 'cp'
             }
           },
           'info' => {
@@ -1429,10 +1411,8 @@ $result_trees{'index_table_chapter_no_node'} = {
               'entry_node' => {},
               'entry_number' => 5,
               'in_code' => 0,
-              'index_at_command' => 'cindex',
               'index_ignore_chars' => {},
-              'index_name' => 'cp',
-              'index_type_command' => 'cindex'
+              'index_name' => 'cp'
             }
           },
           'info' => {
@@ -1473,10 +1453,8 @@ $result_trees{'index_table_chapter_no_node'} = {
               'entry_node' => {},
               'entry_number' => 6,
               'in_code' => 0,
-              'index_at_command' => 'cindex',
               'index_ignore_chars' => {},
-              'index_name' => 'cp',
-              'index_type_command' => 'cindex'
+              'index_name' => 'cp'
             }
           },
           'info' => {
@@ -1517,10 +1495,8 @@ $result_trees{'index_table_chapter_no_node'} = {
               'entry_node' => {},
               'entry_number' => 7,
               'in_code' => 0,
-              'index_at_command' => 'cindex',
               'index_ignore_chars' => {},
-              'index_name' => 'cp',
-              'index_type_command' => 'cindex'
+              'index_name' => 'cp'
             }
           },
           'info' => {
@@ -1561,10 +1537,8 @@ $result_trees{'index_table_chapter_no_node'} = {
               'entry_node' => {},
               'entry_number' => 8,
               'in_code' => 0,
-              'index_at_command' => 'cindex',
               'index_ignore_chars' => {},
-              'index_name' => 'cp',
-              'index_type_command' => 'cindex'
+              'index_name' => 'cp'
             }
           },
           'info' => {
@@ -1605,10 +1579,8 @@ $result_trees{'index_table_chapter_no_node'} = {
               'entry_node' => {},
               'entry_number' => 9,
               'in_code' => 0,
-              'index_at_command' => 'cindex',
               'index_ignore_chars' => {},
-              'index_name' => 'cp',
-              'index_type_command' => 'cindex'
+              'index_name' => 'cp'
             }
           },
           'info' => {
@@ -1649,10 +1621,8 @@ $result_trees{'index_table_chapter_no_node'} = {
               'entry_node' => {},
               'entry_number' => 10,
               'in_code' => 0,
-              'index_at_command' => 'cindex',
               'index_ignore_chars' => {},
-              'index_name' => 'cp',
-              'index_type_command' => 'cindex'
+              'index_name' => 'cp'
             }
           },
           'info' => {
@@ -1693,10 +1663,8 @@ $result_trees{'index_table_chapter_no_node'} = {
               'entry_node' => {},
               'entry_number' => 11,
               'in_code' => 0,
-              'index_at_command' => 'cindex',
               'index_ignore_chars' => {},
-              'index_name' => 'cp',
-              'index_type_command' => 'cindex'
+              'index_name' => 'cp'
             }
           },
           'info' => {
@@ -1737,10 +1705,8 @@ $result_trees{'index_table_chapter_no_node'} = {
               'entry_node' => {},
               'entry_number' => 12,
               'in_code' => 0,
-              'index_at_command' => 'cindex',
               'index_ignore_chars' => {},
-              'index_name' => 'cp',
-              'index_type_command' => 'cindex'
+              'index_name' => 'cp'
             }
           },
           'info' => {
@@ -1781,10 +1747,8 @@ $result_trees{'index_table_chapter_no_node'} = {
               'entry_node' => {},
               'entry_number' => 13,
               'in_code' => 0,
-              'index_at_command' => 'cindex',
               'index_ignore_chars' => {},
-              'index_name' => 'cp',
-              'index_type_command' => 'cindex'
+              'index_name' => 'cp'
             }
           },
           'info' => {
@@ -1825,10 +1789,8 @@ $result_trees{'index_table_chapter_no_node'} = {
               'entry_node' => {},
               'entry_number' => 14,
               'in_code' => 0,
-              'index_at_command' => 'cindex',
               'index_ignore_chars' => {},
-              'index_name' => 'cp',
-              'index_type_command' => 'cindex'
+              'index_name' => 'cp'
             }
           },
           'info' => {
@@ -1869,10 +1831,8 @@ $result_trees{'index_table_chapter_no_node'} = {
               'entry_node' => {},
               'entry_number' => 15,
               'in_code' => 0,
-              'index_at_command' => 'cindex',
               'index_ignore_chars' => {},
-              'index_name' => 'cp',
-              'index_type_command' => 'cindex'
+              'index_name' => 'cp'
             }
           },
           'info' => {
@@ -1913,10 +1873,8 @@ $result_trees{'index_table_chapter_no_node'} = {
               'entry_node' => {},
               'entry_number' => 16,
               'in_code' => 0,
-              'index_at_command' => 'cindex',
               'index_ignore_chars' => {},
-              'index_name' => 'cp',
-              'index_type_command' => 'cindex'
+              'index_name' => 'cp'
             }
           },
           'info' => {
@@ -1957,10 +1915,8 @@ $result_trees{'index_table_chapter_no_node'} = {
               'entry_node' => {},
               'entry_number' => 17,
               'in_code' => 0,
-              'index_at_command' => 'cindex',
               'index_ignore_chars' => {},
-              'index_name' => 'cp',
-              'index_type_command' => 'cindex'
+              'index_name' => 'cp'
             }
           },
           'info' => {
@@ -2001,10 +1957,8 @@ $result_trees{'index_table_chapter_no_node'} = {
               'entry_node' => {},
               'entry_number' => 18,
               'in_code' => 0,
-              'index_at_command' => 'cindex',
               'index_ignore_chars' => {},
-              'index_name' => 'cp',
-              'index_type_command' => 'cindex'
+              'index_name' => 'cp'
             }
           },
           'info' => {
@@ -2045,10 +1999,8 @@ $result_trees{'index_table_chapter_no_node'} = {
               'entry_node' => {},
               'entry_number' => 19,
               'in_code' => 0,
-              'index_at_command' => 'cindex',
               'index_ignore_chars' => {},
-              'index_name' => 'cp',
-              'index_type_command' => 'cindex'
+              'index_name' => 'cp'
             }
           },
           'info' => {
@@ -2089,10 +2041,8 @@ $result_trees{'index_table_chapter_no_node'} = {
               'entry_node' => {},
               'entry_number' => 20,
               'in_code' => 0,
-              'index_at_command' => 'cindex',
               'index_ignore_chars' => {},
-              'index_name' => 'cp',
-              'index_type_command' => 'cindex'
+              'index_name' => 'cp'
             }
           },
           'info' => {
@@ -2133,10 +2083,8 @@ $result_trees{'index_table_chapter_no_node'} = {
               'entry_node' => {},
               'entry_number' => 21,
               'in_code' => 0,
-              'index_at_command' => 'cindex',
               'index_ignore_chars' => {},
-              'index_name' => 'cp',
-              'index_type_command' => 'cindex'
+              'index_name' => 'cp'
             }
           },
           'info' => {
@@ -2177,10 +2125,8 @@ $result_trees{'index_table_chapter_no_node'} = {
               'entry_node' => {},
               'entry_number' => 22,
               'in_code' => 0,
-              'index_at_command' => 'cindex',
               'index_ignore_chars' => {},
-              'index_name' => 'cp',
-              'index_type_command' => 'cindex'
+              'index_name' => 'cp'
             }
           },
           'info' => {
@@ -2221,10 +2167,8 @@ $result_trees{'index_table_chapter_no_node'} = {
               'entry_node' => {},
               'entry_number' => 23,
               'in_code' => 0,
-              'index_at_command' => 'cindex',
               'index_ignore_chars' => {},
-              'index_name' => 'cp',
-              'index_type_command' => 'cindex'
+              'index_name' => 'cp'
             }
           },
           'info' => {
@@ -2265,10 +2209,8 @@ $result_trees{'index_table_chapter_no_node'} = {
               'entry_node' => {},
               'entry_number' => 24,
               'in_code' => 0,
-              'index_at_command' => 'cindex',
               'index_ignore_chars' => {},
-              'index_name' => 'cp',
-              'index_type_command' => 'cindex'
+              'index_name' => 'cp'
             }
           },
           'info' => {
@@ -2309,10 +2251,8 @@ $result_trees{'index_table_chapter_no_node'} = {
               'entry_node' => {},
               'entry_number' => 25,
               'in_code' => 0,
-              'index_at_command' => 'cindex',
               'index_ignore_chars' => {},
-              'index_name' => 'cp',
-              'index_type_command' => 'cindex'
+              'index_name' => 'cp'
             }
           },
           'info' => {
@@ -2353,10 +2293,8 @@ $result_trees{'index_table_chapter_no_node'} = {
               'entry_node' => {},
               'entry_number' => 26,
               'in_code' => 0,
-              'index_at_command' => 'cindex',
               'index_ignore_chars' => {},
-              'index_name' => 'cp',
-              'index_type_command' => 'cindex'
+              'index_name' => 'cp'
             }
           },
           'info' => {
@@ -2397,10 +2335,8 @@ $result_trees{'index_table_chapter_no_node'} = {
               'entry_node' => {},
               'entry_number' => 27,
               'in_code' => 0,
-              'index_at_command' => 'cindex',
               'index_ignore_chars' => {},
-              'index_name' => 'cp',
-              'index_type_command' => 'cindex'
+              'index_name' => 'cp'
             }
           },
           'info' => {
@@ -2441,10 +2377,8 @@ $result_trees{'index_table_chapter_no_node'} = {
               'entry_node' => {},
               'entry_number' => 28,
               'in_code' => 0,
-              'index_at_command' => 'cindex',
               'index_ignore_chars' => {},
-              'index_name' => 'cp',
-              'index_type_command' => 'cindex'
+              'index_name' => 'cp'
             }
           },
           'info' => {
@@ -2485,10 +2419,8 @@ $result_trees{'index_table_chapter_no_node'} = {
               'entry_node' => {},
               'entry_number' => 29,
               'in_code' => 0,
-              'index_at_command' => 'cindex',
               'index_ignore_chars' => {},
-              'index_name' => 'cp',
-              'index_type_command' => 'cindex'
+              'index_name' => 'cp'
             }
           },
           'info' => {
@@ -2529,10 +2461,8 @@ $result_trees{'index_table_chapter_no_node'} = {
               'entry_node' => {},
               'entry_number' => 30,
               'in_code' => 0,
-              'index_at_command' => 'cindex',
               'index_ignore_chars' => {},
-              'index_name' => 'cp',
-              'index_type_command' => 'cindex'
+              'index_name' => 'cp'
             }
           },
           'info' => {
@@ -2573,10 +2503,8 @@ $result_trees{'index_table_chapter_no_node'} = {
               'entry_node' => {},
               'entry_number' => 31,
               'in_code' => 0,
-              'index_at_command' => 'cindex',
               'index_ignore_chars' => {},
-              'index_name' => 'cp',
-              'index_type_command' => 'cindex'
+              'index_name' => 'cp'
             }
           },
           'info' => {
@@ -2617,10 +2545,8 @@ $result_trees{'index_table_chapter_no_node'} = {
               'entry_node' => {},
               'entry_number' => 32,
               'in_code' => 0,
-              'index_at_command' => 'cindex',
               'index_ignore_chars' => {},
-              'index_name' => 'cp',
-              'index_type_command' => 'cindex'
+              'index_name' => 'cp'
             }
           },
           'info' => {
@@ -2661,10 +2587,8 @@ $result_trees{'index_table_chapter_no_node'} = {
               'entry_node' => {},
               'entry_number' => 33,
               'in_code' => 0,
-              'index_at_command' => 'cindex',
               'index_ignore_chars' => {},
-              'index_name' => 'cp',
-              'index_type_command' => 'cindex'
+              'index_name' => 'cp'
             }
           },
           'info' => {
@@ -2705,10 +2629,8 @@ $result_trees{'index_table_chapter_no_node'} = {
               'entry_node' => {},
               'entry_number' => 34,
               'in_code' => 0,
-              'index_at_command' => 'cindex',
               'index_ignore_chars' => {},
-              'index_name' => 'cp',
-              'index_type_command' => 'cindex'
+              'index_name' => 'cp'
             }
           },
           'info' => {
@@ -2749,10 +2671,8 @@ $result_trees{'index_table_chapter_no_node'} = {
               'entry_node' => {},
               'entry_number' => 35,
               'in_code' => 0,
-              'index_at_command' => 'cindex',
               'index_ignore_chars' => {},
-              'index_name' => 'cp',
-              'index_type_command' => 'cindex'
+              'index_name' => 'cp'
             }
           },
           'info' => {
@@ -2793,10 +2713,8 @@ $result_trees{'index_table_chapter_no_node'} = {
               'entry_node' => {},
               'entry_number' => 36,
               'in_code' => 0,
-              'index_at_command' => 'cindex',
               'index_ignore_chars' => {},
-              'index_name' => 'cp',
-              'index_type_command' => 'cindex'
+              'index_name' => 'cp'
             }
           },
           'info' => {
@@ -2837,10 +2755,8 @@ $result_trees{'index_table_chapter_no_node'} = {
               'entry_node' => {},
               'entry_number' => 37,
               'in_code' => 0,
-              'index_at_command' => 'cindex',
               'index_ignore_chars' => {},
-              'index_name' => 'cp',
-              'index_type_command' => 'cindex'
+              'index_name' => 'cp'
             }
           },
           'info' => {
@@ -2881,10 +2797,8 @@ $result_trees{'index_table_chapter_no_node'} = {
               'entry_node' => {},
               'entry_number' => 38,
               'in_code' => 0,
-              'index_at_command' => 'cindex',
               'index_ignore_chars' => {},
-              'index_name' => 'cp',
-              'index_type_command' => 'cindex'
+              'index_name' => 'cp'
             }
           },
           'info' => {
@@ -2925,10 +2839,8 @@ $result_trees{'index_table_chapter_no_node'} = {
               'entry_node' => {},
               'entry_number' => 39,
               'in_code' => 0,
-              'index_at_command' => 'cindex',
               'index_ignore_chars' => {},
-              'index_name' => 'cp',
-              'index_type_command' => 'cindex'
+              'index_name' => 'cp'
             }
           },
           'info' => {
@@ -2969,10 +2881,8 @@ $result_trees{'index_table_chapter_no_node'} = {
               'entry_node' => {},
               'entry_number' => 40,
               'in_code' => 0,
-              'index_at_command' => 'cindex',
               'index_ignore_chars' => {},
-              'index_name' => 'cp',
-              'index_type_command' => 'cindex'
+              'index_name' => 'cp'
             }
           },
           'info' => {
@@ -3013,10 +2923,8 @@ $result_trees{'index_table_chapter_no_node'} = {
               'entry_node' => {},
               'entry_number' => 41,
               'in_code' => 0,
-              'index_at_command' => 'cindex',
               'index_ignore_chars' => {},
-              'index_name' => 'cp',
-              'index_type_command' => 'cindex'
+              'index_name' => 'cp'
             }
           },
           'info' => {
@@ -3057,10 +2965,8 @@ $result_trees{'index_table_chapter_no_node'} = {
               'entry_node' => {},
               'entry_number' => 42,
               'in_code' => 0,
-              'index_at_command' => 'cindex',
               'index_ignore_chars' => {},
-              'index_name' => 'cp',
-              'index_type_command' => 'cindex'
+              'index_name' => 'cp'
             }
           },
           'info' => {
@@ -3101,10 +3007,8 @@ $result_trees{'index_table_chapter_no_node'} = {
               'entry_node' => {},
               'entry_number' => 43,
               'in_code' => 0,
-              'index_at_command' => 'cindex',
               'index_ignore_chars' => {},
-              'index_name' => 'cp',
-              'index_type_command' => 'cindex'
+              'index_name' => 'cp'
             }
           },
           'info' => {
@@ -3145,10 +3049,8 @@ $result_trees{'index_table_chapter_no_node'} = {
               'entry_node' => {},
               'entry_number' => 44,
               'in_code' => 0,
-              'index_at_command' => 'cindex',
               'index_ignore_chars' => {},
-              'index_name' => 'cp',
-              'index_type_command' => 'cindex'
+              'index_name' => 'cp'
             }
           },
           'info' => {
@@ -3189,10 +3091,8 @@ $result_trees{'index_table_chapter_no_node'} = {
               'entry_node' => {},
               'entry_number' => 45,
               'in_code' => 0,
-              'index_at_command' => 'cindex',
               'index_ignore_chars' => {},
-              'index_name' => 'cp',
-              'index_type_command' => 'cindex'
+              'index_name' => 'cp'
             }
           },
           'info' => {
@@ -3233,10 +3133,8 @@ $result_trees{'index_table_chapter_no_node'} = {
               'entry_node' => {},
               'entry_number' => 46,
               'in_code' => 0,
-              'index_at_command' => 'cindex',
               'index_ignore_chars' => {},
-              'index_name' => 'cp',
-              'index_type_command' => 'cindex'
+              'index_name' => 'cp'
             }
           },
           'info' => {
@@ -3277,10 +3175,8 @@ $result_trees{'index_table_chapter_no_node'} = {
               'entry_node' => {},
               'entry_number' => 47,
               'in_code' => 0,
-              'index_at_command' => 'cindex',
               'index_ignore_chars' => {},
-              'index_name' => 'cp',
-              'index_type_command' => 'cindex'
+              'index_name' => 'cp'
             }
           },
           'info' => {
@@ -3321,10 +3217,8 @@ $result_trees{'index_table_chapter_no_node'} = {
               'entry_node' => {},
               'entry_number' => 48,
               'in_code' => 0,
-              'index_at_command' => 'cindex',
               'index_ignore_chars' => {},
-              'index_name' => 'cp',
-              'index_type_command' => 'cindex'
+              'index_name' => 'cp'
             }
           },
           'info' => {
@@ -3365,10 +3259,8 @@ $result_trees{'index_table_chapter_no_node'} = {
               'entry_node' => {},
               'entry_number' => 49,
               'in_code' => 0,
-              'index_at_command' => 'cindex',
               'index_ignore_chars' => {},
-              'index_name' => 'cp',
-              'index_type_command' => 'cindex'
+              'index_name' => 'cp'
             }
           },
           'info' => {
@@ -3409,10 +3301,8 @@ $result_trees{'index_table_chapter_no_node'} = {
               'entry_node' => {},
               'entry_number' => 50,
               'in_code' => 0,
-              'index_at_command' => 'cindex',
               'index_ignore_chars' => {},
-              'index_name' => 'cp',
-              'index_type_command' => 'cindex'
+              'index_name' => 'cp'
             }
           },
           'info' => {
@@ -3453,10 +3343,8 @@ $result_trees{'index_table_chapter_no_node'} = {
               'entry_node' => {},
               'entry_number' => 51,
               'in_code' => 0,
-              'index_at_command' => 'cindex',
               'index_ignore_chars' => {},
-              'index_name' => 'cp',
-              'index_type_command' => 'cindex'
+              'index_name' => 'cp'
             }
           },
           'info' => {
@@ -3497,10 +3385,8 @@ $result_trees{'index_table_chapter_no_node'} = {
               'entry_node' => {},
               'entry_number' => 52,
               'in_code' => 0,
-              'index_at_command' => 'cindex',
               'index_ignore_chars' => {},
-              'index_name' => 'cp',
-              'index_type_command' => 'cindex'
+              'index_name' => 'cp'
             }
           },
           'info' => {
@@ -3541,10 +3427,8 @@ $result_trees{'index_table_chapter_no_node'} = {
               'entry_node' => {},
               'entry_number' => 53,
               'in_code' => 0,
-              'index_at_command' => 'cindex',
               'index_ignore_chars' => {},
-              'index_name' => 'cp',
-              'index_type_command' => 'cindex'
+              'index_name' => 'cp'
             }
           },
           'info' => {
@@ -3585,10 +3469,8 @@ $result_trees{'index_table_chapter_no_node'} = {
               'entry_node' => {},
               'entry_number' => 54,
               'in_code' => 0,
-              'index_at_command' => 'cindex',
               'index_ignore_chars' => {},
-              'index_name' => 'cp',
-              'index_type_command' => 'cindex'
+              'index_name' => 'cp'
             }
           },
           'info' => {
@@ -3629,10 +3511,8 @@ $result_trees{'index_table_chapter_no_node'} = {
               'entry_node' => {},
               'entry_number' => 55,
               'in_code' => 0,
-              'index_at_command' => 'cindex',
               'index_ignore_chars' => {},
-              'index_name' => 'cp',
-              'index_type_command' => 'cindex'
+              'index_name' => 'cp'
             }
           },
           'info' => {
@@ -3673,10 +3553,8 @@ $result_trees{'index_table_chapter_no_node'} = {
               'entry_node' => {},
               'entry_number' => 56,
               'in_code' => 0,
-              'index_at_command' => 'cindex',
               'index_ignore_chars' => {},
-              'index_name' => 'cp',
-              'index_type_command' => 'cindex'
+              'index_name' => 'cp'
             }
           },
           'info' => {
@@ -3717,10 +3595,8 @@ $result_trees{'index_table_chapter_no_node'} = {
               'entry_node' => {},
               'entry_number' => 57,
               'in_code' => 0,
-              'index_at_command' => 'cindex',
               'index_ignore_chars' => {},
-              'index_name' => 'cp',
-              'index_type_command' => 'cindex'
+              'index_name' => 'cp'
             }
           },
           'info' => {
@@ -3761,10 +3637,8 @@ $result_trees{'index_table_chapter_no_node'} = {
               'entry_node' => {},
               'entry_number' => 58,
               'in_code' => 0,
-              'index_at_command' => 'cindex',
               'index_ignore_chars' => {},
-              'index_name' => 'cp',
-              'index_type_command' => 'cindex'
+              'index_name' => 'cp'
             }
           },
           'info' => {
@@ -3805,10 +3679,8 @@ $result_trees{'index_table_chapter_no_node'} = {
               'entry_node' => {},
               'entry_number' => 59,
               'in_code' => 0,
-              'index_at_command' => 'cindex',
               'index_ignore_chars' => {},
-              'index_name' => 'cp',
-              'index_type_command' => 'cindex'
+              'index_name' => 'cp'
             }
           },
           'info' => {
@@ -3849,10 +3721,8 @@ $result_trees{'index_table_chapter_no_node'} = {
               'entry_node' => {},
               'entry_number' => 60,
               'in_code' => 0,
-              'index_at_command' => 'cindex',
               'index_ignore_chars' => {},
-              'index_name' => 'cp',
-              'index_type_command' => 'cindex'
+              'index_name' => 'cp'
             }
           },
           'info' => {
@@ -3893,10 +3763,8 @@ $result_trees{'index_table_chapter_no_node'} = {
               'entry_node' => {},
               'entry_number' => 61,
               'in_code' => 0,
-              'index_at_command' => 'cindex',
               'index_ignore_chars' => {},
-              'index_name' => 'cp',
-              'index_type_command' => 'cindex'
+              'index_name' => 'cp'
             }
           },
           'info' => {
@@ -3937,10 +3805,8 @@ $result_trees{'index_table_chapter_no_node'} = {
               'entry_node' => {},
               'entry_number' => 62,
               'in_code' => 0,
-              'index_at_command' => 'cindex',
               'index_ignore_chars' => {},
-              'index_name' => 'cp',
-              'index_type_command' => 'cindex'
+              'index_name' => 'cp'
             }
           },
           'info' => {
@@ -3981,10 +3847,8 @@ $result_trees{'index_table_chapter_no_node'} = {
               'entry_node' => {},
               'entry_number' => 63,
               'in_code' => 0,
-              'index_at_command' => 'cindex',
               'index_ignore_chars' => {},
-              'index_name' => 'cp',
-              'index_type_command' => 'cindex'
+              'index_name' => 'cp'
             }
           },
           'info' => {
@@ -4025,10 +3889,8 @@ $result_trees{'index_table_chapter_no_node'} = {
               'entry_node' => {},
               'entry_number' => 64,
               'in_code' => 0,
-              'index_at_command' => 'cindex',
               'index_ignore_chars' => {},
-              'index_name' => 'cp',
-              'index_type_command' => 'cindex'
+              'index_name' => 'cp'
             }
           },
           'info' => {
@@ -4069,10 +3931,8 @@ $result_trees{'index_table_chapter_no_node'} = {
               'entry_node' => {},
               'entry_number' => 65,
               'in_code' => 0,
-              'index_at_command' => 'cindex',
               'index_ignore_chars' => {},
-              'index_name' => 'cp',
-              'index_type_command' => 'cindex'
+              'index_name' => 'cp'
             }
           },
           'info' => {
@@ -4113,10 +3973,8 @@ $result_trees{'index_table_chapter_no_node'} = {
               'entry_node' => {},
               'entry_number' => 66,
               'in_code' => 0,
-              'index_at_command' => 'cindex',
               'index_ignore_chars' => {},
-              'index_name' => 'cp',
-              'index_type_command' => 'cindex'
+              'index_name' => 'cp'
             }
           },
           'info' => {
@@ -4157,10 +4015,8 @@ $result_trees{'index_table_chapter_no_node'} = {
               'entry_node' => {},
               'entry_number' => 67,
               'in_code' => 0,
-              'index_at_command' => 'cindex',
               'index_ignore_chars' => {},
-              'index_name' => 'cp',
-              'index_type_command' => 'cindex'
+              'index_name' => 'cp'
             }
           },
           'info' => {
@@ -4201,10 +4057,8 @@ $result_trees{'index_table_chapter_no_node'} = {
               'entry_node' => {},
               'entry_number' => 68,
               'in_code' => 0,
-              'index_at_command' => 'cindex',
               'index_ignore_chars' => {},
-              'index_name' => 'cp',
-              'index_type_command' => 'cindex'
+              'index_name' => 'cp'
             }
           },
           'info' => {
@@ -4245,10 +4099,8 @@ $result_trees{'index_table_chapter_no_node'} = {
               'entry_node' => {},
               'entry_number' => 69,
               'in_code' => 0,
-              'index_at_command' => 'cindex',
               'index_ignore_chars' => {},
-              'index_name' => 'cp',
-              'index_type_command' => 'cindex'
+              'index_name' => 'cp'
             }
           },
           'info' => {
@@ -4289,10 +4141,8 @@ $result_trees{'index_table_chapter_no_node'} = {
               'entry_node' => {},
               'entry_number' => 70,
               'in_code' => 0,
-              'index_at_command' => 'cindex',
               'index_ignore_chars' => {},
-              'index_name' => 'cp',
-              'index_type_command' => 'cindex'
+              'index_name' => 'cp'
             }
           },
           'info' => {
@@ -4333,10 +4183,8 @@ $result_trees{'index_table_chapter_no_node'} = {
               'entry_node' => {},
               'entry_number' => 71,
               'in_code' => 0,
-              'index_at_command' => 'cindex',
               'index_ignore_chars' => {},
-              'index_name' => 'cp',
-              'index_type_command' => 'cindex'
+              'index_name' => 'cp'
             }
           },
           'info' => {
@@ -4377,10 +4225,8 @@ $result_trees{'index_table_chapter_no_node'} = {
               'entry_node' => {},
               'entry_number' => 72,
               'in_code' => 0,
-              'index_at_command' => 'cindex',
               'index_ignore_chars' => {},
-              'index_name' => 'cp',
-              'index_type_command' => 'cindex'
+              'index_name' => 'cp'
             }
           },
           'info' => {
@@ -4421,10 +4267,8 @@ $result_trees{'index_table_chapter_no_node'} = {
               'entry_node' => {},
               'entry_number' => 73,
               'in_code' => 0,
-              'index_at_command' => 'cindex',
               'index_ignore_chars' => {},
-              'index_name' => 'cp',
-              'index_type_command' => 'cindex'
+              'index_name' => 'cp'
             }
           },
           'info' => {
@@ -4465,10 +4309,8 @@ $result_trees{'index_table_chapter_no_node'} = {
               'entry_node' => {},
               'entry_number' => 74,
               'in_code' => 0,
-              'index_at_command' => 'cindex',
               'index_ignore_chars' => {},
-              'index_name' => 'cp',
-              'index_type_command' => 'cindex'
+              'index_name' => 'cp'
             }
           },
           'info' => {
@@ -4509,10 +4351,8 @@ $result_trees{'index_table_chapter_no_node'} = {
               'entry_node' => {},
               'entry_number' => 75,
               'in_code' => 0,
-              'index_at_command' => 'cindex',
               'index_ignore_chars' => {},
-              'index_name' => 'cp',
-              'index_type_command' => 'cindex'
+              'index_name' => 'cp'
             }
           },
           'info' => {
@@ -4553,10 +4393,8 @@ $result_trees{'index_table_chapter_no_node'} = {
               'entry_node' => {},
               'entry_number' => 76,
               'in_code' => 0,
-              'index_at_command' => 'cindex',
               'index_ignore_chars' => {},
-              'index_name' => 'cp',
-              'index_type_command' => 'cindex'
+              'index_name' => 'cp'
             }
           },
           'info' => {
@@ -4597,10 +4435,8 @@ $result_trees{'index_table_chapter_no_node'} = {
               'entry_node' => {},
               'entry_number' => 77,
               'in_code' => 0,
-              'index_at_command' => 'cindex',
               'index_ignore_chars' => {},
-              'index_name' => 'cp',
-              'index_type_command' => 'cindex'
+              'index_name' => 'cp'
             }
           },
           'info' => {
@@ -4641,10 +4477,8 @@ $result_trees{'index_table_chapter_no_node'} = {
               'entry_node' => {},
               'entry_number' => 78,
               'in_code' => 0,
-              'index_at_command' => 'cindex',
               'index_ignore_chars' => {},
-              'index_name' => 'cp',
-              'index_type_command' => 'cindex'
+              'index_name' => 'cp'
             }
           },
           'info' => {
@@ -4685,10 +4519,8 @@ $result_trees{'index_table_chapter_no_node'} = {
               'entry_node' => {},
               'entry_number' => 79,
               'in_code' => 0,
-              'index_at_command' => 'cindex',
               'index_ignore_chars' => {},
-              'index_name' => 'cp',
-              'index_type_command' => 'cindex'
+              'index_name' => 'cp'
             }
           },
           'info' => {
@@ -4729,10 +4561,8 @@ $result_trees{'index_table_chapter_no_node'} = {
               'entry_node' => {},
               'entry_number' => 80,
               'in_code' => 0,
-              'index_at_command' => 'cindex',
               'index_ignore_chars' => {},
-              'index_name' => 'cp',
-              'index_type_command' => 'cindex'
+              'index_name' => 'cp'
             }
           },
           'info' => {
@@ -4773,10 +4603,8 @@ $result_trees{'index_table_chapter_no_node'} = {
               'entry_node' => {},
               'entry_number' => 81,
               'in_code' => 0,
-              'index_at_command' => 'cindex',
               'index_ignore_chars' => {},
-              'index_name' => 'cp',
-              'index_type_command' => 'cindex'
+              'index_name' => 'cp'
             }
           },
           'info' => {
@@ -4817,10 +4645,8 @@ $result_trees{'index_table_chapter_no_node'} = {
               'entry_node' => {},
               'entry_number' => 82,
               'in_code' => 0,
-              'index_at_command' => 'cindex',
               'index_ignore_chars' => {},
-              'index_name' => 'cp',
-              'index_type_command' => 'cindex'
+              'index_name' => 'cp'
             }
           },
           'info' => {
@@ -4861,10 +4687,8 @@ $result_trees{'index_table_chapter_no_node'} = {
               'entry_node' => {},
               'entry_number' => 83,
               'in_code' => 0,
-              'index_at_command' => 'cindex',
               'index_ignore_chars' => {},
-              'index_name' => 'cp',
-              'index_type_command' => 'cindex'
+              'index_name' => 'cp'
             }
           },
           'info' => {
@@ -4905,10 +4729,8 @@ $result_trees{'index_table_chapter_no_node'} = {
               'entry_node' => {},
               'entry_number' => 84,
               'in_code' => 0,
-              'index_at_command' => 'cindex',
               'index_ignore_chars' => {},
-              'index_name' => 'cp',
-              'index_type_command' => 'cindex'
+              'index_name' => 'cp'
             }
           },
           'info' => {
@@ -4949,10 +4771,8 @@ $result_trees{'index_table_chapter_no_node'} = {
               'entry_node' => {},
               'entry_number' => 85,
               'in_code' => 0,
-              'index_at_command' => 'cindex',
               'index_ignore_chars' => {},
-              'index_name' => 'cp',
-              'index_type_command' => 'cindex'
+              'index_name' => 'cp'
             }
           },
           'info' => {
@@ -4993,10 +4813,8 @@ $result_trees{'index_table_chapter_no_node'} = {
               'entry_node' => {},
               'entry_number' => 86,
               'in_code' => 0,
-              'index_at_command' => 'cindex',
               'index_ignore_chars' => {},
-              'index_name' => 'cp',
-              'index_type_command' => 'cindex'
+              'index_name' => 'cp'
             }
           },
           'info' => {
@@ -5037,10 +4855,8 @@ $result_trees{'index_table_chapter_no_node'} = {
               'entry_node' => {},
               'entry_number' => 87,
               'in_code' => 0,
-              'index_at_command' => 'cindex',
               'index_ignore_chars' => {},
-              'index_name' => 'cp',
-              'index_type_command' => 'cindex'
+              'index_name' => 'cp'
             }
           },
           'info' => {
@@ -5081,10 +4897,8 @@ $result_trees{'index_table_chapter_no_node'} = {
               'entry_node' => {},
               'entry_number' => 88,
               'in_code' => 0,
-              'index_at_command' => 'cindex',
               'index_ignore_chars' => {},
-              'index_name' => 'cp',
-              'index_type_command' => 'cindex'
+              'index_name' => 'cp'
             }
           },
           'info' => {
@@ -5125,10 +4939,8 @@ $result_trees{'index_table_chapter_no_node'} = {
               'entry_node' => {},
               'entry_number' => 89,
               'in_code' => 0,
-              'index_at_command' => 'cindex',
               'index_ignore_chars' => {},
-              'index_name' => 'cp',
-              'index_type_command' => 'cindex'
+              'index_name' => 'cp'
             }
           },
           'info' => {
@@ -5169,10 +4981,8 @@ $result_trees{'index_table_chapter_no_node'} = {
               'entry_node' => {},
               'entry_number' => 90,
               'in_code' => 0,
-              'index_at_command' => 'cindex',
               'index_ignore_chars' => {},
-              'index_name' => 'cp',
-              'index_type_command' => 'cindex'
+              'index_name' => 'cp'
             }
           },
           'info' => {
@@ -5213,10 +5023,8 @@ $result_trees{'index_table_chapter_no_node'} = {
               'entry_node' => {},
               'entry_number' => 91,
               'in_code' => 0,
-              'index_at_command' => 'cindex',
               'index_ignore_chars' => {},
-              'index_name' => 'cp',
-              'index_type_command' => 'cindex'
+              'index_name' => 'cp'
             }
           },
           'info' => {
@@ -5257,10 +5065,8 @@ $result_trees{'index_table_chapter_no_node'} = {
               'entry_node' => {},
               'entry_number' => 92,
               'in_code' => 0,
-              'index_at_command' => 'cindex',
               'index_ignore_chars' => {},
-              'index_name' => 'cp',
-              'index_type_command' => 'cindex'
+              'index_name' => 'cp'
             }
           },
           'info' => {
@@ -5301,10 +5107,8 @@ $result_trees{'index_table_chapter_no_node'} = {
               'entry_node' => {},
               'entry_number' => 93,
               'in_code' => 0,
-              'index_at_command' => 'cindex',
               'index_ignore_chars' => {},
-              'index_name' => 'cp',
-              'index_type_command' => 'cindex'
+              'index_name' => 'cp'
             }
           },
           'info' => {
@@ -5345,10 +5149,8 @@ $result_trees{'index_table_chapter_no_node'} = {
               'entry_node' => {},
               'entry_number' => 94,
               'in_code' => 0,
-              'index_at_command' => 'cindex',
               'index_ignore_chars' => {},
-              'index_name' => 'cp',
-              'index_type_command' => 'cindex'
+              'index_name' => 'cp'
             }
           },
           'info' => {
@@ -5389,10 +5191,8 @@ $result_trees{'index_table_chapter_no_node'} = {
               'entry_node' => {},
               'entry_number' => 95,
               'in_code' => 0,
-              'index_at_command' => 'cindex',
               'index_ignore_chars' => {},
-              'index_name' => 'cp',
-              'index_type_command' => 'cindex'
+              'index_name' => 'cp'
             }
           },
           'info' => {
@@ -5433,10 +5233,8 @@ $result_trees{'index_table_chapter_no_node'} = {
               'entry_node' => {},
               'entry_number' => 96,
               'in_code' => 0,
-              'index_at_command' => 'cindex',
               'index_ignore_chars' => {},
-              'index_name' => 'cp',
-              'index_type_command' => 'cindex'
+              'index_name' => 'cp'
             }
           },
           'info' => {
@@ -5477,10 +5275,8 @@ $result_trees{'index_table_chapter_no_node'} = {
               'entry_node' => {},
               'entry_number' => 97,
               'in_code' => 0,
-              'index_at_command' => 'cindex',
               'index_ignore_chars' => {},
-              'index_name' => 'cp',
-              'index_type_command' => 'cindex'
+              'index_name' => 'cp'
             }
           },
           'info' => {
@@ -5521,10 +5317,8 @@ $result_trees{'index_table_chapter_no_node'} = {
               'entry_node' => {},
               'entry_number' => 98,
               'in_code' => 0,
-              'index_at_command' => 'cindex',
               'index_ignore_chars' => {},
-              'index_name' => 'cp',
-              'index_type_command' => 'cindex'
+              'index_name' => 'cp'
             }
           },
           'info' => {
@@ -5565,10 +5359,8 @@ $result_trees{'index_table_chapter_no_node'} = {
               'entry_node' => {},
               'entry_number' => 99,
               'in_code' => 0,
-              'index_at_command' => 'cindex',
               'index_ignore_chars' => {},
-              'index_name' => 'cp',
-              'index_type_command' => 'cindex'
+              'index_name' => 'cp'
             }
           },
           'info' => {
@@ -5609,10 +5401,8 @@ $result_trees{'index_table_chapter_no_node'} = {
               'entry_node' => {},
               'entry_number' => 100,
               'in_code' => 0,
-              'index_at_command' => 'cindex',
               'index_ignore_chars' => {},
-              'index_name' => 'cp',
-              'index_type_command' => 'cindex'
+              'index_name' => 'cp'
             }
           },
           'info' => {
@@ -5653,10 +5443,8 @@ $result_trees{'index_table_chapter_no_node'} = {
               'entry_node' => {},
               'entry_number' => 101,
               'in_code' => 0,
-              'index_at_command' => 'cindex',
               'index_ignore_chars' => {},
-              'index_name' => 'cp',
-              'index_type_command' => 'cindex'
+              'index_name' => 'cp'
             }
           },
           'info' => {
@@ -5697,10 +5485,8 @@ $result_trees{'index_table_chapter_no_node'} = {
               'entry_node' => {},
               'entry_number' => 102,
               'in_code' => 0,
-              'index_at_command' => 'cindex',
               'index_ignore_chars' => {},
-              'index_name' => 'cp',
-              'index_type_command' => 'cindex'
+              'index_name' => 'cp'
             }
           },
           'info' => {
@@ -5741,10 +5527,8 @@ $result_trees{'index_table_chapter_no_node'} = {
               'entry_node' => {},
               'entry_number' => 103,
               'in_code' => 0,
-              'index_at_command' => 'cindex',
               'index_ignore_chars' => {},
-              'index_name' => 'cp',
-              'index_type_command' => 'cindex'
+              'index_name' => 'cp'
             }
           },
           'info' => {
@@ -5785,10 +5569,8 @@ $result_trees{'index_table_chapter_no_node'} = {
               'entry_node' => {},
               'entry_number' => 104,
               'in_code' => 0,
-              'index_at_command' => 'cindex',
               'index_ignore_chars' => {},
-              'index_name' => 'cp',
-              'index_type_command' => 'cindex'
+              'index_name' => 'cp'
             }
           },
           'info' => {
@@ -5829,10 +5611,8 @@ $result_trees{'index_table_chapter_no_node'} = {
               'entry_node' => {},
               'entry_number' => 105,
               'in_code' => 0,
-              'index_at_command' => 'cindex',
               'index_ignore_chars' => {},
-              'index_name' => 'cp',
-              'index_type_command' => 'cindex'
+              'index_name' => 'cp'
             }
           },
           'info' => {
@@ -5873,10 +5653,8 @@ $result_trees{'index_table_chapter_no_node'} = {
               'entry_node' => {},
               'entry_number' => 106,
               'in_code' => 0,
-              'index_at_command' => 'cindex',
               'index_ignore_chars' => {},
-              'index_name' => 'cp',
-              'index_type_command' => 'cindex'
+              'index_name' => 'cp'
             }
           },
           'info' => {
@@ -5917,10 +5695,8 @@ $result_trees{'index_table_chapter_no_node'} = {
               'entry_node' => {},
               'entry_number' => 107,
               'in_code' => 0,
-              'index_at_command' => 'cindex',
               'index_ignore_chars' => {},
-              'index_name' => 'cp',
-              'index_type_command' => 'cindex'
+              'index_name' => 'cp'
             }
           },
           'info' => {
@@ -5961,10 +5737,8 @@ $result_trees{'index_table_chapter_no_node'} = {
               'entry_node' => {},
               'entry_number' => 108,
               'in_code' => 0,
-              'index_at_command' => 'cindex',
               'index_ignore_chars' => {},
-              'index_name' => 'cp',
-              'index_type_command' => 'cindex'
+              'index_name' => 'cp'
             }
           },
           'info' => {
@@ -6005,10 +5779,8 @@ $result_trees{'index_table_chapter_no_node'} = {
               'entry_node' => {},
               'entry_number' => 109,
               'in_code' => 0,
-              'index_at_command' => 'cindex',
               'index_ignore_chars' => {},
-              'index_name' => 'cp',
-              'index_type_command' => 'cindex'
+              'index_name' => 'cp'
             }
           },
           'info' => {
@@ -6049,10 +5821,8 @@ $result_trees{'index_table_chapter_no_node'} = {
               'entry_node' => {},
               'entry_number' => 110,
               'in_code' => 0,
-              'index_at_command' => 'cindex',
               'index_ignore_chars' => {},
-              'index_name' => 'cp',
-              'index_type_command' => 'cindex'
+              'index_name' => 'cp'
             }
           },
           'info' => {
@@ -6093,10 +5863,8 @@ $result_trees{'index_table_chapter_no_node'} = {
               'entry_node' => {},
               'entry_number' => 111,
               'in_code' => 0,
-              'index_at_command' => 'cindex',
               'index_ignore_chars' => {},
-              'index_name' => 'cp',
-              'index_type_command' => 'cindex'
+              'index_name' => 'cp'
             }
           },
           'info' => {
@@ -6137,10 +5905,8 @@ $result_trees{'index_table_chapter_no_node'} = {
               'entry_node' => {},
               'entry_number' => 112,
               'in_code' => 0,
-              'index_at_command' => 'cindex',
               'index_ignore_chars' => {},
-              'index_name' => 'cp',
-              'index_type_command' => 'cindex'
+              'index_name' => 'cp'
             }
           },
           'info' => {
@@ -6181,10 +5947,8 @@ $result_trees{'index_table_chapter_no_node'} = {
               'entry_node' => {},
               'entry_number' => 113,
               'in_code' => 0,
-              'index_at_command' => 'cindex',
               'index_ignore_chars' => {},
-              'index_name' => 'cp',
-              'index_type_command' => 'cindex'
+              'index_name' => 'cp'
             }
           },
           'info' => {
@@ -6225,10 +5989,8 @@ $result_trees{'index_table_chapter_no_node'} = {
               'entry_node' => {},
               'entry_number' => 114,
               'in_code' => 0,
-              'index_at_command' => 'cindex',
               'index_ignore_chars' => {},
-              'index_name' => 'cp',
-              'index_type_command' => 'cindex'
+              'index_name' => 'cp'
             }
           },
           'info' => {
@@ -6269,10 +6031,8 @@ $result_trees{'index_table_chapter_no_node'} = {
               'entry_node' => {},
               'entry_number' => 115,
               'in_code' => 0,
-              'index_at_command' => 'cindex',
               'index_ignore_chars' => {},
-              'index_name' => 'cp',
-              'index_type_command' => 'cindex'
+              'index_name' => 'cp'
             }
           },
           'info' => {
@@ -6313,10 +6073,8 @@ $result_trees{'index_table_chapter_no_node'} = {
               'entry_node' => {},
               'entry_number' => 116,
               'in_code' => 0,
-              'index_at_command' => 'cindex',
               'index_ignore_chars' => {},
-              'index_name' => 'cp',
-              'index_type_command' => 'cindex'
+              'index_name' => 'cp'
             }
           },
           'info' => {
@@ -6357,10 +6115,8 @@ $result_trees{'index_table_chapter_no_node'} = {
               'entry_node' => {},
               'entry_number' => 117,
               'in_code' => 0,
-              'index_at_command' => 'cindex',
               'index_ignore_chars' => {},
-              'index_name' => 'cp',
-              'index_type_command' => 'cindex'
+              'index_name' => 'cp'
             }
           },
           'info' => {
@@ -6401,10 +6157,8 @@ $result_trees{'index_table_chapter_no_node'} = {
               'entry_node' => {},
               'entry_number' => 118,
               'in_code' => 0,
-              'index_at_command' => 'cindex',
               'index_ignore_chars' => {},
-              'index_name' => 'cp',
-              'index_type_command' => 'cindex'
+              'index_name' => 'cp'
             }
           },
           'info' => {
@@ -6445,10 +6199,8 @@ $result_trees{'index_table_chapter_no_node'} = {
               'entry_node' => {},
               'entry_number' => 119,
               'in_code' => 0,
-              'index_at_command' => 'cindex',
               'index_ignore_chars' => {},
-              'index_name' => 'cp',
-              'index_type_command' => 'cindex'
+              'index_name' => 'cp'
             }
           },
           'info' => {
@@ -6489,10 +6241,8 @@ $result_trees{'index_table_chapter_no_node'} = {
               'entry_node' => {},
               'entry_number' => 120,
               'in_code' => 0,
-              'index_at_command' => 'cindex',
               'index_ignore_chars' => {},
-              'index_name' => 'cp',
-              'index_type_command' => 'cindex'
+              'index_name' => 'cp'
             }
           },
           'info' => {
@@ -6533,10 +6283,8 @@ $result_trees{'index_table_chapter_no_node'} = {
               'entry_node' => {},
               'entry_number' => 121,
               'in_code' => 0,
-              'index_at_command' => 'cindex',
               'index_ignore_chars' => {},
-              'index_name' => 'cp',
-              'index_type_command' => 'cindex'
+              'index_name' => 'cp'
             }
           },
           'info' => {
@@ -6577,10 +6325,8 @@ $result_trees{'index_table_chapter_no_node'} = {
               'entry_node' => {},
               'entry_number' => 122,
               'in_code' => 0,
-              'index_at_command' => 'cindex',
               'index_ignore_chars' => {},
-              'index_name' => 'cp',
-              'index_type_command' => 'cindex'
+              'index_name' => 'cp'
             }
           },
           'info' => {
@@ -6621,10 +6367,8 @@ $result_trees{'index_table_chapter_no_node'} = {
               'entry_node' => {},
               'entry_number' => 123,
               'in_code' => 0,
-              'index_at_command' => 'cindex',
               'index_ignore_chars' => {},
-              'index_name' => 'cp',
-              'index_type_command' => 'cindex'
+              'index_name' => 'cp'
             }
           },
           'info' => {
@@ -6665,10 +6409,8 @@ $result_trees{'index_table_chapter_no_node'} = {
               'entry_node' => {},
               'entry_number' => 124,
               'in_code' => 0,
-              'index_at_command' => 'cindex',
               'index_ignore_chars' => {},
-              'index_name' => 'cp',
-              'index_type_command' => 'cindex'
+              'index_name' => 'cp'
             }
           },
           'info' => {
@@ -6709,10 +6451,8 @@ $result_trees{'index_table_chapter_no_node'} = {
               'entry_node' => {},
               'entry_number' => 125,
               'in_code' => 0,
-              'index_at_command' => 'cindex',
               'index_ignore_chars' => {},
-              'index_name' => 'cp',
-              'index_type_command' => 'cindex'
+              'index_name' => 'cp'
             }
           },
           'info' => {
@@ -6753,10 +6493,8 @@ $result_trees{'index_table_chapter_no_node'} = {
               'entry_node' => {},
               'entry_number' => 126,
               'in_code' => 0,
-              'index_at_command' => 'cindex',
               'index_ignore_chars' => {},
-              'index_name' => 'cp',
-              'index_type_command' => 'cindex'
+              'index_name' => 'cp'
             }
           },
           'info' => {
@@ -6797,10 +6535,8 @@ $result_trees{'index_table_chapter_no_node'} = {
               'entry_node' => {},
               'entry_number' => 127,
               'in_code' => 0,
-              'index_at_command' => 'cindex',
               'index_ignore_chars' => {},
-              'index_name' => 'cp',
-              'index_type_command' => 'cindex'
+              'index_name' => 'cp'
             }
           },
           'info' => {
@@ -6841,10 +6577,8 @@ $result_trees{'index_table_chapter_no_node'} = {
               'entry_node' => {},
               'entry_number' => 128,
               'in_code' => 0,
-              'index_at_command' => 'cindex',
               'index_ignore_chars' => {},
-              'index_name' => 'cp',
-              'index_type_command' => 'cindex'
+              'index_name' => 'cp'
             }
           },
           'info' => {
@@ -6885,10 +6619,8 @@ $result_trees{'index_table_chapter_no_node'} = {
               'entry_node' => {},
               'entry_number' => 129,
               'in_code' => 0,
-              'index_at_command' => 'cindex',
               'index_ignore_chars' => {},
-              'index_name' => 'cp',
-              'index_type_command' => 'cindex'
+              'index_name' => 'cp'
             }
           },
           'info' => {
@@ -6929,10 +6661,8 @@ $result_trees{'index_table_chapter_no_node'} = {
               'entry_node' => {},
               'entry_number' => 130,
               'in_code' => 0,
-              'index_at_command' => 'cindex',
               'index_ignore_chars' => {},
-              'index_name' => 'cp',
-              'index_type_command' => 'cindex'
+              'index_name' => 'cp'
             }
           },
           'info' => {
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 139fc4ac11..6b11d677f5 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
@@ -258,10 +258,8 @@ 
$result_trees{'multiple_index_text_sortas_seeentry_seealso'} = {
               'entry_node' => {},
               'entry_number' => 1,
               'in_code' => 0,
-              'index_at_command' => 'cindex',
               'index_ignore_chars' => {},
               'index_name' => 'cp',
-              'index_type_command' => 'cindex',
               'sortas' => 'A---S'
             },
             'seealso' => {},
@@ -334,10 +332,8 @@ 
$result_trees{'multiple_index_text_sortas_seeentry_seealso'} = {
               'entry_node' => {},
               'entry_number' => 2,
               'in_code' => 0,
-              'index_at_command' => 'cindex',
               'index_ignore_chars' => {},
               'index_name' => 'cp',
-              'index_type_command' => 'cindex',
               'sortas' => 'BB'
             },
             'sortas' => 'BB'
@@ -408,10 +404,8 @@ 
$result_trees{'multiple_index_text_sortas_seeentry_seealso'} = {
               'entry_node' => {},
               'entry_number' => 3,
               'in_code' => 0,
-              'index_at_command' => 'cindex',
               'index_ignore_chars' => {},
-              'index_name' => 'cp',
-              'index_type_command' => 'cindex'
+              'index_name' => 'cp'
             },
             'seeentry' => {}
           },
diff --git a/tp/t/results/indices/nodes_before_top.pl 
b/tp/t/results/indices/nodes_before_top.pl
index f7298cc280..2c1aefb5d9 100644
--- a/tp/t/results/indices/nodes_before_top.pl
+++ b/tp/t/results/indices/nodes_before_top.pl
@@ -138,10 +138,8 @@ $result_trees{'nodes_before_top'} = {
               'entry_node' => {},
               'entry_number' => 1,
               'in_code' => 0,
-              'index_at_command' => 'cindex',
               'index_ignore_chars' => {},
-              'index_name' => 'cp',
-              'index_type_command' => 'cindex'
+              'index_name' => 'cp'
             }
           },
           'info' => {
@@ -408,10 +406,8 @@ $result_trees{'nodes_before_top'} = {
               'entry_node' => {},
               'entry_number' => 2,
               'in_code' => 0,
-              'index_at_command' => 'cindex',
               'index_ignore_chars' => {},
-              'index_name' => 'cp',
-              'index_type_command' => 'cindex'
+              'index_name' => 'cp'
             }
           },
           'info' => {
@@ -500,10 +496,8 @@ $result_trees{'nodes_before_top'} = {
               'entry_node' => {},
               'entry_number' => 3,
               'in_code' => 0,
-              'index_at_command' => 'cindex',
               'index_ignore_chars' => {},
-              'index_name' => 'cp',
-              'index_type_command' => 'cindex'
+              'index_name' => 'cp'
             }
           },
           'info' => {
@@ -624,10 +618,8 @@ $result_trees{'nodes_before_top'} = {
               'entry_node' => {},
               'entry_number' => 4,
               'in_code' => 0,
-              'index_at_command' => 'cindex',
               'index_ignore_chars' => {},
-              'index_name' => 'cp',
-              'index_type_command' => 'cindex'
+              'index_name' => 'cp'
             }
           },
           'info' => {
@@ -991,10 +983,8 @@ $result_trees{'nodes_before_top'} = {
                   'entry_node' => {},
                   'entry_number' => 5,
                   'in_code' => 0,
-                  'index_at_command' => 'cindex',
                   'index_ignore_chars' => {},
-                  'index_name' => 'cp',
-                  'index_type_command' => 'cindex'
+                  'index_name' => 'cp'
                 }
               },
               'info' => {
@@ -1035,10 +1025,8 @@ $result_trees{'nodes_before_top'} = {
                   'entry_node' => {},
                   'entry_number' => 1,
                   'in_code' => 1,
-                  'index_at_command' => 'findex',
                   'index_ignore_chars' => {},
-                  'index_name' => 'fn',
-                  'index_type_command' => 'findex'
+                  'index_name' => 'fn'
                 }
               },
               'info' => {
@@ -1079,10 +1067,8 @@ $result_trees{'nodes_before_top'} = {
                   'entry_node' => {},
                   'entry_number' => 6,
                   'in_code' => 0,
-                  'index_at_command' => 'cindex',
                   'index_ignore_chars' => {},
-                  'index_name' => 'cp',
-                  'index_type_command' => 'cindex'
+                  'index_name' => 'cp'
                 }
               },
               'info' => {
@@ -1633,10 +1619,8 @@ $result_trees{'nodes_before_top'} = {
               'entry_node' => {},
               'entry_number' => 7,
               'in_code' => 0,
-              'index_at_command' => 'cindex',
               'index_ignore_chars' => {},
-              'index_name' => 'cp',
-              'index_type_command' => 'cindex'
+              'index_name' => 'cp'
             }
           },
           'info' => {
@@ -1677,10 +1661,8 @@ $result_trees{'nodes_before_top'} = {
               'entry_node' => {},
               'entry_number' => 2,
               'in_code' => 1,
-              'index_at_command' => 'findex',
               'index_ignore_chars' => {},
-              'index_name' => 'fn',
-              'index_type_command' => 'findex'
+              'index_name' => 'fn'
             }
           },
           'info' => {
@@ -1721,10 +1703,8 @@ $result_trees{'nodes_before_top'} = {
               'entry_node' => {},
               'entry_number' => 8,
               'in_code' => 0,
-              'index_at_command' => 'cindex',
               'index_ignore_chars' => {},
-              'index_name' => 'cp',
-              'index_type_command' => 'cindex'
+              'index_name' => 'cp'
             }
           },
           'info' => {
@@ -1857,10 +1837,8 @@ $result_trees{'nodes_before_top'} = {
               'entry_node' => {},
               'entry_number' => 9,
               'in_code' => 0,
-              'index_at_command' => 'cindex',
               'index_ignore_chars' => {},
-              'index_name' => 'cp',
-              'index_type_command' => 'cindex'
+              'index_name' => 'cp'
             }
           },
           'info' => {
@@ -1945,10 +1923,8 @@ $result_trees{'nodes_before_top'} = {
               'entry_node' => {},
               'entry_number' => 3,
               'in_code' => 1,
-              'index_at_command' => 'findex',
               'index_ignore_chars' => {},
-              'index_name' => 'fn',
-              'index_type_command' => 'findex'
+              'index_name' => 'fn'
             }
           },
           'info' => {
@@ -1989,10 +1965,8 @@ $result_trees{'nodes_before_top'} = {
               'entry_node' => {},
               'entry_number' => 10,
               'in_code' => 0,
-              'index_at_command' => 'cindex',
               'index_ignore_chars' => {},
-              'index_name' => 'cp',
-              'index_type_command' => 'cindex'
+              'index_name' => 'cp'
             }
           },
           'info' => {
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 f6b230b0fa..f40a717fe1 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
@@ -111,10 +111,8 @@ $result_trees{'nodes_before_top_and_sections_chapter'} = {
               'entry_node' => {},
               'entry_number' => 1,
               'in_code' => 0,
-              'index_at_command' => 'cindex',
               'index_ignore_chars' => {},
-              'index_name' => 'cp',
-              'index_type_command' => 'cindex'
+              'index_name' => 'cp'
             }
           },
           'info' => {
@@ -438,10 +436,8 @@ $result_trees{'nodes_before_top_and_sections_chapter'} = {
               'entry_node' => {},
               'entry_number' => 2,
               'in_code' => 0,
-              'index_at_command' => 'cindex',
               'index_ignore_chars' => {},
-              'index_name' => 'cp',
-              'index_type_command' => 'cindex'
+              'index_name' => 'cp'
             }
           },
           'info' => {
@@ -539,10 +535,8 @@ $result_trees{'nodes_before_top_and_sections_chapter'} = {
               'entry_node' => {},
               'entry_number' => 3,
               'in_code' => 0,
-              'index_at_command' => 'cindex',
               'index_ignore_chars' => {},
-              'index_name' => 'cp',
-              'index_type_command' => 'cindex'
+              'index_name' => 'cp'
             }
           },
           'info' => {
@@ -663,10 +657,8 @@ $result_trees{'nodes_before_top_and_sections_chapter'} = {
               'entry_node' => {},
               'entry_number' => 4,
               'in_code' => 0,
-              'index_at_command' => 'cindex',
               'index_ignore_chars' => {},
-              'index_name' => 'cp',
-              'index_type_command' => 'cindex'
+              'index_name' => 'cp'
             }
           },
           'info' => {
@@ -900,10 +892,8 @@ $result_trees{'nodes_before_top_and_sections_chapter'} = {
               'entry_node' => {},
               'entry_number' => 5,
               'in_code' => 0,
-              'index_at_command' => 'cindex',
               'index_ignore_chars' => {},
-              'index_name' => 'cp',
-              'index_type_command' => 'cindex'
+              'index_name' => 'cp'
             }
           },
           'info' => {
@@ -1225,10 +1215,8 @@ $result_trees{'nodes_before_top_and_sections_chapter'} = 
{
                   'entry_node' => {},
                   'entry_number' => 6,
                   'in_code' => 0,
-                  'index_at_command' => 'cindex',
                   'index_ignore_chars' => {},
-                  'index_name' => 'cp',
-                  'index_type_command' => 'cindex'
+                  'index_name' => 'cp'
                 }
               },
               'info' => {
@@ -1269,10 +1257,8 @@ $result_trees{'nodes_before_top_and_sections_chapter'} = 
{
                   'entry_node' => {},
                   'entry_number' => 1,
                   'in_code' => 1,
-                  'index_at_command' => 'findex',
                   'index_ignore_chars' => {},
-                  'index_name' => 'fn',
-                  'index_type_command' => 'findex'
+                  'index_name' => 'fn'
                 }
               },
               'info' => {
@@ -1313,10 +1299,8 @@ $result_trees{'nodes_before_top_and_sections_chapter'} = 
{
                   'entry_node' => {},
                   'entry_number' => 7,
                   'in_code' => 0,
-                  'index_at_command' => 'cindex',
                   'index_ignore_chars' => {},
-                  'index_name' => 'cp',
-                  'index_type_command' => 'cindex'
+                  'index_name' => 'cp'
                 }
               },
               'info' => {
@@ -1867,10 +1851,8 @@ $result_trees{'nodes_before_top_and_sections_chapter'} = 
{
               'entry_node' => {},
               'entry_number' => 8,
               'in_code' => 0,
-              'index_at_command' => 'cindex',
               'index_ignore_chars' => {},
-              'index_name' => 'cp',
-              'index_type_command' => 'cindex'
+              'index_name' => 'cp'
             }
           },
           'info' => {
@@ -1911,10 +1893,8 @@ $result_trees{'nodes_before_top_and_sections_chapter'} = 
{
               'entry_node' => {},
               'entry_number' => 2,
               'in_code' => 1,
-              'index_at_command' => 'findex',
               'index_ignore_chars' => {},
-              'index_name' => 'fn',
-              'index_type_command' => 'findex'
+              'index_name' => 'fn'
             }
           },
           'info' => {
@@ -1955,10 +1935,8 @@ $result_trees{'nodes_before_top_and_sections_chapter'} = 
{
               'entry_node' => {},
               'entry_number' => 9,
               'in_code' => 0,
-              'index_at_command' => 'cindex',
               'index_ignore_chars' => {},
-              'index_name' => 'cp',
-              'index_type_command' => 'cindex'
+              'index_name' => 'cp'
             }
           },
           'info' => {
@@ -2091,10 +2069,8 @@ $result_trees{'nodes_before_top_and_sections_chapter'} = 
{
               'entry_node' => {},
               'entry_number' => 10,
               'in_code' => 0,
-              'index_at_command' => 'cindex',
               'index_ignore_chars' => {},
-              'index_name' => 'cp',
-              'index_type_command' => 'cindex'
+              'index_name' => 'cp'
             }
           },
           'info' => {
@@ -2179,10 +2155,8 @@ $result_trees{'nodes_before_top_and_sections_chapter'} = 
{
               'entry_node' => {},
               'entry_number' => 3,
               'in_code' => 1,
-              'index_at_command' => 'findex',
               'index_ignore_chars' => {},
-              'index_name' => 'fn',
-              'index_type_command' => 'findex'
+              'index_name' => 'fn'
             }
           },
           'info' => {
@@ -2223,10 +2197,8 @@ $result_trees{'nodes_before_top_and_sections_chapter'} = 
{
               'entry_node' => {},
               'entry_number' => 11,
               'in_code' => 0,
-              'index_at_command' => 'cindex',
               'index_ignore_chars' => {},
-              'index_name' => 'cp',
-              'index_type_command' => 'cindex'
+              'index_name' => 'cp'
             }
           },
           'info' => {
@@ -2551,10 +2523,8 @@ $result_trees{'nodes_before_top_and_sections_chapter'} = 
{
               'entry_node' => {},
               'entry_number' => 12,
               'in_code' => 0,
-              'index_at_command' => 'cindex',
               'index_ignore_chars' => {},
-              'index_name' => 'cp',
-              'index_type_command' => 'cindex'
+              'index_name' => 'cp'
             }
           },
           'info' => {
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 850e6e12c7..261612d214 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
@@ -111,10 +111,8 @@ 
$result_trees{'nodes_before_top_and_sections_chapter_no_node'} = {
               'entry_node' => {},
               'entry_number' => 1,
               'in_code' => 0,
-              'index_at_command' => 'cindex',
               'index_ignore_chars' => {},
-              'index_name' => 'cp',
-              'index_type_command' => 'cindex'
+              'index_name' => 'cp'
             }
           },
           'info' => {
@@ -438,10 +436,8 @@ 
$result_trees{'nodes_before_top_and_sections_chapter_no_node'} = {
               'entry_node' => {},
               'entry_number' => 2,
               'in_code' => 0,
-              'index_at_command' => 'cindex',
               'index_ignore_chars' => {},
-              'index_name' => 'cp',
-              'index_type_command' => 'cindex'
+              'index_name' => 'cp'
             }
           },
           'info' => {
@@ -539,10 +535,8 @@ 
$result_trees{'nodes_before_top_and_sections_chapter_no_node'} = {
               'entry_node' => {},
               'entry_number' => 3,
               'in_code' => 0,
-              'index_at_command' => 'cindex',
               'index_ignore_chars' => {},
-              'index_name' => 'cp',
-              'index_type_command' => 'cindex'
+              'index_name' => 'cp'
             }
           },
           'info' => {
@@ -663,10 +657,8 @@ 
$result_trees{'nodes_before_top_and_sections_chapter_no_node'} = {
               'entry_node' => {},
               'entry_number' => 4,
               'in_code' => 0,
-              'index_at_command' => 'cindex',
               'index_ignore_chars' => {},
-              'index_name' => 'cp',
-              'index_type_command' => 'cindex'
+              'index_name' => 'cp'
             }
           },
           'info' => {
@@ -900,10 +892,8 @@ 
$result_trees{'nodes_before_top_and_sections_chapter_no_node'} = {
               'entry_node' => {},
               'entry_number' => 5,
               'in_code' => 0,
-              'index_at_command' => 'cindex',
               'index_ignore_chars' => {},
-              'index_name' => 'cp',
-              'index_type_command' => 'cindex'
+              'index_name' => 'cp'
             }
           },
           'info' => {
@@ -1225,10 +1215,8 @@ 
$result_trees{'nodes_before_top_and_sections_chapter_no_node'} = {
                   'entry_node' => {},
                   'entry_number' => 6,
                   'in_code' => 0,
-                  'index_at_command' => 'cindex',
                   'index_ignore_chars' => {},
-                  'index_name' => 'cp',
-                  'index_type_command' => 'cindex'
+                  'index_name' => 'cp'
                 }
               },
               'info' => {
@@ -1269,10 +1257,8 @@ 
$result_trees{'nodes_before_top_and_sections_chapter_no_node'} = {
                   'entry_node' => {},
                   'entry_number' => 1,
                   'in_code' => 1,
-                  'index_at_command' => 'findex',
                   'index_ignore_chars' => {},
-                  'index_name' => 'fn',
-                  'index_type_command' => 'findex'
+                  'index_name' => 'fn'
                 }
               },
               'info' => {
@@ -1313,10 +1299,8 @@ 
$result_trees{'nodes_before_top_and_sections_chapter_no_node'} = {
                   'entry_node' => {},
                   'entry_number' => 7,
                   'in_code' => 0,
-                  'index_at_command' => 'cindex',
                   'index_ignore_chars' => {},
-                  'index_name' => 'cp',
-                  'index_type_command' => 'cindex'
+                  'index_name' => 'cp'
                 }
               },
               'info' => {
@@ -1867,10 +1851,8 @@ 
$result_trees{'nodes_before_top_and_sections_chapter_no_node'} = {
               'entry_node' => {},
               'entry_number' => 8,
               'in_code' => 0,
-              'index_at_command' => 'cindex',
               'index_ignore_chars' => {},
-              'index_name' => 'cp',
-              'index_type_command' => 'cindex'
+              'index_name' => 'cp'
             }
           },
           'info' => {
@@ -1911,10 +1893,8 @@ 
$result_trees{'nodes_before_top_and_sections_chapter_no_node'} = {
               'entry_node' => {},
               'entry_number' => 2,
               'in_code' => 1,
-              'index_at_command' => 'findex',
               'index_ignore_chars' => {},
-              'index_name' => 'fn',
-              'index_type_command' => 'findex'
+              'index_name' => 'fn'
             }
           },
           'info' => {
@@ -1955,10 +1935,8 @@ 
$result_trees{'nodes_before_top_and_sections_chapter_no_node'} = {
               'entry_node' => {},
               'entry_number' => 9,
               'in_code' => 0,
-              'index_at_command' => 'cindex',
               'index_ignore_chars' => {},
-              'index_name' => 'cp',
-              'index_type_command' => 'cindex'
+              'index_name' => 'cp'
             }
           },
           'info' => {
@@ -2091,10 +2069,8 @@ 
$result_trees{'nodes_before_top_and_sections_chapter_no_node'} = {
               'entry_node' => {},
               'entry_number' => 10,
               'in_code' => 0,
-              'index_at_command' => 'cindex',
               'index_ignore_chars' => {},
-              'index_name' => 'cp',
-              'index_type_command' => 'cindex'
+              'index_name' => 'cp'
             }
           },
           'info' => {
@@ -2179,10 +2155,8 @@ 
$result_trees{'nodes_before_top_and_sections_chapter_no_node'} = {
               'entry_node' => {},
               'entry_number' => 3,
               'in_code' => 1,
-              'index_at_command' => 'findex',
               'index_ignore_chars' => {},
-              'index_name' => 'fn',
-              'index_type_command' => 'findex'
+              'index_name' => 'fn'
             }
           },
           'info' => {
@@ -2223,10 +2197,8 @@ 
$result_trees{'nodes_before_top_and_sections_chapter_no_node'} = {
               'entry_node' => {},
               'entry_number' => 11,
               'in_code' => 0,
-              'index_at_command' => 'cindex',
               'index_ignore_chars' => {},
-              'index_name' => 'cp',
-              'index_type_command' => 'cindex'
+              'index_name' => 'cp'
             }
           },
           'info' => {
@@ -2551,10 +2523,8 @@ 
$result_trees{'nodes_before_top_and_sections_chapter_no_node'} = {
               'entry_node' => {},
               'entry_number' => 12,
               'in_code' => 0,
-              'index_at_command' => 'cindex',
               'index_ignore_chars' => {},
-              'index_name' => 'cp',
-              'index_type_command' => 'cindex'
+              'index_name' => 'cp'
             }
           },
           'info' => {
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 89134c0e07..55f8af8e96 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
@@ -111,10 +111,8 @@ 
$result_trees{'nodes_before_top_and_sections_unsplit_no_nodes'} = {
               'entry_node' => {},
               'entry_number' => 1,
               'in_code' => 0,
-              'index_at_command' => 'cindex',
               'index_ignore_chars' => {},
-              'index_name' => 'cp',
-              'index_type_command' => 'cindex'
+              'index_name' => 'cp'
             }
           },
           'info' => {
@@ -438,10 +436,8 @@ 
$result_trees{'nodes_before_top_and_sections_unsplit_no_nodes'} = {
               'entry_node' => {},
               'entry_number' => 2,
               'in_code' => 0,
-              'index_at_command' => 'cindex',
               'index_ignore_chars' => {},
-              'index_name' => 'cp',
-              'index_type_command' => 'cindex'
+              'index_name' => 'cp'
             }
           },
           'info' => {
@@ -539,10 +535,8 @@ 
$result_trees{'nodes_before_top_and_sections_unsplit_no_nodes'} = {
               'entry_node' => {},
               'entry_number' => 3,
               'in_code' => 0,
-              'index_at_command' => 'cindex',
               'index_ignore_chars' => {},
-              'index_name' => 'cp',
-              'index_type_command' => 'cindex'
+              'index_name' => 'cp'
             }
           },
           'info' => {
@@ -663,10 +657,8 @@ 
$result_trees{'nodes_before_top_and_sections_unsplit_no_nodes'} = {
               'entry_node' => {},
               'entry_number' => 4,
               'in_code' => 0,
-              'index_at_command' => 'cindex',
               'index_ignore_chars' => {},
-              'index_name' => 'cp',
-              'index_type_command' => 'cindex'
+              'index_name' => 'cp'
             }
           },
           'info' => {
@@ -900,10 +892,8 @@ 
$result_trees{'nodes_before_top_and_sections_unsplit_no_nodes'} = {
               'entry_node' => {},
               'entry_number' => 5,
               'in_code' => 0,
-              'index_at_command' => 'cindex',
               'index_ignore_chars' => {},
-              'index_name' => 'cp',
-              'index_type_command' => 'cindex'
+              'index_name' => 'cp'
             }
           },
           'info' => {
@@ -1225,10 +1215,8 @@ 
$result_trees{'nodes_before_top_and_sections_unsplit_no_nodes'} = {
                   'entry_node' => {},
                   'entry_number' => 6,
                   'in_code' => 0,
-                  'index_at_command' => 'cindex',
                   'index_ignore_chars' => {},
-                  'index_name' => 'cp',
-                  'index_type_command' => 'cindex'
+                  'index_name' => 'cp'
                 }
               },
               'info' => {
@@ -1269,10 +1257,8 @@ 
$result_trees{'nodes_before_top_and_sections_unsplit_no_nodes'} = {
                   'entry_node' => {},
                   'entry_number' => 1,
                   'in_code' => 1,
-                  'index_at_command' => 'findex',
                   'index_ignore_chars' => {},
-                  'index_name' => 'fn',
-                  'index_type_command' => 'findex'
+                  'index_name' => 'fn'
                 }
               },
               'info' => {
@@ -1313,10 +1299,8 @@ 
$result_trees{'nodes_before_top_and_sections_unsplit_no_nodes'} = {
                   'entry_node' => {},
                   'entry_number' => 7,
                   'in_code' => 0,
-                  'index_at_command' => 'cindex',
                   'index_ignore_chars' => {},
-                  'index_name' => 'cp',
-                  'index_type_command' => 'cindex'
+                  'index_name' => 'cp'
                 }
               },
               'info' => {
@@ -1867,10 +1851,8 @@ 
$result_trees{'nodes_before_top_and_sections_unsplit_no_nodes'} = {
               'entry_node' => {},
               'entry_number' => 8,
               'in_code' => 0,
-              'index_at_command' => 'cindex',
               'index_ignore_chars' => {},
-              'index_name' => 'cp',
-              'index_type_command' => 'cindex'
+              'index_name' => 'cp'
             }
           },
           'info' => {
@@ -1911,10 +1893,8 @@ 
$result_trees{'nodes_before_top_and_sections_unsplit_no_nodes'} = {
               'entry_node' => {},
               'entry_number' => 2,
               'in_code' => 1,
-              'index_at_command' => 'findex',
               'index_ignore_chars' => {},
-              'index_name' => 'fn',
-              'index_type_command' => 'findex'
+              'index_name' => 'fn'
             }
           },
           'info' => {
@@ -1955,10 +1935,8 @@ 
$result_trees{'nodes_before_top_and_sections_unsplit_no_nodes'} = {
               'entry_node' => {},
               'entry_number' => 9,
               'in_code' => 0,
-              'index_at_command' => 'cindex',
               'index_ignore_chars' => {},
-              'index_name' => 'cp',
-              'index_type_command' => 'cindex'
+              'index_name' => 'cp'
             }
           },
           'info' => {
@@ -2091,10 +2069,8 @@ 
$result_trees{'nodes_before_top_and_sections_unsplit_no_nodes'} = {
               'entry_node' => {},
               'entry_number' => 10,
               'in_code' => 0,
-              'index_at_command' => 'cindex',
               'index_ignore_chars' => {},
-              'index_name' => 'cp',
-              'index_type_command' => 'cindex'
+              'index_name' => 'cp'
             }
           },
           'info' => {
@@ -2179,10 +2155,8 @@ 
$result_trees{'nodes_before_top_and_sections_unsplit_no_nodes'} = {
               'entry_node' => {},
               'entry_number' => 3,
               'in_code' => 1,
-              'index_at_command' => 'findex',
               'index_ignore_chars' => {},
-              'index_name' => 'fn',
-              'index_type_command' => 'findex'
+              'index_name' => 'fn'
             }
           },
           'info' => {
@@ -2223,10 +2197,8 @@ 
$result_trees{'nodes_before_top_and_sections_unsplit_no_nodes'} = {
               'entry_node' => {},
               'entry_number' => 11,
               'in_code' => 0,
-              'index_at_command' => 'cindex',
               'index_ignore_chars' => {},
-              'index_name' => 'cp',
-              'index_type_command' => 'cindex'
+              'index_name' => 'cp'
             }
           },
           'info' => {
@@ -2551,10 +2523,8 @@ 
$result_trees{'nodes_before_top_and_sections_unsplit_no_nodes'} = {
               'entry_node' => {},
               'entry_number' => 12,
               'in_code' => 0,
-              'index_at_command' => 'cindex',
               'index_ignore_chars' => {},
-              'index_name' => 'cp',
-              'index_type_command' => 'cindex'
+              'index_name' => 'cp'
             }
           },
           'info' => {
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 27c5961ba1..c04eee1fbf 100644
--- a/tp/t/results/indices/nodes_before_top_split_chapter.pl
+++ b/tp/t/results/indices/nodes_before_top_split_chapter.pl
@@ -138,10 +138,8 @@ $result_trees{'nodes_before_top_split_chapter'} = {
               'entry_node' => {},
               'entry_number' => 1,
               'in_code' => 0,
-              'index_at_command' => 'cindex',
               'index_ignore_chars' => {},
-              'index_name' => 'cp',
-              'index_type_command' => 'cindex'
+              'index_name' => 'cp'
             }
           },
           'info' => {
@@ -408,10 +406,8 @@ $result_trees{'nodes_before_top_split_chapter'} = {
               'entry_node' => {},
               'entry_number' => 2,
               'in_code' => 0,
-              'index_at_command' => 'cindex',
               'index_ignore_chars' => {},
-              'index_name' => 'cp',
-              'index_type_command' => 'cindex'
+              'index_name' => 'cp'
             }
           },
           'info' => {
@@ -500,10 +496,8 @@ $result_trees{'nodes_before_top_split_chapter'} = {
               'entry_node' => {},
               'entry_number' => 3,
               'in_code' => 0,
-              'index_at_command' => 'cindex',
               'index_ignore_chars' => {},
-              'index_name' => 'cp',
-              'index_type_command' => 'cindex'
+              'index_name' => 'cp'
             }
           },
           'info' => {
@@ -624,10 +618,8 @@ $result_trees{'nodes_before_top_split_chapter'} = {
               'entry_node' => {},
               'entry_number' => 4,
               'in_code' => 0,
-              'index_at_command' => 'cindex',
               'index_ignore_chars' => {},
-              'index_name' => 'cp',
-              'index_type_command' => 'cindex'
+              'index_name' => 'cp'
             }
           },
           'info' => {
@@ -991,10 +983,8 @@ $result_trees{'nodes_before_top_split_chapter'} = {
                   'entry_node' => {},
                   'entry_number' => 5,
                   'in_code' => 0,
-                  'index_at_command' => 'cindex',
                   'index_ignore_chars' => {},
-                  'index_name' => 'cp',
-                  'index_type_command' => 'cindex'
+                  'index_name' => 'cp'
                 }
               },
               'info' => {
@@ -1035,10 +1025,8 @@ $result_trees{'nodes_before_top_split_chapter'} = {
                   'entry_node' => {},
                   'entry_number' => 1,
                   'in_code' => 1,
-                  'index_at_command' => 'findex',
                   'index_ignore_chars' => {},
-                  'index_name' => 'fn',
-                  'index_type_command' => 'findex'
+                  'index_name' => 'fn'
                 }
               },
               'info' => {
@@ -1079,10 +1067,8 @@ $result_trees{'nodes_before_top_split_chapter'} = {
                   'entry_node' => {},
                   'entry_number' => 6,
                   'in_code' => 0,
-                  'index_at_command' => 'cindex',
                   'index_ignore_chars' => {},
-                  'index_name' => 'cp',
-                  'index_type_command' => 'cindex'
+                  'index_name' => 'cp'
                 }
               },
               'info' => {
@@ -1633,10 +1619,8 @@ $result_trees{'nodes_before_top_split_chapter'} = {
               'entry_node' => {},
               'entry_number' => 7,
               'in_code' => 0,
-              'index_at_command' => 'cindex',
               'index_ignore_chars' => {},
-              'index_name' => 'cp',
-              'index_type_command' => 'cindex'
+              'index_name' => 'cp'
             }
           },
           'info' => {
@@ -1677,10 +1661,8 @@ $result_trees{'nodes_before_top_split_chapter'} = {
               'entry_node' => {},
               'entry_number' => 2,
               'in_code' => 1,
-              'index_at_command' => 'findex',
               'index_ignore_chars' => {},
-              'index_name' => 'fn',
-              'index_type_command' => 'findex'
+              'index_name' => 'fn'
             }
           },
           'info' => {
@@ -1721,10 +1703,8 @@ $result_trees{'nodes_before_top_split_chapter'} = {
               'entry_node' => {},
               'entry_number' => 8,
               'in_code' => 0,
-              'index_at_command' => 'cindex',
               'index_ignore_chars' => {},
-              'index_name' => 'cp',
-              'index_type_command' => 'cindex'
+              'index_name' => 'cp'
             }
           },
           'info' => {
@@ -1857,10 +1837,8 @@ $result_trees{'nodes_before_top_split_chapter'} = {
               'entry_node' => {},
               'entry_number' => 9,
               'in_code' => 0,
-              'index_at_command' => 'cindex',
               'index_ignore_chars' => {},
-              'index_name' => 'cp',
-              'index_type_command' => 'cindex'
+              'index_name' => 'cp'
             }
           },
           'info' => {
@@ -1945,10 +1923,8 @@ $result_trees{'nodes_before_top_split_chapter'} = {
               'entry_node' => {},
               'entry_number' => 3,
               'in_code' => 1,
-              'index_at_command' => 'findex',
               'index_ignore_chars' => {},
-              'index_name' => 'fn',
-              'index_type_command' => 'findex'
+              'index_name' => 'fn'
             }
           },
           'info' => {
@@ -1989,10 +1965,8 @@ $result_trees{'nodes_before_top_split_chapter'} = {
               'entry_node' => {},
               'entry_number' => 10,
               'in_code' => 0,
-              'index_at_command' => 'cindex',
               'index_ignore_chars' => {},
-              'index_name' => 'cp',
-              'index_type_command' => 'cindex'
+              'index_name' => 'cp'
             }
           },
           'info' => {
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 10273dd638..9c1e5d4fb3 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
@@ -138,10 +138,8 @@ $result_trees{'nodes_before_top_split_chapter_no_nodes'} = 
{
               'entry_node' => {},
               'entry_number' => 1,
               'in_code' => 0,
-              'index_at_command' => 'cindex',
               'index_ignore_chars' => {},
-              'index_name' => 'cp',
-              'index_type_command' => 'cindex'
+              'index_name' => 'cp'
             }
           },
           'info' => {
@@ -408,10 +406,8 @@ $result_trees{'nodes_before_top_split_chapter_no_nodes'} = 
{
               'entry_node' => {},
               'entry_number' => 2,
               'in_code' => 0,
-              'index_at_command' => 'cindex',
               'index_ignore_chars' => {},
-              'index_name' => 'cp',
-              'index_type_command' => 'cindex'
+              'index_name' => 'cp'
             }
           },
           'info' => {
@@ -500,10 +496,8 @@ $result_trees{'nodes_before_top_split_chapter_no_nodes'} = 
{
               'entry_node' => {},
               'entry_number' => 3,
               'in_code' => 0,
-              'index_at_command' => 'cindex',
               'index_ignore_chars' => {},
-              'index_name' => 'cp',
-              'index_type_command' => 'cindex'
+              'index_name' => 'cp'
             }
           },
           'info' => {
@@ -624,10 +618,8 @@ $result_trees{'nodes_before_top_split_chapter_no_nodes'} = 
{
               'entry_node' => {},
               'entry_number' => 4,
               'in_code' => 0,
-              'index_at_command' => 'cindex',
               'index_ignore_chars' => {},
-              'index_name' => 'cp',
-              'index_type_command' => 'cindex'
+              'index_name' => 'cp'
             }
           },
           'info' => {
@@ -991,10 +983,8 @@ $result_trees{'nodes_before_top_split_chapter_no_nodes'} = 
{
                   'entry_node' => {},
                   'entry_number' => 5,
                   'in_code' => 0,
-                  'index_at_command' => 'cindex',
                   'index_ignore_chars' => {},
-                  'index_name' => 'cp',
-                  'index_type_command' => 'cindex'
+                  'index_name' => 'cp'
                 }
               },
               'info' => {
@@ -1035,10 +1025,8 @@ $result_trees{'nodes_before_top_split_chapter_no_nodes'} 
= {
                   'entry_node' => {},
                   'entry_number' => 1,
                   'in_code' => 1,
-                  'index_at_command' => 'findex',
                   'index_ignore_chars' => {},
-                  'index_name' => 'fn',
-                  'index_type_command' => 'findex'
+                  'index_name' => 'fn'
                 }
               },
               'info' => {
@@ -1079,10 +1067,8 @@ $result_trees{'nodes_before_top_split_chapter_no_nodes'} 
= {
                   'entry_node' => {},
                   'entry_number' => 6,
                   'in_code' => 0,
-                  'index_at_command' => 'cindex',
                   'index_ignore_chars' => {},
-                  'index_name' => 'cp',
-                  'index_type_command' => 'cindex'
+                  'index_name' => 'cp'
                 }
               },
               'info' => {
@@ -1633,10 +1619,8 @@ $result_trees{'nodes_before_top_split_chapter_no_nodes'} 
= {
               'entry_node' => {},
               'entry_number' => 7,
               'in_code' => 0,
-              'index_at_command' => 'cindex',
               'index_ignore_chars' => {},
-              'index_name' => 'cp',
-              'index_type_command' => 'cindex'
+              'index_name' => 'cp'
             }
           },
           'info' => {
@@ -1677,10 +1661,8 @@ $result_trees{'nodes_before_top_split_chapter_no_nodes'} 
= {
               'entry_node' => {},
               'entry_number' => 2,
               'in_code' => 1,
-              'index_at_command' => 'findex',
               'index_ignore_chars' => {},
-              'index_name' => 'fn',
-              'index_type_command' => 'findex'
+              'index_name' => 'fn'
             }
           },
           'info' => {
@@ -1721,10 +1703,8 @@ $result_trees{'nodes_before_top_split_chapter_no_nodes'} 
= {
               'entry_node' => {},
               'entry_number' => 8,
               'in_code' => 0,
-              'index_at_command' => 'cindex',
               'index_ignore_chars' => {},
-              'index_name' => 'cp',
-              'index_type_command' => 'cindex'
+              'index_name' => 'cp'
             }
           },
           'info' => {
@@ -1857,10 +1837,8 @@ $result_trees{'nodes_before_top_split_chapter_no_nodes'} 
= {
               'entry_node' => {},
               'entry_number' => 9,
               'in_code' => 0,
-              'index_at_command' => 'cindex',
               'index_ignore_chars' => {},
-              'index_name' => 'cp',
-              'index_type_command' => 'cindex'
+              'index_name' => 'cp'
             }
           },
           'info' => {
@@ -1945,10 +1923,8 @@ $result_trees{'nodes_before_top_split_chapter_no_nodes'} 
= {
               'entry_node' => {},
               'entry_number' => 3,
               'in_code' => 1,
-              'index_at_command' => 'findex',
               'index_ignore_chars' => {},
-              'index_name' => 'fn',
-              'index_type_command' => 'findex'
+              'index_name' => 'fn'
             }
           },
           'info' => {
@@ -1989,10 +1965,8 @@ $result_trees{'nodes_before_top_split_chapter_no_nodes'} 
= {
               'entry_node' => {},
               'entry_number' => 10,
               'in_code' => 0,
-              'index_at_command' => 'cindex',
               'index_ignore_chars' => {},
-              'index_name' => 'cp',
-              'index_type_command' => 'cindex'
+              'index_name' => 'cp'
             }
           },
           'info' => {
diff --git a/tp/t/results/indices/printindex_between_node_section.pl 
b/tp/t/results/indices/printindex_between_node_section.pl
index 0c4a53ab89..6073f1cbda 100644
--- a/tp/t/results/indices/printindex_between_node_section.pl
+++ b/tp/t/results/indices/printindex_between_node_section.pl
@@ -109,10 +109,8 @@ $result_trees{'printindex_between_node_section'} = {
               'entry_node' => {},
               'entry_number' => 1,
               'in_code' => 0,
-              'index_at_command' => 'cindex',
               'index_ignore_chars' => {},
-              'index_name' => 'cp',
-              'index_type_command' => 'cindex'
+              'index_name' => 'cp'
             }
           },
           'info' => {
@@ -153,10 +151,8 @@ $result_trees{'printindex_between_node_section'} = {
               'entry_node' => {},
               'entry_number' => 2,
               'in_code' => 0,
-              'index_at_command' => 'cindex',
               'index_ignore_chars' => {},
-              'index_name' => 'cp',
-              'index_type_command' => 'cindex'
+              'index_name' => 'cp'
             }
           },
           'info' => {
@@ -197,10 +193,8 @@ $result_trees{'printindex_between_node_section'} = {
               'entry_node' => {},
               'entry_number' => 3,
               'in_code' => 0,
-              'index_at_command' => 'cindex',
               'index_ignore_chars' => {},
-              'index_name' => 'cp',
-              'index_type_command' => 'cindex'
+              'index_name' => 'cp'
             }
           },
           'info' => {
@@ -241,10 +235,8 @@ $result_trees{'printindex_between_node_section'} = {
               'entry_node' => {},
               'entry_number' => 4,
               'in_code' => 0,
-              'index_at_command' => 'cindex',
               'index_ignore_chars' => {},
-              'index_name' => 'cp',
-              'index_type_command' => 'cindex'
+              'index_name' => 'cp'
             }
           },
           'info' => {
@@ -370,10 +362,8 @@ $result_trees{'printindex_between_node_section'} = {
               'entry_node' => {},
               'entry_number' => 5,
               'in_code' => 0,
-              'index_at_command' => 'cindex',
               'index_ignore_chars' => {},
-              'index_name' => 'cp',
-              'index_type_command' => 'cindex'
+              'index_name' => 'cp'
             }
           },
           'info' => {
@@ -414,10 +404,8 @@ $result_trees{'printindex_between_node_section'} = {
               'entry_node' => {},
               'entry_number' => 6,
               'in_code' => 0,
-              'index_at_command' => 'cindex',
               'index_ignore_chars' => {},
-              'index_name' => 'cp',
-              'index_type_command' => 'cindex'
+              'index_name' => 'cp'
             }
           },
           'info' => {
diff --git a/tp/t/results/indices/printindex_between_part_chapter.pl 
b/tp/t/results/indices/printindex_between_part_chapter.pl
index 8f6d5f9a63..89d80ea487 100644
--- a/tp/t/results/indices/printindex_between_part_chapter.pl
+++ b/tp/t/results/indices/printindex_between_part_chapter.pl
@@ -110,10 +110,8 @@ $result_trees{'printindex_between_part_chapter'} = {
               'entry_node' => {},
               'entry_number' => 1,
               'in_code' => 0,
-              'index_at_command' => 'cindex',
               'index_ignore_chars' => {},
-              'index_name' => 'cp',
-              'index_type_command' => 'cindex'
+              'index_name' => 'cp'
             }
           },
           'info' => {
@@ -154,10 +152,8 @@ $result_trees{'printindex_between_part_chapter'} = {
               'entry_node' => {},
               'entry_number' => 2,
               'in_code' => 0,
-              'index_at_command' => 'cindex',
               'index_ignore_chars' => {},
-              'index_name' => 'cp',
-              'index_type_command' => 'cindex'
+              'index_name' => 'cp'
             }
           },
           'info' => {
@@ -198,10 +194,8 @@ $result_trees{'printindex_between_part_chapter'} = {
               'entry_node' => {},
               'entry_number' => 3,
               'in_code' => 0,
-              'index_at_command' => 'cindex',
               'index_ignore_chars' => {},
-              'index_name' => 'cp',
-              'index_type_command' => 'cindex'
+              'index_name' => 'cp'
             }
           },
           'info' => {
@@ -242,10 +236,8 @@ $result_trees{'printindex_between_part_chapter'} = {
               'entry_node' => {},
               'entry_number' => 4,
               'in_code' => 0,
-              'index_at_command' => 'cindex',
               'index_ignore_chars' => {},
-              'index_name' => 'cp',
-              'index_type_command' => 'cindex'
+              'index_name' => 'cp'
             }
           },
           'info' => {
@@ -529,10 +521,8 @@ $result_trees{'printindex_between_part_chapter'} = {
               'entry_node' => {},
               'entry_number' => 5,
               'in_code' => 0,
-              'index_at_command' => 'cindex',
               'index_ignore_chars' => {},
-              'index_name' => 'cp',
-              'index_type_command' => 'cindex'
+              'index_name' => 'cp'
             }
           },
           'info' => {
@@ -573,10 +563,8 @@ $result_trees{'printindex_between_part_chapter'} = {
               'entry_node' => {},
               'entry_number' => 6,
               'in_code' => 0,
-              'index_at_command' => 'cindex',
               'index_ignore_chars' => {},
-              'index_name' => 'cp',
-              'index_type_command' => 'cindex'
+              'index_name' => 'cp'
             }
           },
           'info' => {
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 c050cc1438..1bcccbd748 100644
--- a/tp/t/results/indices/printindex_index_entry_in_copying.pl
+++ b/tp/t/results/indices/printindex_index_entry_in_copying.pl
@@ -56,10 +56,8 @@ $result_trees{'printindex_index_entry_in_copying'} = {
                       'entry_number' => 1,
                       'entry_region' => 'copying',
                       'in_code' => 1,
-                      'index_at_command' => 'findex',
                       'index_ignore_chars' => {},
-                      'index_name' => 'fn',
-                      'index_type_command' => 'findex'
+                      'index_name' => 'fn'
                     }
                   },
                   'info' => {
@@ -150,10 +148,8 @@ $result_trees{'printindex_index_entry_in_copying'} = {
                           'entry_number' => 2,
                           'entry_region' => 'copying',
                           'in_code' => 1,
-                          'index_at_command' => 'defun',
                           'index_ignore_chars' => {},
-                          'index_name' => 'fn',
-                          'index_type_command' => 'defun'
+                          'index_name' => 'fn'
                         },
                         'original_def_cmdname' => 'defun'
                       },
@@ -233,10 +229,8 @@ $result_trees{'printindex_index_entry_in_copying'} = {
                           'entry_number' => 3,
                           'entry_region' => 'copying',
                           'in_code' => 1,
-                          'index_at_command' => 'defunx',
                           'index_ignore_chars' => {},
-                          'index_name' => 'fn',
-                          'index_type_command' => 'defun'
+                          'index_name' => 'fn'
                         },
                         'original_def_cmdname' => 'defunx'
                       },
@@ -370,10 +364,8 @@ $result_trees{'printindex_index_entry_in_copying'} = {
                                   'entry_number' => 4,
                                   'entry_region' => 'copying',
                                   'in_code' => 1,
-                                  'index_at_command' => 'item',
                                   'index_ignore_chars' => {},
-                                  'index_name' => 'fn',
-                                  'index_type_command' => 'ftable'
+                                  'index_name' => 'fn'
                                 }
                               },
                               'info' => {
@@ -413,10 +405,8 @@ $result_trees{'printindex_index_entry_in_copying'} = {
                                   'entry_number' => 5,
                                   'entry_region' => 'copying',
                                   'in_code' => 1,
-                                  'index_at_command' => 'itemx',
                                   'index_ignore_chars' => {},
-                                  'index_name' => 'fn',
-                                  'index_type_command' => 'ftable'
+                                  'index_name' => 'fn'
                                 }
                               },
                               'info' => {
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 fb13284366..7e1a7c5d58 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
@@ -71,10 +71,8 @@ 
$result_trees{'printindex_index_entry_in_copying_in_footnote'} = {
                                       'entry_number' => 1,
                                       'entry_region' => 'copying',
                                       'in_code' => 0,
-                                      'index_at_command' => 'cindex',
                                       'index_ignore_chars' => {},
-                                      'index_name' => 'cp',
-                                      'index_type_command' => 'cindex'
+                                      'index_name' => 'cp'
                                     }
                                   },
                                   'info' => {
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 eaeb4b506a..76debe16a5 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
@@ -56,10 +56,8 @@ 
$result_trees{'printindex_index_entry_in_copying_no_insertcopying'} = {
                       'entry_number' => 1,
                       'entry_region' => 'copying',
                       'in_code' => 1,
-                      'index_at_command' => 'findex',
                       'index_ignore_chars' => {},
-                      'index_name' => 'fn',
-                      'index_type_command' => 'findex'
+                      'index_name' => 'fn'
                     }
                   },
                   'info' => {
@@ -150,10 +148,8 @@ 
$result_trees{'printindex_index_entry_in_copying_no_insertcopying'} = {
                           'entry_number' => 2,
                           'entry_region' => 'copying',
                           'in_code' => 1,
-                          'index_at_command' => 'defun',
                           'index_ignore_chars' => {},
-                          'index_name' => 'fn',
-                          'index_type_command' => 'defun'
+                          'index_name' => 'fn'
                         },
                         'original_def_cmdname' => 'defun'
                       },
@@ -233,10 +229,8 @@ 
$result_trees{'printindex_index_entry_in_copying_no_insertcopying'} = {
                           'entry_number' => 3,
                           'entry_region' => 'copying',
                           'in_code' => 1,
-                          'index_at_command' => 'defunx',
                           'index_ignore_chars' => {},
-                          'index_name' => 'fn',
-                          'index_type_command' => 'defun'
+                          'index_name' => 'fn'
                         },
                         'original_def_cmdname' => 'defunx'
                       },
@@ -370,10 +364,8 @@ 
$result_trees{'printindex_index_entry_in_copying_no_insertcopying'} = {
                                   'entry_number' => 4,
                                   'entry_region' => 'copying',
                                   'in_code' => 1,
-                                  'index_at_command' => 'item',
                                   'index_ignore_chars' => {},
-                                  'index_name' => 'fn',
-                                  'index_type_command' => 'ftable'
+                                  'index_name' => 'fn'
                                 }
                               },
                               'info' => {
@@ -413,10 +405,8 @@ 
$result_trees{'printindex_index_entry_in_copying_no_insertcopying'} = {
                                   'entry_number' => 5,
                                   'entry_region' => 'copying',
                                   'in_code' => 1,
-                                  'index_at_command' => 'itemx',
                                   'index_ignore_chars' => {},
-                                  'index_name' => 'fn',
-                                  'index_type_command' => 'ftable'
+                                  'index_name' => 'fn'
                                 }
                               },
                               'info' => {
diff --git a/tp/t/results/indices/printindex_with_space_before.pl 
b/tp/t/results/indices/printindex_with_space_before.pl
index 6259a13b6f..f69916c734 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 d9735507c6..68ad4e44a7 100644
--- a/tp/t/results/indices/same_index_entry_merged_indices.pl
+++ b/tp/t/results/indices/same_index_entry_merged_indices.pl
@@ -290,10 +290,8 @@ $result_trees{'same_index_entry_merged_indices'} = {
                   'entry_node' => {},
                   'entry_number' => 1,
                   'in_code' => 1,
-                  'index_at_command' => 'deffn',
                   'index_ignore_chars' => {},
-                  'index_name' => 'fn',
-                  'index_type_command' => 'deffn'
+                  'index_name' => 'fn'
                 },
                 'original_def_cmdname' => 'deffn'
               },
@@ -425,10 +423,8 @@ $result_trees{'same_index_entry_merged_indices'} = {
                   'entry_node' => {},
                   'entry_number' => 1,
                   'in_code' => 1,
-                  'index_at_command' => 'defvar',
                   'index_ignore_chars' => {},
-                  'index_name' => 'vr',
-                  'index_type_command' => 'defvar'
+                  'index_name' => 'vr'
                 },
                 'original_def_cmdname' => 'defvar'
               },
diff --git a/tp/t/results/indices/same_only_seealso_seeentry.pl 
b/tp/t/results/indices/same_only_seealso_seeentry.pl
index e0f1dcd9dd..5f7e941dda 100644
--- a/tp/t/results/indices/same_only_seealso_seeentry.pl
+++ b/tp/t/results/indices/same_only_seealso_seeentry.pl
@@ -212,10 +212,8 @@ $result_trees{'same_only_seealso_seeentry'} = {
               'entry_node' => {},
               'entry_number' => 1,
               'in_code' => 0,
-              'index_at_command' => 'cindex',
               'index_ignore_chars' => {},
-              'index_name' => 'cp',
-              'index_type_command' => 'cindex'
+              'index_name' => 'cp'
             },
             'seealso' => {}
           },
@@ -279,10 +277,8 @@ $result_trees{'same_only_seealso_seeentry'} = {
               'entry_node' => {},
               'entry_number' => 2,
               'in_code' => 0,
-              'index_at_command' => 'cindex',
               'index_ignore_chars' => {},
-              'index_name' => 'cp',
-              'index_type_command' => 'cindex'
+              'index_name' => 'cp'
             },
             'seealso' => {}
           },
@@ -351,10 +347,8 @@ $result_trees{'same_only_seealso_seeentry'} = {
               'entry_node' => {},
               'entry_number' => 3,
               'in_code' => 0,
-              'index_at_command' => 'cindex',
               'index_ignore_chars' => {},
-              'index_name' => 'cp',
-              'index_type_command' => 'cindex'
+              'index_name' => 'cp'
             },
             'seeentry' => {}
           },
@@ -418,10 +412,8 @@ $result_trees{'same_only_seealso_seeentry'} = {
               'entry_node' => {},
               'entry_number' => 4,
               'in_code' => 0,
-              'index_at_command' => 'cindex',
               'index_ignore_chars' => {},
-              'index_name' => 'cp',
-              'index_type_command' => 'cindex'
+              'index_name' => 'cp'
             },
             'seeentry' => {}
           },
@@ -490,10 +482,8 @@ $result_trees{'same_only_seealso_seeentry'} = {
               'entry_node' => {},
               'entry_number' => 5,
               'in_code' => 0,
-              'index_at_command' => 'cindex',
               'index_ignore_chars' => {},
-              'index_name' => 'cp',
-              'index_type_command' => 'cindex'
+              'index_name' => 'cp'
             },
             'seealso' => {}
           },
@@ -557,10 +547,8 @@ $result_trees{'same_only_seealso_seeentry'} = {
               'entry_node' => {},
               'entry_number' => 6,
               'in_code' => 0,
-              'index_at_command' => 'cindex',
               'index_ignore_chars' => {},
-              'index_name' => 'cp',
-              'index_type_command' => 'cindex'
+              'index_name' => 'cp'
             },
             'seeentry' => {}
           },
diff --git a/tp/t/results/indices/same_seealso_seeentry.pl 
b/tp/t/results/indices/same_seealso_seeentry.pl
index 4d8e525fdc..6ddbfd9d7f 100644
--- a/tp/t/results/indices/same_seealso_seeentry.pl
+++ b/tp/t/results/indices/same_seealso_seeentry.pl
@@ -212,10 +212,8 @@ $result_trees{'same_seealso_seeentry'} = {
               'entry_node' => {},
               'entry_number' => 1,
               'in_code' => 0,
-              'index_at_command' => 'cindex',
               'index_ignore_chars' => {},
-              'index_name' => 'cp',
-              'index_type_command' => 'cindex'
+              'index_name' => 'cp'
             },
             'seealso' => {}
           },
@@ -279,10 +277,8 @@ $result_trees{'same_seealso_seeentry'} = {
               'entry_node' => {},
               'entry_number' => 2,
               'in_code' => 0,
-              'index_at_command' => 'cindex',
               'index_ignore_chars' => {},
-              'index_name' => 'cp',
-              'index_type_command' => 'cindex'
+              'index_name' => 'cp'
             },
             'seealso' => {}
           },
@@ -351,10 +347,8 @@ $result_trees{'same_seealso_seeentry'} = {
               'entry_node' => {},
               'entry_number' => 3,
               'in_code' => 0,
-              'index_at_command' => 'cindex',
               'index_ignore_chars' => {},
-              'index_name' => 'cp',
-              'index_type_command' => 'cindex'
+              'index_name' => 'cp'
             },
             'seeentry' => {}
           },
@@ -418,10 +412,8 @@ $result_trees{'same_seealso_seeentry'} = {
               'entry_node' => {},
               'entry_number' => 4,
               'in_code' => 0,
-              'index_at_command' => 'cindex',
               'index_ignore_chars' => {},
-              'index_name' => 'cp',
-              'index_type_command' => 'cindex'
+              'index_name' => 'cp'
             },
             'seeentry' => {}
           },
@@ -490,10 +482,8 @@ $result_trees{'same_seealso_seeentry'} = {
               'entry_node' => {},
               'entry_number' => 5,
               'in_code' => 0,
-              'index_at_command' => 'cindex',
               'index_ignore_chars' => {},
-              'index_name' => 'cp',
-              'index_type_command' => 'cindex'
+              'index_name' => 'cp'
             },
             'seealso' => {}
           },
@@ -557,10 +547,8 @@ $result_trees{'same_seealso_seeentry'} = {
               'entry_node' => {},
               'entry_number' => 6,
               'in_code' => 0,
-              'index_at_command' => 'cindex',
               'index_ignore_chars' => {},
-              'index_name' => 'cp',
-              'index_type_command' => 'cindex'
+              'index_name' => 'cp'
             },
             'seeentry' => {}
           },
@@ -607,10 +595,8 @@ $result_trees{'same_seealso_seeentry'} = {
               'entry_node' => {},
               'entry_number' => 7,
               'in_code' => 0,
-              'index_at_command' => 'cindex',
               'index_ignore_chars' => {},
-              'index_name' => 'cp',
-              'index_type_command' => 'cindex'
+              'index_name' => 'cp'
             }
           },
           'info' => {
diff --git a/tp/t/results/indices/seealso_duplicate.pl 
b/tp/t/results/indices/seealso_duplicate.pl
index 18aa063bfb..23ed6fa105 100644
--- a/tp/t/results/indices/seealso_duplicate.pl
+++ b/tp/t/results/indices/seealso_duplicate.pl
@@ -123,10 +123,8 @@ $result_trees{'seealso_duplicate'} = {
               'entry_node' => {},
               'entry_number' => 1,
               'in_code' => 0,
-              'index_at_command' => 'cindex',
               'index_ignore_chars' => {},
-              'index_name' => 'cp',
-              'index_type_command' => 'cindex'
+              'index_name' => 'cp'
             },
             'subentry' => {
               'args' => [
@@ -214,10 +212,8 @@ $result_trees{'seealso_duplicate'} = {
               'entry_node' => {},
               'entry_number' => 2,
               'in_code' => 0,
-              'index_at_command' => 'cindex',
               'index_ignore_chars' => {},
-              'index_name' => 'cp',
-              'index_type_command' => 'cindex'
+              'index_name' => 'cp'
             },
             'subentry' => {
               'args' => [
diff --git a/tp/t/results/indices/seeentry.pl b/tp/t/results/indices/seeentry.pl
index 0478f38764..898008f44c 100644
--- a/tp/t/results/indices/seeentry.pl
+++ b/tp/t/results/indices/seeentry.pl
@@ -202,10 +202,8 @@ $result_trees{'seeentry'} = {
               'entry_node' => {},
               'entry_number' => 1,
               'in_code' => 0,
-              'index_at_command' => 'cindex',
               'index_ignore_chars' => {},
-              'index_name' => 'cp',
-              'index_type_command' => 'cindex'
+              'index_name' => 'cp'
             },
             'seeentry' => {}
           },
@@ -269,10 +267,8 @@ $result_trees{'seeentry'} = {
               'entry_node' => {},
               'entry_number' => 2,
               'in_code' => 0,
-              'index_at_command' => 'cindex',
               'index_ignore_chars' => {},
-              'index_name' => 'cp',
-              'index_type_command' => 'cindex'
+              'index_name' => 'cp'
             },
             'seealso' => {}
           },
@@ -341,10 +337,8 @@ $result_trees{'seeentry'} = {
               'entry_node' => {},
               'entry_number' => 1,
               'in_code' => 1,
-              'index_at_command' => 'findex',
               'index_ignore_chars' => {},
-              'index_name' => 'fn',
-              'index_type_command' => 'findex'
+              'index_name' => 'fn'
             },
             'seeentry' => {}
           },
@@ -408,10 +402,8 @@ $result_trees{'seeentry'} = {
               'entry_node' => {},
               'entry_number' => 2,
               'in_code' => 1,
-              'index_at_command' => 'findex',
               'index_ignore_chars' => {},
-              'index_name' => 'fn',
-              'index_type_command' => 'findex'
+              'index_name' => 'fn'
             },
             'seealso' => {}
           },
diff --git a/tp/t/results/indices/sorted_subentries.pl 
b/tp/t/results/indices/sorted_subentries.pl
index 38a051e2c3..9f218eb12f 100644
--- a/tp/t/results/indices/sorted_subentries.pl
+++ b/tp/t/results/indices/sorted_subentries.pl
@@ -178,10 +178,8 @@ $result_trees{'sorted_subentries'} = {
               'entry_node' => {},
               'entry_number' => 1,
               'in_code' => 0,
-              'index_at_command' => 'cindex',
               'index_ignore_chars' => {},
-              'index_name' => 'cp',
-              'index_type_command' => 'cindex'
+              'index_name' => 'cp'
             },
             'subentry' => {
               'args' => [
@@ -254,10 +252,8 @@ $result_trees{'sorted_subentries'} = {
               'entry_node' => {},
               'entry_number' => 2,
               'in_code' => 0,
-              'index_at_command' => 'cindex',
               'index_ignore_chars' => {},
-              'index_name' => 'cp',
-              'index_type_command' => 'cindex'
+              'index_name' => 'cp'
             },
             'subentry' => {
               'args' => [
@@ -330,10 +326,8 @@ $result_trees{'sorted_subentries'} = {
               'entry_node' => {},
               'entry_number' => 3,
               'in_code' => 0,
-              'index_at_command' => 'cindex',
               'index_ignore_chars' => {},
-              'index_name' => 'cp',
-              'index_type_command' => 'cindex'
+              'index_name' => 'cp'
             },
             'subentry' => {
               'args' => [
@@ -406,10 +400,8 @@ $result_trees{'sorted_subentries'} = {
               'entry_node' => {},
               'entry_number' => 4,
               'in_code' => 0,
-              'index_at_command' => 'cindex',
               'index_ignore_chars' => {},
-              'index_name' => 'cp',
-              'index_type_command' => 'cindex'
+              'index_name' => 'cp'
             },
             'subentry' => {
               'args' => [
@@ -487,10 +479,8 @@ $result_trees{'sorted_subentries'} = {
               'entry_node' => {},
               'entry_number' => 5,
               'in_code' => 0,
-              'index_at_command' => 'cindex',
               'index_ignore_chars' => {},
-              'index_name' => 'cp',
-              'index_type_command' => 'cindex'
+              'index_name' => 'cp'
             },
             'subentry' => {
               'args' => [
@@ -595,10 +585,8 @@ $result_trees{'sorted_subentries'} = {
               'entry_node' => {},
               'entry_number' => 6,
               'in_code' => 0,
-              'index_at_command' => 'cindex',
               'index_ignore_chars' => {},
-              'index_name' => 'cp',
-              'index_type_command' => 'cindex'
+              'index_name' => 'cp'
             },
             'subentry' => {
               'args' => [
@@ -672,10 +660,8 @@ $result_trees{'sorted_subentries'} = {
               'entry_node' => {},
               'entry_number' => 7,
               'in_code' => 0,
-              'index_at_command' => 'cindex',
               'index_ignore_chars' => {},
-              'index_name' => 'cp',
-              'index_type_command' => 'cindex'
+              'index_name' => 'cp'
             }
           },
           'info' => {
@@ -715,10 +701,8 @@ $result_trees{'sorted_subentries'} = {
               'entry_node' => {},
               'entry_number' => 8,
               'in_code' => 0,
-              'index_at_command' => 'cindex',
               'index_ignore_chars' => {},
-              'index_name' => 'cp',
-              'index_type_command' => 'cindex'
+              'index_name' => 'cp'
             },
             'subentry' => {
               'args' => [
@@ -791,10 +775,8 @@ $result_trees{'sorted_subentries'} = {
               'entry_node' => {},
               'entry_number' => 9,
               'in_code' => 0,
-              'index_at_command' => 'cindex',
               'index_ignore_chars' => {},
-              'index_name' => 'cp',
-              'index_type_command' => 'cindex'
+              'index_name' => 'cp'
             },
             'subentry' => {
               'args' => [
@@ -859,10 +841,8 @@ $result_trees{'sorted_subentries'} = {
               'entry_node' => {},
               'entry_number' => 10,
               'in_code' => 0,
-              'index_at_command' => 'cindex',
               'index_ignore_chars' => {},
-              'index_name' => 'cp',
-              'index_type_command' => 'cindex'
+              'index_name' => 'cp'
             }
           },
           'info' => {
@@ -902,10 +882,8 @@ $result_trees{'sorted_subentries'} = {
               'entry_node' => {},
               'entry_number' => 11,
               'in_code' => 0,
-              'index_at_command' => 'cindex',
               'index_ignore_chars' => {},
-              'index_name' => 'cp',
-              'index_type_command' => 'cindex'
+              'index_name' => 'cp'
             },
             'subentry' => {
               'args' => [
@@ -1123,10 +1101,8 @@ $result_trees{'sorted_subentries'} = {
               'entry_node' => {},
               'entry_number' => 12,
               'in_code' => 0,
-              'index_at_command' => 'cindex',
               'index_ignore_chars' => {},
-              'index_name' => 'cp',
-              'index_type_command' => 'cindex'
+              'index_name' => 'cp'
             },
             'subentry' => {
               'args' => [
@@ -1232,10 +1208,8 @@ $result_trees{'sorted_subentries'} = {
               'entry_node' => {},
               'entry_number' => 13,
               'in_code' => 0,
-              'index_at_command' => 'cindex',
               'index_ignore_chars' => {},
-              'index_name' => 'cp',
-              'index_type_command' => 'cindex'
+              'index_name' => 'cp'
             }
           },
           'info' => {
@@ -1290,10 +1264,8 @@ $result_trees{'sorted_subentries'} = {
               'entry_node' => {},
               'entry_number' => 14,
               'in_code' => 0,
-              'index_at_command' => 'cindex',
               'index_ignore_chars' => {},
-              'index_name' => 'cp',
-              'index_type_command' => 'cindex'
+              'index_name' => 'cp'
             },
             'subentry' => {
               'args' => [
@@ -1381,10 +1353,8 @@ $result_trees{'sorted_subentries'} = {
               'entry_node' => {},
               'entry_number' => 15,
               'in_code' => 0,
-              'index_at_command' => 'cindex',
               'index_ignore_chars' => {},
-              'index_name' => 'cp',
-              'index_type_command' => 'cindex'
+              'index_name' => 'cp'
             },
             'subentry' => {
               'args' => [
@@ -1581,10 +1551,8 @@ $result_trees{'sorted_subentries'} = {
               'entry_node' => {},
               'entry_number' => 16,
               'in_code' => 0,
-              'index_at_command' => 'cindex',
               'index_ignore_chars' => {},
-              'index_name' => 'cp',
-              'index_type_command' => 'cindex'
+              'index_name' => 'cp'
             },
             'subentry' => {
               'args' => [
@@ -1712,10 +1680,8 @@ $result_trees{'sorted_subentries'} = {
               'entry_node' => {},
               'entry_number' => 17,
               'in_code' => 0,
-              'index_at_command' => 'cindex',
               'index_ignore_chars' => {},
-              'index_name' => 'cp',
-              'index_type_command' => 'cindex'
+              'index_name' => 'cp'
             },
             'subentry' => {
               'args' => [
@@ -1820,10 +1786,8 @@ $result_trees{'sorted_subentries'} = {
               'entry_node' => {},
               'entry_number' => 18,
               'in_code' => 0,
-              'index_at_command' => 'cindex',
               'index_ignore_chars' => {},
-              'index_name' => 'cp',
-              'index_type_command' => 'cindex'
+              'index_name' => 'cp'
             },
             'subentry' => {
               'args' => [
diff --git a/tp/t/results/indices/split_chapter_index.pl 
b/tp/t/results/indices/split_chapter_index.pl
index d90547f852..9b6a92cf94 100644
--- a/tp/t/results/indices/split_chapter_index.pl
+++ b/tp/t/results/indices/split_chapter_index.pl
@@ -162,10 +162,8 @@ $result_trees{'split_chapter_index'} = {
               'entry_node' => {},
               'entry_number' => 1,
               'in_code' => 0,
-              'index_at_command' => 'cindex',
               'index_ignore_chars' => {},
-              'index_name' => 'cp',
-              'index_type_command' => 'cindex'
+              'index_name' => 'cp'
             }
           },
           'info' => {
@@ -423,10 +421,8 @@ $result_trees{'split_chapter_index'} = {
                   'entry_node' => {},
                   'entry_number' => 2,
                   'in_code' => 0,
-                  'index_at_command' => 'cindex',
                   'index_ignore_chars' => {},
-                  'index_name' => 'cp',
-                  'index_type_command' => 'cindex'
+                  'index_name' => 'cp'
                 }
               },
               'info' => {
@@ -467,10 +463,8 @@ $result_trees{'split_chapter_index'} = {
                   'entry_node' => {},
                   'entry_number' => 3,
                   'in_code' => 0,
-                  'index_at_command' => 'cindex',
                   'index_ignore_chars' => {},
-                  'index_name' => 'cp',
-                  'index_type_command' => 'cindex'
+                  'index_name' => 'cp'
                 }
               },
               'info' => {
@@ -511,10 +505,8 @@ $result_trees{'split_chapter_index'} = {
                   'entry_node' => {},
                   'entry_number' => 1,
                   'in_code' => 1,
-                  'index_at_command' => 'findex',
                   'index_ignore_chars' => {},
-                  'index_name' => 'fn',
-                  'index_type_command' => 'findex'
+                  'index_name' => 'fn'
                 }
               },
               'info' => {
@@ -555,10 +547,8 @@ $result_trees{'split_chapter_index'} = {
                   'entry_node' => {},
                   'entry_number' => 4,
                   'in_code' => 0,
-                  'index_at_command' => 'cindex',
                   'index_ignore_chars' => {},
-                  'index_name' => 'cp',
-                  'index_type_command' => 'cindex'
+                  'index_name' => 'cp'
                 }
               },
               'info' => {
@@ -646,10 +636,8 @@ $result_trees{'split_chapter_index'} = {
               'entry_node' => {},
               'entry_number' => 5,
               'in_code' => 0,
-              'index_at_command' => 'cindex',
               'index_ignore_chars' => {},
-              'index_name' => 'cp',
-              'index_type_command' => 'cindex'
+              'index_name' => 'cp'
             }
           },
           'info' => {
@@ -695,10 +683,8 @@ $result_trees{'split_chapter_index'} = {
               'entry_node' => {},
               'entry_number' => 2,
               'in_code' => 1,
-              'index_at_command' => 'findex',
               'index_ignore_chars' => {},
-              'index_name' => 'fn',
-              'index_type_command' => 'findex'
+              'index_name' => 'fn'
             }
           },
           'info' => {
@@ -739,10 +725,8 @@ $result_trees{'split_chapter_index'} = {
               'entry_node' => {},
               'entry_number' => 6,
               'in_code' => 0,
-              'index_at_command' => 'cindex',
               'index_ignore_chars' => {},
-              'index_name' => 'cp',
-              'index_type_command' => 'cindex'
+              'index_name' => 'cp'
             }
           },
           'info' => {
@@ -783,10 +767,8 @@ $result_trees{'split_chapter_index'} = {
               'entry_node' => {},
               'entry_number' => 3,
               'in_code' => 1,
-              'index_at_command' => 'findex',
               'index_ignore_chars' => {},
-              'index_name' => 'fn',
-              'index_type_command' => 'findex'
+              'index_name' => 'fn'
             }
           },
           'info' => {
@@ -1124,10 +1106,8 @@ $result_trees{'split_chapter_index'} = {
               'entry_node' => {},
               'entry_number' => 7,
               'in_code' => 0,
-              'index_at_command' => 'cindex',
               'index_ignore_chars' => {},
-              'index_name' => 'cp',
-              'index_type_command' => 'cindex'
+              'index_name' => 'cp'
             }
           },
           'info' => {
@@ -1173,10 +1153,8 @@ $result_trees{'split_chapter_index'} = {
               'entry_node' => {},
               'entry_number' => 8,
               'in_code' => 0,
-              'index_at_command' => 'cindex',
               'index_ignore_chars' => {},
-              'index_name' => 'cp',
-              'index_type_command' => 'cindex'
+              'index_name' => 'cp'
             }
           },
           'info' => {
@@ -1316,10 +1294,8 @@ $result_trees{'split_chapter_index'} = {
               'entry_node' => {},
               'entry_number' => 9,
               'in_code' => 0,
-              'index_at_command' => 'cindex',
               'index_ignore_chars' => {},
-              'index_name' => 'cp',
-              'index_type_command' => 'cindex'
+              'index_name' => 'cp'
             }
           },
           'info' => {
diff --git a/tp/t/results/indices/subentries.pl 
b/tp/t/results/indices/subentries.pl
index cecfd143f8..9b394e53bd 100644
--- a/tp/t/results/indices/subentries.pl
+++ b/tp/t/results/indices/subentries.pl
@@ -180,10 +180,8 @@ $result_trees{'subentries'} = {
               'entry_node' => {},
               'entry_number' => 1,
               'in_code' => 0,
-              'index_at_command' => 'cindex',
               'index_ignore_chars' => {},
-              'index_name' => 'cp',
-              'index_type_command' => 'cindex'
+              'index_name' => 'cp'
             }
           },
           'info' => {
@@ -223,10 +221,8 @@ $result_trees{'subentries'} = {
               'entry_node' => {},
               'entry_number' => 2,
               'in_code' => 0,
-              'index_at_command' => 'cindex',
               'index_ignore_chars' => {},
-              'index_name' => 'cp',
-              'index_type_command' => 'cindex'
+              'index_name' => 'cp'
             },
             'subentry' => {
               'args' => [
@@ -299,10 +295,8 @@ $result_trees{'subentries'} = {
               'entry_node' => {},
               'entry_number' => 3,
               'in_code' => 0,
-              'index_at_command' => 'cindex',
               'index_ignore_chars' => {},
-              'index_name' => 'cp',
-              'index_type_command' => 'cindex'
+              'index_name' => 'cp'
             },
             'subentry' => {
               'args' => [
@@ -407,10 +401,8 @@ $result_trees{'subentries'} = {
               'entry_node' => {},
               'entry_number' => 4,
               'in_code' => 0,
-              'index_at_command' => 'cindex',
               'index_ignore_chars' => {},
-              'index_name' => 'cp',
-              'index_type_command' => 'cindex'
+              'index_name' => 'cp'
             },
             'subentry' => {
               'args' => [
@@ -553,10 +545,8 @@ $result_trees{'subentries'} = {
               'entry_node' => {},
               'entry_number' => 1,
               'in_code' => 1,
-              'index_at_command' => 'findex',
               'index_ignore_chars' => {},
-              'index_name' => 'fn',
-              'index_type_command' => 'findex'
+              'index_name' => 'fn'
             }
           },
           'info' => {
@@ -596,10 +586,8 @@ $result_trees{'subentries'} = {
               'entry_node' => {},
               'entry_number' => 2,
               'in_code' => 1,
-              'index_at_command' => 'findex',
               'index_ignore_chars' => {},
-              'index_name' => 'fn',
-              'index_type_command' => 'findex'
+              'index_name' => 'fn'
             },
             'subentry' => {
               'args' => [
@@ -672,10 +660,8 @@ $result_trees{'subentries'} = {
               'entry_node' => {},
               'entry_number' => 3,
               'in_code' => 1,
-              'index_at_command' => 'findex',
               'index_ignore_chars' => {},
-              'index_name' => 'fn',
-              'index_type_command' => 'findex'
+              'index_name' => 'fn'
             },
             'subentry' => {
               'args' => [
@@ -780,10 +766,8 @@ $result_trees{'subentries'} = {
               'entry_node' => {},
               'entry_number' => 4,
               'in_code' => 1,
-              'index_at_command' => 'findex',
               'index_ignore_chars' => {},
-              'index_name' => 'fn',
-              'index_type_command' => 'findex'
+              'index_name' => 'fn'
             },
             'subentry' => {
               'args' => [
diff --git a/tp/t/results/indices/subentry_and_sortas.pl 
b/tp/t/results/indices/subentry_and_sortas.pl
index fba02ed8c3..e94322a0ee 100644
--- a/tp/t/results/indices/subentry_and_sortas.pl
+++ b/tp/t/results/indices/subentry_and_sortas.pl
@@ -201,10 +201,8 @@ $result_trees{'subentry_and_sortas'} = {
               'entry_node' => {},
               'entry_number' => 1,
               'in_code' => 0,
-              'index_at_command' => 'cindex',
               'index_ignore_chars' => {},
               'index_name' => 'cp',
-              'index_type_command' => 'cindex',
               'sortas' => 'A---S'
             },
             'sortas' => 'A---S',
@@ -329,10 +327,8 @@ $result_trees{'subentry_and_sortas'} = {
               'entry_node' => {},
               'entry_number' => 1,
               'in_code' => 1,
-              'index_at_command' => 'findex',
               'index_ignore_chars' => {},
               'index_name' => 'fn',
-              'index_type_command' => 'findex',
               'sortas' => 'X---S'
             },
             'sortas' => 'X---S',
diff --git a/tp/t/results/indices/subentry_and_sortas_spaces.pl 
b/tp/t/results/indices/subentry_and_sortas_spaces.pl
index 164fa8ca47..6eea799991 100644
--- a/tp/t/results/indices/subentry_and_sortas_spaces.pl
+++ b/tp/t/results/indices/subentry_and_sortas_spaces.pl
@@ -196,10 +196,8 @@ $result_trees{'subentry_and_sortas_spaces'} = {
               'entry_node' => {},
               'entry_number' => 1,
               'in_code' => 0,
-              'index_at_command' => 'cindex',
               'index_ignore_chars' => {},
               'index_name' => 'cp',
-              'index_type_command' => 'cindex',
               'sortas' => 'A---S'
             },
             'sortas' => 'A---S',
@@ -293,10 +291,8 @@ $result_trees{'subentry_and_sortas_spaces'} = {
               'entry_node' => {},
               'entry_number' => 2,
               'in_code' => 0,
-              'index_at_command' => 'cindex',
               'index_ignore_chars' => {},
-              'index_name' => 'cp',
-              'index_type_command' => 'cindex'
+              'index_name' => 'cp'
             },
             'subentry' => {
               'args' => [
@@ -375,10 +371,8 @@ $result_trees{'subentry_and_sortas_spaces'} = {
               'entry_node' => {},
               'entry_number' => 3,
               'in_code' => 0,
-              'index_at_command' => 'cindex',
               'index_ignore_chars' => {},
-              'index_name' => 'cp',
-              'index_type_command' => 'cindex'
+              'index_name' => 'cp'
             },
             'subentry' => {
               'args' => [
@@ -502,10 +496,8 @@ $result_trees{'subentry_and_sortas_spaces'} = {
               'entry_node' => {},
               'entry_number' => 4,
               'in_code' => 0,
-              'index_at_command' => 'cindex',
               'index_ignore_chars' => {},
-              'index_name' => 'cp',
-              'index_type_command' => 'cindex'
+              'index_name' => 'cp'
             },
             'subentry' => {
               'args' => [
diff --git a/tp/t/results/indices/syncode_index_print_both.pl 
b/tp/t/results/indices/syncode_index_print_both.pl
index 14b5fea198..5ab41924eb 100644
--- a/tp/t/results/indices/syncode_index_print_both.pl
+++ b/tp/t/results/indices/syncode_index_print_both.pl
@@ -231,10 +231,8 @@ $result_trees{'syncode_index_print_both'} = {
               'entry_node' => {},
               'entry_number' => 1,
               'in_code' => 0,
-              'index_at_command' => 'cindex',
               'index_ignore_chars' => {},
-              'index_name' => 'cp',
-              'index_type_command' => 'cindex'
+              'index_name' => 'cp'
             }
           },
           'info' => {
@@ -275,10 +273,8 @@ $result_trees{'syncode_index_print_both'} = {
               'entry_node' => {},
               'entry_number' => 1,
               'in_code' => 1,
-              'index_at_command' => 'findex',
               'index_ignore_chars' => {},
-              'index_name' => 'fn',
-              'index_type_command' => 'findex'
+              'index_name' => 'fn'
             }
           },
           'info' => {
diff --git a/tp/t/results/indices/syncodeindex_to_plain.pl 
b/tp/t/results/indices/syncodeindex_to_plain.pl
index c21e1d9c73..4c2037f83e 100644
--- a/tp/t/results/indices/syncodeindex_to_plain.pl
+++ b/tp/t/results/indices/syncodeindex_to_plain.pl
@@ -150,10 +150,8 @@ $result_trees{'syncodeindex_to_plain'} = {
               'entry_node' => {},
               'entry_number' => 1,
               'in_code' => 1,
-              'index_at_command' => 'kindex',
               'index_ignore_chars' => {},
-              'index_name' => 'ky',
-              'index_type_command' => 'kindex'
+              'index_name' => 'ky'
             }
           },
           'info' => {
@@ -194,10 +192,8 @@ $result_trees{'syncodeindex_to_plain'} = {
               'entry_node' => {},
               'entry_number' => 1,
               'in_code' => 1,
-              'index_at_command' => 'vindex',
               'index_ignore_chars' => {},
-              'index_name' => 'vr',
-              'index_type_command' => 'vindex'
+              'index_name' => 'vr'
             }
           },
           'info' => {
@@ -238,10 +234,8 @@ $result_trees{'syncodeindex_to_plain'} = {
               'entry_node' => {},
               'entry_number' => 1,
               'in_code' => 0,
-              'index_at_command' => 'cindex',
               'index_ignore_chars' => {},
-              'index_name' => 'cp',
-              'index_type_command' => 'cindex'
+              'index_name' => 'cp'
             }
           },
           'info' => {
diff --git a/tp/t/results/indices/transparent_sort_chars.pl 
b/tp/t/results/indices/transparent_sort_chars.pl
index 8ae4fd9b2a..7659348a0e 100644
--- a/tp/t/results/indices/transparent_sort_chars.pl
+++ b/tp/t/results/indices/transparent_sort_chars.pl
@@ -201,12 +201,10 @@ $result_trees{'transparent_sort_chars'} = {
               'entry_node' => {},
               'entry_number' => 1,
               'in_code' => 0,
-              'index_at_command' => 'cindex',
               'index_ignore_chars' => {
                 '-' => 1
               },
-              'index_name' => 'cp',
-              'index_type_command' => 'cindex'
+              'index_name' => 'cp'
             }
           },
           'info' => {
@@ -247,12 +245,10 @@ $result_trees{'transparent_sort_chars'} = {
               'entry_node' => {},
               'entry_number' => 2,
               'in_code' => 0,
-              'index_at_command' => 'cindex',
               'index_ignore_chars' => {
                 '-' => 1
               },
-              'index_name' => 'cp',
-              'index_type_command' => 'cindex'
+              'index_name' => 'cp'
             }
           },
           'info' => {
@@ -293,12 +289,10 @@ $result_trees{'transparent_sort_chars'} = {
               'entry_node' => {},
               'entry_number' => 3,
               'in_code' => 0,
-              'index_at_command' => 'cindex',
               'index_ignore_chars' => {
                 '-' => 1
               },
-              'index_name' => 'cp',
-              'index_type_command' => 'cindex'
+              'index_name' => 'cp'
             }
           },
           'info' => {
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 5f3a053451..4fb7a91d59 100644
--- a/tp/t/results/indices/unknown_then_known_index_entry.pl
+++ b/tp/t/results/indices/unknown_then_known_index_entry.pl
@@ -74,10 +74,8 @@ $result_trees{'unknown_then_known_index_entry'} = {
                   'entry_element' => {},
                   'entry_number' => 1,
                   'in_code' => 0,
-                  'index_at_command' => 'someindex',
                   'index_ignore_chars' => {},
-                  'index_name' => 'some',
-                  'index_type_command' => 'someindex'
+                  'index_name' => 'some'
                 }
               },
               'info' => {
diff --git a/tp/t/results/indices/w_lines_count.pl 
b/tp/t/results/indices/w_lines_count.pl
index 66dd114a6c..ac849e28c9 100644
--- a/tp/t/results/indices/w_lines_count.pl
+++ b/tp/t/results/indices/w_lines_count.pl
@@ -156,10 +156,8 @@ $result_trees{'w_lines_count'} = {
               'entry_node' => {},
               'entry_number' => 1,
               'in_code' => 1,
-              'index_at_command' => 'findex',
               'index_ignore_chars' => {},
-              'index_name' => 'fn',
-              'index_type_command' => 'findex'
+              'index_name' => 'fn'
             }
           },
           'info' => {
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 98daeab547..e3f0e8db1f 100644
--- a/tp/t/results/info_tests/before_node_and_section.pl
+++ b/tp/t/results/info_tests/before_node_and_section.pl
@@ -116,10 +116,8 @@ $result_trees{'before_node_and_section'} = {
                   'entry_element' => {},
                   'entry_number' => 1,
                   'in_code' => 0,
-                  'index_at_command' => 'cindex',
                   'index_ignore_chars' => {},
-                  'index_name' => 'cp',
-                  'index_type_command' => 'cindex'
+                  'index_name' => 'cp'
                 }
               },
               'info' => {
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 00e5f905bd..082e3c23a4 100644
--- a/tp/t/results/info_tests/colon_in_index_entry.pl
+++ b/tp/t/results/info_tests/colon_in_index_entry.pl
@@ -100,10 +100,8 @@ $result_trees{'colon_in_index_entry'} = {
               'entry_node' => {},
               'entry_number' => 1,
               'in_code' => 0,
-              'index_at_command' => 'cindex',
               'index_ignore_chars' => {},
-              'index_name' => 'cp',
-              'index_type_command' => 'cindex'
+              'index_name' => 'cp'
             }
           },
           'info' => {
@@ -178,10 +176,8 @@ $result_trees{'colon_in_index_entry'} = {
                           'entry_node' => {},
                           'entry_number' => 1,
                           'in_code' => 0,
-                          'index_at_command' => 'item',
                           'index_ignore_chars' => {},
-                          'index_name' => 'vr',
-                          'index_type_command' => 'vtable'
+                          'index_name' => 'vr'
                         }
                       },
                       'info' => {
@@ -352,10 +348,8 @@ $result_trees{'colon_in_index_entry'} = {
                   'entry_node' => {},
                   'entry_number' => 2,
                   'in_code' => 0,
-                  'index_at_command' => 'defvr',
                   'index_ignore_chars' => {},
-                  'index_name' => 'vr',
-                  'index_type_command' => 'defvr'
+                  'index_name' => 'vr'
                 },
                 'original_def_cmdname' => 'defvr'
               },
@@ -476,10 +470,8 @@ $result_trees{'colon_in_index_entry'} = {
                   'entry_node' => {},
                   'entry_number' => 3,
                   'in_code' => 0,
-                  'index_at_command' => 'defvrx',
                   'index_ignore_chars' => {},
-                  'index_name' => 'vr',
-                  'index_type_command' => 'defvr'
+                  'index_name' => 'vr'
                 },
                 'original_def_cmdname' => 'defvrx'
               },
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 2665049ff2..4159ee8dbc 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
@@ -342,10 +342,8 @@ $result_trees{'colons_in_index_entries_and_node'} = {
               'entry_node' => {},
               'entry_number' => 1,
               'in_code' => 0,
-              'index_at_command' => 'cindex',
               'index_ignore_chars' => {},
-              'index_name' => 'cp',
-              'index_type_command' => 'cindex'
+              'index_name' => 'cp'
             }
           },
           'info' => {
@@ -386,10 +384,8 @@ $result_trees{'colons_in_index_entries_and_node'} = {
               'entry_node' => {},
               'entry_number' => 2,
               'in_code' => 0,
-              'index_at_command' => 'cindex',
               'index_ignore_chars' => {},
-              'index_name' => 'cp',
-              'index_type_command' => 'cindex'
+              'index_name' => 'cp'
             }
           },
           'info' => {
@@ -430,10 +426,8 @@ $result_trees{'colons_in_index_entries_and_node'} = {
               'entry_node' => {},
               'entry_number' => 3,
               'in_code' => 0,
-              'index_at_command' => 'cindex',
               'index_ignore_chars' => {},
-              'index_name' => 'cp',
-              'index_type_command' => 'cindex'
+              'index_name' => 'cp'
             }
           },
           'info' => {
@@ -546,10 +540,8 @@ $result_trees{'colons_in_index_entries_and_node'} = {
               'entry_node' => {},
               'entry_number' => 4,
               'in_code' => 0,
-              'index_at_command' => 'cindex',
               'index_ignore_chars' => {},
-              'index_name' => 'cp',
-              'index_type_command' => 'cindex'
+              'index_name' => 'cp'
             }
           },
           'info' => {
@@ -590,10 +582,8 @@ $result_trees{'colons_in_index_entries_and_node'} = {
               'entry_node' => {},
               'entry_number' => 5,
               'in_code' => 0,
-              'index_at_command' => 'cindex',
               'index_ignore_chars' => {},
-              'index_name' => 'cp',
-              'index_type_command' => 'cindex'
+              'index_name' => 'cp'
             }
           },
           'info' => {
@@ -634,10 +624,8 @@ $result_trees{'colons_in_index_entries_and_node'} = {
               'entry_node' => {},
               'entry_number' => 6,
               'in_code' => 0,
-              'index_at_command' => 'cindex',
               'index_ignore_chars' => {},
-              'index_name' => 'cp',
-              'index_type_command' => 'cindex'
+              'index_name' => 'cp'
             }
           },
           'info' => {
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 748b6abdf3..e7f90df1cc 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
@@ -342,10 +342,8 @@ 
$result_trees{'colons_in_index_entries_and_node_no_quoting'} = {
               'entry_node' => {},
               'entry_number' => 1,
               'in_code' => 0,
-              'index_at_command' => 'cindex',
               'index_ignore_chars' => {},
-              'index_name' => 'cp',
-              'index_type_command' => 'cindex'
+              'index_name' => 'cp'
             }
           },
           'info' => {
@@ -386,10 +384,8 @@ 
$result_trees{'colons_in_index_entries_and_node_no_quoting'} = {
               'entry_node' => {},
               'entry_number' => 2,
               'in_code' => 0,
-              'index_at_command' => 'cindex',
               'index_ignore_chars' => {},
-              'index_name' => 'cp',
-              'index_type_command' => 'cindex'
+              'index_name' => 'cp'
             }
           },
           'info' => {
@@ -430,10 +426,8 @@ 
$result_trees{'colons_in_index_entries_and_node_no_quoting'} = {
               'entry_node' => {},
               'entry_number' => 3,
               'in_code' => 0,
-              'index_at_command' => 'cindex',
               'index_ignore_chars' => {},
-              'index_name' => 'cp',
-              'index_type_command' => 'cindex'
+              'index_name' => 'cp'
             }
           },
           'info' => {
@@ -546,10 +540,8 @@ 
$result_trees{'colons_in_index_entries_and_node_no_quoting'} = {
               'entry_node' => {},
               'entry_number' => 4,
               'in_code' => 0,
-              'index_at_command' => 'cindex',
               'index_ignore_chars' => {},
-              'index_name' => 'cp',
-              'index_type_command' => 'cindex'
+              'index_name' => 'cp'
             }
           },
           'info' => {
@@ -590,10 +582,8 @@ 
$result_trees{'colons_in_index_entries_and_node_no_quoting'} = {
               'entry_node' => {},
               'entry_number' => 5,
               'in_code' => 0,
-              'index_at_command' => 'cindex',
               'index_ignore_chars' => {},
-              'index_name' => 'cp',
-              'index_type_command' => 'cindex'
+              'index_name' => 'cp'
             }
           },
           'info' => {
@@ -634,10 +624,8 @@ 
$result_trees{'colons_in_index_entries_and_node_no_quoting'} = {
               'entry_node' => {},
               'entry_number' => 6,
               'in_code' => 0,
-              'index_at_command' => 'cindex',
               'index_ignore_chars' => {},
-              'index_name' => 'cp',
-              'index_type_command' => 'cindex'
+              'index_name' => 'cp'
             }
           },
           'info' => {
diff --git a/tp/t/results/info_tests/def_in_copying.pl 
b/tp/t/results/info_tests/def_in_copying.pl
index d93db106ab..c9d5ffb5c3 100644
--- a/tp/t/results/info_tests/def_in_copying.pl
+++ b/tp/t/results/info_tests/def_in_copying.pl
@@ -265,10 +265,8 @@ $result_trees{'def_in_copying'} = {
                       'entry_number' => 1,
                       'entry_region' => 'copying',
                       'in_code' => 1,
-                      'index_at_command' => 'deffn',
                       'index_ignore_chars' => {},
-                      'index_name' => 'fn',
-                      'index_type_command' => 'deffn'
+                      'index_name' => 'fn'
                     },
                     'original_def_cmdname' => 'deffn'
                   },
@@ -343,10 +341,8 @@ $result_trees{'def_in_copying'} = {
                       'entry_number' => 2,
                       'entry_region' => 'copying',
                       'in_code' => 1,
-                      'index_at_command' => 'deffnx',
                       'index_ignore_chars' => {},
-                      'index_name' => 'fn',
-                      'index_type_command' => 'deffn'
+                      'index_name' => 'fn'
                     },
                     'original_def_cmdname' => 'deffnx'
                   },
@@ -566,10 +562,8 @@ $result_trees{'def_in_copying'} = {
                   'entry_node' => {},
                   'entry_number' => 3,
                   'in_code' => 1,
-                  'index_at_command' => 'deffn',
                   'index_ignore_chars' => {},
-                  'index_name' => 'fn',
-                  'index_type_command' => 'deffn'
+                  'index_name' => 'fn'
                 },
                 'original_def_cmdname' => 'deffn'
               },
@@ -644,10 +638,8 @@ $result_trees{'def_in_copying'} = {
                   'entry_node' => {},
                   'entry_number' => 4,
                   'in_code' => 1,
-                  'index_at_command' => 'deffnx',
                   'index_ignore_chars' => {},
-                  'index_name' => 'fn',
-                  'index_type_command' => 'deffn'
+                  'index_name' => 'fn'
                 },
                 'original_def_cmdname' => 'deffnx'
               },
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 3fa1d759ae..c9f05d677b 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
@@ -278,10 +278,8 @@ $result_trees{'end_of_line_command_in_node_lines'} = {
               'entry_node' => {},
               'entry_number' => 1,
               'in_code' => 0,
-              'index_at_command' => 'cindex',
               'index_ignore_chars' => {},
-              'index_name' => 'cp',
-              'index_type_command' => 'cindex'
+              'index_name' => 'cp'
             }
           },
           'info' => {
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 10e3be388e..05eac247fe 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
@@ -352,10 +352,8 @@ $result_trees{'index_entry_at_end_node'} = {
               'entry_node' => {},
               'entry_number' => 1,
               'in_code' => 0,
-              'index_at_command' => 'cindex',
               'index_ignore_chars' => {},
-              'index_name' => 'cp',
-              'index_type_command' => 'cindex'
+              'index_name' => 'cp'
             }
           },
           'info' => {
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 d1b869be24..690034ad79 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
@@ -286,10 +286,8 @@ $result_trees{'multitable_anchor_and_index_entry'} = {
                                   'entry_node' => {},
                                   'entry_number' => 1,
                                   'in_code' => 0,
-                                  'index_at_command' => 'cindex',
                                   'index_ignore_chars' => {},
-                                  'index_name' => 'cp',
-                                  'index_type_command' => 'cindex'
+                                  'index_name' => 'cp'
                                 }
                               },
                               'info' => {
@@ -602,10 +600,8 @@ $result_trees{'multitable_anchor_and_index_entry'} = {
                                   'entry_node' => {},
                                   'entry_number' => 2,
                                   'in_code' => 0,
-                                  'index_at_command' => 'cindex',
                                   'index_ignore_chars' => {},
-                                  'index_name' => 'cp',
-                                  'index_type_command' => 'cindex'
+                                  'index_name' => 'cp'
                                 }
                               },
                               'info' => {
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 826d638a86..bbbe37df46 100644
--- a/tp/t/results/info_tests/nested_multitable_anchor_index.pl
+++ b/tp/t/results/info_tests/nested_multitable_anchor_index.pl
@@ -212,10 +212,8 @@ $result_trees{'nested_multitable_anchor_index'} = {
                                                   'entry_node' => {},
                                                   'entry_number' => 1,
                                                   'in_code' => 0,
-                                                  'index_at_command' => 
'cindex',
                                                   'index_ignore_chars' => {},
-                                                  'index_name' => 'cp',
-                                                  'index_type_command' => 
'cindex'
+                                                  'index_name' => 'cp'
                                                 }
                                               },
                                               'info' => {
@@ -453,10 +451,8 @@ $result_trees{'nested_multitable_anchor_index'} = {
                                   'entry_node' => {},
                                   'entry_number' => 2,
                                   'in_code' => 0,
-                                  'index_at_command' => 'cindex',
                                   'index_ignore_chars' => {},
-                                  'index_name' => 'cp',
-                                  'index_type_command' => 'cindex'
+                                  'index_name' => 'cp'
                                 }
                               },
                               'info' => {
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 cd046b3e0e..601dd13739 100644
--- a/tp/t/results/info_tests/one_node_counted_elements.pl
+++ b/tp/t/results/info_tests/one_node_counted_elements.pl
@@ -40,10 +40,8 @@ $result_trees{'one_node_counted_elements'} = {
                   'entry_element' => {},
                   'entry_number' => 1,
                   'in_code' => 0,
-                  'index_at_command' => 'cindex',
                   'index_ignore_chars' => {},
-                  'index_name' => 'cp',
-                  'index_type_command' => 'cindex'
+                  'index_name' => 'cp'
                 }
               },
               'info' => {
@@ -140,10 +138,8 @@ $result_trees{'one_node_counted_elements'} = {
                   'entry_node' => {},
                   'entry_number' => 2,
                   'in_code' => 0,
-                  'index_at_command' => 'cindex',
                   'index_ignore_chars' => {},
-                  'index_name' => 'cp',
-                  'index_type_command' => 'cindex'
+                  'index_name' => 'cp'
                 }
               },
               'info' => {
diff --git a/tp/t/results/info_tests/test_index.pl 
b/tp/t/results/info_tests/test_index.pl
index f6917b6aac..807ea843a2 100644
--- a/tp/t/results/info_tests/test_index.pl
+++ b/tp/t/results/info_tests/test_index.pl
@@ -173,10 +173,8 @@ $result_trees{'test_index'} = {
                   'entry_node' => {},
                   'entry_number' => 1,
                   'in_code' => 0,
-                  'index_at_command' => 'cindex',
                   'index_ignore_chars' => {},
-                  'index_name' => 'cp',
-                  'index_type_command' => 'cindex'
+                  'index_name' => 'cp'
                 }
               },
               'info' => {
@@ -217,10 +215,8 @@ $result_trees{'test_index'} = {
                   'entry_node' => {},
                   'entry_number' => 2,
                   'in_code' => 0,
-                  'index_at_command' => 'cindex',
                   'index_ignore_chars' => {},
-                  'index_name' => 'cp',
-                  'index_type_command' => 'cindex'
+                  'index_name' => 'cp'
                 }
               },
               'info' => {
@@ -271,10 +267,8 @@ $result_trees{'test_index'} = {
                   'entry_node' => {},
                   'entry_number' => 3,
                   'in_code' => 0,
-                  'index_at_command' => 'cindex',
                   'index_ignore_chars' => {},
-                  'index_name' => 'cp',
-                  'index_type_command' => 'cindex'
+                  'index_name' => 'cp'
                 }
               },
               'info' => {
@@ -315,10 +309,8 @@ $result_trees{'test_index'} = {
                   'entry_node' => {},
                   'entry_number' => 4,
                   'in_code' => 0,
-                  'index_at_command' => 'cindex',
                   'index_ignore_chars' => {},
-                  'index_name' => 'cp',
-                  'index_type_command' => 'cindex'
+                  'index_name' => 'cp'
                 }
               },
               'info' => {
@@ -435,10 +427,8 @@ $result_trees{'test_index'} = {
                   'entry_node' => {},
                   'entry_number' => 1,
                   'in_code' => 1,
-                  'index_at_command' => 'deffn',
                   'index_ignore_chars' => {},
-                  'index_name' => 'fn',
-                  'index_type_command' => 'deffn'
+                  'index_name' => 'fn'
                 },
                 'original_def_cmdname' => 'deffn'
               },
@@ -526,10 +516,8 @@ $result_trees{'test_index'} = {
                   'entry_node' => {},
                   'entry_number' => 2,
                   'in_code' => 1,
-                  'index_at_command' => 'deffnx',
                   'index_ignore_chars' => {},
-                  'index_name' => 'fn',
-                  'index_type_command' => 'deffn'
+                  'index_name' => 'fn'
                 },
                 'original_def_cmdname' => 'deffnx'
               },
@@ -659,10 +647,8 @@ $result_trees{'test_index'} = {
                           'entry_node' => {},
                           'entry_number' => 3,
                           'in_code' => 1,
-                          'index_at_command' => 'item',
                           'index_ignore_chars' => {},
-                          'index_name' => 'fn',
-                          'index_type_command' => 'ftable'
+                          'index_name' => 'fn'
                         }
                       },
                       'info' => {
@@ -731,10 +717,8 @@ $result_trees{'test_index'} = {
                           'entry_node' => {},
                           'entry_number' => 4,
                           'in_code' => 1,
-                          'index_at_command' => 'item',
                           'index_ignore_chars' => {},
-                          'index_name' => 'fn',
-                          'index_type_command' => 'ftable'
+                          'index_name' => 'fn'
                         }
                       },
                       'info' => {
@@ -774,10 +758,8 @@ $result_trees{'test_index'} = {
                           'entry_node' => {},
                           'entry_number' => 5,
                           'in_code' => 1,
-                          'index_at_command' => 'itemx',
                           'index_ignore_chars' => {},
-                          'index_name' => 'fn',
-                          'index_type_command' => 'ftable'
+                          'index_name' => 'fn'
                         }
                       },
                       'info' => {
@@ -1119,10 +1101,8 @@ $result_trees{'test_index'} = {
               'entry_node' => {},
               'entry_number' => 5,
               'in_code' => 0,
-              'index_at_command' => 'cindex',
               'index_ignore_chars' => {},
-              'index_name' => 'cp',
-              'index_type_command' => 'cindex'
+              'index_name' => 'cp'
             }
           },
           'info' => {
@@ -1163,10 +1143,8 @@ $result_trees{'test_index'} = {
               'entry_node' => {},
               'entry_number' => 6,
               'in_code' => 1,
-              'index_at_command' => 'findex',
               'index_ignore_chars' => {},
-              'index_name' => 'fn',
-              'index_type_command' => 'findex'
+              'index_name' => 'fn'
             }
           },
           'info' => {
@@ -1218,10 +1196,8 @@ $result_trees{'test_index'} = {
                   'entry_node' => {},
                   'entry_number' => 7,
                   'in_code' => 1,
-                  'index_at_command' => 'findex',
                   'index_ignore_chars' => {},
-                  'index_name' => 'fn',
-                  'index_type_command' => 'findex'
+                  'index_name' => 'fn'
                 }
               },
               'info' => {
@@ -1344,10 +1320,8 @@ $result_trees{'test_index'} = {
               'entry_node' => {},
               'entry_number' => 8,
               'in_code' => 1,
-              'index_at_command' => 'findex',
               'index_ignore_chars' => {},
-              'index_name' => 'fn',
-              'index_type_command' => 'findex'
+              'index_name' => 'fn'
             }
           },
           'info' => {
@@ -2443,10 +2417,8 @@ $result_trees{'test_index'} = {
               'entry_node' => {},
               'entry_number' => 9,
               'in_code' => 1,
-              'index_at_command' => 'findex',
               'index_ignore_chars' => {},
-              'index_name' => 'fn',
-              'index_type_command' => 'findex'
+              'index_name' => 'fn'
             }
           },
           'info' => {
@@ -2573,10 +2545,8 @@ $result_trees{'test_index'} = {
               'entry_node' => {},
               'entry_number' => 6,
               'in_code' => 0,
-              'index_at_command' => 'cindex',
               'index_ignore_chars' => {},
-              'index_name' => 'cp',
-              'index_type_command' => 'cindex'
+              'index_name' => 'cp'
             }
           },
           'info' => {
@@ -2679,10 +2649,8 @@ $result_trees{'test_index'} = {
               'entry_node' => {},
               'entry_number' => 10,
               'in_code' => 1,
-              'index_at_command' => 'findex',
               'index_ignore_chars' => {},
-              'index_name' => 'fn',
-              'index_type_command' => 'findex'
+              'index_name' => 'fn'
             }
           },
           'info' => {
@@ -2991,10 +2959,8 @@ $result_trees{'test_index'} = {
               'entry_node' => {},
               'entry_number' => 7,
               'in_code' => 0,
-              'index_at_command' => 'cindex',
               'index_ignore_chars' => {},
-              'index_name' => 'cp',
-              'index_type_command' => 'cindex'
+              'index_name' => 'cp'
             }
           },
           'info' => {
diff --git a/tp/t/results/invalid_nestings/block_not_matching.pl 
b/tp/t/results/invalid_nestings/block_not_matching.pl
index 76f6395ba4..c8eb0e6992 100644
--- a/tp/t/results/invalid_nestings/block_not_matching.pl
+++ b/tp/t/results/invalid_nestings/block_not_matching.pl
@@ -119,10 +119,8 @@ $result_trees{'block_not_matching'} = {
                   'entry_element' => {},
                   'entry_number' => 1,
                   'in_code' => 1,
-                  'index_at_command' => 'deffn',
                   'index_ignore_chars' => {},
-                  'index_name' => 'fn',
-                  'index_type_command' => 'deffn'
+                  'index_name' => 'fn'
                 },
                 'original_def_cmdname' => 'deffn'
               },
diff --git a/tp/t/results/invalid_nestings/center.pl 
b/tp/t/results/invalid_nestings/center.pl
index a9dfb95ac5..2fd26304aa 100644
--- a/tp/t/results/invalid_nestings/center.pl
+++ b/tp/t/results/invalid_nestings/center.pl
@@ -152,10 +152,8 @@ $result_trees{'center'} = {
                       'entry_element' => {},
                       'entry_number' => 1,
                       'in_code' => 0,
-                      'index_at_command' => 'cindex',
                       'index_ignore_chars' => {},
-                      'index_name' => 'cp',
-                      'index_type_command' => 'cindex'
+                      'index_name' => 'cp'
                     }
                   },
                   'info' => {
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 ac61e28a2d..9aebb2bef2 100644
--- a/tp/t/results/invalid_nestings/def_in_style_command.pl
+++ b/tp/t/results/invalid_nestings/def_in_style_command.pl
@@ -103,10 +103,8 @@ $result_trees{'def_in_style_command'} = {
                   'entry_element' => {},
                   'entry_number' => 1,
                   'in_code' => 1,
-                  'index_at_command' => 'defun',
                   'index_ignore_chars' => {},
-                  'index_name' => 'fn',
-                  'index_type_command' => 'defun'
+                  'index_name' => 'fn'
                 },
                 'original_def_cmdname' => 'defun'
               },
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 12c5856bd3..8516941ea3 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
@@ -122,10 +122,8 @@ $result_trees{'def_not_closed_in_menu_description'} = {
                               'entry_element' => {},
                               'entry_number' => 1,
                               'in_code' => 1,
-                              'index_at_command' => 'deffn',
                               'index_ignore_chars' => {},
-                              'index_name' => 'fn',
-                              'index_type_command' => 'deffn'
+                              'index_name' => 'fn'
                             },
                             'original_def_cmdname' => 'deffn'
                           },
diff --git a/tp/t/results/invalid_nestings/in_table.pl 
b/tp/t/results/invalid_nestings/in_table.pl
index 5d7c71a647..56a726171b 100644
--- a/tp/t/results/invalid_nestings/in_table.pl
+++ b/tp/t/results/invalid_nestings/in_table.pl
@@ -540,10 +540,8 @@ $result_trees{'in_table'} = {
                                   'entry_node' => {},
                                   'entry_number' => 1,
                                   'in_code' => 0,
-                                  'index_at_command' => 'cindex',
                                   'index_ignore_chars' => {},
-                                  'index_name' => 'cp',
-                                  'index_type_command' => 'cindex'
+                                  'index_name' => 'cp'
                                 }
                               },
                               'info' => {
@@ -691,10 +689,8 @@ $result_trees{'in_table'} = {
                                   'entry_node' => {},
                                   'entry_number' => 2,
                                   'in_code' => 0,
-                                  'index_at_command' => 'cindex',
                                   'index_ignore_chars' => {},
-                                  'index_name' => 'cp',
-                                  'index_type_command' => 'cindex'
+                                  'index_name' => 'cp'
                                 }
                               },
                               'info' => {
@@ -722,10 +718,8 @@ $result_trees{'in_table'} = {
                           'entry_node' => {},
                           'entry_number' => 1,
                           'in_code' => 1,
-                          'index_at_command' => 'item',
                           'index_ignore_chars' => {},
-                          'index_name' => 'vr',
-                          'index_type_command' => 'vtable'
+                          'index_name' => 'vr'
                         }
                       },
                       'info' => {
@@ -815,10 +809,8 @@ $result_trees{'in_table'} = {
                                   'entry_node' => {},
                                   'entry_number' => 3,
                                   'in_code' => 0,
-                                  'index_at_command' => 'cindex',
                                   'index_ignore_chars' => {},
-                                  'index_name' => 'cp',
-                                  'index_type_command' => 'cindex'
+                                  'index_name' => 'cp'
                                 }
                               },
                               'info' => {
@@ -846,10 +838,8 @@ $result_trees{'in_table'} = {
                           'entry_node' => {},
                           'entry_number' => 2,
                           'in_code' => 1,
-                          'index_at_command' => 'item',
                           'index_ignore_chars' => {},
-                          'index_name' => 'vr',
-                          'index_type_command' => 'vtable'
+                          'index_name' => 'vr'
                         }
                       },
                       'info' => {
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 e547fe15cf..acb33f8ec5 100644
--- a/tp/t/results/invalid_nestings/multitable_item_in_index.pl
+++ b/tp/t/results/invalid_nestings/multitable_item_in_index.pl
@@ -75,10 +75,8 @@ $result_trees{'multitable_item_in_index'} = {
                       'entry_element' => {},
                       'entry_number' => 1,
                       'in_code' => 1,
-                      'index_at_command' => 'vindex',
                       'index_ignore_chars' => {},
-                      'index_name' => 'vr',
-                      'index_type_command' => 'vindex'
+                      'index_name' => 'vr'
                     }
                   },
                   'info' => {
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 4b8755149b..f2d3e86172 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
@@ -38,10 +38,8 @@ $result_trees{'node_on_index_entry_line'} = {
               'entry_element' => {},
               'entry_number' => 1,
               'in_code' => 0,
-              'index_at_command' => 'cindex',
               'index_ignore_chars' => {},
-              'index_name' => 'cp',
-              'index_type_command' => 'cindex'
+              'index_name' => 'cp'
             }
           },
           'info' => {
diff --git a/tp/t/results/invalid_nestings/on_def_line.pl 
b/tp/t/results/invalid_nestings/on_def_line.pl
index 6d7b555d8f..6a3bfbc4ef 100644
--- a/tp/t/results/invalid_nestings/on_def_line.pl
+++ b/tp/t/results/invalid_nestings/on_def_line.pl
@@ -173,10 +173,8 @@ $result_trees{'on_def_line'} = {
                   'entry_element' => {},
                   'entry_number' => 1,
                   'in_code' => 1,
-                  'index_at_command' => 'deffn',
                   'index_ignore_chars' => {},
-                  'index_name' => 'fn',
-                  'index_type_command' => 'deffn'
+                  'index_name' => 'fn'
                 },
                 'original_def_cmdname' => 'deffn'
               },
@@ -349,10 +347,8 @@ $result_trees{'on_def_line'} = {
                   'entry_element' => {},
                   'entry_number' => 2,
                   'in_code' => 1,
-                  'index_at_command' => 'deffnx',
                   'index_ignore_chars' => {},
-                  'index_name' => 'fn',
-                  'index_type_command' => 'deffn'
+                  'index_name' => 'fn'
                 },
                 'original_def_cmdname' => 'deffnx'
               },
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 a19026a633..8949d48ccb 100644
--- a/tp/t/results/invalid_nestings/on_index_entry_line.pl
+++ b/tp/t/results/invalid_nestings/on_index_entry_line.pl
@@ -137,10 +137,8 @@ $result_trees{'on_index_entry_line'} = {
               'entry_element' => {},
               'entry_number' => 1,
               'in_code' => 0,
-              'index_at_command' => 'cindex',
               'index_ignore_chars' => {},
-              'index_name' => 'cp',
-              'index_type_command' => 'cindex'
+              'index_name' => 'cp'
             }
           },
           'info' => {
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 e68f6f9bd1..e91209ab2d 100644
--- a/tp/t/results/invalid_nestings/raw_block_on_line.pl
+++ b/tp/t/results/invalid_nestings/raw_block_on_line.pl
@@ -44,10 +44,8 @@ $result_trees{'raw_block_on_line'} = {
               'entry_element' => {},
               'entry_number' => 1,
               'in_code' => 0,
-              'index_at_command' => 'cindex',
               'index_ignore_chars' => {},
-              'index_name' => 'cp',
-              'index_type_command' => 'cindex'
+              'index_name' => 'cp'
             }
           },
           'info' => {
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 e810f82f4e..1bbdfdab87 100644
--- a/tp/t/results/invalid_nestings/section_on_def_line.pl
+++ b/tp/t/results/invalid_nestings/section_on_def_line.pl
@@ -60,10 +60,8 @@ $result_trees{'section_on_def_line'} = {
                   'entry_element' => {},
                   'entry_number' => 1,
                   'in_code' => 1,
-                  'index_at_command' => 'deffn',
                   'index_ignore_chars' => {},
-                  'index_name' => 'fn',
-                  'index_type_command' => 'deffn'
+                  'index_name' => 'fn'
                 },
                 'original_def_cmdname' => 'deffn'
               },
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 3f1e2e9e1c..6c5a535dbb 100644
--- a/tp/t/results/invalid_nestings/section_on_defx_line.pl
+++ b/tp/t/results/invalid_nestings/section_on_defx_line.pl
@@ -87,10 +87,8 @@ $result_trees{'section_on_defx_line'} = {
                   'entry_element' => {},
                   'entry_number' => 1,
                   'in_code' => 1,
-                  'index_at_command' => 'deffn',
                   'index_ignore_chars' => {},
-                  'index_name' => 'fn',
-                  'index_type_command' => 'deffn'
+                  'index_name' => 'fn'
                 },
                 'original_def_cmdname' => 'deffn'
               },
@@ -150,10 +148,8 @@ $result_trees{'section_on_defx_line'} = {
                   'entry_element' => {},
                   'entry_number' => 2,
                   'in_code' => 1,
-                  'index_at_command' => 'deffnx',
                   'index_ignore_chars' => {},
-                  'index_name' => 'fn',
-                  'index_type_command' => 'deffn'
+                  'index_name' => 'fn'
                 },
                 'original_def_cmdname' => 'deffnx'
               },
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 1671f8f7d1..b4403f34cd 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
@@ -33,10 +33,8 @@ $result_trees{'section_on_index_entry_line'} = {
               'entry_element' => {},
               'entry_number' => 1,
               'in_code' => 0,
-              'index_at_command' => 'cindex',
               'index_ignore_chars' => {},
-              'index_name' => 'cp',
-              'index_type_command' => 'cindex'
+              'index_name' => 'cp'
             }
           },
           'info' => {
diff --git a/tp/t/results/invalid_nestings/tab_in_index.pl 
b/tp/t/results/invalid_nestings/tab_in_index.pl
index ea85235e5e..ce56090ea4 100644
--- a/tp/t/results/invalid_nestings/tab_in_index.pl
+++ b/tp/t/results/invalid_nestings/tab_in_index.pl
@@ -118,10 +118,8 @@ $result_trees{'tab_in_index'} = {
                                   'entry_element' => {},
                                   'entry_number' => 1,
                                   'in_code' => 1,
-                                  'index_at_command' => 'vindex',
                                   'index_ignore_chars' => {},
-                                  'index_name' => 'vr',
-                                  'index_type_command' => 'vindex'
+                                  'index_name' => 'vr'
                                 }
                               },
                               'info' => {
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 a4fb418fb4..31ba47969c 100644
--- a/tp/t/results/itemize/inter_item_commands_in_enumerate.pl
+++ b/tp/t/results/itemize/inter_item_commands_in_enumerate.pl
@@ -323,10 +323,8 @@ $result_trees{'inter_item_commands_in_enumerate'} = {
                       'entry_node' => {},
                       'entry_number' => 1,
                       'in_code' => 0,
-                      'index_at_command' => 'cindex',
                       'index_ignore_chars' => {},
-                      'index_name' => 'cp',
-                      'index_type_command' => 'cindex'
+                      'index_name' => 'cp'
                     }
                   },
                   'info' => {
@@ -469,10 +467,8 @@ $result_trees{'inter_item_commands_in_enumerate'} = {
                       'entry_node' => {},
                       'entry_number' => 2,
                       'in_code' => 0,
-                      'index_at_command' => 'cindex',
                       'index_ignore_chars' => {},
-                      'index_name' => 'cp',
-                      'index_type_command' => 'cindex'
+                      'index_name' => 'cp'
                     }
                   },
                   'info' => {
@@ -605,10 +601,8 @@ $result_trees{'inter_item_commands_in_enumerate'} = {
                       'entry_node' => {},
                       'entry_number' => 3,
                       'in_code' => 0,
-                      'index_at_command' => 'cindex',
                       'index_ignore_chars' => {},
-                      'index_name' => 'cp',
-                      'index_type_command' => 'cindex'
+                      'index_name' => 'cp'
                     }
                   },
                   'info' => {
@@ -752,10 +746,8 @@ $result_trees{'inter_item_commands_in_enumerate'} = {
                           'entry_node' => {},
                           'entry_number' => 4,
                           'in_code' => 0,
-                          'index_at_command' => 'cindex',
                           'index_ignore_chars' => {},
-                          'index_name' => 'cp',
-                          'index_type_command' => 'cindex'
+                          'index_name' => 'cp'
                         }
                       },
                       'info' => {
@@ -891,10 +883,8 @@ $result_trees{'inter_item_commands_in_enumerate'} = {
                       'entry_node' => {},
                       'entry_number' => 5,
                       'in_code' => 0,
-                      'index_at_command' => 'cindex',
                       'index_ignore_chars' => {},
-                      'index_name' => 'cp',
-                      'index_type_command' => 'cindex'
+                      'index_name' => 'cp'
                     }
                   },
                   'info' => {
@@ -951,10 +941,8 @@ $result_trees{'inter_item_commands_in_enumerate'} = {
                       'entry_node' => {},
                       'entry_number' => 6,
                       'in_code' => 0,
-                      'index_at_command' => 'cindex',
                       'index_ignore_chars' => {},
-                      'index_name' => 'cp',
-                      'index_type_command' => 'cindex'
+                      'index_name' => 'cp'
                     }
                   },
                   'info' => {
@@ -995,10 +983,8 @@ $result_trees{'inter_item_commands_in_enumerate'} = {
                       'entry_node' => {},
                       'entry_number' => 7,
                       'in_code' => 0,
-                      'index_at_command' => 'cindex',
                       'index_ignore_chars' => {},
-                      'index_name' => 'cp',
-                      'index_type_command' => 'cindex'
+                      'index_name' => 'cp'
                     }
                   },
                   'info' => {
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 15a6b248b3..4b2d0e4627 100644
--- a/tp/t/results/itemize/inter_item_commands_in_itemize.pl
+++ b/tp/t/results/itemize/inter_item_commands_in_itemize.pl
@@ -232,10 +232,8 @@ $result_trees{'inter_item_commands_in_itemize'} = {
                       'entry_node' => {},
                       'entry_number' => 1,
                       'in_code' => 0,
-                      'index_at_command' => 'cindex',
                       'index_ignore_chars' => {},
-                      'index_name' => 'cp',
-                      'index_type_command' => 'cindex'
+                      'index_name' => 'cp'
                     }
                   },
                   'info' => {
@@ -384,10 +382,8 @@ $result_trees{'inter_item_commands_in_itemize'} = {
                       'entry_node' => {},
                       'entry_number' => 2,
                       'in_code' => 0,
-                      'index_at_command' => 'cindex',
                       'index_ignore_chars' => {},
-                      'index_name' => 'cp',
-                      'index_type_command' => 'cindex'
+                      'index_name' => 'cp'
                     }
                   },
                   'info' => {
@@ -470,10 +466,8 @@ $result_trees{'inter_item_commands_in_itemize'} = {
                       'entry_node' => {},
                       'entry_number' => 3,
                       'in_code' => 0,
-                      'index_at_command' => 'cindex',
                       'index_ignore_chars' => {},
-                      'index_name' => 'cp',
-                      'index_type_command' => 'cindex'
+                      'index_name' => 'cp'
                     }
                   },
                   'info' => {
@@ -629,10 +623,8 @@ $result_trees{'inter_item_commands_in_itemize'} = {
                           'entry_node' => {},
                           'entry_number' => 4,
                           'in_code' => 0,
-                          'index_at_command' => 'cindex',
                           'index_ignore_chars' => {},
-                          'index_name' => 'cp',
-                          'index_type_command' => 'cindex'
+                          'index_name' => 'cp'
                         }
                       },
                       'info' => {
diff --git a/tp/t/results/languages/documentlanguage.pl 
b/tp/t/results/languages/documentlanguage.pl
index 3c8bfbef51..2d58a9e86d 100644
--- a/tp/t/results/languages/documentlanguage.pl
+++ b/tp/t/results/languages/documentlanguage.pl
@@ -663,10 +663,8 @@ $result_trees{'documentlanguage'} = {
                   'entry_node' => {},
                   'entry_number' => 1,
                   'in_code' => 1,
-                  'index_at_command' => 'deftypemethod',
                   'index_ignore_chars' => {},
-                  'index_name' => 'fn',
-                  'index_type_command' => 'deftypemethod'
+                  'index_name' => 'fn'
                 },
                 'original_def_cmdname' => 'deftypemethod'
               },
diff --git a/tp/t/results/languages/documentlanguage_option.pl 
b/tp/t/results/languages/documentlanguage_option.pl
index af441a6571..83ce5c0de7 100644
--- a/tp/t/results/languages/documentlanguage_option.pl
+++ b/tp/t/results/languages/documentlanguage_option.pl
@@ -663,10 +663,8 @@ $result_trees{'documentlanguage_option'} = {
                   'entry_node' => {},
                   'entry_number' => 1,
                   'in_code' => 1,
-                  'index_at_command' => 'deftypemethod',
                   'index_ignore_chars' => {},
-                  'index_name' => 'fn',
-                  'index_type_command' => 'deftypemethod'
+                  'index_name' => 'fn'
                 },
                 'original_def_cmdname' => 'deftypemethod'
               },
diff --git a/tp/t/results/languages/documentlanguage_unknown.pl 
b/tp/t/results/languages/documentlanguage_unknown.pl
index f4b8aa67a6..f27ee39579 100644
--- a/tp/t/results/languages/documentlanguage_unknown.pl
+++ b/tp/t/results/languages/documentlanguage_unknown.pl
@@ -663,10 +663,8 @@ $result_trees{'documentlanguage_unknown'} = {
                   'entry_node' => {},
                   'entry_number' => 1,
                   'in_code' => 1,
-                  'index_at_command' => 'deftypemethod',
                   'index_ignore_chars' => {},
-                  'index_name' => 'fn',
-                  'index_type_command' => 'deftypemethod'
+                  'index_name' => 'fn'
                 },
                 'original_def_cmdname' => 'deftypemethod'
               },
diff --git a/tp/t/results/languages/multiple_documentlanguage.pl 
b/tp/t/results/languages/multiple_documentlanguage.pl
index cc8ed76048..fb3417f3cf 100644
--- a/tp/t/results/languages/multiple_documentlanguage.pl
+++ b/tp/t/results/languages/multiple_documentlanguage.pl
@@ -160,10 +160,8 @@ $result_trees{'multiple_documentlanguage'} = {
                           'entry_number' => 1,
                           'entry_region' => 'copying',
                           'in_code' => 1,
-                          'index_at_command' => 'defivar',
                           'index_ignore_chars' => {},
-                          'index_name' => 'vr',
-                          'index_type_command' => 'defivar'
+                          'index_name' => 'vr'
                         },
                         'original_def_cmdname' => 'defivar'
                       },
@@ -541,10 +539,8 @@ $result_trees{'multiple_documentlanguage'} = {
                   'entry_node' => {},
                   'entry_number' => 2,
                   'in_code' => 1,
-                  'index_at_command' => 'defivar',
                   'index_ignore_chars' => {},
-                  'index_name' => 'vr',
-                  'index_type_command' => 'defivar'
+                  'index_name' => 'vr'
                 },
                 'original_def_cmdname' => 'defivar'
               },
@@ -823,10 +819,8 @@ $result_trees{'multiple_documentlanguage'} = {
                   'entry_node' => {},
                   'entry_number' => 3,
                   'in_code' => 1,
-                  'index_at_command' => 'defivar',
                   'index_ignore_chars' => {},
-                  'index_name' => 'vr',
-                  'index_type_command' => 'defivar'
+                  'index_name' => 'vr'
                 },
                 'original_def_cmdname' => 'defivar'
               },
diff --git a/tp/t/results/languages/multiple_in_preamble.pl 
b/tp/t/results/languages/multiple_in_preamble.pl
index 488c8b4289..119b60f7b2 100644
--- a/tp/t/results/languages/multiple_in_preamble.pl
+++ b/tp/t/results/languages/multiple_in_preamble.pl
@@ -160,10 +160,8 @@ $result_trees{'multiple_in_preamble'} = {
                           'entry_number' => 1,
                           'entry_region' => 'copying',
                           'in_code' => 1,
-                          'index_at_command' => 'defivar',
                           'index_ignore_chars' => {},
-                          'index_name' => 'vr',
-                          'index_type_command' => 'defivar'
+                          'index_name' => 'vr'
                         },
                         'original_def_cmdname' => 'defivar'
                       },
@@ -577,10 +575,8 @@ $result_trees{'multiple_in_preamble'} = {
                   'entry_node' => {},
                   'entry_number' => 2,
                   'in_code' => 1,
-                  'index_at_command' => 'defivar',
                   'index_ignore_chars' => {},
-                  'index_name' => 'vr',
-                  'index_type_command' => 'defivar'
+                  'index_name' => 'vr'
                 },
                 'original_def_cmdname' => 'defivar'
               },
@@ -802,10 +798,8 @@ $result_trees{'multiple_in_preamble'} = {
                   'entry_node' => {},
                   'entry_number' => 3,
                   'in_code' => 1,
-                  'index_at_command' => 'defivar',
                   'index_ignore_chars' => {},
-                  'index_name' => 'vr',
-                  'index_type_command' => 'defivar'
+                  'index_name' => 'vr'
                 },
                 'original_def_cmdname' => 'defivar'
               },
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 7cc15d69b5..00f7f344e1 100644
--- a/tp/t/results/languages/multiple_in_preamble_before_node.pl
+++ b/tp/t/results/languages/multiple_in_preamble_before_node.pl
@@ -160,10 +160,8 @@ $result_trees{'multiple_in_preamble_before_node'} = {
                           'entry_number' => 1,
                           'entry_region' => 'copying',
                           'in_code' => 1,
-                          'index_at_command' => 'defivar',
                           'index_ignore_chars' => {},
-                          'index_name' => 'vr',
-                          'index_type_command' => 'defivar'
+                          'index_name' => 'vr'
                         },
                         'original_def_cmdname' => 'defivar'
                       },
@@ -628,10 +626,8 @@ $result_trees{'multiple_in_preamble_before_node'} = {
                   'entry_node' => {},
                   'entry_number' => 2,
                   'in_code' => 1,
-                  'index_at_command' => 'defivar',
                   'index_ignore_chars' => {},
-                  'index_name' => 'vr',
-                  'index_type_command' => 'defivar'
+                  'index_name' => 'vr'
                 },
                 'original_def_cmdname' => 'defivar'
               },
diff --git a/tp/t/results/languages/multiple_lang_chapters.pl 
b/tp/t/results/languages/multiple_lang_chapters.pl
index 8c22c9329f..fd626f8b91 100644
--- a/tp/t/results/languages/multiple_lang_chapters.pl
+++ b/tp/t/results/languages/multiple_lang_chapters.pl
@@ -860,10 +860,8 @@ $result_trees{'multiple_lang_chapters'} = {
                   'entry_node' => {},
                   'entry_number' => 1,
                   'in_code' => 1,
-                  'index_at_command' => 'defivar',
                   'index_ignore_chars' => {},
-                  'index_name' => 'vr',
-                  'index_type_command' => 'defivar'
+                  'index_name' => 'vr'
                 },
                 'original_def_cmdname' => 'defivar'
               },
@@ -1172,10 +1170,8 @@ $result_trees{'multiple_lang_chapters'} = {
                   'entry_node' => {},
                   'entry_number' => 2,
                   'in_code' => 1,
-                  'index_at_command' => 'defivar',
                   'index_ignore_chars' => {},
-                  'index_name' => 'vr',
-                  'index_type_command' => 'defivar'
+                  'index_name' => 'vr'
                 },
                 'original_def_cmdname' => 'defivar'
               },
@@ -1445,10 +1441,8 @@ $result_trees{'multiple_lang_chapters'} = {
                   'entry_node' => {},
                   'entry_number' => 3,
                   'in_code' => 1,
-                  'index_at_command' => 'defivar',
                   'index_ignore_chars' => {},
-                  'index_name' => 'vr',
-                  'index_type_command' => 'defivar'
+                  'index_name' => 'vr'
                 },
                 'original_def_cmdname' => 'defivar'
               },
diff --git a/tp/t/results/languages/multiple_lang_chapters_latex.pl 
b/tp/t/results/languages/multiple_lang_chapters_latex.pl
index c0c0c3c876..f15433c3f0 100644
--- a/tp/t/results/languages/multiple_lang_chapters_latex.pl
+++ b/tp/t/results/languages/multiple_lang_chapters_latex.pl
@@ -860,10 +860,8 @@ $result_trees{'multiple_lang_chapters_latex'} = {
                   'entry_node' => {},
                   'entry_number' => 1,
                   'in_code' => 1,
-                  'index_at_command' => 'defivar',
                   'index_ignore_chars' => {},
-                  'index_name' => 'vr',
-                  'index_type_command' => 'defivar'
+                  'index_name' => 'vr'
                 },
                 'original_def_cmdname' => 'defivar'
               },
@@ -1172,10 +1170,8 @@ $result_trees{'multiple_lang_chapters_latex'} = {
                   'entry_node' => {},
                   'entry_number' => 2,
                   'in_code' => 1,
-                  'index_at_command' => 'defivar',
                   'index_ignore_chars' => {},
-                  'index_name' => 'vr',
-                  'index_type_command' => 'defivar'
+                  'index_name' => 'vr'
                 },
                 'original_def_cmdname' => 'defivar'
               },
@@ -1445,10 +1441,8 @@ $result_trees{'multiple_lang_chapters_latex'} = {
                   'entry_node' => {},
                   'entry_number' => 3,
                   'in_code' => 1,
-                  'index_at_command' => 'defivar',
                   'index_ignore_chars' => {},
-                  'index_name' => 'vr',
-                  'index_type_command' => 'defivar'
+                  'index_name' => 'vr'
                 },
                 'original_def_cmdname' => 'defivar'
               },
diff --git a/tp/t/results/languages/multiple_lang_chapters_texi2html.pl 
b/tp/t/results/languages/multiple_lang_chapters_texi2html.pl
index 8d5f053010..53a000258f 100644
--- a/tp/t/results/languages/multiple_lang_chapters_texi2html.pl
+++ b/tp/t/results/languages/multiple_lang_chapters_texi2html.pl
@@ -827,10 +827,8 @@ $result_trees{'multiple_lang_chapters_texi2html'} = {
                   'entry_node' => {},
                   'entry_number' => 1,
                   'in_code' => 1,
-                  'index_at_command' => 'defivar',
                   'index_ignore_chars' => {},
-                  'index_name' => 'vr',
-                  'index_type_command' => 'defivar'
+                  'index_name' => 'vr'
                 },
                 'original_def_cmdname' => 'defivar'
               },
@@ -1139,10 +1137,8 @@ $result_trees{'multiple_lang_chapters_texi2html'} = {
                   'entry_node' => {},
                   'entry_number' => 2,
                   'in_code' => 1,
-                  'index_at_command' => 'defivar',
                   'index_ignore_chars' => {},
-                  'index_name' => 'vr',
-                  'index_type_command' => 'defivar'
+                  'index_name' => 'vr'
                 },
                 'original_def_cmdname' => 'defivar'
               },
@@ -1412,10 +1408,8 @@ $result_trees{'multiple_lang_chapters_texi2html'} = {
                   'entry_node' => {},
                   'entry_number' => 3,
                   'in_code' => 1,
-                  'index_at_command' => 'defivar',
                   'index_ignore_chars' => {},
-                  'index_name' => 'vr',
-                  'index_type_command' => 'defivar'
+                  'index_name' => 'vr'
                 },
                 'original_def_cmdname' => 'defivar'
               },
diff --git a/tp/t/results/languages/simple_documentlanguage.pl 
b/tp/t/results/languages/simple_documentlanguage.pl
index e78f8420fd..8f167d95ec 100644
--- a/tp/t/results/languages/simple_documentlanguage.pl
+++ b/tp/t/results/languages/simple_documentlanguage.pl
@@ -219,10 +219,8 @@ $result_trees{'simple_documentlanguage'} = {
                   'entry_node' => {},
                   'entry_number' => 1,
                   'in_code' => 1,
-                  'index_at_command' => 'defivar',
                   'index_ignore_chars' => {},
-                  'index_name' => 'vr',
-                  'index_type_command' => 'defivar'
+                  'index_name' => 'vr'
                 },
                 'original_def_cmdname' => 'defivar'
               },
diff --git a/tp/t/results/languages/unknown_region.pl 
b/tp/t/results/languages/unknown_region.pl
index c974d99c7c..66d3141478 100644
--- a/tp/t/results/languages/unknown_region.pl
+++ b/tp/t/results/languages/unknown_region.pl
@@ -219,10 +219,8 @@ $result_trees{'unknown_region'} = {
                   'entry_node' => {},
                   'entry_number' => 1,
                   'in_code' => 1,
-                  'index_at_command' => 'defivar',
                   'index_ignore_chars' => {},
-                  'index_name' => 'vr',
-                  'index_type_command' => 'defivar'
+                  'index_name' => 'vr'
                 },
                 'original_def_cmdname' => 'defivar'
               },
diff --git a/tp/t/results/latex_tests/brace_in_index.pl 
b/tp/t/results/latex_tests/brace_in_index.pl
index dd595581dc..9ec02ac23e 100644
--- a/tp/t/results/latex_tests/brace_in_index.pl
+++ b/tp/t/results/latex_tests/brace_in_index.pl
@@ -152,10 +152,8 @@ $result_trees{'brace_in_index'} = {
               'entry_element' => {},
               'entry_number' => 1,
               'in_code' => 0,
-              'index_at_command' => 'cindex',
               'index_ignore_chars' => {},
-              'index_name' => 'cp',
-              'index_type_command' => 'cindex'
+              'index_name' => 'cp'
             }
           },
           'info' => {
@@ -215,10 +213,8 @@ $result_trees{'brace_in_index'} = {
               'entry_element' => {},
               'entry_number' => 2,
               'in_code' => 0,
-              'index_at_command' => 'cindex',
               'index_ignore_chars' => {},
-              'index_name' => 'cp',
-              'index_type_command' => 'cindex'
+              'index_name' => 'cp'
             }
           },
           'info' => {
@@ -278,10 +274,8 @@ $result_trees{'brace_in_index'} = {
               'entry_element' => {},
               'entry_number' => 3,
               'in_code' => 0,
-              'index_at_command' => 'cindex',
               'index_ignore_chars' => {},
-              'index_name' => 'cp',
-              'index_type_command' => 'cindex'
+              'index_name' => 'cp'
             }
           },
           'info' => {
@@ -396,10 +390,8 @@ $result_trees{'brace_in_index'} = {
                   'entry_element' => {},
                   'entry_number' => 1,
                   'in_code' => 1,
-                  'index_at_command' => 'defun',
                   'index_ignore_chars' => {},
-                  'index_name' => 'fn',
-                  'index_type_command' => 'defun'
+                  'index_name' => 'fn'
                 },
                 'original_def_cmdname' => 'defun'
               },
diff --git a/tp/t/results/latex_tests/indices.pl 
b/tp/t/results/latex_tests/indices.pl
index ba7d7dc851..bfea01598c 100644
--- a/tp/t/results/latex_tests/indices.pl
+++ b/tp/t/results/latex_tests/indices.pl
@@ -265,12 +265,10 @@ $result_trees{'indices'} = {
               'entry_node' => {},
               'entry_number' => 1,
               'in_code' => 0,
-              'index_at_command' => 'cindex',
               'index_ignore_chars' => {
                 '\\' => 1
               },
-              'index_name' => 'cp',
-              'index_type_command' => 'cindex'
+              'index_name' => 'cp'
             }
           },
           'info' => {
@@ -311,12 +309,10 @@ $result_trees{'indices'} = {
               'entry_node' => {},
               'entry_number' => 2,
               'in_code' => 0,
-              'index_at_command' => 'cindex',
               'index_ignore_chars' => {
                 '\\' => 1
               },
-              'index_name' => 'cp',
-              'index_type_command' => 'cindex'
+              'index_name' => 'cp'
             }
           },
           'info' => {
@@ -357,12 +353,10 @@ $result_trees{'indices'} = {
               'entry_node' => {},
               'entry_number' => 3,
               'in_code' => 0,
-              'index_at_command' => 'cindex',
               'index_ignore_chars' => {
                 '\\' => 1
               },
-              'index_name' => 'cp',
-              'index_type_command' => 'cindex'
+              'index_name' => 'cp'
             }
           },
           'info' => {
@@ -403,12 +397,10 @@ $result_trees{'indices'} = {
               'entry_node' => {},
               'entry_number' => 4,
               'in_code' => 0,
-              'index_at_command' => 'cindex',
               'index_ignore_chars' => {
                 '\\' => 1
               },
-              'index_name' => 'cp',
-              'index_type_command' => 'cindex'
+              'index_name' => 'cp'
             }
           },
           'info' => {
@@ -449,12 +441,10 @@ $result_trees{'indices'} = {
               'entry_node' => {},
               'entry_number' => 5,
               'in_code' => 0,
-              'index_at_command' => 'cindex',
               'index_ignore_chars' => {
                 '\\' => 1
               },
-              'index_name' => 'cp',
-              'index_type_command' => 'cindex'
+              'index_name' => 'cp'
             }
           },
           'info' => {
@@ -510,12 +500,10 @@ $result_trees{'indices'} = {
               'entry_node' => {},
               'entry_number' => 6,
               'in_code' => 0,
-              'index_at_command' => 'cindex',
               'index_ignore_chars' => {
                 '\\' => 1
               },
-              'index_name' => 'cp',
-              'index_type_command' => 'cindex'
+              'index_name' => 'cp'
             }
           },
           'info' => {
@@ -629,12 +617,10 @@ $result_trees{'indices'} = {
               'entry_node' => {},
               'entry_number' => 7,
               'in_code' => 0,
-              'index_at_command' => 'cindex',
               'index_ignore_chars' => {
                 '\\' => 1
               },
-              'index_name' => 'cp',
-              'index_type_command' => 'cindex'
+              'index_name' => 'cp'
             },
             'subentry' => {
               'args' => [
@@ -901,12 +887,10 @@ $result_trees{'indices'} = {
               'entry_node' => {},
               'entry_number' => 8,
               'in_code' => 0,
-              'index_at_command' => 'cindex',
               'index_ignore_chars' => {
                 '\\' => 1
               },
-              'index_name' => 'cp',
-              'index_type_command' => 'cindex'
+              'index_name' => 'cp'
             }
           },
           'info' => {
@@ -969,12 +953,10 @@ $result_trees{'indices'} = {
               'entry_node' => {},
               'entry_number' => 9,
               'in_code' => 0,
-              'index_at_command' => 'cindex',
               'index_ignore_chars' => {
                 '\\' => 1
               },
               'index_name' => 'cp',
-              'index_type_command' => 'cindex',
               'sortas' => '\\cmd'
             },
             'sortas' => '\\cmd'
@@ -1078,10 +1060,8 @@ $result_trees{'indices'} = {
               'entry_node' => {},
               'entry_number' => 10,
               'in_code' => 0,
-              'index_at_command' => 'cindex',
               'index_ignore_chars' => {},
-              'index_name' => 'cp',
-              'index_type_command' => 'cindex'
+              'index_name' => 'cp'
             }
           },
           'info' => {
@@ -1166,10 +1146,8 @@ $result_trees{'indices'} = {
               'entry_node' => {},
               'entry_number' => 1,
               'in_code' => 1,
-              'index_at_command' => 'findex',
               'index_ignore_chars' => {},
-              'index_name' => 'fn',
-              'index_type_command' => 'findex'
+              'index_name' => 'fn'
             }
           },
           'info' => {
diff --git a/tp/t/results/latex_tests/indices_disable_encoding.pl 
b/tp/t/results/latex_tests/indices_disable_encoding.pl
index 5cb8658d40..77bb5ed855 100644
--- a/tp/t/results/latex_tests/indices_disable_encoding.pl
+++ b/tp/t/results/latex_tests/indices_disable_encoding.pl
@@ -265,12 +265,10 @@ $result_trees{'indices_disable_encoding'} = {
               'entry_node' => {},
               'entry_number' => 1,
               'in_code' => 0,
-              'index_at_command' => 'cindex',
               'index_ignore_chars' => {
                 '\\' => 1
               },
-              'index_name' => 'cp',
-              'index_type_command' => 'cindex'
+              'index_name' => 'cp'
             }
           },
           'info' => {
@@ -311,12 +309,10 @@ $result_trees{'indices_disable_encoding'} = {
               'entry_node' => {},
               'entry_number' => 2,
               'in_code' => 0,
-              'index_at_command' => 'cindex',
               'index_ignore_chars' => {
                 '\\' => 1
               },
-              'index_name' => 'cp',
-              'index_type_command' => 'cindex'
+              'index_name' => 'cp'
             }
           },
           'info' => {
@@ -357,12 +353,10 @@ $result_trees{'indices_disable_encoding'} = {
               'entry_node' => {},
               'entry_number' => 3,
               'in_code' => 0,
-              'index_at_command' => 'cindex',
               'index_ignore_chars' => {
                 '\\' => 1
               },
-              'index_name' => 'cp',
-              'index_type_command' => 'cindex'
+              'index_name' => 'cp'
             }
           },
           'info' => {
@@ -403,12 +397,10 @@ $result_trees{'indices_disable_encoding'} = {
               'entry_node' => {},
               'entry_number' => 4,
               'in_code' => 0,
-              'index_at_command' => 'cindex',
               'index_ignore_chars' => {
                 '\\' => 1
               },
-              'index_name' => 'cp',
-              'index_type_command' => 'cindex'
+              'index_name' => 'cp'
             }
           },
           'info' => {
@@ -449,12 +441,10 @@ $result_trees{'indices_disable_encoding'} = {
               'entry_node' => {},
               'entry_number' => 5,
               'in_code' => 0,
-              'index_at_command' => 'cindex',
               'index_ignore_chars' => {
                 '\\' => 1
               },
-              'index_name' => 'cp',
-              'index_type_command' => 'cindex'
+              'index_name' => 'cp'
             }
           },
           'info' => {
@@ -510,12 +500,10 @@ $result_trees{'indices_disable_encoding'} = {
               'entry_node' => {},
               'entry_number' => 6,
               'in_code' => 0,
-              'index_at_command' => 'cindex',
               'index_ignore_chars' => {
                 '\\' => 1
               },
-              'index_name' => 'cp',
-              'index_type_command' => 'cindex'
+              'index_name' => 'cp'
             }
           },
           'info' => {
@@ -629,12 +617,10 @@ $result_trees{'indices_disable_encoding'} = {
               'entry_node' => {},
               'entry_number' => 7,
               'in_code' => 0,
-              'index_at_command' => 'cindex',
               'index_ignore_chars' => {
                 '\\' => 1
               },
-              'index_name' => 'cp',
-              'index_type_command' => 'cindex'
+              'index_name' => 'cp'
             },
             'subentry' => {
               'args' => [
@@ -901,12 +887,10 @@ $result_trees{'indices_disable_encoding'} = {
               'entry_node' => {},
               'entry_number' => 8,
               'in_code' => 0,
-              'index_at_command' => 'cindex',
               'index_ignore_chars' => {
                 '\\' => 1
               },
-              'index_name' => 'cp',
-              'index_type_command' => 'cindex'
+              'index_name' => 'cp'
             }
           },
           'info' => {
@@ -969,12 +953,10 @@ $result_trees{'indices_disable_encoding'} = {
               'entry_node' => {},
               'entry_number' => 9,
               'in_code' => 0,
-              'index_at_command' => 'cindex',
               'index_ignore_chars' => {
                 '\\' => 1
               },
               'index_name' => 'cp',
-              'index_type_command' => 'cindex',
               'sortas' => '\\cmd'
             },
             'sortas' => '\\cmd'
@@ -1078,10 +1060,8 @@ $result_trees{'indices_disable_encoding'} = {
               'entry_node' => {},
               'entry_number' => 10,
               'in_code' => 0,
-              'index_at_command' => 'cindex',
               'index_ignore_chars' => {},
-              'index_name' => 'cp',
-              'index_type_command' => 'cindex'
+              'index_name' => 'cp'
             }
           },
           'info' => {
@@ -1166,10 +1146,8 @@ $result_trees{'indices_disable_encoding'} = {
               'entry_node' => {},
               'entry_number' => 1,
               'in_code' => 1,
-              'index_at_command' => 'findex',
               'index_ignore_chars' => {},
-              'index_name' => 'fn',
-              'index_type_command' => 'findex'
+              'index_name' => 'fn'
             }
           },
           'info' => {
diff --git a/tp/t/results/latex_tests/vbar_in_index.pl 
b/tp/t/results/latex_tests/vbar_in_index.pl
index 2263e977b0..d88a174821 100644
--- a/tp/t/results/latex_tests/vbar_in_index.pl
+++ b/tp/t/results/latex_tests/vbar_in_index.pl
@@ -38,10 +38,8 @@ $result_trees{'vbar_in_index'} = {
               'entry_element' => {},
               'entry_number' => 1,
               'in_code' => 1,
-              'index_at_command' => 'findex',
               'index_ignore_chars' => {},
-              'index_name' => 'fn',
-              'index_type_command' => 'findex'
+              'index_name' => 'fn'
             }
           },
           'info' => {
@@ -81,10 +79,8 @@ $result_trees{'vbar_in_index'} = {
               'entry_element' => {},
               'entry_number' => 1,
               'in_code' => 0,
-              'index_at_command' => 'cindex',
               'index_ignore_chars' => {},
-              'index_name' => 'cp',
-              'index_type_command' => 'cindex'
+              'index_name' => 'cp'
             }
           },
           'info' => {
diff --git a/tp/t/results/layout/no_monolithic.pl 
b/tp/t/results/layout/no_monolithic.pl
index 5d89ad6267..928c212593 100644
--- a/tp/t/results/layout/no_monolithic.pl
+++ b/tp/t/results/layout/no_monolithic.pl
@@ -164,10 +164,8 @@ $result_trees{'no_monolithic'} = {
               'entry_node' => {},
               'entry_number' => 1,
               'in_code' => 0,
-              'index_at_command' => 'cindex',
               'index_ignore_chars' => {},
-              'index_name' => 'cp',
-              'index_type_command' => 'cindex'
+              'index_name' => 'cp'
             }
           },
           'info' => {
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 cdec8c208d..84e38d079f 100644
--- a/tp/t/results/layout/no_monolithic_only_toc_out.pl
+++ b/tp/t/results/layout/no_monolithic_only_toc_out.pl
@@ -164,10 +164,8 @@ $result_trees{'no_monolithic_only_toc_out'} = {
               'entry_node' => {},
               'entry_number' => 1,
               'in_code' => 0,
-              'index_at_command' => 'cindex',
               'index_ignore_chars' => {},
-              'index_name' => 'cp',
-              'index_type_command' => 'cindex'
+              'index_name' => 'cp'
             }
           },
           'info' => {
diff --git a/tp/t/results/macro/backslash_in_arg.pl 
b/tp/t/results/macro/backslash_in_arg.pl
index 9f09b03239..18bef82fc1 100644
--- a/tp/t/results/macro/backslash_in_arg.pl
+++ b/tp/t/results/macro/backslash_in_arg.pl
@@ -206,10 +206,8 @@ $result_trees{'backslash_in_arg'} = {
               'entry_node' => {},
               'entry_number' => 1,
               'in_code' => 1,
-              'index_at_command' => 'findex',
               'index_ignore_chars' => {},
-              'index_name' => 'fn',
-              'index_type_command' => 'findex'
+              'index_name' => 'fn'
             }
           },
           'info' => {
@@ -281,10 +279,8 @@ $result_trees{'backslash_in_arg'} = {
               'entry_node' => {},
               'entry_number' => 2,
               'in_code' => 1,
-              'index_at_command' => 'findex',
               'index_ignore_chars' => {},
-              'index_name' => 'fn',
-              'index_type_command' => 'findex'
+              'index_name' => 'fn'
             }
           },
           'info' => {
@@ -361,10 +357,8 @@ $result_trees{'backslash_in_arg'} = {
               'entry_node' => {},
               'entry_number' => 3,
               'in_code' => 1,
-              'index_at_command' => 'findex',
               'index_ignore_chars' => {},
-              'index_name' => 'fn',
-              'index_type_command' => 'findex'
+              'index_name' => 'fn'
             }
           },
           'info' => {
@@ -436,10 +430,8 @@ $result_trees{'backslash_in_arg'} = {
               'entry_node' => {},
               'entry_number' => 4,
               'in_code' => 1,
-              'index_at_command' => 'findex',
               'index_ignore_chars' => {},
-              'index_name' => 'fn',
-              'index_type_command' => 'findex'
+              'index_name' => 'fn'
             }
           },
           'info' => {
diff --git a/tp/t/results/macro/macro_in_def_delimiters.pl 
b/tp/t/results/macro/macro_in_def_delimiters.pl
index 4ae7f9964e..aa10ecbfce 100644
--- a/tp/t/results/macro/macro_in_def_delimiters.pl
+++ b/tp/t/results/macro/macro_in_def_delimiters.pl
@@ -461,10 +461,8 @@ $result_trees{'macro_in_def_delimiters'} = {
                   'entry_element' => {},
                   'entry_number' => 1,
                   'in_code' => 1,
-                  'index_at_command' => 'deffn',
                   'index_ignore_chars' => {},
-                  'index_name' => 'fn',
-                  'index_type_command' => 'deffn'
+                  'index_name' => 'fn'
                 },
                 'original_def_cmdname' => 'deffn'
               },
diff --git a/tp/t/results/macro/macro_in_index_commands.pl 
b/tp/t/results/macro/macro_in_index_commands.pl
index 65ac414f7a..e9f495ed4d 100644
--- a/tp/t/results/macro/macro_in_index_commands.pl
+++ b/tp/t/results/macro/macro_in_index_commands.pl
@@ -843,10 +843,8 @@ $result_trees{'macro_in_index_commands'} = {
               'entry_node' => {},
               'entry_number' => 1,
               'in_code' => 0,
-              'index_at_command' => 'trucindex',
               'index_ignore_chars' => {},
-              'index_name' => 'truc',
-              'index_type_command' => 'trucindex'
+              'index_name' => 'truc'
             }
           },
           'info' => {
@@ -981,10 +979,8 @@ $result_trees{'macro_in_index_commands'} = {
               'entry_node' => {},
               'entry_number' => 1,
               'in_code' => 1,
-              'index_at_command' => 'codeidxindex',
               'index_ignore_chars' => {},
-              'index_name' => 'codeidx',
-              'index_type_command' => 'codeidxindex'
+              'index_name' => 'codeidx'
             }
           },
           'info' => {
@@ -1057,10 +1053,8 @@ $result_trees{'macro_in_index_commands'} = {
               'entry_node' => {},
               'entry_number' => 1,
               'in_code' => 1,
-              'index_at_command' => 'kindex',
               'index_ignore_chars' => {},
-              'index_name' => 'ky',
-              'index_type_command' => 'kindex'
+              'index_name' => 'ky'
             }
           },
           'info' => {
@@ -1145,10 +1139,8 @@ $result_trees{'macro_in_index_commands'} = {
               'entry_node' => {},
               'entry_number' => 1,
               'in_code' => 1,
-              'index_at_command' => 'pindex',
               'index_ignore_chars' => {},
-              'index_name' => 'pg',
-              'index_type_command' => 'pindex'
+              'index_name' => 'pg'
             }
           },
           'info' => {
diff --git a/tp/t/results/menu/menu_in_deffn.pl 
b/tp/t/results/menu/menu_in_deffn.pl
index 91ef3e71c0..d0fc877aca 100644
--- a/tp/t/results/menu/menu_in_deffn.pl
+++ b/tp/t/results/menu/menu_in_deffn.pl
@@ -100,10 +100,8 @@ $result_trees{'menu_in_deffn'} = {
                   'entry_node' => {},
                   'entry_number' => 1,
                   'in_code' => 1,
-                  'index_at_command' => 'deffn',
                   'index_ignore_chars' => {},
-                  'index_name' => 'fn',
-                  'index_type_command' => 'deffn'
+                  'index_name' => 'fn'
                 },
                 'original_def_cmdname' => 'deffn'
               },
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 853de1a9c6..1075c920d9 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
@@ -425,10 +425,8 @@ $result_trees{'comment_space_command_on_line'} = {
               'entry_node' => {},
               'entry_number' => 1,
               'in_code' => 0,
-              'index_at_command' => 'cindex',
               'index_ignore_chars' => {},
-              'index_name' => 'cp',
-              'index_type_command' => 'cindex'
+              'index_name' => 'cp'
             }
           },
           'info' => {
diff --git a/tp/t/results/misc_commands/index_entries.pl 
b/tp/t/results/misc_commands/index_entries.pl
index 05bba826f5..5baff35231 100644
--- a/tp/t/results/misc_commands/index_entries.pl
+++ b/tp/t/results/misc_commands/index_entries.pl
@@ -34,10 +34,8 @@ $result_trees{'index_entries'} = {
               'entry_element' => {},
               'entry_number' => 1,
               'in_code' => 0,
-              'index_at_command' => 'cindex',
               'index_ignore_chars' => {},
-              'index_name' => 'cp',
-              'index_type_command' => 'cindex'
+              'index_name' => 'cp'
             }
           },
           'info' => {
@@ -121,10 +119,8 @@ $result_trees{'index_entries'} = {
               'entry_element' => {},
               'entry_number' => 1,
               'in_code' => 0,
-              'index_at_command' => 'trucindex',
               'index_ignore_chars' => {},
-              'index_name' => 'truc',
-              'index_type_command' => 'trucindex'
+              'index_name' => 'truc'
             }
           },
           'info' => {
diff --git a/tp/t/results/moresectioning/no_element.pl 
b/tp/t/results/moresectioning/no_element.pl
index 622f515bda..67eae02950 100644
--- a/tp/t/results/moresectioning/no_element.pl
+++ b/tp/t/results/moresectioning/no_element.pl
@@ -591,10 +591,8 @@ $result_trees{'no_element'} = {
               'entry_element' => {},
               'entry_number' => 1,
               'in_code' => 0,
-              'index_at_command' => 'cindex',
               'index_ignore_chars' => {},
-              'index_name' => 'cp',
-              'index_type_command' => 'cindex'
+              'index_name' => 'cp'
             }
           },
           'info' => {
diff --git a/tp/t/results/moresectioning/placed_things_before_element.pl 
b/tp/t/results/moresectioning/placed_things_before_element.pl
index 3ca289cb03..cb3661d3b6 100644
--- a/tp/t/results/moresectioning/placed_things_before_element.pl
+++ b/tp/t/results/moresectioning/placed_things_before_element.pl
@@ -518,10 +518,8 @@ $result_trees{'placed_things_before_element'} = {
               'entry_element' => {},
               'entry_number' => 1,
               'in_code' => 0,
-              'index_at_command' => 'cindex',
               'index_ignore_chars' => {},
-              'index_name' => 'cp',
-              'index_type_command' => 'cindex'
+              'index_name' => 'cp'
             }
           },
           'info' => {
diff --git a/tp/t/results/moresectioning/placed_things_before_node.pl 
b/tp/t/results/moresectioning/placed_things_before_node.pl
index 559c0633b5..5eb4a1369a 100644
--- a/tp/t/results/moresectioning/placed_things_before_node.pl
+++ b/tp/t/results/moresectioning/placed_things_before_node.pl
@@ -522,10 +522,8 @@ $result_trees{'placed_things_before_node'} = {
               'entry_element' => {},
               'entry_number' => 1,
               'in_code' => 0,
-              'index_at_command' => 'cindex',
               'index_ignore_chars' => {},
-              'index_name' => 'cp',
-              'index_type_command' => 'cindex'
+              'index_name' => 'cp'
             }
           },
           'info' => {
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 9b9b11f89d..1b3985665b 100644
--- a/tp/t/results/multitable/inter_item_commands_in_multitable.pl
+++ b/tp/t/results/multitable/inter_item_commands_in_multitable.pl
@@ -109,10 +109,8 @@ $result_trees{'inter_item_commands_in_multitable'} = {
                               'entry_element' => {},
                               'entry_number' => 1,
                               'in_code' => 0,
-                              'index_at_command' => 'cindex',
                               'index_ignore_chars' => {},
-                              'index_name' => 'cp',
-                              'index_type_command' => 'cindex'
+                              'index_name' => 'cp'
                             }
                           },
                           'info' => {
@@ -512,10 +510,8 @@ $result_trees{'inter_item_commands_in_multitable'} = {
                                   'entry_element' => {},
                                   'entry_number' => 2,
                                   'in_code' => 0,
-                                  'index_at_command' => 'cindex',
                                   'index_ignore_chars' => {},
-                                  'index_name' => 'cp',
-                                  'index_type_command' => 'cindex'
+                                  'index_name' => 'cp'
                                 }
                               },
                               'info' => {
@@ -696,10 +692,8 @@ $result_trees{'inter_item_commands_in_multitable'} = {
                           'entry_element' => {},
                           'entry_number' => 3,
                           'in_code' => 0,
-                          'index_at_command' => 'cindex',
                           'index_ignore_chars' => {},
-                          'index_name' => 'cp',
-                          'index_type_command' => 'cindex'
+                          'index_name' => 'cp'
                         }
                       },
                       'info' => {
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 789098c968..aae539b369 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
@@ -409,10 +409,8 @@ $result_trees{'at_commands_glued_in_example'} = {
                       'entry_element' => {},
                       'entry_number' => 1,
                       'in_code' => 0,
-                      'index_at_command' => 'cindex',
                       'index_ignore_chars' => {},
-                      'index_name' => 'cp',
-                      'index_type_command' => 'cindex'
+                      'index_name' => 'cp'
                     }
                   },
                   'info' => {
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 3c6f8df682..cbbf0c4341 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
@@ -400,10 +400,8 @@ $result_trees{'at_commands_glued_in_paragraph'} = {
                   'entry_element' => {},
                   'entry_number' => 1,
                   'in_code' => 0,
-                  'index_at_command' => 'cindex',
                   'index_ignore_chars' => {},
-                  'index_name' => 'cp',
-                  'index_type_command' => 'cindex'
+                  'index_name' => 'cp'
                 }
               },
               'info' => {
diff --git a/tp/t/results/preformatted/def_in_example.pl 
b/tp/t/results/preformatted/def_in_example.pl
index ca9290baad..ce657cb25e 100644
--- a/tp/t/results/preformatted/def_in_example.pl
+++ b/tp/t/results/preformatted/def_in_example.pl
@@ -93,10 +93,8 @@ $result_trees{'def_in_example'} = {
                       'entry_element' => {},
                       'entry_number' => 1,
                       'in_code' => 1,
-                      'index_at_command' => 'defun',
                       'index_ignore_chars' => {},
-                      'index_name' => 'fn',
-                      'index_type_command' => 'defun'
+                      'index_name' => 'fn'
                     },
                     'original_def_cmdname' => 'defun'
                   },
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 ba84a282df..64296538ad 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
@@ -244,10 +244,8 @@ 
$result_trees{'index_entries_relate_to_item_no_transformation'} = {
                           'entry_node' => {},
                           'entry_number' => 1,
                           'in_code' => 0,
-                          'index_at_command' => 'cindex',
                           'index_ignore_chars' => {},
-                          'index_name' => 'cp',
-                          'index_type_command' => 'cindex'
+                          'index_name' => 'cp'
                         }
                       },
                       'info' => {
@@ -288,10 +286,8 @@ 
$result_trees{'index_entries_relate_to_item_no_transformation'} = {
                           'entry_node' => {},
                           'entry_number' => 2,
                           'in_code' => 0,
-                          'index_at_command' => 'cindex',
                           'index_ignore_chars' => {},
-                          'index_name' => 'cp',
-                          'index_type_command' => 'cindex'
+                          'index_name' => 'cp'
                         }
                       },
                       'info' => {
@@ -332,10 +328,8 @@ 
$result_trees{'index_entries_relate_to_item_no_transformation'} = {
                           'entry_node' => {},
                           'entry_number' => 3,
                           'in_code' => 0,
-                          'index_at_command' => 'cindex',
                           'index_ignore_chars' => {},
-                          'index_name' => 'cp',
-                          'index_type_command' => 'cindex'
+                          'index_name' => 'cp'
                         }
                       },
                       'info' => {
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 eb3af2f97f..9694ba3518 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
@@ -272,10 +272,8 @@ 
$result_trees{'index_entries_relate_to_item_transformation'} = {
                           'entry_node' => {},
                           'entry_number' => 1,
                           'in_code' => 0,
-                          'index_at_command' => 'cindex',
                           'index_ignore_chars' => {},
-                          'index_name' => 'cp',
-                          'index_type_command' => 'cindex'
+                          'index_name' => 'cp'
                         }
                       },
                       'info' => {
@@ -316,10 +314,8 @@ 
$result_trees{'index_entries_relate_to_item_transformation'} = {
                           'entry_node' => {},
                           'entry_number' => 2,
                           'in_code' => 0,
-                          'index_at_command' => 'cindex',
                           'index_ignore_chars' => {},
-                          'index_name' => 'cp',
-                          'index_type_command' => 'cindex'
+                          'index_name' => 'cp'
                         }
                       },
                       'info' => {
@@ -360,10 +356,8 @@ 
$result_trees{'index_entries_relate_to_item_transformation'} = {
                           'entry_node' => {},
                           'entry_number' => 3,
                           'in_code' => 0,
-                          'index_at_command' => 'cindex',
                           'index_ignore_chars' => {},
-                          'index_name' => 'cp',
-                          'index_type_command' => 'cindex'
+                          'index_name' => 'cp'
                         }
                       },
                       'info' => {
diff --git a/tp/t/results/value/value_in_index_commands.pl 
b/tp/t/results/value/value_in_index_commands.pl
index 56c07b0293..e28206c90d 100644
--- a/tp/t/results/value/value_in_index_commands.pl
+++ b/tp/t/results/value/value_in_index_commands.pl
@@ -593,10 +593,8 @@ $result_trees{'value_in_index_commands'} = {
               'entry_node' => {},
               'entry_number' => 1,
               'in_code' => 0,
-              'index_at_command' => 'trucindex',
               'index_ignore_chars' => {},
-              'index_name' => 'truc',
-              'index_type_command' => 'trucindex'
+              'index_name' => 'truc'
             }
           },
           'info' => {
@@ -731,10 +729,8 @@ $result_trees{'value_in_index_commands'} = {
               'entry_node' => {},
               'entry_number' => 1,
               'in_code' => 1,
-              'index_at_command' => 'codeidxindex',
               'index_ignore_chars' => {},
-              'index_name' => 'codeidx',
-              'index_type_command' => 'codeidxindex'
+              'index_name' => 'codeidx'
             }
           },
           'info' => {
@@ -805,10 +801,8 @@ $result_trees{'value_in_index_commands'} = {
               'entry_node' => {},
               'entry_number' => 1,
               'in_code' => 1,
-              'index_at_command' => 'kindex',
               'index_ignore_chars' => {},
-              'index_name' => 'ky',
-              'index_type_command' => 'kindex'
+              'index_name' => 'ky'
             }
           },
           'info' => {
@@ -889,10 +883,8 @@ $result_trees{'value_in_index_commands'} = {
               'entry_node' => {},
               'entry_number' => 1,
               'in_code' => 1,
-              'index_at_command' => 'pindex',
               'index_ignore_chars' => {},
-              'index_name' => 'pg',
-              'index_type_command' => 'pindex'
+              'index_name' => 'pg'
             }
           },
           'info' => {
diff --git a/tp/t/results/xml_tests/commands_and_spaces.pl 
b/tp/t/results/xml_tests/commands_and_spaces.pl
index cb9455883a..942545f588 100644
--- a/tp/t/results/xml_tests/commands_and_spaces.pl
+++ b/tp/t/results/xml_tests/commands_and_spaces.pl
@@ -1637,10 +1637,8 @@ $result_trees{'commands_and_spaces'} = {
                   'entry_node' => {},
                   'entry_number' => 1,
                   'in_code' => 1,
-                  'index_at_command' => 'deffn',
                   'index_ignore_chars' => {},
-                  'index_name' => 'fn',
-                  'index_type_command' => 'deffn'
+                  'index_name' => 'fn'
                 },
                 'original_def_cmdname' => 'deffn'
               },
diff --git a/tp/t/results/xtable/block_commands_in_table.pl 
b/tp/t/results/xtable/block_commands_in_table.pl
index 01c1ef1b4a..285e0bb786 100644
--- a/tp/t/results/xtable/block_commands_in_table.pl
+++ b/tp/t/results/xtable/block_commands_in_table.pl
@@ -776,10 +776,8 @@ $result_trees{'block_commands_in_table'} = {
                           'entry_node' => {},
                           'entry_number' => 1,
                           'in_code' => 1,
-                          'index_at_command' => 'item',
                           'index_ignore_chars' => {},
-                          'index_name' => 'vr',
-                          'index_type_command' => 'vtable'
+                          'index_name' => 'vr'
                         }
                       },
                       'info' => {
@@ -840,10 +838,8 @@ $result_trees{'block_commands_in_table'} = {
                           'entry_node' => {},
                           'entry_number' => 2,
                           'in_code' => 1,
-                          'index_at_command' => 'vindex',
                           'index_ignore_chars' => {},
-                          'index_name' => 'vr',
-                          'index_type_command' => 'vindex'
+                          'index_name' => 'vr'
                         }
                       },
                       'info' => {
@@ -884,10 +880,8 @@ $result_trees{'block_commands_in_table'} = {
                           'entry_node' => {},
                           'entry_number' => 3,
                           'in_code' => 1,
-                          'index_at_command' => 'itemx',
                           'index_ignore_chars' => {},
-                          'index_name' => 'vr',
-                          'index_type_command' => 'vtable'
+                          'index_name' => 'vr'
                         }
                       },
                       'info' => {
@@ -1028,10 +1022,8 @@ $result_trees{'block_commands_in_table'} = {
                           'entry_node' => {},
                           'entry_number' => 4,
                           'in_code' => 1,
-                          'index_at_command' => 'item',
                           'index_ignore_chars' => {},
-                          'index_name' => 'vr',
-                          'index_type_command' => 'vtable'
+                          'index_name' => 'vr'
                         }
                       },
                       'info' => {
@@ -1081,10 +1073,8 @@ $result_trees{'block_commands_in_table'} = {
                           'entry_node' => {},
                           'entry_number' => 5,
                           'in_code' => 1,
-                          'index_at_command' => 'itemx',
                           'index_ignore_chars' => {},
-                          'index_name' => 'vr',
-                          'index_type_command' => 'vtable'
+                          'index_name' => 'vr'
                         }
                       },
                       'info' => {
diff --git a/tp/t/results/xtable/empty_item_itemx.pl 
b/tp/t/results/xtable/empty_item_itemx.pl
index 889bcc99f5..3236415851 100644
--- a/tp/t/results/xtable/empty_item_itemx.pl
+++ b/tp/t/results/xtable/empty_item_itemx.pl
@@ -87,10 +87,8 @@ $result_trees{'empty_item_itemx'} = {
                           'entry_element' => {},
                           'entry_number' => 1,
                           'in_code' => 1,
-                          'index_at_command' => 'item',
                           'index_ignore_chars' => {},
-                          'index_name' => 'vr',
-                          'index_type_command' => 'vtable'
+                          'index_name' => 'vr'
                         }
                       },
                       'info' => {
@@ -151,10 +149,8 @@ $result_trees{'empty_item_itemx'} = {
                           'entry_element' => {},
                           'entry_number' => 2,
                           'in_code' => 1,
-                          'index_at_command' => 'itemx',
                           'index_ignore_chars' => {},
-                          'index_name' => 'vr',
-                          'index_type_command' => 'vtable'
+                          'index_name' => 'vr'
                         }
                       },
                       'info' => {
@@ -235,10 +231,8 @@ $result_trees{'empty_item_itemx'} = {
                           'entry_element' => {},
                           'entry_number' => 3,
                           'in_code' => 1,
-                          'index_at_command' => 'item',
                           'index_ignore_chars' => {},
-                          'index_name' => 'vr',
-                          'index_type_command' => 'vtable'
+                          'index_name' => 'vr'
                         }
                       },
                       'info' => {
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 69b3bcda7a..0ed70e03a9 100644
--- a/tp/t/results/xtable/index_command_before_end_table.pl
+++ b/tp/t/results/xtable/index_command_before_end_table.pl
@@ -145,10 +145,8 @@ $result_trees{'index_command_before_end_table'} = {
                           'entry_element' => {},
                           'entry_number' => 1,
                           'in_code' => 1,
-                          'index_at_command' => 'vindex',
                           'index_ignore_chars' => {},
-                          'index_name' => 'vr',
-                          'index_type_command' => 'vindex'
+                          'index_name' => 'vr'
                         }
                       },
                       'info' => {
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 7f0284971a..deeb3e73ac 100644
--- a/tp/t/results/xtable/inter_item_commands_in_table.pl
+++ b/tp/t/results/xtable/inter_item_commands_in_table.pl
@@ -234,10 +234,8 @@ $result_trees{'inter_item_commands_in_table'} = {
                           'entry_node' => {},
                           'entry_number' => 1,
                           'in_code' => 1,
-                          'index_at_command' => 'item',
                           'index_ignore_chars' => {},
-                          'index_name' => 'vr',
-                          'index_type_command' => 'vtable'
+                          'index_name' => 'vr'
                         }
                       },
                       'info' => {
@@ -378,10 +376,8 @@ $result_trees{'inter_item_commands_in_table'} = {
                           'entry_node' => {},
                           'entry_number' => 2,
                           'in_code' => 1,
-                          'index_at_command' => 'item',
                           'index_ignore_chars' => {},
-                          'index_name' => 'vr',
-                          'index_type_command' => 'vtable'
+                          'index_name' => 'vr'
                         }
                       },
                       'info' => {
@@ -442,10 +438,8 @@ $result_trees{'inter_item_commands_in_table'} = {
                           'entry_node' => {},
                           'entry_number' => 3,
                           'in_code' => 1,
-                          'index_at_command' => 'itemx',
                           'index_ignore_chars' => {},
-                          'index_name' => 'vr',
-                          'index_type_command' => 'vtable'
+                          'index_name' => 'vr'
                         }
                       },
                       'info' => {
@@ -586,10 +580,8 @@ $result_trees{'inter_item_commands_in_table'} = {
                           'entry_node' => {},
                           'entry_number' => 1,
                           'in_code' => 1,
-                          'index_at_command' => 'item',
                           'index_ignore_chars' => {},
-                          'index_name' => 'fn',
-                          'index_type_command' => 'ftable'
+                          'index_name' => 'fn'
                         }
                       },
                       'info' => {
@@ -631,10 +623,8 @@ $result_trees{'inter_item_commands_in_table'} = {
                               'entry_node' => {},
                               'entry_number' => 1,
                               'in_code' => 0,
-                              'index_at_command' => 'cindex',
                               'index_ignore_chars' => {},
-                              'index_name' => 'cp',
-                              'index_type_command' => 'cindex'
+                              'index_name' => 'cp'
                             }
                           },
                           'info' => {
@@ -710,10 +700,8 @@ $result_trees{'inter_item_commands_in_table'} = {
                           'entry_node' => {},
                           'entry_number' => 2,
                           'in_code' => 1,
-                          'index_at_command' => 'itemx',
                           'index_ignore_chars' => {},
-                          'index_name' => 'fn',
-                          'index_type_command' => 'ftable'
+                          'index_name' => 'fn'
                         }
                       },
                       'info' => {
@@ -777,10 +765,8 @@ $result_trees{'inter_item_commands_in_table'} = {
                           'entry_node' => {},
                           'entry_number' => 3,
                           'in_code' => 1,
-                          'index_at_command' => 'item',
                           'index_ignore_chars' => {},
-                          'index_name' => 'fn',
-                          'index_type_command' => 'ftable'
+                          'index_name' => 'fn'
                         }
                       },
                       'info' => {
@@ -851,10 +837,8 @@ $result_trees{'inter_item_commands_in_table'} = {
                           'entry_node' => {},
                           'entry_number' => 4,
                           'in_code' => 1,
-                          'index_at_command' => 'itemx',
                           'index_ignore_chars' => {},
-                          'index_name' => 'fn',
-                          'index_type_command' => 'ftable'
+                          'index_name' => 'fn'
                         }
                       },
                       'info' => {
@@ -1007,10 +991,8 @@ $result_trees{'inter_item_commands_in_table'} = {
                           'entry_node' => {},
                           'entry_number' => 5,
                           'in_code' => 1,
-                          'index_at_command' => 'item',
                           'index_ignore_chars' => {},
-                          'index_name' => 'fn',
-                          'index_type_command' => 'ftable'
+                          'index_name' => 'fn'
                         }
                       },
                       'info' => {
@@ -1052,10 +1034,8 @@ $result_trees{'inter_item_commands_in_table'} = {
                               'entry_node' => {},
                               'entry_number' => 2,
                               'in_code' => 0,
-                              'index_at_command' => 'cindex',
                               'index_ignore_chars' => {},
-                              'index_name' => 'cp',
-                              'index_type_command' => 'cindex'
+                              'index_name' => 'cp'
                             }
                           },
                           'info' => {
@@ -1099,10 +1079,8 @@ $result_trees{'inter_item_commands_in_table'} = {
                           'entry_node' => {},
                           'entry_number' => 6,
                           'in_code' => 1,
-                          'index_at_command' => 'itemx',
                           'index_ignore_chars' => {},
-                          'index_name' => 'fn',
-                          'index_type_command' => 'ftable'
+                          'index_name' => 'fn'
                         }
                       },
                       'info' => {
@@ -1243,10 +1221,8 @@ $result_trees{'inter_item_commands_in_table'} = {
                           'entry_node' => {},
                           'entry_number' => 3,
                           'in_code' => 0,
-                          'index_at_command' => 'cindex',
                           'index_ignore_chars' => {},
-                          'index_name' => 'cp',
-                          'index_type_command' => 'cindex'
+                          'index_name' => 'cp'
                         }
                       },
                       'info' => {
@@ -1431,10 +1407,8 @@ $result_trees{'inter_item_commands_in_table'} = {
                       'entry_node' => {},
                       'entry_number' => 4,
                       'in_code' => 0,
-                      'index_at_command' => 'cindex',
                       'index_ignore_chars' => {},
-                      'index_name' => 'cp',
-                      'index_type_command' => 'cindex'
+                      'index_name' => 'cp'
                     }
                   },
                   'info' => {
@@ -1607,10 +1581,8 @@ $result_trees{'inter_item_commands_in_table'} = {
                           'entry_node' => {},
                           'entry_number' => 5,
                           'in_code' => 0,
-                          'index_at_command' => 'cindex',
                           'index_ignore_chars' => {},
-                          'index_name' => 'cp',
-                          'index_type_command' => 'cindex'
+                          'index_name' => 'cp'
                         }
                       },
                       'info' => {
@@ -1795,10 +1767,8 @@ $result_trees{'inter_item_commands_in_table'} = {
                       'entry_node' => {},
                       'entry_number' => 6,
                       'in_code' => 0,
-                      'index_at_command' => 'cindex',
                       'index_ignore_chars' => {},
-                      'index_name' => 'cp',
-                      'index_type_command' => 'cindex'
+                      'index_name' => 'cp'
                     }
                   },
                   'info' => {
@@ -1974,10 +1944,8 @@ $result_trees{'inter_item_commands_in_table'} = {
                       'entry_node' => {},
                       'entry_number' => 7,
                       'in_code' => 0,
-                      'index_at_command' => 'cindex',
                       'index_ignore_chars' => {},
-                      'index_name' => 'cp',
-                      'index_type_command' => 'cindex'
+                      'index_name' => 'cp'
                     }
                   },
                   'info' => {
@@ -2144,10 +2112,8 @@ $result_trees{'inter_item_commands_in_table'} = {
                       'entry_node' => {},
                       'entry_number' => 8,
                       'in_code' => 0,
-                      'index_at_command' => 'cindex',
                       'index_ignore_chars' => {},
-                      'index_name' => 'cp',
-                      'index_type_command' => 'cindex'
+                      'index_name' => 'cp'
                     }
                   },
                   'info' => {
@@ -2326,10 +2292,8 @@ $result_trees{'inter_item_commands_in_table'} = {
                           'entry_node' => {},
                           'entry_number' => 9,
                           'in_code' => 0,
-                          'index_at_command' => 'cindex',
                           'index_ignore_chars' => {},
-                          'index_name' => 'cp',
-                          'index_type_command' => 'cindex'
+                          'index_name' => 'cp'
                         }
                       },
                       'info' => {
@@ -2486,10 +2450,8 @@ $result_trees{'inter_item_commands_in_table'} = {
                           'entry_node' => {},
                           'entry_number' => 10,
                           'in_code' => 0,
-                          'index_at_command' => 'cindex',
                           'index_ignore_chars' => {},
-                          'index_name' => 'cp',
-                          'index_type_command' => 'cindex'
+                          'index_name' => 'cp'
                         }
                       },
                       'info' => {
@@ -2546,10 +2508,8 @@ $result_trees{'inter_item_commands_in_table'} = {
                           'entry_node' => {},
                           'entry_number' => 11,
                           'in_code' => 0,
-                          'index_at_command' => 'cindex',
                           'index_ignore_chars' => {},
-                          'index_name' => 'cp',
-                          'index_type_command' => 'cindex'
+                          'index_name' => 'cp'
                         }
                       },
                       'info' => {
@@ -2590,10 +2550,8 @@ $result_trees{'inter_item_commands_in_table'} = {
                           'entry_node' => {},
                           'entry_number' => 12,
                           'in_code' => 0,
-                          'index_at_command' => 'cindex',
                           'index_ignore_chars' => {},
-                          'index_name' => 'cp',
-                          'index_type_command' => 'cindex'
+                          'index_name' => 'cp'
                         }
                       },
                       'info' => {
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 a95c2803cd..e29765e8e0 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
@@ -114,10 +114,8 @@ $result_trees{'inter_item_commands_in_table_in_example'} = 
{
                                       'entry_element' => {},
                                       'entry_number' => 1,
                                       'in_code' => 0,
-                                      'index_at_command' => 'cindex',
                                       'index_ignore_chars' => {},
-                                      'index_name' => 'cp',
-                                      'index_type_command' => 'cindex'
+                                      'index_name' => 'cp'
                                     }
                                   },
                                   'info' => {
diff --git a/tp/t/results/xtable/table_nested.pl 
b/tp/t/results/xtable/table_nested.pl
index 27b0ba2cde..887e0ae498 100644
--- a/tp/t/results/xtable/table_nested.pl
+++ b/tp/t/results/xtable/table_nested.pl
@@ -269,10 +269,8 @@ $result_trees{'table_nested'} = {
                               'entry_element' => {},
                               'entry_number' => 1,
                               'in_code' => 1,
-                              'index_at_command' => 'item',
                               'index_ignore_chars' => {},
-                              'index_name' => 'vr',
-                              'index_type_command' => 'vtable'
+                              'index_name' => 'vr'
                             }
                           },
                           'info' => {
@@ -311,10 +309,8 @@ $result_trees{'table_nested'} = {
                               'entry_element' => {},
                               'entry_number' => 2,
                               'in_code' => 1,
-                              'index_at_command' => 'itemx',
                               'index_ignore_chars' => {},
-                              'index_name' => 'vr',
-                              'index_type_command' => 'vtable'
+                              'index_name' => 'vr'
                             }
                           },
                           'info' => {
@@ -387,10 +383,8 @@ $result_trees{'table_nested'} = {
                               'entry_element' => {},
                               'entry_number' => 3,
                               'in_code' => 1,
-                              'index_at_command' => 'item',
                               'index_ignore_chars' => {},
-                              'index_name' => 'vr',
-                              'index_type_command' => 'vtable'
+                              'index_name' => 'vr'
                             }
                           },
                           'info' => {
@@ -463,10 +457,8 @@ $result_trees{'table_nested'} = {
                               'entry_element' => {},
                               'entry_number' => 4,
                               'in_code' => 1,
-                              'index_at_command' => 'item',
                               'index_ignore_chars' => {},
-                              'index_name' => 'vr',
-                              'index_type_command' => 'vtable'
+                              'index_name' => 'vr'
                             }
                           },
                           'info' => {
@@ -883,10 +875,8 @@ $result_trees{'table_nested'} = {
                               'entry_element' => {},
                               'entry_number' => 5,
                               'in_code' => 1,
-                              'index_at_command' => 'item',
                               'index_ignore_chars' => {},
-                              'index_name' => 'vr',
-                              'index_type_command' => 'vtable'
+                              'index_name' => 'vr'
                             }
                           },
                           'info' => {
@@ -925,10 +915,8 @@ $result_trees{'table_nested'} = {
                               'entry_element' => {},
                               'entry_number' => 6,
                               'in_code' => 1,
-                              'index_at_command' => 'itemx',
                               'index_ignore_chars' => {},
-                              'index_name' => 'vr',
-                              'index_type_command' => 'vtable'
+                              'index_name' => 'vr'
                             }
                           },
                           'info' => {
@@ -1001,10 +989,8 @@ $result_trees{'table_nested'} = {
                               'entry_element' => {},
                               'entry_number' => 7,
                               'in_code' => 1,
-                              'index_at_command' => 'item',
                               'index_ignore_chars' => {},
-                              'index_name' => 'vr',
-                              'index_type_command' => 'vtable'
+                              'index_name' => 'vr'
                             }
                           },
                           'info' => {
@@ -1077,10 +1063,8 @@ $result_trees{'table_nested'} = {
                               'entry_element' => {},
                               'entry_number' => 8,
                               'in_code' => 1,
-                              'index_at_command' => 'item',
                               'index_ignore_chars' => {},
-                              'index_name' => 'vr',
-                              'index_type_command' => 'vtable'
+                              'index_name' => 'vr'
                             }
                           },
                           'info' => {
@@ -1512,10 +1496,8 @@ $result_trees{'table_nested'} = {
                                   'entry_element' => {},
                                   'entry_number' => 9,
                                   'in_code' => 1,
-                                  'index_at_command' => 'item',
                                   'index_ignore_chars' => {},
-                                  'index_name' => 'vr',
-                                  'index_type_command' => 'vtable'
+                                  'index_name' => 'vr'
                                 }
                               },
                               'info' => {
@@ -1554,10 +1536,8 @@ $result_trees{'table_nested'} = {
                                   'entry_element' => {},
                                   'entry_number' => 10,
                                   'in_code' => 1,
-                                  'index_at_command' => 'itemx',
                                   'index_ignore_chars' => {},
-                                  'index_name' => 'vr',
-                                  'index_type_command' => 'vtable'
+                                  'index_name' => 'vr'
                                 }
                               },
                               'info' => {
@@ -1630,10 +1610,8 @@ $result_trees{'table_nested'} = {
                                   'entry_element' => {},
                                   'entry_number' => 11,
                                   'in_code' => 1,
-                                  'index_at_command' => 'item',
                                   'index_ignore_chars' => {},
-                                  'index_name' => 'vr',
-                                  'index_type_command' => 'vtable'
+                                  'index_name' => 'vr'
                                 }
                               },
                               'info' => {
@@ -1706,10 +1684,8 @@ $result_trees{'table_nested'} = {
                                   'entry_element' => {},
                                   'entry_number' => 12,
                                   'in_code' => 1,
-                                  'index_at_command' => 'item',
                                   'index_ignore_chars' => {},
-                                  'index_name' => 'vr',
-                                  'index_type_command' => 'vtable'
+                                  'index_name' => 'vr'
                                 }
                               },
                               'info' => {



reply via email to

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