texinfo-commits
[Top][All Lists]
Advanced

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

branch master updated: Remove extra misc_args for special and lineraw li


From: Patrice Dumas
Subject: branch master updated: Remove extra misc_args for special and lineraw line commands
Date: Wed, 01 Mar 2023 18:33:18 -0500

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

pertusus pushed a commit to branch master
in repository texinfo.

The following commit(s) were added to refs/heads/master by this push:
     new 101a2b8992 Remove extra misc_args for special and lineraw line commands
101a2b8992 is described below

commit 101a2b89924542cb7fa0e3968e08e3e40be89345
Author: Patrice Dumas <pertusus@free.fr>
AuthorDate: Thu Mar 2 00:33:05 2023 +0100

    Remove extra misc_args for special and lineraw line commands
    
    * tp/Texinfo/Common.pm (_informative_command_value),
    tp/Texinfo/Convert/LaTeX.pm (_convert), tp/Texinfo/ParserNonXS.pm
    (_process_remaining_on_line),
    tp/Texinfo/XS/parsetexi/handle_commands.c (handle_line_command): do
    not add args to extra misc_args for special and lineraw line commands,
    regular args can be used instead.
---
 ChangeLog                                          |   11 +
 tp/Texinfo/Common.pm                               |   10 +-
 tp/Texinfo/Convert/HTML.pm                         |    2 +
 tp/Texinfo/Convert/LaTeX.pm                        |    4 +-
 tp/Texinfo/ParserNonXS.pm                          |   22 +-
 tp/Texinfo/XS/parsetexi/handle_commands.c          |   10 +-
 tp/t/results/alias/alias_macro_target_removed.pl   |    5 -
 tp/t/results/alias/simple.pl                       |    8 +-
 tp/t/results/columnfractions/empty_comment.pl      |    8 +-
 tp/t/results/columnfractions/good_comment.pl       |    8 +-
 tp/t/results/columnfractions/good_space_comment.pl |    8 +-
 tp/t/results/conditionals/comment_on_ifset_line.pl |   54 +-
 tp/t/results/conditionals/cond.pl                  |    8 +-
 tp/t/results/conditionals/cond_ifhtml_ifinfo.pl    |    8 +-
 .../conditionals/cond_ifhtml_ifinfo_iftex.pl       |    8 +-
 tp/t/results/conditionals/cond_info.pl             |    8 +-
 .../conditionals/cond_info_ifhtml_ifinfo_iftex.pl  |    8 +-
 .../cond_info_no-ifhtml_no-ifinfo_no-iftex.pl      |    8 +-
 .../cond_no-ifhtml_no-ifinfo_no-iftex.pl           |    8 +-
 tp/t/results/conditionals/cond_xml.pl              |    8 +-
 .../conditionals/consecutive_conditionals.pl       |    6 -
 tp/t/results/conditionals/defcondx_Dbar.pl         |   24 +-
 tp/t/results/conditionals/defcondx_Ubar.pl         |   24 +-
 .../conditionals/empty_ifset_in_ifset_set.pl       |    6 -
 tp/t/results/conditionals/empty_set_in_ifclear.pl  |    6 -
 tp/t/results/conditionals/empty_set_in_ifset.pl    |    6 -
 tp/t/results/conditionals/end_ifset_in_format.pl   |    6 -
 tp/t/results/conditionals/ifclear_in_ifset.pl      |    8 +-
 tp/t/results/conditionals/ifclear_in_ifset_set.pl  |   22 +-
 .../conditionals/ignore_spaces_and_comments.pl     |   24 +-
 tp/t/results/conditionals/macro_in_ifset_set.pl    |   11 -
 tp/t/results/conditionals/nested_ifset_ifclear.pl  |   44 -
 .../index_entry_in_preformatted.pl                 |    8 +-
 .../indices_in_begin_tables_lists.pl               |  104 +-
 ...ces_in_begin_tables_lists_entries_after_item.pl |  104 +-
 .../results/converters_tests/inlineifsetifclear.pl |    6 -
 .../converters_tests/inlineifsetifclearspaces.pl   |    6 -
 tp/t/results/coverage/accent_no_closed_comment.pl  |    8 +-
 tp/t/results/coverage/comment_on_cartouche_line.pl |   16 +-
 tp/t/results/coverage/comment_on_group_line.pl     |    8 +-
 tp/t/results/coverage/def.pl                       |   16 +-
 tp/t/results/coverage/delcomment.pl                |   16 +-
 .../coverage/delcomment_followed_by_cpp_line.pl    |   16 +-
 tp/t/results/coverage/displaymath.pl               |    8 +-
 .../coverage/formats_only_title_comments.pl        |   48 +-
 tp/t/results/coverage/multitable.pl                |    8 +-
 tp/t/results/coverage/table.pl                     |   32 +-
 tp/t/results/coverage/table_command_comment.pl     |    8 +-
 .../coverage_braces/contain_plain_text_nestings.pl |    8 +-
 tp/t/results/def/defx_after_comment.pl             |    8 +-
 tp/t/results/def/defx_after_comment_in_example.pl  |    8 +-
 .../def/defx_after_empty_line_in_example.pl        |   16 +-
 tp/t/results/def/inter_item_commands_in_def.pl     |    8 +-
 .../def/inter_item_commands_in_def_in_example.pl   |    8 +-
 tp/t/results/def/omit_def_space.pl                 |    6 -
 .../results/float/comment_space_comand_in_float.pl |   16 +-
 tp/t/results/float/complex_float.pl                |    6 -
 tp/t/results/float/empty_label_no_space_comment.pl |    8 +-
 .../float/empty_label_with_space_comment.pl        |    8 +-
 tp/t/results/formats_encodings/accent.pl           |   16 +-
 .../formats_encodings/accent_enable_encoding.pl    |   16 +-
 tp/t/results/formats_encodings/accentenc.pl        |   16 +-
 .../formats_encodings/accentenc_enable_encoding.pl |   16 +-
 .../char_latin2_latin2_in_refs.pl                  |    8 +-
 tp/t/results/formats_encodings/sample_utf8.pl      |   32 +-
 .../empty_lines_at_beginning_no_setfilename.pl     |    8 +-
 tp/t/results/html_tests/itemize_arguments.pl       |    5 -
 .../itemize_arguments_enable_encoding.pl           |    5 -
 tp/t/results/html_tests/node_footnote_end.pl       |    8 +-
 tp/t/results/html_tests/node_footnote_separated.pl |    8 +-
 tp/t/results/html_tests/node_footnote_use_node.pl  |    8 +-
 .../html_tests/node_footnote_use_node_separate.pl  |    8 +-
 tp/t/results/html_tests/redirection_same_labels.pl |   24 +-
 tp/t/results/include/include_comment.pl            |    7 +-
 tp/t/results/include/include_space_comment.pl      |    7 +-
 tp/t/results/include/test_two_include.pl           |   42 -
 tp/t/results/include/value_expansion_in_include.pl |   34 +-
 .../indices/ignored_sort_char_empty_entries.pl     |    6 -
 tp/t/results/indices/index_special_region.pl       |    8 +-
 .../index_special_region_no_insertcopying.pl       |   24 +-
 ...egion_no_insertcopying_no_titlepage_no_nodes.pl |   24 +-
 ...l_region_no_insertcopying_titlepage_no_nodes.pl |   24 +-
 ...copying_titlepage_no_nodes_footnotes_default.pl |   24 +-
 .../index_special_region_no_titlepage_no_nodes.pl  |    8 +-
 .../index_special_region_titlepage_no_nodes.pl     |    8 +-
 ..._region_titlepage_no_nodes_footnotes_default.pl |    8 +-
 tp/t/results/indices/index_table.pl                |   16 +-
 .../results/indices/index_table_chapter_no_node.pl |   16 +-
 tp/t/results/indices/nodes_before_top.pl           |    8 +-
 .../indices/nodes_before_top_split_chapter.pl      |    8 +-
 .../nodes_before_top_split_chapter_no_nodes.pl     |    8 +-
 tp/t/results/indices/transparent_sort_chars.pl     |    6 -
 tp/t/results/info_tests/anchor_in_command.pl       |    8 +-
 .../multitable_anchor_and_index_entry.pl           |    8 +-
 .../itemize/comment_first_on_enumerate_line.pl     |    8 +-
 .../itemize/comment_first_on_itemize_line.pl       |    8 +-
 tp/t/results/itemize/empty_accent_argument.pl      |    8 +-
 tp/t/results/itemize/enumerate_argument.pl         |   16 +-
 tp/t/results/itemize/enumerate_argument_item.pl    |   16 +-
 .../itemize/inter_item_commands_in_enumerate.pl    |   16 +-
 .../itemize/inter_item_commands_in_itemize.pl      |   16 +-
 tp/t/results/languages/documentlanguage.pl         |  144 +--
 tp/t/results/languages/documentlanguage_option.pl  |  144 +--
 tp/t/results/languages/documentlanguage_unknown.pl |  144 +--
 tp/t/results/languages/multiple_lang_chapters.pl   |    6 -
 .../languages/multiple_lang_chapters_latex.pl      |    6 -
 .../languages/multiple_lang_chapters_texi2html.pl  |    6 -
 .../latex_tests/custom_heading_with_include.pl     |   14 +-
 .../custom_heading_with_include_in_command.pl      |   14 +-
 tp/t/results/latex_tests/indices.pl                |   19 +-
 .../latex_tests/indices_disable_encoding.pl        |   19 +-
 tp/t/results/latex_tests/titlepage_classical.pl    |   16 +-
 .../titlepage_with_commands_classical.pl           |   16 +-
 tp/t/results/macro/arg_body_expansion_order.pl     |    5 -
 tp/t/results/macro/bib_example.pl                  | 1280 +++-----------------
 tp/t/results/macro/complex_argument.pl             |    8 +-
 tp/t/results/macro/glossary.pl                     |   20 -
 .../macro_expansion_end_in_conditional_end.pl      |    6 -
 .../macro_expansion_end_in_conditional_line.pl     |    6 -
 .../macro/macro_in_menu_comment_like_entry.pl      |    8 +-
 tp/t/results/macro/macro_in_misc_commands.pl       |   45 +-
 tp/t/results/menu/comment_on_menu_line.pl          |    8 +-
 tp/t/results/menu/menu_entry_name_comment.pl       |   40 +-
 tp/t/results/menu/menu_entry_no_entry.pl           |   24 +-
 tp/t/results/menu/menu_entry_node_comments.pl      |   32 +-
 tp/t/results/misc_commands/also_not_line.pl        |    8 +-
 tp/t/results/misc_commands/clickstyle.pl           |   10 -
 .../misc_commands/clickstyle_and_comments.pl       |   25 -
 .../misc_commands/clickstyle_no_end_of_line.pl     |    5 -
 .../misc_commands/comment_space_command_on_line.pl |   96 +-
 tp/t/results/misc_commands/comments_in_text.pl     |   40 +-
 tp/t/results/misc_commands/invalid_clickstyle.pl   |   10 -
 .../misc_commands/invalid_documentencoding.pl      |    8 +-
 tp/t/results/misc_commands/setfilename.pl          |   16 +-
 tp/t/results/misc_commands/vskip.pl                |    8 +-
 tp/t/results/moresectioning/raiselowersections.pl  |   27 +-
 .../inter_item_commands_in_multitable.pl           |   24 +-
 ...bracketed_prototype_empty_not_closed_comment.pl |    8 +-
 ...ed_prototype_empty_spaces_not_closed_comment.pl |    8 +-
 ...table_bracketed_prototype_not_closed_comment.pl |    8 +-
 ...bracketed_prototype_not_closed_space_comment.pl |    8 +-
 .../multitable/prototype_brace_no_brace_comment.pl |    8 +-
 tp/t/results/paragraph/comment_between_text.pl     |    8 +-
 tp/t/results/paragraph/comment_in_quotation.pl     |   16 +-
 tp/t/results/paragraph/text_comment.pl             |    7 +-
 tp/t/results/paragraph/text_space_comment.pl       |    7 +-
 .../characters_and_commands_in_var.pl              |    8 +-
 .../plaintext_tests/no_empty_line_after_section.pl |   16 +-
 .../comment_example_and_blank_lines.pl             |   16 +-
 tp/t/results/preformatted/comments_in_example.pl   |   32 +-
 .../preformatted/nested_example_and_comment.pl     |   48 +-
 .../results/quotation/comment_on_quotation_line.pl |    8 +-
 .../quotation/only_comment_on_quotation_line.pl    |    8 +-
 tp/t/results/raw/misc_raw_comments.pl              |   24 +-
 .../sectioning/empty_nodes_with_commands.pl        |    8 +-
 tp/t/results/sectioning/empty_ref_arg.pl           |   32 +-
 tp/t/results/sectioning/node_line_arguments.pl     |   16 +-
 .../value/begin_like_comment_on_set_line.pl        |    6 -
 tp/t/results/value/clear_no_end_of_line.pl         |    5 -
 tp/t/results/value/comment_on_clear_line.pl        |   34 -
 tp/t/results/value/comment_on_set_line.pl          |   24 -
 tp/t/results/value/empty_set.pl                    |    6 -
 tp/t/results/value/empty_value_in_line.pl          |    6 -
 tp/t/results/value/ignored_value_definition.pl     |    6 -
 tp/t/results/value/not_only_characters.pl          |    6 -
 tp/t/results/value/recursive_expansion_in_set.pl   |    6 -
 tp/t/results/value/set_form_feed.pl                |   18 -
 tp/t/results/value/set_in_item_missing_line.pl     |   12 -
 tp/t/results/value/set_no_end_of_line.pl           |    6 -
 tp/t/results/value/set_on_item_line.pl             |   36 -
 tp/t/results/value/simple.pl                       |    6 -
 tp/t/results/value/spaces_before_value.pl          |    6 -
 tp/t/results/value/value_after_accent.pl           |    6 -
 tp/t/results/value/value_after_brace_command.pl    |   12 -
 tp/t/results/value/value_in_index_commands.pl      |   42 -
 .../value/value_in_invalid_documentencoding.pl     |    6 -
 tp/t/results/value/value_in_misc_commands.pl       |  263 +---
 tp/t/results/value/value_in_node.pl                |   12 -
 tp/t/results/value/value_node_directions.pl        |    6 -
 tp/t/results/value/value_zero.pl                   |    6 -
 .../value_and_macro/comma_value_in_macro_arg.pl    |    6 -
 tp/t/results/value_and_macro/macro_in_value.pl     |    6 -
 .../results/value_and_macro/value_in_macro_body.pl |    6 -
 .../value_and_macro/value_in_macro_formal_arg.pl   |    6 -
 tp/t/results/verb/comments.pl                      |   15 +-
 tp/t/results/xml_tests/commands_and_spaces.pl      |   16 -
 tp/t/results/xml_tests/comments_end_lines.pl       |   80 +-
 .../xml_tests/comments_on_block_command_lines.pl   |  160 +--
 .../xml_tests/comments_on_misc_command_line.pl     |   48 +-
 tp/t/results/xml_tests/raw_and_comments.pl         |   32 +-
 tp/t/results/xtable/accent_on_table_line.pl        |    8 +-
 tp/t/results/xtable/block_commands_in_table.pl     |    8 +-
 .../xtable/comment_and_itemx_before_item.pl        |    8 +-
 .../results/xtable/inter_item_commands_in_table.pl |   72 +-
 .../inter_item_commands_in_table_in_example.pl     |   16 +-
 195 files changed, 549 insertions(+), 4556 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index e035f95816..13f1ada231 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,14 @@
+2023-03-01  Patrice Dumas  <pertusus@free.fr>
+
+       Remove extra misc_args for special and lineraw line commands
+
+       * tp/Texinfo/Common.pm (_informative_command_value),
+       tp/Texinfo/Convert/LaTeX.pm (_convert), tp/Texinfo/ParserNonXS.pm
+       (_process_remaining_on_line),
+       tp/Texinfo/XS/parsetexi/handle_commands.c (handle_line_command): do
+       not add args to extra misc_args for special and lineraw line commands,
+       regular args can be used instead.
+
 2023-03-01  Patrice Dumas  <pertusus@free.fr>
 
        Merge LINE_skipline in LINE_lineraw, distinguish with arg number
diff --git a/tp/Texinfo/Common.pm b/tp/Texinfo/Common.pm
index b87b0bc25e..7ce665c6f7 100644
--- a/tp/Texinfo/Common.pm
+++ b/tp/Texinfo/Common.pm
@@ -1208,8 +1208,13 @@ sub _informative_command_value($)
   my $cmdname = $element->{'cmdname'};
 
   if ($Texinfo::Commands::line_commands{$cmdname} eq 'lineraw'
-      and not $Texinfo::Commands::commands_args_number{$cmdname}) {
-    return 1;
+      or $Texinfo::Commands::line_commands{$cmdname} eq 'special') {
+    if ($Texinfo::Commands::line_commands{$cmdname} eq 'lineraw'
+        and not $Texinfo::Commands::commands_args_number{$cmdname}) {
+      return 1;
+    } elsif ($element->{'args'}) {
+      return $element->{'args'}->[0]->{'text'};
+    }
   } elsif ($element->{'extra'}
            and exists($element->{'extra'}->{'text_arg'})) {
     return $element->{'extra'}->{'text_arg'};
@@ -1239,6 +1244,7 @@ sub set_informative_command_value($$)
   $cmdname = 'shortcontents' if ($cmdname eq 'summarycontents');
 
   my $value = _informative_command_value($element);
+
   if (defined($value)) {
     return $self->set_conf($cmdname, $value);
   }
diff --git a/tp/Texinfo/Convert/HTML.pm b/tp/Texinfo/Convert/HTML.pm
index 190cbf5db3..8be3605697 100644
--- a/tp/Texinfo/Convert/HTML.pm
+++ b/tp/Texinfo/Convert/HTML.pm
@@ -2504,6 +2504,8 @@ sub _noticed_line_warn($$$)
 
 my %kept_line_commands;
 
+# TODO add the possibility to customize to add more commands to
+# @informative_global_commands?
 my @informative_global_commands = ('documentlanguage', 'footnotestyle',
   'xrefautomaticsectiontitle', 'deftypefnnewline');
 
diff --git a/tp/Texinfo/Convert/LaTeX.pm b/tp/Texinfo/Convert/LaTeX.pm
index 19ef34297c..f8bffef74f 100644
--- a/tp/Texinfo/Convert/LaTeX.pm
+++ b/tp/Texinfo/Convert/LaTeX.pm
@@ -3941,10 +3941,10 @@ sub _convert($$)
         return $result;
       }
     } elsif ($cmdname eq 'vskip') {
-      if ($element->{'extra'}->{'misc_args'}->[0]) {
+      if ($element->{'args'}) {
         # no need for space in front and end of line they are in the
         # argument
-        $result .= "\\vskip$element->{'extra'}->{'misc_args'}->[0]";
+        $result .= "\\vskip$element->{'args'}->[0]->{'text'}";
       }
       return $result;
     } elsif ($cmdname eq 'contents') {
diff --git a/tp/Texinfo/ParserNonXS.pm b/tp/Texinfo/ParserNonXS.pm
index 7b52ad1d70..e4470555ff 100644
--- a/tp/Texinfo/ParserNonXS.pm
+++ b/tp/Texinfo/ParserNonXS.pm
@@ -5704,6 +5704,7 @@ sub _process_remaining_on_line($$$$)
           } else {
             $arg = 'off';
           }
+          # note that those commands are line 'specific' type.
           $command = $set_flag_command_equivalent{$args->[0]};
           $misc = {'cmdname' => $command,
                    'parent' => $current,
@@ -5723,18 +5724,13 @@ sub _process_remaining_on_line($$$$)
         } else {
           if (!$ignored) {
             push @{$current->{'contents'}}, $misc;
-            foreach my $arg (@$args) {
-              push @{$misc->{'args'}},
-                { 'type' => 'misc_arg', 'text' => $arg,
-                  'parent' => $current->{'contents'}->[-1] };
-            }
-            # TODO: Could we have just set misc->args directly as args?
-            if (scalar(@$args)
-                and ($arg_spec eq 'special'
-                     # lineraw with the line as argument
-                     or $commands_args_number{$command})) {
-              $misc->{'extra'} = {} if (!$misc->{'extra'});
-              $misc->{'extra'}->{'misc_args'} = $args;
+            if (scalar(@$args)) {
+              $misc->{'args'} = [];
+              foreach my $arg (@$args) {
+                push @{$misc->{'args'}},
+                  { 'type' => 'misc_arg', 'text' => $arg,
+                    'parent' => $current->{'contents'}->[-1] };
+              }
             }
           } else {
             $misc = undef;
@@ -8314,8 +8310,6 @@ not empty, for @-commands elements that have an 
associated index entry.
 An array holding strings, the arguments of @-commands taking simple
 textual arguments as arguments, like C<@everyheadingmarks>,
 C<@frenchspacing>, C<@alias>, C<@synindex>, C<@columnfractions>.
-Also filled for C<@set>, C<@clickstyle>, C<@unmacro> or C<@comment>
-arguments.
 
 =item missing_argument
 
diff --git a/tp/Texinfo/XS/parsetexi/handle_commands.c 
b/tp/Texinfo/XS/parsetexi/handle_commands.c
index 4df15b460f..0eb767e457 100644
--- a/tp/Texinfo/XS/parsetexi/handle_commands.c
+++ b/tp/Texinfo/XS/parsetexi/handle_commands.c
@@ -465,21 +465,13 @@ handle_line_command (ELEMENT *current, char **line_inout,
                                  args->contents.list[i]->text.end);
                   add_to_element_args (misc, misc_arg);
                 }
-              /* TODO: Could we have just set misc->args directly as args? */
-              if (args->contents.number > 0
-                  && (arg_spec == LINE_special
-                      /* lineraw with the line as argument */
-                      || command_data (cmd).args_number > 0))
-                add_extra_misc_args (misc, "misc_args", args);
-              else
-                destroy_element_and_children (args);
             }
           else
             {
               destroy_element_and_children (misc);
-              destroy_element_and_children (args);
               misc = 0;
             }
+          destroy_element_and_children (args);
         }
 
       if (cmd == CM_raisesections)
diff --git a/tp/t/results/alias/alias_macro_target_removed.pl 
b/tp/t/results/alias/alias_macro_target_removed.pl
index d4f4e39520..9fbd89a460 100644
--- a/tp/t/results/alias/alias_macro_target_removed.pl
+++ b/tp/t/results/alias/alias_macro_target_removed.pl
@@ -169,11 +169,6 @@ $result_trees{'alias_macro_target_removed'} = {
             }
           ],
           'cmdname' => 'unmacro',
-          'extra' => {
-            'misc_args' => [
-              'mystrong'
-            ]
-          },
           'info' => {
             'arg_line' => ' mystrong
 '
diff --git a/tp/t/results/alias/simple.pl b/tp/t/results/alias/simple.pl
index 30395dbe8e..30d6ffe3c6 100644
--- a/tp/t/results/alias/simple.pl
+++ b/tp/t/results/alias/simple.pl
@@ -66,13 +66,7 @@ $result_trees{'simple'} = {
                       'type' => 'misc_arg'
                     }
                   ],
-                  'cmdname' => 'c',
-                  'extra' => {
-                    'misc_args' => [
-                      ' comment
-'
-                    ]
-                  }
+                  'cmdname' => 'c'
                 },
                 'spaces_after_argument' => {
                   'text' => ' '
diff --git a/tp/t/results/columnfractions/empty_comment.pl 
b/tp/t/results/columnfractions/empty_comment.pl
index d55d8cfc9a..b13a323c2e 100644
--- a/tp/t/results/columnfractions/empty_comment.pl
+++ b/tp/t/results/columnfractions/empty_comment.pl
@@ -25,13 +25,7 @@ $result_trees{'empty_comment'} = {
                               'type' => 'misc_arg'
                             }
                           ],
-                          'cmdname' => 'c',
-                          'extra' => {
-                            'misc_args' => [
-                              '
-'
-                            ]
-                          }
+                          'cmdname' => 'c'
                         }
                       },
                       'type' => 'line_arg'
diff --git a/tp/t/results/columnfractions/good_comment.pl 
b/tp/t/results/columnfractions/good_comment.pl
index e512c0cf9d..0f92ffdb8e 100644
--- a/tp/t/results/columnfractions/good_comment.pl
+++ b/tp/t/results/columnfractions/good_comment.pl
@@ -30,13 +30,7 @@ $result_trees{'good_comment'} = {
                               'type' => 'misc_arg'
                             }
                           ],
-                          'cmdname' => 'c',
-                          'extra' => {
-                            'misc_args' => [
-                              ' comment
-'
-                            ]
-                          }
+                          'cmdname' => 'c'
                         }
                       },
                       'type' => 'line_arg'
diff --git a/tp/t/results/columnfractions/good_space_comment.pl 
b/tp/t/results/columnfractions/good_space_comment.pl
index 8d2f7b3865..cfd33248ba 100644
--- a/tp/t/results/columnfractions/good_space_comment.pl
+++ b/tp/t/results/columnfractions/good_space_comment.pl
@@ -30,13 +30,7 @@ $result_trees{'good_space_comment'} = {
                               'type' => 'misc_arg'
                             }
                           ],
-                          'cmdname' => 'c',
-                          'extra' => {
-                            'misc_args' => [
-                              ' space comment
-'
-                            ]
-                          }
+                          'cmdname' => 'c'
                         },
                         'spaces_after_argument' => {
                           'text' => '  '
diff --git a/tp/t/results/conditionals/comment_on_ifset_line.pl 
b/tp/t/results/conditionals/comment_on_ifset_line.pl
index 3b1f698df8..08bc78c955 100644
--- a/tp/t/results/conditionals/comment_on_ifset_line.pl
+++ b/tp/t/results/conditionals/comment_on_ifset_line.pl
@@ -21,12 +21,6 @@ $result_trees{'comment_on_ifset_line'} = {
             }
           ],
           'cmdname' => 'set',
-          'extra' => {
-            'misc_args' => [
-              'x',
-              ''
-            ]
-          },
           'info' => {
             'arg_line' => ' x
 '
@@ -53,13 +47,7 @@ $result_trees{'comment_on_ifset_line'} = {
                             'type' => 'misc_arg'
                           }
                         ],
-                        'cmdname' => 'c',
-                        'extra' => {
-                          'misc_args' => [
-                            '
-'
-                          ]
-                        }
+                        'cmdname' => 'c'
                       }
                     },
                     'type' => 'block_line_arg'
@@ -147,13 +135,7 @@ $result_trees{'comment_on_ifset_line'} = {
                                 'type' => 'misc_arg'
                               }
                             ],
-                            'cmdname' => 'c',
-                            'extra' => {
-                              'misc_args' => [
-                                ' comm
-'
-                              ]
-                            }
+                            'cmdname' => 'c'
                           }
                         },
                         'type' => 'block_line_arg'
@@ -238,13 +220,7 @@ $result_trees{'comment_on_ifset_line'} = {
                                 'type' => 'misc_arg'
                               }
                             ],
-                            'cmdname' => 'c',
-                            'extra' => {
-                              'misc_args' => [
-                                '@ggg
-'
-                              ]
-                            }
+                            'cmdname' => 'c'
                           }
                         },
                         'type' => 'block_line_arg'
@@ -329,13 +305,7 @@ $result_trees{'comment_on_ifset_line'} = {
                                 'type' => 'misc_arg'
                               }
                             ],
-                            'cmdname' => 'c',
-                            'extra' => {
-                              'misc_args' => [
-                                '
-'
-                              ]
-                            }
+                            'cmdname' => 'c'
                           },
                           'spaces_after_argument' => {
                             'text' => ' '
@@ -423,13 +393,7 @@ $result_trees{'comment_on_ifset_line'} = {
                                 'type' => 'misc_arg'
                               }
                             ],
-                            'cmdname' => 'c',
-                            'extra' => {
-                              'misc_args' => [
-                                ' comm
-'
-                              ]
-                            }
+                            'cmdname' => 'c'
                           },
                           'spaces_after_argument' => {
                             'text' => ' '
@@ -517,13 +481,7 @@ $result_trees{'comment_on_ifset_line'} = {
                                 'type' => 'misc_arg'
                               }
                             ],
-                            'cmdname' => 'c',
-                            'extra' => {
-                              'misc_args' => [
-                                '@ggg
-'
-                              ]
-                            }
+                            'cmdname' => 'c'
                           },
                           'spaces_after_argument' => {
                             'text' => ' '
diff --git a/tp/t/results/conditionals/cond.pl 
b/tp/t/results/conditionals/cond.pl
index 86a72708f9..8d27ebf86d 100644
--- a/tp/t/results/conditionals/cond.pl
+++ b/tp/t/results/conditionals/cond.pl
@@ -34,13 +34,7 @@ $result_trees{'cond'} = {
                   'type' => 'misc_arg'
                 }
               ],
-              'cmdname' => 'c',
-              'extra' => {
-                'misc_args' => [
-                  ' test conditions
-'
-                ]
-              }
+              'cmdname' => 'c'
             },
             {
               'text' => '
diff --git a/tp/t/results/conditionals/cond_ifhtml_ifinfo.pl 
b/tp/t/results/conditionals/cond_ifhtml_ifinfo.pl
index dd9a72d2eb..96aedafcb5 100644
--- a/tp/t/results/conditionals/cond_ifhtml_ifinfo.pl
+++ b/tp/t/results/conditionals/cond_ifhtml_ifinfo.pl
@@ -34,13 +34,7 @@ $result_trees{'cond_ifhtml_ifinfo'} = {
                   'type' => 'misc_arg'
                 }
               ],
-              'cmdname' => 'c',
-              'extra' => {
-                'misc_args' => [
-                  ' test conditions
-'
-                ]
-              }
+              'cmdname' => 'c'
             },
             {
               'text' => '
diff --git a/tp/t/results/conditionals/cond_ifhtml_ifinfo_iftex.pl 
b/tp/t/results/conditionals/cond_ifhtml_ifinfo_iftex.pl
index ba8c2b5ad2..090207ba74 100644
--- a/tp/t/results/conditionals/cond_ifhtml_ifinfo_iftex.pl
+++ b/tp/t/results/conditionals/cond_ifhtml_ifinfo_iftex.pl
@@ -34,13 +34,7 @@ $result_trees{'cond_ifhtml_ifinfo_iftex'} = {
                   'type' => 'misc_arg'
                 }
               ],
-              'cmdname' => 'c',
-              'extra' => {
-                'misc_args' => [
-                  ' test conditions
-'
-                ]
-              }
+              'cmdname' => 'c'
             },
             {
               'text' => '
diff --git a/tp/t/results/conditionals/cond_info.pl 
b/tp/t/results/conditionals/cond_info.pl
index eaa7c8ded6..47701fa363 100644
--- a/tp/t/results/conditionals/cond_info.pl
+++ b/tp/t/results/conditionals/cond_info.pl
@@ -34,13 +34,7 @@ $result_trees{'cond_info'} = {
                   'type' => 'misc_arg'
                 }
               ],
-              'cmdname' => 'c',
-              'extra' => {
-                'misc_args' => [
-                  ' test conditions
-'
-                ]
-              }
+              'cmdname' => 'c'
             },
             {
               'text' => '
diff --git a/tp/t/results/conditionals/cond_info_ifhtml_ifinfo_iftex.pl 
b/tp/t/results/conditionals/cond_info_ifhtml_ifinfo_iftex.pl
index e33e0502fd..b8befb77d4 100644
--- a/tp/t/results/conditionals/cond_info_ifhtml_ifinfo_iftex.pl
+++ b/tp/t/results/conditionals/cond_info_ifhtml_ifinfo_iftex.pl
@@ -34,13 +34,7 @@ $result_trees{'cond_info_ifhtml_ifinfo_iftex'} = {
                   'type' => 'misc_arg'
                 }
               ],
-              'cmdname' => 'c',
-              'extra' => {
-                'misc_args' => [
-                  ' test conditions
-'
-                ]
-              }
+              'cmdname' => 'c'
             },
             {
               'text' => '
diff --git 
a/tp/t/results/conditionals/cond_info_no-ifhtml_no-ifinfo_no-iftex.pl 
b/tp/t/results/conditionals/cond_info_no-ifhtml_no-ifinfo_no-iftex.pl
index 2f1d09e424..f50927128e 100644
--- a/tp/t/results/conditionals/cond_info_no-ifhtml_no-ifinfo_no-iftex.pl
+++ b/tp/t/results/conditionals/cond_info_no-ifhtml_no-ifinfo_no-iftex.pl
@@ -34,13 +34,7 @@ $result_trees{'cond_info_no-ifhtml_no-ifinfo_no-iftex'} = {
                   'type' => 'misc_arg'
                 }
               ],
-              'cmdname' => 'c',
-              'extra' => {
-                'misc_args' => [
-                  ' test conditions
-'
-                ]
-              }
+              'cmdname' => 'c'
             },
             {
               'text' => '
diff --git a/tp/t/results/conditionals/cond_no-ifhtml_no-ifinfo_no-iftex.pl 
b/tp/t/results/conditionals/cond_no-ifhtml_no-ifinfo_no-iftex.pl
index a5ad7864fb..21ad667c4b 100644
--- a/tp/t/results/conditionals/cond_no-ifhtml_no-ifinfo_no-iftex.pl
+++ b/tp/t/results/conditionals/cond_no-ifhtml_no-ifinfo_no-iftex.pl
@@ -34,13 +34,7 @@ $result_trees{'cond_no-ifhtml_no-ifinfo_no-iftex'} = {
                   'type' => 'misc_arg'
                 }
               ],
-              'cmdname' => 'c',
-              'extra' => {
-                'misc_args' => [
-                  ' test conditions
-'
-                ]
-              }
+              'cmdname' => 'c'
             },
             {
               'text' => '
diff --git a/tp/t/results/conditionals/cond_xml.pl 
b/tp/t/results/conditionals/cond_xml.pl
index 6b7ac37ad9..013edd9ded 100644
--- a/tp/t/results/conditionals/cond_xml.pl
+++ b/tp/t/results/conditionals/cond_xml.pl
@@ -34,13 +34,7 @@ $result_trees{'cond_xml'} = {
                   'type' => 'misc_arg'
                 }
               ],
-              'cmdname' => 'c',
-              'extra' => {
-                'misc_args' => [
-                  ' test conditions
-'
-                ]
-              }
+              'cmdname' => 'c'
             },
             {
               'text' => '
diff --git a/tp/t/results/conditionals/consecutive_conditionals.pl 
b/tp/t/results/conditionals/consecutive_conditionals.pl
index 437a49fb20..2a8d014df0 100644
--- a/tp/t/results/conditionals/consecutive_conditionals.pl
+++ b/tp/t/results/conditionals/consecutive_conditionals.pl
@@ -155,12 +155,6 @@ $result_trees{'consecutive_conditionals'} = {
             }
           ],
           'cmdname' => 'set',
-          'extra' => {
-            'misc_args' => [
-              'b',
-              ''
-            ]
-          },
           'info' => {
             'arg_line' => ' b
 '
diff --git a/tp/t/results/conditionals/defcondx_Dbar.pl 
b/tp/t/results/conditionals/defcondx_Dbar.pl
index 6a39312f96..1fb66f1826 100644
--- a/tp/t/results/conditionals/defcondx_Dbar.pl
+++ b/tp/t/results/conditionals/defcondx_Dbar.pl
@@ -34,13 +34,7 @@ $result_trees{'defcondx_Dbar'} = {
                   'type' => 'misc_arg'
                 }
               ],
-              'cmdname' => 'c',
-              'extra' => {
-                'misc_args' => [
-                  ' test def*x in a conditional
-'
-                ]
-              }
+              'cmdname' => 'c'
             },
             {
               'text' => '
@@ -55,13 +49,7 @@ $result_trees{'defcondx_Dbar'} = {
                   'type' => 'misc_arg'
                 }
               ],
-              'cmdname' => 'c',
-              'extra' => {
-                'misc_args' => [
-                  ' set this from the command line.
-'
-                ]
-              }
+              'cmdname' => 'c'
             },
             {
               'args' => [
@@ -71,13 +59,7 @@ $result_trees{'defcondx_Dbar'} = {
                   'type' => 'misc_arg'
                 }
               ],
-              'cmdname' => 'c',
-              'extra' => {
-                'misc_args' => [
-                  ' set bar
-'
-                ]
-              }
+              'cmdname' => 'c'
             },
             {
               'text' => '
diff --git a/tp/t/results/conditionals/defcondx_Ubar.pl 
b/tp/t/results/conditionals/defcondx_Ubar.pl
index 9fd50e395d..bd341df48d 100644
--- a/tp/t/results/conditionals/defcondx_Ubar.pl
+++ b/tp/t/results/conditionals/defcondx_Ubar.pl
@@ -34,13 +34,7 @@ $result_trees{'defcondx_Ubar'} = {
                   'type' => 'misc_arg'
                 }
               ],
-              'cmdname' => 'c',
-              'extra' => {
-                'misc_args' => [
-                  ' test def*x in a conditional
-'
-                ]
-              }
+              'cmdname' => 'c'
             },
             {
               'text' => '
@@ -55,13 +49,7 @@ $result_trees{'defcondx_Ubar'} = {
                   'type' => 'misc_arg'
                 }
               ],
-              'cmdname' => 'c',
-              'extra' => {
-                'misc_args' => [
-                  ' set this from the command line.
-'
-                ]
-              }
+              'cmdname' => 'c'
             },
             {
               'args' => [
@@ -71,13 +59,7 @@ $result_trees{'defcondx_Ubar'} = {
                   'type' => 'misc_arg'
                 }
               ],
-              'cmdname' => 'c',
-              'extra' => {
-                'misc_args' => [
-                  ' set bar
-'
-                ]
-              }
+              'cmdname' => 'c'
             },
             {
               'text' => '
diff --git a/tp/t/results/conditionals/empty_ifset_in_ifset_set.pl 
b/tp/t/results/conditionals/empty_ifset_in_ifset_set.pl
index efdd192432..de124cacf0 100644
--- a/tp/t/results/conditionals/empty_ifset_in_ifset_set.pl
+++ b/tp/t/results/conditionals/empty_ifset_in_ifset_set.pl
@@ -26,12 +26,6 @@ $result_trees{'empty_ifset_in_ifset_set'} = {
             }
           ],
           'cmdname' => 'set',
-          'extra' => {
-            'misc_args' => [
-              'notset',
-              ''
-            ]
-          },
           'info' => {
             'arg_line' => ' notset
 '
diff --git a/tp/t/results/conditionals/empty_set_in_ifclear.pl 
b/tp/t/results/conditionals/empty_set_in_ifclear.pl
index e796a09d20..bfa4ebd5f6 100644
--- a/tp/t/results/conditionals/empty_set_in_ifclear.pl
+++ b/tp/t/results/conditionals/empty_set_in_ifclear.pl
@@ -21,12 +21,6 @@ $result_trees{'empty_set_in_ifclear'} = {
             }
           ],
           'cmdname' => 'set',
-          'extra' => {
-            'misc_args' => [
-              'a',
-              ''
-            ]
-          },
           'info' => {
             'arg_line' => ' a
 '
diff --git a/tp/t/results/conditionals/empty_set_in_ifset.pl 
b/tp/t/results/conditionals/empty_set_in_ifset.pl
index ad8229c0c7..afa678d09f 100644
--- a/tp/t/results/conditionals/empty_set_in_ifset.pl
+++ b/tp/t/results/conditionals/empty_set_in_ifset.pl
@@ -21,12 +21,6 @@ $result_trees{'empty_set_in_ifset'} = {
             }
           ],
           'cmdname' => 'set',
-          'extra' => {
-            'misc_args' => [
-              'a',
-              ''
-            ]
-          },
           'info' => {
             'arg_line' => ' a
 '
diff --git a/tp/t/results/conditionals/end_ifset_in_format.pl 
b/tp/t/results/conditionals/end_ifset_in_format.pl
index 30f08d14bd..3e920c43be 100644
--- a/tp/t/results/conditionals/end_ifset_in_format.pl
+++ b/tp/t/results/conditionals/end_ifset_in_format.pl
@@ -26,12 +26,6 @@ $result_trees{'end_ifset_in_format'} = {
             }
           ],
           'cmdname' => 'set',
-          'extra' => {
-            'misc_args' => [
-              'notset',
-              ''
-            ]
-          },
           'info' => {
             'arg_line' => ' notset
 '
diff --git a/tp/t/results/conditionals/ifclear_in_ifset.pl 
b/tp/t/results/conditionals/ifclear_in_ifset.pl
index 9843508656..90e32e5f66 100644
--- a/tp/t/results/conditionals/ifclear_in_ifset.pl
+++ b/tp/t/results/conditionals/ifclear_in_ifset.pl
@@ -102,13 +102,7 @@ $result_trees{'ifclear_in_ifset'} = {
               'type' => 'misc_arg'
             }
           ],
-          'cmdname' => 'c',
-          'extra' => {
-            'misc_args' => [
-              ' WRONG - missing @end ifset.
-'
-            ]
-          }
+          'cmdname' => 'c'
         }
       ],
       'type' => 'before_node_section'
diff --git a/tp/t/results/conditionals/ifclear_in_ifset_set.pl 
b/tp/t/results/conditionals/ifclear_in_ifset_set.pl
index 4e5f22dcec..40dca33492 100644
--- a/tp/t/results/conditionals/ifclear_in_ifset_set.pl
+++ b/tp/t/results/conditionals/ifclear_in_ifset_set.pl
@@ -26,12 +26,6 @@ $result_trees{'ifclear_in_ifset_set'} = {
             }
           ],
           'cmdname' => 'set',
-          'extra' => {
-            'misc_args' => [
-              'a',
-              ''
-            ]
-          },
           'info' => {
             'arg_line' => ' a
 '
@@ -93,13 +87,7 @@ $result_trees{'ifclear_in_ifset_set'} = {
                             'type' => 'misc_arg'
                           }
                         ],
-                        'cmdname' => 'c',
-                        'extra' => {
-                          'misc_args' => [
-                            ' - ok, ignored
-'
-                          ]
-                        }
+                        'cmdname' => 'c'
                       },
                       'spaces_after_argument' => {
                         'text' => ' '
@@ -169,13 +157,7 @@ $result_trees{'ifclear_in_ifset_set'} = {
               'type' => 'misc_arg'
             }
           ],
-          'cmdname' => 'c',
-          'extra' => {
-            'misc_args' => [
-              ' WRONG - missing @end ifset.
-'
-            ]
-          }
+          'cmdname' => 'c'
         }
       ],
       'type' => 'before_node_section'
diff --git a/tp/t/results/conditionals/ignore_spaces_and_comments.pl 
b/tp/t/results/conditionals/ignore_spaces_and_comments.pl
index 9b262d2379..0e0eb375ff 100644
--- a/tp/t/results/conditionals/ignore_spaces_and_comments.pl
+++ b/tp/t/results/conditionals/ignore_spaces_and_comments.pl
@@ -147,13 +147,7 @@ $result_trees{'ignore_spaces_and_comments'} = {
                       'type' => 'misc_arg'
                     }
                   ],
-                  'cmdname' => 'c',
-                  'extra' => {
-                    'misc_args' => [
-                      ' no space comment
-'
-                    ]
-                  }
+                  'cmdname' => 'c'
                 }
               },
               'type' => 'block_line_arg'
@@ -222,13 +216,7 @@ $result_trees{'ignore_spaces_and_comments'} = {
                       'type' => 'misc_arg'
                     }
                   ],
-                  'cmdname' => 'comment',
-                  'extra' => {
-                    'misc_args' => [
-                      ' space comment
-'
-                    ]
-                  }
+                  'cmdname' => 'comment'
                 }
               },
               'type' => 'block_line_arg'
@@ -302,13 +290,7 @@ $result_trees{'ignore_spaces_and_comments'} = {
                       'type' => 'misc_arg'
                     }
                   ],
-                  'cmdname' => 'c',
-                  'extra' => {
-                    'misc_args' => [
-                      '
-'
-                    ]
-                  }
+                  'cmdname' => 'c'
                 }
               },
               'type' => 'block_line_arg'
diff --git a/tp/t/results/conditionals/macro_in_ifset_set.pl 
b/tp/t/results/conditionals/macro_in_ifset_set.pl
index db761e6559..99ebe1607a 100644
--- a/tp/t/results/conditionals/macro_in_ifset_set.pl
+++ b/tp/t/results/conditionals/macro_in_ifset_set.pl
@@ -26,12 +26,6 @@ $result_trees{'macro_in_ifset_set'} = {
             }
           ],
           'cmdname' => 'set',
-          'extra' => {
-            'misc_args' => [
-              'a',
-              ''
-            ]
-          },
           'info' => {
             'arg_line' => ' a
 '
@@ -149,11 +143,6 @@ $result_trees{'macro_in_ifset_set'} = {
             }
           ],
           'cmdname' => 'unmacro',
-          'extra' => {
-            'misc_args' => [
-              'truc'
-            ]
-          },
           'info' => {
             'arg_line' => ' truc
 '
diff --git a/tp/t/results/conditionals/nested_ifset_ifclear.pl 
b/tp/t/results/conditionals/nested_ifset_ifclear.pl
index a007e6f251..c9d4157ca6 100644
--- a/tp/t/results/conditionals/nested_ifset_ifclear.pl
+++ b/tp/t/results/conditionals/nested_ifset_ifclear.pl
@@ -123,12 +123,6 @@ $result_trees{'nested_ifset_ifclear'} = {
             }
           ],
           'cmdname' => 'set',
-          'extra' => {
-            'misc_args' => [
-              'somevar',
-              ''
-            ]
-          },
           'info' => {
             'arg_line' => ' somevar
 '
@@ -146,12 +140,6 @@ $result_trees{'nested_ifset_ifclear'} = {
             }
           ],
           'cmdname' => 'set',
-          'extra' => {
-            'misc_args' => [
-              'anothervar',
-              ''
-            ]
-          },
           'info' => {
             'arg_line' => ' anothervar
 '
@@ -428,12 +416,6 @@ $result_trees{'nested_ifset_ifclear'} = {
             }
           ],
           'cmdname' => 'set',
-          'extra' => {
-            'misc_args' => [
-              'somevar',
-              ''
-            ]
-          },
           'info' => {
             'arg_line' => ' somevar
 '
@@ -447,11 +429,6 @@ $result_trees{'nested_ifset_ifclear'} = {
             }
           ],
           'cmdname' => 'clear',
-          'extra' => {
-            'misc_args' => [
-              'anothervar'
-            ]
-          },
           'info' => {
             'arg_line' => ' anothervar
 '
@@ -723,11 +700,6 @@ $result_trees{'nested_ifset_ifclear'} = {
             }
           ],
           'cmdname' => 'clear',
-          'extra' => {
-            'misc_args' => [
-              'somevar'
-            ]
-          },
           'info' => {
             'arg_line' => ' somevar
 '
@@ -745,12 +717,6 @@ $result_trees{'nested_ifset_ifclear'} = {
             }
           ],
           'cmdname' => 'set',
-          'extra' => {
-            'misc_args' => [
-              'anothervar',
-              ''
-            ]
-          },
           'info' => {
             'arg_line' => ' anothervar
 '
@@ -928,11 +894,6 @@ $result_trees{'nested_ifset_ifclear'} = {
             }
           ],
           'cmdname' => 'clear',
-          'extra' => {
-            'misc_args' => [
-              'somevar'
-            ]
-          },
           'info' => {
             'arg_line' => ' somevar
 '
@@ -946,11 +907,6 @@ $result_trees{'nested_ifset_ifclear'} = {
             }
           ],
           'cmdname' => 'clear',
-          'extra' => {
-            'misc_args' => [
-              'anothervar'
-            ]
-          },
           'info' => {
             'arg_line' => ' anothervar
 '
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 aca4170ec7..a5964cd62e 100644
--- a/tp/t/results/converters_tests/index_entry_in_preformatted.pl
+++ b/tp/t/results/converters_tests/index_entry_in_preformatted.pl
@@ -216,13 +216,7 @@ $result_trees{'index_entry_in_preformatted'} = {
                               'type' => 'misc_arg'
                             }
                           ],
-                          'cmdname' => 'c',
-                          'extra' => {
-                            'misc_args' => [
-                              ' comment
-'
-                            ]
-                          }
+                          'cmdname' => 'c'
                         },
                         'spaces_after_argument' => {
                           'text' => ' '
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 f5676987b9..08049dd39e 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
@@ -191,13 +191,7 @@ $result_trees{'indices_in_begin_tables_lists'} = {
                       'type' => 'misc_arg'
                     }
                   ],
-                  'cmdname' => 'c',
-                  'extra' => {
-                    'misc_args' => [
-                      ' comment in itemize
-'
-                    ]
-                  }
+                  'cmdname' => 'c'
                 },
                 {
                   'args' => [
@@ -567,13 +561,7 @@ $result_trees{'indices_in_begin_tables_lists'} = {
                       'type' => 'misc_arg'
                     }
                   ],
-                  'cmdname' => 'c',
-                  'extra' => {
-                    'misc_args' => [
-                      ' comment in itemize
-'
-                    ]
-                  }
+                  'cmdname' => 'c'
                 },
                 {
                   'contents' => [
@@ -728,13 +716,7 @@ $result_trees{'indices_in_begin_tables_lists'} = {
                       'type' => 'misc_arg'
                     }
                   ],
-                  'cmdname' => 'comment',
-                  'extra' => {
-                    'misc_args' => [
-                      ' comment before first item in enumerate
-'
-                    ]
-                  }
+                  'cmdname' => 'comment'
                 }
               ],
               'type' => 'before_item'
@@ -1428,13 +1410,7 @@ $result_trees{'indices_in_begin_tables_lists'} = {
                       'type' => 'misc_arg'
                     }
                   ],
-                  'cmdname' => 'comment',
-                  'extra' => {
-                    'misc_args' => [
-                      ' comment
-'
-                    ]
-                  }
+                  'cmdname' => 'comment'
                 },
                 {
                   'args' => [
@@ -1627,13 +1603,7 @@ $result_trees{'indices_in_begin_tables_lists'} = {
                           'type' => 'misc_arg'
                         }
                       ],
-                      'cmdname' => 'c',
-                      'extra' => {
-                        'misc_args' => [
-                          ' comment in table
-'
-                        ]
-                      }
+                      'cmdname' => 'c'
                     },
                     {
                       'args' => [
@@ -1822,13 +1792,7 @@ $result_trees{'indices_in_begin_tables_lists'} = {
                               'type' => 'misc_arg'
                             }
                           ],
-                          'cmdname' => 'c',
-                          'extra' => {
-                            'misc_args' => [
-                              ' comment between item and itemx
-'
-                            ]
-                          }
+                          'cmdname' => 'c'
                         }
                       ],
                       'type' => 'inter_item'
@@ -2059,13 +2023,7 @@ $result_trees{'indices_in_begin_tables_lists'} = {
                               'type' => 'misc_arg'
                             }
                           ],
-                          'cmdname' => 'c',
-                          'extra' => {
-                            'misc_args' => [
-                              ' and a comment
-'
-                            ]
-                          }
+                          'cmdname' => 'c'
                         },
                         {
                           'args' => [
@@ -2075,13 +2033,7 @@ $result_trees{'indices_in_begin_tables_lists'} = {
                               'type' => 'misc_arg'
                             }
                           ],
-                          'cmdname' => 'comment',
-                          'extra' => {
-                            'misc_args' => [
-                              ' and another comment
-'
-                            ]
-                          }
+                          'cmdname' => 'comment'
                         }
                       ],
                       'type' => 'inter_item'
@@ -2201,13 +2153,7 @@ $result_trees{'indices_in_begin_tables_lists'} = {
                               'type' => 'misc_arg'
                             }
                           ],
-                          'cmdname' => 'c',
-                          'extra' => {
-                            'misc_args' => [
-                              ' comment between lines
-'
-                            ]
-                          }
+                          'cmdname' => 'c'
                         },
                         {
                           'text' => '
@@ -2273,13 +2219,7 @@ $result_trees{'indices_in_begin_tables_lists'} = {
                           'type' => 'misc_arg'
                         }
                       ],
-                      'cmdname' => 'c',
-                      'extra' => {
-                        'misc_args' => [
-                          ' comment at end
-'
-                        ]
-                      }
+                      'cmdname' => 'c'
                     }
                   ],
                   'type' => 'table_definition'
@@ -2415,13 +2355,7 @@ $result_trees{'indices_in_begin_tables_lists'} = {
                           'type' => 'misc_arg'
                         }
                       ],
-                      'cmdname' => 'c',
-                      'extra' => {
-                        'misc_args' => [
-                          ' comment in table
-'
-                        ]
-                      }
+                      'cmdname' => 'c'
                     },
                     {
                       'args' => [
@@ -2769,13 +2703,7 @@ $result_trees{'indices_in_begin_tables_lists'} = {
                           'type' => 'misc_arg'
                         }
                       ],
-                      'cmdname' => 'c',
-                      'extra' => {
-                        'misc_args' => [
-                          ' samp comment in table
-'
-                        ]
-                      }
+                      'cmdname' => 'c'
                     },
                     {
                       'args' => [
@@ -3623,13 +3551,7 @@ $result_trees{'indices_in_begin_tables_lists'} = {
                           'type' => 'misc_arg'
                         }
                       ],
-                      'cmdname' => 'c',
-                      'extra' => {
-                        'misc_args' => [
-                          ' commant
-'
-                        ]
-                      }
+                      'cmdname' => 'c'
                     },
                     {
                       'args' => [
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 7e9f7710a8..53bc9a569c 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
@@ -191,13 +191,7 @@ 
$result_trees{'indices_in_begin_tables_lists_entries_after_item'} = {
                       'type' => 'misc_arg'
                     }
                   ],
-                  'cmdname' => 'c',
-                  'extra' => {
-                    'misc_args' => [
-                      ' comment in itemize
-'
-                    ]
-                  }
+                  'cmdname' => 'c'
                 }
               ],
               'type' => 'before_item'
@@ -568,13 +562,7 @@ 
$result_trees{'indices_in_begin_tables_lists_entries_after_item'} = {
                       'type' => 'misc_arg'
                     }
                   ],
-                  'cmdname' => 'c',
-                  'extra' => {
-                    'misc_args' => [
-                      ' comment in itemize
-'
-                    ]
-                  }
+                  'cmdname' => 'c'
                 },
                 {
                   'contents' => [
@@ -730,13 +718,7 @@ 
$result_trees{'indices_in_begin_tables_lists_entries_after_item'} = {
                       'type' => 'misc_arg'
                     }
                   ],
-                  'cmdname' => 'comment',
-                  'extra' => {
-                    'misc_args' => [
-                      ' comment before first item in enumerate
-'
-                    ]
-                  }
+                  'cmdname' => 'comment'
                 }
               ],
               'type' => 'before_item'
@@ -1442,13 +1424,7 @@ 
$result_trees{'indices_in_begin_tables_lists_entries_after_item'} = {
                       'type' => 'misc_arg'
                     }
                   ],
-                  'cmdname' => 'comment',
-                  'extra' => {
-                    'misc_args' => [
-                      ' comment
-'
-                    ]
-                  }
+                  'cmdname' => 'comment'
                 },
                 {
                   'args' => [
@@ -1631,13 +1607,7 @@ 
$result_trees{'indices_in_begin_tables_lists_entries_after_item'} = {
                           'type' => 'misc_arg'
                         }
                       ],
-                      'cmdname' => 'c',
-                      'extra' => {
-                        'misc_args' => [
-                          ' comment in table
-'
-                        ]
-                      }
+                      'cmdname' => 'c'
                     },
                     {
                       'args' => [
@@ -1826,13 +1796,7 @@ 
$result_trees{'indices_in_begin_tables_lists_entries_after_item'} = {
                               'type' => 'misc_arg'
                             }
                           ],
-                          'cmdname' => 'c',
-                          'extra' => {
-                            'misc_args' => [
-                              ' comment between item and itemx
-'
-                            ]
-                          }
+                          'cmdname' => 'c'
                         }
                       ],
                       'type' => 'inter_item'
@@ -2063,13 +2027,7 @@ 
$result_trees{'indices_in_begin_tables_lists_entries_after_item'} = {
                               'type' => 'misc_arg'
                             }
                           ],
-                          'cmdname' => 'c',
-                          'extra' => {
-                            'misc_args' => [
-                              ' and a comment
-'
-                            ]
-                          }
+                          'cmdname' => 'c'
                         },
                         {
                           'args' => [
@@ -2079,13 +2037,7 @@ 
$result_trees{'indices_in_begin_tables_lists_entries_after_item'} = {
                               'type' => 'misc_arg'
                             }
                           ],
-                          'cmdname' => 'comment',
-                          'extra' => {
-                            'misc_args' => [
-                              ' and another comment
-'
-                            ]
-                          }
+                          'cmdname' => 'comment'
                         }
                       ],
                       'type' => 'inter_item'
@@ -2205,13 +2157,7 @@ 
$result_trees{'indices_in_begin_tables_lists_entries_after_item'} = {
                               'type' => 'misc_arg'
                             }
                           ],
-                          'cmdname' => 'c',
-                          'extra' => {
-                            'misc_args' => [
-                              ' comment between lines
-'
-                            ]
-                          }
+                          'cmdname' => 'c'
                         },
                         {
                           'text' => '
@@ -2277,13 +2223,7 @@ 
$result_trees{'indices_in_begin_tables_lists_entries_after_item'} = {
                           'type' => 'misc_arg'
                         }
                       ],
-                      'cmdname' => 'c',
-                      'extra' => {
-                        'misc_args' => [
-                          ' comment at end
-'
-                        ]
-                      }
+                      'cmdname' => 'c'
                     }
                   ],
                   'type' => 'table_definition'
@@ -2419,13 +2359,7 @@ 
$result_trees{'indices_in_begin_tables_lists_entries_after_item'} = {
                           'type' => 'misc_arg'
                         }
                       ],
-                      'cmdname' => 'c',
-                      'extra' => {
-                        'misc_args' => [
-                          ' comment in table
-'
-                        ]
-                      }
+                      'cmdname' => 'c'
                     },
                     {
                       'args' => [
@@ -2773,13 +2707,7 @@ 
$result_trees{'indices_in_begin_tables_lists_entries_after_item'} = {
                           'type' => 'misc_arg'
                         }
                       ],
-                      'cmdname' => 'c',
-                      'extra' => {
-                        'misc_args' => [
-                          ' samp comment in table
-'
-                        ]
-                      }
+                      'cmdname' => 'c'
                     },
                     {
                       'args' => [
@@ -3627,13 +3555,7 @@ 
$result_trees{'indices_in_begin_tables_lists_entries_after_item'} = {
                           'type' => 'misc_arg'
                         }
                       ],
-                      'cmdname' => 'c',
-                      'extra' => {
-                        'misc_args' => [
-                          ' commant
-'
-                        ]
-                      }
+                      'cmdname' => 'c'
                     },
                     {
                       'args' => [
diff --git a/tp/t/results/converters_tests/inlineifsetifclear.pl 
b/tp/t/results/converters_tests/inlineifsetifclear.pl
index a3d54b6933..f33be45c1c 100644
--- a/tp/t/results/converters_tests/inlineifsetifclear.pl
+++ b/tp/t/results/converters_tests/inlineifsetifclear.pl
@@ -114,12 +114,6 @@ $result_trees{'inlineifsetifclear'} = {
             }
           ],
           'cmdname' => 'set',
-          'extra' => {
-            'misc_args' => [
-              'aaa',
-              ''
-            ]
-          },
           'info' => {
             'arg_line' => ' aaa
 '
diff --git a/tp/t/results/converters_tests/inlineifsetifclearspaces.pl 
b/tp/t/results/converters_tests/inlineifsetifclearspaces.pl
index b67ea4d530..7963974742 100644
--- a/tp/t/results/converters_tests/inlineifsetifclearspaces.pl
+++ b/tp/t/results/converters_tests/inlineifsetifclearspaces.pl
@@ -142,12 +142,6 @@ $result_trees{'inlineifsetifclearspaces'} = {
             }
           ],
           'cmdname' => 'set',
-          'extra' => {
-            'misc_args' => [
-              'aaa',
-              ''
-            ]
-          },
           'info' => {
             'arg_line' => ' aaa
 '
diff --git a/tp/t/results/coverage/accent_no_closed_comment.pl 
b/tp/t/results/coverage/accent_no_closed_comment.pl
index cf4bd76e91..cb272609f8 100644
--- a/tp/t/results/coverage/accent_no_closed_comment.pl
+++ b/tp/t/results/coverage/accent_no_closed_comment.pl
@@ -26,13 +26,7 @@ $result_trees{'accent_no_closed_comment'} = {
                           'type' => 'misc_arg'
                         }
                       ],
-                      'cmdname' => 'c',
-                      'extra' => {
-                        'misc_args' => [
-                          ' comment
-'
-                        ]
-                      }
+                      'cmdname' => 'c'
                     }
                   ],
                   'type' => 'brace_command_arg'
diff --git a/tp/t/results/coverage/comment_on_cartouche_line.pl 
b/tp/t/results/coverage/comment_on_cartouche_line.pl
index 8e2a6cb308..aac2c5292d 100644
--- a/tp/t/results/coverage/comment_on_cartouche_line.pl
+++ b/tp/t/results/coverage/comment_on_cartouche_line.pl
@@ -21,13 +21,7 @@ $result_trees{'comment_on_cartouche_line'} = {
                       'type' => 'misc_arg'
                     }
                   ],
-                  'cmdname' => 'c',
-                  'extra' => {
-                    'misc_args' => [
-                      ' comment
-'
-                    ]
-                  }
+                  'cmdname' => 'c'
                 }
               },
               'type' => 'block_line_arg'
@@ -125,13 +119,7 @@ $result_trees{'comment_on_cartouche_line'} = {
                       'type' => 'misc_arg'
                     }
                   ],
-                  'cmdname' => 'c',
-                  'extra' => {
-                    'misc_args' => [
-                      ' comment
-'
-                    ]
-                  }
+                  'cmdname' => 'c'
                 },
                 'spaces_after_argument' => {
                   'text' => ' '
diff --git a/tp/t/results/coverage/comment_on_group_line.pl 
b/tp/t/results/coverage/comment_on_group_line.pl
index b8265e58bf..31a8bb1717 100644
--- a/tp/t/results/coverage/comment_on_group_line.pl
+++ b/tp/t/results/coverage/comment_on_group_line.pl
@@ -21,13 +21,7 @@ $result_trees{'comment_on_group_line'} = {
                       'type' => 'misc_arg'
                     }
                   ],
-                  'cmdname' => 'c',
-                  'extra' => {
-                    'misc_args' => [
-                      ' comment
-'
-                    ]
-                  }
+                  'cmdname' => 'c'
                 }
               },
               'type' => 'block_line_arg'
diff --git a/tp/t/results/coverage/def.pl b/tp/t/results/coverage/def.pl
index 6da6ebb264..9df5725023 100644
--- a/tp/t/results/coverage/def.pl
+++ b/tp/t/results/coverage/def.pl
@@ -1359,13 +1359,7 @@ $result_trees{'def'} = {
                       'type' => 'misc_arg'
                     }
                   ],
-                  'cmdname' => 'c',
-                  'extra' => {
-                    'misc_args' => [
-                      ' comment
-'
-                    ]
-                  }
+                  'cmdname' => 'c'
                 }
               ],
               'type' => 'inter_def_item'
@@ -1490,13 +1484,7 @@ $result_trees{'def'} = {
                       'type' => 'misc_arg'
                     }
                   ],
-                  'cmdname' => 'c',
-                  'extra' => {
-                    'misc_args' => [
-                      ' comment
-'
-                    ]
-                  }
+                  'cmdname' => 'c'
                 }
               ],
               'type' => 'inter_def_item'
diff --git a/tp/t/results/coverage/delcomment.pl 
b/tp/t/results/coverage/delcomment.pl
index ebf66ae3be..d7e0dee9ec 100644
--- a/tp/t/results/coverage/delcomment.pl
+++ b/tp/t/results/coverage/delcomment.pl
@@ -34,13 +34,7 @@ $result_trees{'delcomment'} = {
                   'type' => 'misc_arg'
                 }
               ],
-              'cmdname' => 'c',
-              'extra' => {
-                'misc_args' => [
-                  ' this tests both the del comment and a file without
-'
-                ]
-              }
+              'cmdname' => 'c'
             },
             {
               'args' => [
@@ -50,13 +44,7 @@ $result_trees{'delcomment'} = {
                   'type' => 'misc_arg'
                 }
               ],
-              'cmdname' => 'c',
-              'extra' => {
-                'misc_args' => [
-                  ' element.
-'
-                ]
-              }
+              'cmdname' => 'c'
             },
             {
               'text' => '
diff --git a/tp/t/results/coverage/delcomment_followed_by_cpp_line.pl 
b/tp/t/results/coverage/delcomment_followed_by_cpp_line.pl
index c0a46e6ed9..907c21e032 100644
--- a/tp/t/results/coverage/delcomment_followed_by_cpp_line.pl
+++ b/tp/t/results/coverage/delcomment_followed_by_cpp_line.pl
@@ -34,13 +34,7 @@ $result_trees{'delcomment_followed_by_cpp_line'} = {
                   'type' => 'misc_arg'
                 }
               ],
-              'cmdname' => 'c',
-              'extra' => {
-                'misc_args' => [
-                  ' this tests both the del comment and a file without
-'
-                ]
-              }
+              'cmdname' => 'c'
             },
             {
               'args' => [
@@ -50,13 +44,7 @@ $result_trees{'delcomment_followed_by_cpp_line'} = {
                   'type' => 'misc_arg'
                 }
               ],
-              'cmdname' => 'c',
-              'extra' => {
-                'misc_args' => [
-                  ' element.
-'
-                ]
-              }
+              'cmdname' => 'c'
             },
             {
               'source_marks' => [
diff --git a/tp/t/results/coverage/displaymath.pl 
b/tp/t/results/coverage/displaymath.pl
index b701d28916..72ee251704 100644
--- a/tp/t/results/coverage/displaymath.pl
+++ b/tp/t/results/coverage/displaymath.pl
@@ -443,13 +443,7 @@ $result_trees{'displaymath'} = {
                   'type' => 'misc_arg'
                 }
               ],
-              'cmdname' => 'c',
-              'extra' => {
-                'misc_args' => [
-                  ' comment in displaymath
-'
-                ]
-              }
+              'cmdname' => 'c'
             },
             {
               'text' => 'a/2
diff --git a/tp/t/results/coverage/formats_only_title_comments.pl 
b/tp/t/results/coverage/formats_only_title_comments.pl
index 5e9fdc4391..9efc553fb1 100644
--- a/tp/t/results/coverage/formats_only_title_comments.pl
+++ b/tp/t/results/coverage/formats_only_title_comments.pl
@@ -39,13 +39,7 @@ $result_trees{'formats_only_title_comments'} = {
                       'type' => 'misc_arg'
                     }
                   ],
-                  'cmdname' => 'c',
-                  'extra' => {
-                    'misc_args' => [
-                      ' comment itemize
-'
-                    ]
-                  }
+                  'cmdname' => 'c'
                 },
                 {
                   'contents' => [
@@ -118,13 +112,7 @@ $result_trees{'formats_only_title_comments'} = {
                       'type' => 'misc_arg'
                     }
                   ],
-                  'cmdname' => 'c',
-                  'extra' => {
-                    'misc_args' => [
-                      ' comment on enumerate line
-'
-                    ]
-                  }
+                  'cmdname' => 'c'
                 }
               },
               'type' => 'block_line_arg'
@@ -142,13 +130,7 @@ $result_trees{'formats_only_title_comments'} = {
                       'type' => 'misc_arg'
                     }
                   ],
-                  'cmdname' => 'c',
-                  'extra' => {
-                    'misc_args' => [
-                      ' comment enumerate
-'
-                    ]
-                  }
+                  'cmdname' => 'c'
                 },
                 {
                   'contents' => [
@@ -249,13 +231,7 @@ $result_trees{'formats_only_title_comments'} = {
                       'type' => 'misc_arg'
                     }
                   ],
-                  'cmdname' => 'c',
-                  'extra' => {
-                    'misc_args' => [
-                      ' comment table
-'
-                    ]
-                  }
+                  'cmdname' => 'c'
                 },
                 {
                   'contents' => [
@@ -344,13 +320,7 @@ $result_trees{'formats_only_title_comments'} = {
                       'type' => 'misc_arg'
                     }
                   ],
-                  'cmdname' => 'c',
-                  'extra' => {
-                    'misc_args' => [
-                      ' comment on vtable line
-'
-                    ]
-                  }
+                  'cmdname' => 'c'
                 },
                 'spaces_after_argument' => {
                   'text' => ' '
@@ -482,13 +452,7 @@ $result_trees{'formats_only_title_comments'} = {
                       'type' => 'misc_arg'
                     }
                   ],
-                  'cmdname' => 'c',
-                  'extra' => {
-                    'misc_args' => [
-                      ' comment multitable
-'
-                    ]
-                  }
+                  'cmdname' => 'c'
                 },
                 {
                   'contents' => [
diff --git a/tp/t/results/coverage/multitable.pl 
b/tp/t/results/coverage/multitable.pl
index f812b6dbfb..120e94f2cd 100644
--- a/tp/t/results/coverage/multitable.pl
+++ b/tp/t/results/coverage/multitable.pl
@@ -173,13 +173,7 @@ $result_trees{'multitable'} = {
                                   'type' => 'misc_arg'
                                 }
                               ],
-                              'cmdname' => 'c',
-                              'extra' => {
-                                'misc_args' => [
-                                  ' comment in multitable
-'
-                                ]
-                              }
+                              'cmdname' => 'c'
                             }
                           ],
                           'type' => 'paragraph'
diff --git a/tp/t/results/coverage/table.pl b/tp/t/results/coverage/table.pl
index 3bc189f3e1..5516b934ee 100644
--- a/tp/t/results/coverage/table.pl
+++ b/tp/t/results/coverage/table.pl
@@ -201,13 +201,7 @@ $result_trees{'table'} = {
                       'type' => 'misc_arg'
                     }
                   ],
-                  'cmdname' => 'c',
-                  'extra' => {
-                    'misc_args' => [
-                      ' samp
-'
-                    ]
-                  }
+                  'cmdname' => 'c'
                 }
               },
               'type' => 'block_line_arg'
@@ -225,13 +219,7 @@ $result_trees{'table'} = {
                       'type' => 'misc_arg'
                     }
                   ],
-                  'cmdname' => 'c',
-                  'extra' => {
-                    'misc_args' => [
-                      ' after vtable
-'
-                    ]
-                  }
+                  'cmdname' => 'c'
                 },
                 {
                   'args' => [
@@ -330,13 +318,7 @@ $result_trees{'table'} = {
                               'type' => 'misc_arg'
                             }
                           ],
-                          'cmdname' => 'c',
-                          'extra' => {
-                            'misc_args' => [
-                              ' after item
-'
-                            ]
-                          }
+                          'cmdname' => 'c'
                         }
                       ],
                       'type' => 'inter_item'
@@ -396,13 +378,7 @@ $result_trees{'table'} = {
                                   'type' => 'misc_arg'
                                 }
                               ],
-                              'cmdname' => 'comment',
-                              'extra' => {
-                                'misc_args' => [
-                                  ' comment in itemx line
-'
-                                ]
-                              }
+                              'cmdname' => 'comment'
                             },
                             'spaces_after_argument' => {
                               'text' => ' '
diff --git a/tp/t/results/coverage/table_command_comment.pl 
b/tp/t/results/coverage/table_command_comment.pl
index 0053b33e04..13f1e28392 100644
--- a/tp/t/results/coverage/table_command_comment.pl
+++ b/tp/t/results/coverage/table_command_comment.pl
@@ -32,13 +32,7 @@ $result_trees{'table_command_comment'} = {
                       'type' => 'misc_arg'
                     }
                   ],
-                  'cmdname' => 'c',
-                  'extra' => {
-                    'misc_args' => [
-                      ' in comment
-'
-                    ]
-                  }
+                  'cmdname' => 'c'
                 }
               },
               'type' => 'block_line_arg'
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 5216d9fdbd..93612f0ac1 100644
--- a/tp/t/results/coverage_braces/contain_plain_text_nestings.pl
+++ b/tp/t/results/coverage_braces/contain_plain_text_nestings.pl
@@ -358,13 +358,7 @@ $result_trees{'contain_plain_text_nestings'} = {
               'type' => 'misc_arg'
             }
           ],
-          'cmdname' => 'c',
-          'extra' => {
-            'misc_args' => [
-              ' no warning for @ref in @w
-'
-            ]
-          }
+          'cmdname' => 'c'
         },
         {
           'contents' => [
diff --git a/tp/t/results/def/defx_after_comment.pl 
b/tp/t/results/def/defx_after_comment.pl
index 988f6f109d..6d41138a7a 100644
--- a/tp/t/results/def/defx_after_comment.pl
+++ b/tp/t/results/def/defx_after_comment.pl
@@ -118,13 +118,7 @@ $result_trees{'defx_after_comment'} = {
                       'type' => 'misc_arg'
                     }
                   ],
-                  'cmdname' => 'c',
-                  'extra' => {
-                    'misc_args' => [
-                      ' comment
-'
-                    ]
-                  }
+                  'cmdname' => 'c'
                 }
               ],
               'type' => 'inter_def_item'
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 42b7b47424..fbb4530635 100644
--- a/tp/t/results/def/defx_after_comment_in_example.pl
+++ b/tp/t/results/def/defx_after_comment_in_example.pl
@@ -134,13 +134,7 @@ $result_trees{'defx_after_comment_in_example'} = {
                               'type' => 'misc_arg'
                             }
                           ],
-                          'cmdname' => 'c',
-                          'extra' => {
-                            'misc_args' => [
-                              ' comment
-'
-                            ]
-                          }
+                          'cmdname' => 'c'
                         }
                       ],
                       'type' => 'preformatted'
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 c66394ddb6..d30cef0803 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
@@ -139,13 +139,7 @@ $result_trees{'defx_after_empty_line_in_example'} = {
                               'type' => 'misc_arg'
                             }
                           ],
-                          'cmdname' => 'c',
-                          'extra' => {
-                            'misc_args' => [
-                              ' c
-'
-                            ]
-                          }
+                          'cmdname' => 'c'
                         },
                         {
                           'args' => [
@@ -155,13 +149,7 @@ $result_trees{'defx_after_empty_line_in_example'} = {
                               'type' => 'misc_arg'
                             }
                           ],
-                          'cmdname' => 'comment',
-                          'extra' => {
-                            'misc_args' => [
-                              ' comment
-'
-                            ]
-                          }
+                          'cmdname' => 'comment'
                         },
                         {
                           'text' => '
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 4102da2024..3dc1c04064 100644
--- a/tp/t/results/def/inter_item_commands_in_def.pl
+++ b/tp/t/results/def/inter_item_commands_in_def.pl
@@ -118,13 +118,7 @@ $result_trees{'inter_item_commands_in_def'} = {
                       'type' => 'misc_arg'
                     }
                   ],
-                  'cmdname' => 'c',
-                  'extra' => {
-                    'misc_args' => [
-                      ' comment before first deffnx
-'
-                    ]
-                  }
+                  'cmdname' => 'c'
                 },
                 {
                   'text' => '
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 105bddfc31..a6f2c5d5a3 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
@@ -134,13 +134,7 @@ $result_trees{'inter_item_commands_in_def_in_example'} = {
                               'type' => 'misc_arg'
                             }
                           ],
-                          'cmdname' => 'c',
-                          'extra' => {
-                            'misc_args' => [
-                              ' comment before first deffnx
-'
-                            ]
-                          }
+                          'cmdname' => 'c'
                         },
                         {
                           'text' => '
diff --git a/tp/t/results/def/omit_def_space.pl 
b/tp/t/results/def/omit_def_space.pl
index 5522577b09..0929e74d1b 100644
--- a/tp/t/results/def/omit_def_space.pl
+++ b/tp/t/results/def/omit_def_space.pl
@@ -85,12 +85,6 @@ $result_trees{'omit_def_space'} = {
             }
           ],
           'cmdname' => 'set',
-          'extra' => {
-            'misc_args' => [
-              'txidefnamenospace',
-              ''
-            ]
-          },
           'info' => {
             'arg_line' => ' txidefnamenospace
 '
diff --git a/tp/t/results/float/comment_space_comand_in_float.pl 
b/tp/t/results/float/comment_space_comand_in_float.pl
index b8eda009da..20d804163d 100644
--- a/tp/t/results/float/comment_space_comand_in_float.pl
+++ b/tp/t/results/float/comment_space_comand_in_float.pl
@@ -103,13 +103,7 @@ $result_trees{'comment_space_comand_in_float'} = {
                       'type' => 'misc_arg'
                     }
                   ],
-                  'cmdname' => 'c',
-                  'extra' => {
-                    'misc_args' => [
-                      ' float
-'
-                    ]
-                  }
+                  'cmdname' => 'c'
                 },
                 'spaces_before_argument' => {
                   'text' => ' '
@@ -202,13 +196,7 @@ $result_trees{'comment_space_comand_in_float'} = {
                       'type' => 'misc_arg'
                     }
                   ],
-                  'cmdname' => 'c',
-                  'extra' => {
-                    'misc_args' => [
-                      ' listoffloats
-'
-                    ]
-                  }
+                  'cmdname' => 'c'
                 }
               },
               'type' => 'line_arg'
diff --git a/tp/t/results/float/complex_float.pl 
b/tp/t/results/float/complex_float.pl
index cd017d186c..15dc10da56 100644
--- a/tp/t/results/float/complex_float.pl
+++ b/tp/t/results/float/complex_float.pl
@@ -300,12 +300,6 @@ $result_trees{'complex_float'} = {
                 }
               ],
               'cmdname' => 'c',
-              'extra' => {
-                'misc_args' => [
-                  ' makeinfo --docbook segfaults
-'
-                ]
-              },
               'source_marks' => [
                 {
                   'counter' => 1,
diff --git a/tp/t/results/float/empty_label_no_space_comment.pl 
b/tp/t/results/float/empty_label_no_space_comment.pl
index fd70c9df62..3977d6aacd 100644
--- a/tp/t/results/float/empty_label_no_space_comment.pl
+++ b/tp/t/results/float/empty_label_no_space_comment.pl
@@ -33,13 +33,7 @@ $result_trees{'empty_label_no_space_comment'} = {
                       'type' => 'misc_arg'
                     }
                   ],
-                  'cmdname' => 'c',
-                  'extra' => {
-                    'misc_args' => [
-                      ' comment
-'
-                    ]
-                  }
+                  'cmdname' => 'c'
                 }
               },
               'type' => 'block_line_arg'
diff --git a/tp/t/results/float/empty_label_with_space_comment.pl 
b/tp/t/results/float/empty_label_with_space_comment.pl
index 513049227f..86acfed94a 100644
--- a/tp/t/results/float/empty_label_with_space_comment.pl
+++ b/tp/t/results/float/empty_label_with_space_comment.pl
@@ -33,13 +33,7 @@ $result_trees{'empty_label_with_space_comment'} = {
                       'type' => 'misc_arg'
                     }
                   ],
-                  'cmdname' => 'c',
-                  'extra' => {
-                    'misc_args' => [
-                      ' comment
-'
-                    ]
-                  }
+                  'cmdname' => 'c'
                 },
                 'spaces_before_argument' => {
                   'text' => ' '
diff --git a/tp/t/results/formats_encodings/accent.pl 
b/tp/t/results/formats_encodings/accent.pl
index 61f1879112..ebdc6736c8 100644
--- a/tp/t/results/formats_encodings/accent.pl
+++ b/tp/t/results/formats_encodings/accent.pl
@@ -1679,13 +1679,7 @@ $result_trees{'accent'} = {
               'type' => 'misc_arg'
             }
           ],
-          'cmdname' => 'c',
-          'extra' => {
-            'misc_args' => [
-              ' arg is command -- @dotless{i} is special-cased for HTML
-'
-            ]
-          }
+          'cmdname' => 'c'
         },
         {
           'contents' => [
@@ -1895,13 +1889,7 @@ $result_trees{'accent'} = {
               'type' => 'misc_arg'
             }
           ],
-          'cmdname' => 'c',
-          'extra' => {
-            'misc_args' => [
-              ' arg is command -- @dotless{j}
-'
-            ]
-          }
+          'cmdname' => 'c'
         },
         {
           'contents' => [
diff --git a/tp/t/results/formats_encodings/accent_enable_encoding.pl 
b/tp/t/results/formats_encodings/accent_enable_encoding.pl
index 3b2b898e46..07e5f6e2ca 100644
--- a/tp/t/results/formats_encodings/accent_enable_encoding.pl
+++ b/tp/t/results/formats_encodings/accent_enable_encoding.pl
@@ -1679,13 +1679,7 @@ $result_trees{'accent_enable_encoding'} = {
               'type' => 'misc_arg'
             }
           ],
-          'cmdname' => 'c',
-          'extra' => {
-            'misc_args' => [
-              ' arg is command -- @dotless{i} is special-cased for HTML
-'
-            ]
-          }
+          'cmdname' => 'c'
         },
         {
           'contents' => [
@@ -1895,13 +1889,7 @@ $result_trees{'accent_enable_encoding'} = {
               'type' => 'misc_arg'
             }
           ],
-          'cmdname' => 'c',
-          'extra' => {
-            'misc_args' => [
-              ' arg is command -- @dotless{j}
-'
-            ]
-          }
+          'cmdname' => 'c'
         },
         {
           'contents' => [
diff --git a/tp/t/results/formats_encodings/accentenc.pl 
b/tp/t/results/formats_encodings/accentenc.pl
index 3080e77ac3..1e24a51ce1 100644
--- a/tp/t/results/formats_encodings/accentenc.pl
+++ b/tp/t/results/formats_encodings/accentenc.pl
@@ -1719,13 +1719,7 @@ $result_trees{'accentenc'} = {
               'type' => 'misc_arg'
             }
           ],
-          'cmdname' => 'c',
-          'extra' => {
-            'misc_args' => [
-              ' arg is command -- @dotless{i} is special-cased for HTML
-'
-            ]
-          }
+          'cmdname' => 'c'
         },
         {
           'contents' => [
@@ -1935,13 +1929,7 @@ $result_trees{'accentenc'} = {
               'type' => 'misc_arg'
             }
           ],
-          'cmdname' => 'c',
-          'extra' => {
-            'misc_args' => [
-              ' arg is command -- @dotless{j}
-'
-            ]
-          }
+          'cmdname' => 'c'
         },
         {
           'contents' => [
diff --git a/tp/t/results/formats_encodings/accentenc_enable_encoding.pl 
b/tp/t/results/formats_encodings/accentenc_enable_encoding.pl
index c3b4d44169..fefab25dc4 100644
--- a/tp/t/results/formats_encodings/accentenc_enable_encoding.pl
+++ b/tp/t/results/formats_encodings/accentenc_enable_encoding.pl
@@ -1714,13 +1714,7 @@ $result_trees{'accentenc_enable_encoding'} = {
               'type' => 'misc_arg'
             }
           ],
-          'cmdname' => 'c',
-          'extra' => {
-            'misc_args' => [
-              ' arg is command -- @dotless{i} is special-cased for HTML
-'
-            ]
-          }
+          'cmdname' => 'c'
         },
         {
           'contents' => [
@@ -1930,13 +1924,7 @@ $result_trees{'accentenc_enable_encoding'} = {
               'type' => 'misc_arg'
             }
           ],
-          'cmdname' => 'c',
-          'extra' => {
-            'misc_args' => [
-              ' arg is command -- @dotless{j}
-'
-            ]
-          }
+          'cmdname' => 'c'
         },
         {
           'contents' => [
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 667a0b70f5..085c7a3c5d 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
@@ -213,13 +213,7 @@ $result_trees{'char_latin2_latin2_in_refs'} = {
               'type' => 'misc_arg'
             }
           ],
-          'cmdname' => 'c',
-          'extra' => {
-            'misc_args' => [
-              ' Aogonek(0xa1=0241) aogonek(0xb1=0261) standalone 
ogonek(0xca=0312) Eogonek(0xea=0352) eogonek
-'
-            ]
-          }
+          'cmdname' => 'c'
         },
         {
           'args' => [
diff --git a/tp/t/results/formats_encodings/sample_utf8.pl 
b/tp/t/results/formats_encodings/sample_utf8.pl
index c65122e28f..67b5a8ac83 100644
--- a/tp/t/results/formats_encodings/sample_utf8.pl
+++ b/tp/t/results/formats_encodings/sample_utf8.pl
@@ -29,13 +29,7 @@ $result_trees{'sample_utf8'} = {
                   'type' => 'misc_arg'
                 }
               ],
-              'cmdname' => 'c',
-              'extra' => {
-                'misc_args' => [
-                  ' %**start of header
-'
-                ]
-              }
+              'cmdname' => 'c'
             }
           ],
           'type' => 'preamble_before_setfilename'
@@ -145,13 +139,7 @@ $result_trees{'sample_utf8'} = {
                   'type' => 'misc_arg'
                 }
               ],
-              'cmdname' => 'c',
-              'extra' => {
-                'misc_args' => [
-                  ' %**end of header
-'
-                ]
-              }
+              'cmdname' => 'c'
             },
             {
               'text' => '
@@ -310,13 +298,7 @@ $result_trees{'sample_utf8'} = {
                           'type' => 'misc_arg'
                         }
                       ],
-                      'cmdname' => 'vskip',
-                      'extra' => {
-                        'misc_args' => [
-                          ' 0pt plus 1filll
-'
-                        ]
-                      }
+                      'cmdname' => 'vskip'
                     }
                   ],
                   'type' => 'paragraph'
@@ -388,13 +370,7 @@ $result_trees{'sample_utf8'} = {
                   'type' => 'misc_arg'
                 }
               ],
-              'cmdname' => 'c',
-              'extra' => {
-                'misc_args' => [
-                  ' Output the table of the contents at the beginning.
-'
-                ]
-              }
+              'cmdname' => 'c'
             },
             {
               'args' => [
diff --git a/tp/t/results/html_tests/empty_lines_at_beginning_no_setfilename.pl 
b/tp/t/results/html_tests/empty_lines_at_beginning_no_setfilename.pl
index 5581a5166f..1dbd3ed482 100644
--- a/tp/t/results/html_tests/empty_lines_at_beginning_no_setfilename.pl
+++ b/tp/t/results/html_tests/empty_lines_at_beginning_no_setfilename.pl
@@ -39,13 +39,7 @@ $result_trees{'empty_lines_at_beginning_no_setfilename'} = {
                   'type' => 'misc_arg'
                 }
               ],
-              'cmdname' => 'c',
-              'extra' => {
-                'misc_args' => [
-                  ' comment
-'
-                ]
-              }
+              'cmdname' => 'c'
             },
             {
               'text' => '
diff --git a/tp/t/results/html_tests/itemize_arguments.pl 
b/tp/t/results/html_tests/itemize_arguments.pl
index 3e4ea0c322..38eb0ad079 100644
--- a/tp/t/results/html_tests/itemize_arguments.pl
+++ b/tp/t/results/html_tests/itemize_arguments.pl
@@ -3892,11 +3892,6 @@ $result_trees{'itemize_arguments'} = {
             }
           ],
           'cmdname' => 'clickstyle',
-          'extra' => {
-            'misc_args' => [
-              '@result'
-            ]
-          },
           'info' => {
             'arg_line' => ' @result
 '
diff --git a/tp/t/results/html_tests/itemize_arguments_enable_encoding.pl 
b/tp/t/results/html_tests/itemize_arguments_enable_encoding.pl
index 8a46519ad4..6a5bb0a89d 100644
--- a/tp/t/results/html_tests/itemize_arguments_enable_encoding.pl
+++ b/tp/t/results/html_tests/itemize_arguments_enable_encoding.pl
@@ -3892,11 +3892,6 @@ $result_trees{'itemize_arguments_enable_encoding'} = {
             }
           ],
           'cmdname' => 'clickstyle',
-          'extra' => {
-            'misc_args' => [
-              '@result'
-            ]
-          },
           'info' => {
             'arg_line' => ' @result
 '
diff --git a/tp/t/results/html_tests/node_footnote_end.pl 
b/tp/t/results/html_tests/node_footnote_end.pl
index a0775316af..2586e4d139 100644
--- a/tp/t/results/html_tests/node_footnote_end.pl
+++ b/tp/t/results/html_tests/node_footnote_end.pl
@@ -34,13 +34,7 @@ $result_trees{'node_footnote_end'} = {
                   'type' => 'misc_arg'
                 }
               ],
-              'cmdname' => 'c',
-              'extra' => {
-                'misc_args' => [
-                  ' test footnotes with nodes only
-'
-                ]
-              }
+              'cmdname' => 'c'
             },
             {
               'text' => '
diff --git a/tp/t/results/html_tests/node_footnote_separated.pl 
b/tp/t/results/html_tests/node_footnote_separated.pl
index 5801b4a8dc..eccfe75336 100644
--- a/tp/t/results/html_tests/node_footnote_separated.pl
+++ b/tp/t/results/html_tests/node_footnote_separated.pl
@@ -34,13 +34,7 @@ $result_trees{'node_footnote_separated'} = {
                   'type' => 'misc_arg'
                 }
               ],
-              'cmdname' => 'c',
-              'extra' => {
-                'misc_args' => [
-                  ' test footnotes with nodes only
-'
-                ]
-              }
+              'cmdname' => 'c'
             },
             {
               'text' => '
diff --git a/tp/t/results/html_tests/node_footnote_use_node.pl 
b/tp/t/results/html_tests/node_footnote_use_node.pl
index da0f2285c6..43e80c93a3 100644
--- a/tp/t/results/html_tests/node_footnote_use_node.pl
+++ b/tp/t/results/html_tests/node_footnote_use_node.pl
@@ -34,13 +34,7 @@ $result_trees{'node_footnote_use_node'} = {
                   'type' => 'misc_arg'
                 }
               ],
-              'cmdname' => 'c',
-              'extra' => {
-                'misc_args' => [
-                  ' test footnotes with nodes only
-'
-                ]
-              }
+              'cmdname' => 'c'
             },
             {
               'text' => '
diff --git a/tp/t/results/html_tests/node_footnote_use_node_separate.pl 
b/tp/t/results/html_tests/node_footnote_use_node_separate.pl
index a2bc543d76..e4fc31b7b0 100644
--- a/tp/t/results/html_tests/node_footnote_use_node_separate.pl
+++ b/tp/t/results/html_tests/node_footnote_use_node_separate.pl
@@ -34,13 +34,7 @@ $result_trees{'node_footnote_use_node_separate'} = {
                   'type' => 'misc_arg'
                 }
               ],
-              'cmdname' => 'c',
-              'extra' => {
-                'misc_args' => [
-                  ' test footnotes with nodes only
-'
-                ]
-              }
+              'cmdname' => 'c'
             },
             {
               'text' => '
diff --git a/tp/t/results/html_tests/redirection_same_labels.pl 
b/tp/t/results/html_tests/redirection_same_labels.pl
index a2ae5f3d0a..c3ecf16060 100644
--- a/tp/t/results/html_tests/redirection_same_labels.pl
+++ b/tp/t/results/html_tests/redirection_same_labels.pl
@@ -93,13 +93,7 @@ $result_trees{'redirection_same_labels'} = [
                             'type' => 'misc_arg'
                           }
                         ],
-                        'cmdname' => 'c',
-                        'extra' => {
-                          'misc_args' => [
-                            ' * @"i::
-'
-                          ]
-                        }
+                        'cmdname' => 'c'
                       },
                       {
                         'args' => [
@@ -109,13 +103,7 @@ $result_trees{'redirection_same_labels'} = [
                             'type' => 'misc_arg'
                           }
                         ],
-                        'cmdname' => 'c',
-                        'extra' => {
-                          'misc_args' => [
-                            ' * @~{@dotless{i}}::
-'
-                          ]
-                        }
+                        'cmdname' => 'c'
                       },
                       {
                         'args' => [
@@ -125,13 +113,7 @@ $result_trees{'redirection_same_labels'} = [
                             'type' => 'misc_arg'
                           }
                         ],
-                        'cmdname' => 'c',
-                        'extra' => {
-                          'misc_args' => [
-                            ' * @^i::
-'
-                          ]
-                        }
+                        'cmdname' => 'c'
                       }
                     ],
                     'type' => 'preformatted'
diff --git a/tp/t/results/include/include_comment.pl 
b/tp/t/results/include/include_comment.pl
index b39bafc628..8163b1fb9b 100644
--- a/tp/t/results/include/include_comment.pl
+++ b/tp/t/results/include/include_comment.pl
@@ -29,12 +29,7 @@ $result_trees{'include_comment'} = {
                             'type' => 'misc_arg'
                           }
                         ],
-                        'cmdname' => 'c',
-                        'extra' => {
-                          'misc_args' => [
-                            ' comment'
-                          ]
-                        }
+                        'cmdname' => 'c'
                       }
                     },
                     'type' => 'line_arg'
diff --git a/tp/t/results/include/include_space_comment.pl 
b/tp/t/results/include/include_space_comment.pl
index 78f31851cb..a7f6524267 100644
--- a/tp/t/results/include/include_space_comment.pl
+++ b/tp/t/results/include/include_space_comment.pl
@@ -29,12 +29,7 @@ $result_trees{'include_space_comment'} = {
                             'type' => 'misc_arg'
                           }
                         ],
-                        'cmdname' => 'c',
-                        'extra' => {
-                          'misc_args' => [
-                            ' comment'
-                          ]
-                        }
+                        'cmdname' => 'c'
                       },
                       'spaces_after_argument' => {
                         'text' => ' '
diff --git a/tp/t/results/include/test_two_include.pl 
b/tp/t/results/include/test_two_include.pl
index cb97080c05..8b279e7c09 100644
--- a/tp/t/results/include/test_two_include.pl
+++ b/tp/t/results/include/test_two_include.pl
@@ -67,12 +67,6 @@ $result_trees{'test_two_include'} = {
                 }
               ],
               'cmdname' => 'set',
-              'extra' => {
-                'misc_args' => [
-                  'UPDATED',
-                  '28 March 2002'
-                ]
-              },
               'info' => {
                 'arg_line' => ' UPDATED 28 March 2002
 '
@@ -90,12 +84,6 @@ $result_trees{'test_two_include'} = {
                 }
               ],
               'cmdname' => 'set',
-              'extra' => {
-                'misc_args' => [
-                  'UPDATED-MONTH',
-                  'March 2002'
-                ]
-              },
               'info' => {
                 'arg_line' => ' UPDATED-MONTH March 2002
 '
@@ -113,12 +101,6 @@ $result_trees{'test_two_include'} = {
                 }
               ],
               'cmdname' => 'set',
-              'extra' => {
-                'misc_args' => [
-                  'EDITION',
-                  '4.2'
-                ]
-              },
               'info' => {
                 'arg_line' => ' EDITION 4.2
 '
@@ -136,12 +118,6 @@ $result_trees{'test_two_include'} = {
                 }
               ],
               'cmdname' => 'set',
-              'extra' => {
-                'misc_args' => [
-                  'VERSION',
-                  '4.2'
-                ]
-              },
               'info' => {
                 'arg_line' => ' VERSION 4.2
 '
@@ -167,12 +143,6 @@ $result_trees{'test_two_include'} = {
             }
           ],
           'cmdname' => 'set',
-          'extra' => {
-            'misc_args' => [
-              'VERSION_DATE',
-              'October 2002'
-            ]
-          },
           'info' => {
             'arg_line' => ' VERSION_DATE October 2002
 '
@@ -190,12 +160,6 @@ $result_trees{'test_two_include'} = {
             }
           ],
           'cmdname' => 'set',
-          'extra' => {
-            'misc_args' => [
-              'SHORT_VERSION',
-              '2-0'
-            ]
-          },
           'info' => {
             'arg_line' => ' SHORT_VERSION 2-0
 '
@@ -213,12 +177,6 @@ $result_trees{'test_two_include'} = {
             }
           ],
           'cmdname' => 'set',
-          'extra' => {
-            'misc_args' => [
-              'RPM_VERSION',
-              '2.0.4'
-            ]
-          },
           'info' => {
             'arg_line' => ' RPM_VERSION 2.0.4
 '
diff --git a/tp/t/results/include/value_expansion_in_include.pl 
b/tp/t/results/include/value_expansion_in_include.pl
index 838a6ed823..7f28d1f661 100644
--- a/tp/t/results/include/value_expansion_in_include.pl
+++ b/tp/t/results/include/value_expansion_in_include.pl
@@ -21,12 +21,6 @@ $result_trees{'value_expansion_in_include'} = {
             }
           ],
           'cmdname' => 'set',
-          'extra' => {
-            'misc_args' => [
-              'testvar',
-              'incl-incl.txi'
-            ]
-          },
           'info' => {
             'arg_line' => ' testvar incl-incl.txi
 '
@@ -45,13 +39,7 @@ $result_trees{'value_expansion_in_include'} = {
               'type' => 'misc_arg'
             }
           ],
-          'cmdname' => 'c',
-          'extra' => {
-            'misc_args' => [
-              ' test - in the variable name, and concatenation of text after.
-'
-            ]
-          }
+          'cmdname' => 'c'
         },
         {
           'args' => [
@@ -65,12 +53,6 @@ $result_trees{'value_expansion_in_include'} = {
             }
           ],
           'cmdname' => 'set',
-          'extra' => {
-            'misc_args' => [
-              'test-var',
-              'incl-incl.tx'
-            ]
-          },
           'info' => {
             'arg_line' => ' test-var incl-incl.tx
 '
@@ -89,13 +71,7 @@ $result_trees{'value_expansion_in_include'} = {
               'type' => 'misc_arg'
             }
           ],
-          'cmdname' => 'c',
-          'extra' => {
-            'misc_args' => [
-              ' test - in the variable name, and concatenation of text before 
and after.
-'
-            ]
-          }
+          'cmdname' => 'c'
         },
         {
           'args' => [
@@ -109,12 +85,6 @@ $result_trees{'value_expansion_in_include'} = {
             }
           ],
           'cmdname' => 'set',
-          'extra' => {
-            'misc_args' => [
-              'test_var',
-              'ncl-incl.tx'
-            ]
-          },
           'info' => {
             'arg_line' => ' test_var ncl-incl.tx
 '
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 69cb3620da..9f79a77e85 100644
--- a/tp/t/results/indices/ignored_sort_char_empty_entries.pl
+++ b/tp/t/results/indices/ignored_sort_char_empty_entries.pl
@@ -23,12 +23,6 @@ $result_trees{'ignored_sort_char_empty_entries'} = {
                 }
               ],
               'cmdname' => 'set',
-              'extra' => {
-                'misc_args' => [
-                  'txiindexhyphenignore',
-                  ''
-                ]
-              },
               'info' => {
                 'arg_line' => ' txiindexhyphenignore
 '
diff --git a/tp/t/results/indices/index_special_region.pl 
b/tp/t/results/indices/index_special_region.pl
index 63d0bdb498..e837d297e7 100644
--- a/tp/t/results/indices/index_special_region.pl
+++ b/tp/t/results/indices/index_special_region.pl
@@ -672,13 +672,7 @@ $result_trees{'index_special_region'} = {
                   'type' => 'misc_arg'
                 }
               ],
-              'cmdname' => 'c',
-              'extra' => {
-                'misc_args' => [
-                  ' note this chapter is not associated to a node
-'
-                ]
-              }
+              'cmdname' => 'c'
             },
             'spaces_after_argument' => {
               'text' => '  '
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 090b853b7a..09bb45dd9e 100644
--- a/tp/t/results/indices/index_special_region_no_insertcopying.pl
+++ b/tp/t/results/indices/index_special_region_no_insertcopying.pl
@@ -672,13 +672,7 @@ $result_trees{'index_special_region_no_insertcopying'} = {
                   'type' => 'misc_arg'
                 }
               ],
-              'cmdname' => 'c',
-              'extra' => {
-                'misc_args' => [
-                  ' note this chapter is not associated to a node
-'
-                ]
-              }
+              'cmdname' => 'c'
             },
             'spaces_after_argument' => {
               'text' => '  '
@@ -702,13 +696,7 @@ $result_trees{'index_special_region_no_insertcopying'} = {
               'type' => 'misc_arg'
             }
           ],
-          'cmdname' => 'c',
-          'extra' => {
-            'misc_args' => [
-              ' @insertcopying
-'
-            ]
-          }
+          'cmdname' => 'c'
         },
         {
           'text' => '
@@ -1590,13 +1578,7 @@ $result_trees{'index_special_region_no_insertcopying'} = 
{
               'type' => 'misc_arg'
             }
           ],
-          'cmdname' => 'c',
-          'extra' => {
-            'misc_args' => [
-              ' @insertcopying
-'
-            ]
-          }
+          'cmdname' => 'c'
         },
         {
           'text' => '
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 090d39aca3..a02200ffcb 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
@@ -672,13 +672,7 @@ 
$result_trees{'index_special_region_no_insertcopying_no_titlepage_no_nodes'} = {
                   'type' => 'misc_arg'
                 }
               ],
-              'cmdname' => 'c',
-              'extra' => {
-                'misc_args' => [
-                  ' note this chapter is not associated to a node
-'
-                ]
-              }
+              'cmdname' => 'c'
             },
             'spaces_after_argument' => {
               'text' => '  '
@@ -702,13 +696,7 @@ 
$result_trees{'index_special_region_no_insertcopying_no_titlepage_no_nodes'} = {
               'type' => 'misc_arg'
             }
           ],
-          'cmdname' => 'c',
-          'extra' => {
-            'misc_args' => [
-              ' @insertcopying
-'
-            ]
-          }
+          'cmdname' => 'c'
         },
         {
           'text' => '
@@ -1590,13 +1578,7 @@ 
$result_trees{'index_special_region_no_insertcopying_no_titlepage_no_nodes'} = {
               'type' => 'misc_arg'
             }
           ],
-          'cmdname' => 'c',
-          'extra' => {
-            'misc_args' => [
-              ' @insertcopying
-'
-            ]
-          }
+          'cmdname' => 'c'
         },
         {
           'text' => '
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 bef37f8950..f61dba8abf 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
@@ -672,13 +672,7 @@ 
$result_trees{'index_special_region_no_insertcopying_titlepage_no_nodes'} = {
                   'type' => 'misc_arg'
                 }
               ],
-              'cmdname' => 'c',
-              'extra' => {
-                'misc_args' => [
-                  ' note this chapter is not associated to a node
-'
-                ]
-              }
+              'cmdname' => 'c'
             },
             'spaces_after_argument' => {
               'text' => '  '
@@ -702,13 +696,7 @@ 
$result_trees{'index_special_region_no_insertcopying_titlepage_no_nodes'} = {
               'type' => 'misc_arg'
             }
           ],
-          'cmdname' => 'c',
-          'extra' => {
-            'misc_args' => [
-              ' @insertcopying
-'
-            ]
-          }
+          'cmdname' => 'c'
         },
         {
           'text' => '
@@ -1590,13 +1578,7 @@ 
$result_trees{'index_special_region_no_insertcopying_titlepage_no_nodes'} = {
               'type' => 'misc_arg'
             }
           ],
-          'cmdname' => 'c',
-          'extra' => {
-            'misc_args' => [
-              ' @insertcopying
-'
-            ]
-          }
+          'cmdname' => 'c'
         },
         {
           'text' => '
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 232ec2c393..c2575f9830 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
@@ -672,13 +672,7 @@ 
$result_trees{'index_special_region_no_insertcopying_titlepage_no_nodes_footnote
                   'type' => 'misc_arg'
                 }
               ],
-              'cmdname' => 'c',
-              'extra' => {
-                'misc_args' => [
-                  ' note this chapter is not associated to a node
-'
-                ]
-              }
+              'cmdname' => 'c'
             },
             'spaces_after_argument' => {
               'text' => '  '
@@ -702,13 +696,7 @@ 
$result_trees{'index_special_region_no_insertcopying_titlepage_no_nodes_footnote
               'type' => 'misc_arg'
             }
           ],
-          'cmdname' => 'c',
-          'extra' => {
-            'misc_args' => [
-              ' @insertcopying
-'
-            ]
-          }
+          'cmdname' => 'c'
         },
         {
           'text' => '
@@ -1590,13 +1578,7 @@ 
$result_trees{'index_special_region_no_insertcopying_titlepage_no_nodes_footnote
               'type' => 'misc_arg'
             }
           ],
-          'cmdname' => 'c',
-          'extra' => {
-            'misc_args' => [
-              ' @insertcopying
-'
-            ]
-          }
+          'cmdname' => 'c'
         },
         {
           'text' => '
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 30ca2b7ef8..5fbcda9945 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
@@ -672,13 +672,7 @@ 
$result_trees{'index_special_region_no_titlepage_no_nodes'} = {
                   'type' => 'misc_arg'
                 }
               ],
-              'cmdname' => 'c',
-              'extra' => {
-                'misc_args' => [
-                  ' note this chapter is not associated to a node
-'
-                ]
-              }
+              'cmdname' => 'c'
             },
             'spaces_after_argument' => {
               'text' => '  '
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 6fb021ac95..54be8077bb 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
@@ -672,13 +672,7 @@ $result_trees{'index_special_region_titlepage_no_nodes'} = 
{
                   'type' => 'misc_arg'
                 }
               ],
-              'cmdname' => 'c',
-              'extra' => {
-                'misc_args' => [
-                  ' note this chapter is not associated to a node
-'
-                ]
-              }
+              'cmdname' => 'c'
             },
             'spaces_after_argument' => {
               'text' => '  '
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 7e9cd78a24..6c50fe1e7d 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
@@ -672,13 +672,7 @@ 
$result_trees{'index_special_region_titlepage_no_nodes_footnotes_default'} = {
                   'type' => 'misc_arg'
                 }
               ],
-              'cmdname' => 'c',
-              'extra' => {
-                'misc_args' => [
-                  ' note this chapter is not associated to a node
-'
-                ]
-              }
+              'cmdname' => 'c'
             },
             'spaces_after_argument' => {
               'text' => '  '
diff --git a/tp/t/results/indices/index_table.pl 
b/tp/t/results/indices/index_table.pl
index fd027f3811..38c2ed372a 100644
--- a/tp/t/results/indices/index_table.pl
+++ b/tp/t/results/indices/index_table.pl
@@ -6228,13 +6228,7 @@ $result_trees{'index_table'} = {
               'type' => 'misc_arg'
             }
           ],
-          'cmdname' => 'c',
-          'extra' => {
-            'misc_args' => [
-              ' @printindex fn
-'
-            ]
-          }
+          'cmdname' => 'c'
         },
         {
           'args' => [
@@ -6244,13 +6238,7 @@ $result_trees{'index_table'} = {
               'type' => 'misc_arg'
             }
           ],
-          'cmdname' => 'c',
-          'extra' => {
-            'misc_args' => [
-              ' @printindex vr
-'
-            ]
-          }
+          'cmdname' => 'c'
         },
         {
           'text' => '
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 83d2c2667e..db281c53cc 100644
--- a/tp/t/results/indices/index_table_chapter_no_node.pl
+++ b/tp/t/results/indices/index_table_chapter_no_node.pl
@@ -6228,13 +6228,7 @@ $result_trees{'index_table_chapter_no_node'} = {
               'type' => 'misc_arg'
             }
           ],
-          'cmdname' => 'c',
-          'extra' => {
-            'misc_args' => [
-              ' @printindex fn
-'
-            ]
-          }
+          'cmdname' => 'c'
         },
         {
           'args' => [
@@ -6244,13 +6238,7 @@ $result_trees{'index_table_chapter_no_node'} = {
               'type' => 'misc_arg'
             }
           ],
-          'cmdname' => 'c',
-          'extra' => {
-            'misc_args' => [
-              ' @printindex vr
-'
-            ]
-          }
+          'cmdname' => 'c'
         },
         {
           'text' => '
diff --git a/tp/t/results/indices/nodes_before_top.pl 
b/tp/t/results/indices/nodes_before_top.pl
index 3ab44b4ddf..52c48e4218 100644
--- a/tp/t/results/indices/nodes_before_top.pl
+++ b/tp/t/results/indices/nodes_before_top.pl
@@ -34,13 +34,7 @@ $result_trees{'nodes_before_top'} = {
                   'type' => 'misc_arg'
                 }
               ],
-              'cmdname' => 'c',
-              'extra' => {
-                'misc_args' => [
-                  ' test nodes before Top node
-'
-                ]
-              }
+              'cmdname' => 'c'
             },
             {
               'text' => '
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 8ef03a8c17..e22e70173f 100644
--- a/tp/t/results/indices/nodes_before_top_split_chapter.pl
+++ b/tp/t/results/indices/nodes_before_top_split_chapter.pl
@@ -34,13 +34,7 @@ $result_trees{'nodes_before_top_split_chapter'} = {
                   'type' => 'misc_arg'
                 }
               ],
-              'cmdname' => 'c',
-              'extra' => {
-                'misc_args' => [
-                  ' test nodes before Top node
-'
-                ]
-              }
+              'cmdname' => 'c'
             },
             {
               'text' => '
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 6689a48efc..7cb3a7433e 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
@@ -34,13 +34,7 @@ $result_trees{'nodes_before_top_split_chapter_no_nodes'} = {
                   'type' => 'misc_arg'
                 }
               ],
-              'cmdname' => 'c',
-              'extra' => {
-                'misc_args' => [
-                  ' test nodes before Top node
-'
-                ]
-              }
+              'cmdname' => 'c'
             },
             {
               'text' => '
diff --git a/tp/t/results/indices/transparent_sort_chars.pl 
b/tp/t/results/indices/transparent_sort_chars.pl
index f5dc0edd2e..bcd60d966a 100644
--- a/tp/t/results/indices/transparent_sort_chars.pl
+++ b/tp/t/results/indices/transparent_sort_chars.pl
@@ -23,12 +23,6 @@ $result_trees{'transparent_sort_chars'} = {
                 }
               ],
               'cmdname' => 'set',
-              'extra' => {
-                'misc_args' => [
-                  'txiindexhyphenignore',
-                  ''
-                ]
-              },
               'info' => {
                 'arg_line' => ' txiindexhyphenignore
 '
diff --git a/tp/t/results/info_tests/anchor_in_command.pl 
b/tp/t/results/info_tests/anchor_in_command.pl
index cab5fea7ce..59103bbad6 100644
--- a/tp/t/results/info_tests/anchor_in_command.pl
+++ b/tp/t/results/info_tests/anchor_in_command.pl
@@ -89,13 +89,7 @@ $result_trees{'anchor_in_command'} = {
                           'type' => 'misc_arg'
                         }
                       ],
-                      'cmdname' => 'c',
-                      'extra' => {
-                        'misc_args' => [
-                          ' emph @emph{emph2 @anchor{anchor in emph} }}.
-'
-                        ]
-                      }
+                      'cmdname' => 'c'
                     },
                     {
                       'text' => 'emph '
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 24c5e5af4f..b11a8c6a8f 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
@@ -193,13 +193,7 @@ $result_trees{'multitable_anchor_and_index_entry'} = {
                                   'type' => 'misc_arg'
                                 }
                               ],
-                              'cmdname' => 'c',
-                              'extra' => {
-                                'misc_args' => [
-                                  ' comment in multitable
-'
-                                ]
-                              }
+                              'cmdname' => 'c'
                             }
                           ],
                           'type' => 'paragraph'
diff --git a/tp/t/results/itemize/comment_first_on_enumerate_line.pl 
b/tp/t/results/itemize/comment_first_on_enumerate_line.pl
index c646e8a74c..2b4837829b 100644
--- a/tp/t/results/itemize/comment_first_on_enumerate_line.pl
+++ b/tp/t/results/itemize/comment_first_on_enumerate_line.pl
@@ -21,13 +21,7 @@ $result_trees{'comment_first_on_enumerate_line'} = {
                       'type' => 'misc_arg'
                     }
                   ],
-                  'cmdname' => 'c',
-                  'extra' => {
-                    'misc_args' => [
-                      ' comment on enumerate line
-'
-                    ]
-                  }
+                  'cmdname' => 'c'
                 }
               },
               'type' => 'block_line_arg'
diff --git a/tp/t/results/itemize/comment_first_on_itemize_line.pl 
b/tp/t/results/itemize/comment_first_on_itemize_line.pl
index 068a2e9df9..63bc5c0f28 100644
--- a/tp/t/results/itemize/comment_first_on_itemize_line.pl
+++ b/tp/t/results/itemize/comment_first_on_itemize_line.pl
@@ -27,13 +27,7 @@ $result_trees{'comment_first_on_itemize_line'} = {
                       'type' => 'misc_arg'
                     }
                   ],
-                  'cmdname' => 'c',
-                  'extra' => {
-                    'misc_args' => [
-                      ' comment on itemize line
-'
-                    ]
-                  }
+                  'cmdname' => 'c'
                 }
               },
               'type' => 'block_line_arg'
diff --git a/tp/t/results/itemize/empty_accent_argument.pl 
b/tp/t/results/itemize/empty_accent_argument.pl
index 00f499076a..261b097fb9 100644
--- a/tp/t/results/itemize/empty_accent_argument.pl
+++ b/tp/t/results/itemize/empty_accent_argument.pl
@@ -31,13 +31,7 @@ $result_trees{'empty_accent_argument'} = {
                       'type' => 'misc_arg'
                     }
                   ],
-                  'cmdname' => 'comment',
-                  'extra' => {
-                    'misc_args' => [
-                      '
-'
-                    ]
-                  }
+                  'cmdname' => 'comment'
                 }
               },
               'type' => 'block_line_arg'
diff --git a/tp/t/results/itemize/enumerate_argument.pl 
b/tp/t/results/itemize/enumerate_argument.pl
index 88ceb201be..3705835e1a 100644
--- a/tp/t/results/itemize/enumerate_argument.pl
+++ b/tp/t/results/itemize/enumerate_argument.pl
@@ -97,13 +97,7 @@ $result_trees{'enumerate_argument'} = {
                       'type' => 'misc_arg'
                     }
                   ],
-                  'cmdname' => 'c',
-                  'extra' => {
-                    'misc_args' => [
-                      ' comment
-'
-                    ]
-                  }
+                  'cmdname' => 'c'
                 }
               },
               'type' => 'block_line_arg'
@@ -180,13 +174,7 @@ $result_trees{'enumerate_argument'} = {
                       'type' => 'misc_arg'
                     }
                   ],
-                  'cmdname' => 'c',
-                  'extra' => {
-                    'misc_args' => [
-                      ' comment
-'
-                    ]
-                  }
+                  'cmdname' => 'c'
                 },
                 'spaces_after_argument' => {
                   'text' => ' '
diff --git a/tp/t/results/itemize/enumerate_argument_item.pl 
b/tp/t/results/itemize/enumerate_argument_item.pl
index 686e2e9fc7..652aa31a6f 100644
--- a/tp/t/results/itemize/enumerate_argument_item.pl
+++ b/tp/t/results/itemize/enumerate_argument_item.pl
@@ -149,13 +149,7 @@ $result_trees{'enumerate_argument_item'} = {
                       'type' => 'misc_arg'
                     }
                   ],
-                  'cmdname' => 'c',
-                  'extra' => {
-                    'misc_args' => [
-                      ' comment
-'
-                    ]
-                  }
+                  'cmdname' => 'c'
                 }
               },
               'type' => 'block_line_arg'
@@ -284,13 +278,7 @@ $result_trees{'enumerate_argument_item'} = {
                       'type' => 'misc_arg'
                     }
                   ],
-                  'cmdname' => 'c',
-                  'extra' => {
-                    'misc_args' => [
-                      ' comment
-'
-                    ]
-                  }
+                  'cmdname' => 'c'
                 },
                 'spaces_after_argument' => {
                   'text' => ' '
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 eaea8de1c2..ba3f392270 100644
--- a/tp/t/results/itemize/inter_item_commands_in_enumerate.pl
+++ b/tp/t/results/itemize/inter_item_commands_in_enumerate.pl
@@ -170,13 +170,7 @@ $result_trees{'inter_item_commands_in_enumerate'} = {
                       'type' => 'misc_arg'
                     }
                   ],
-                  'cmdname' => 'comment',
-                  'extra' => {
-                    'misc_args' => [
-                      ' comment before first item in enumerate
-'
-                    ]
-                  }
+                  'cmdname' => 'comment'
                 }
               ],
               'type' => 'before_item'
@@ -870,13 +864,7 @@ $result_trees{'inter_item_commands_in_enumerate'} = {
                       'type' => 'misc_arg'
                     }
                   ],
-                  'cmdname' => 'comment',
-                  'extra' => {
-                    'misc_args' => [
-                      ' comment
-'
-                    ]
-                  }
+                  'cmdname' => 'comment'
                 },
                 {
                   'args' => [
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 c79d250abe..83fda73bda 100644
--- a/tp/t/results/itemize/inter_item_commands_in_itemize.pl
+++ b/tp/t/results/itemize/inter_item_commands_in_itemize.pl
@@ -176,13 +176,7 @@ $result_trees{'inter_item_commands_in_itemize'} = {
                       'type' => 'misc_arg'
                     }
                   ],
-                  'cmdname' => 'c',
-                  'extra' => {
-                    'misc_args' => [
-                      ' comment in itemize
-'
-                    ]
-                  }
+                  'cmdname' => 'c'
                 },
                 {
                   'args' => [
@@ -552,13 +546,7 @@ $result_trees{'inter_item_commands_in_itemize'} = {
                       'type' => 'misc_arg'
                     }
                   ],
-                  'cmdname' => 'c',
-                  'extra' => {
-                    'misc_args' => [
-                      ' comment in itemize
-'
-                    ]
-                  }
+                  'cmdname' => 'c'
                 },
                 {
                   'contents' => [
diff --git a/tp/t/results/languages/documentlanguage.pl 
b/tp/t/results/languages/documentlanguage.pl
index e47169fa9d..0bdcb57f91 100644
--- a/tp/t/results/languages/documentlanguage.pl
+++ b/tp/t/results/languages/documentlanguage.pl
@@ -34,13 +34,7 @@ $result_trees{'documentlanguage'} = {
                   'type' => 'misc_arg'
                 }
               ],
-              'cmdname' => 'c',
-              'extra' => {
-                'misc_args' => [
-                  ' this document is setup to detect when the documentlanguage 
was not
-'
-                ]
-              }
+              'cmdname' => 'c'
             },
             {
               'args' => [
@@ -50,13 +44,7 @@ $result_trees{'documentlanguage'} = {
                   'type' => 'misc_arg'
                 }
               ],
-              'cmdname' => 'c',
-              'extra' => {
-                'misc_args' => [
-                  ' set according to command line, but according to document.  
This
-'
-                ]
-              }
+              'cmdname' => 'c'
             },
             {
               'args' => [
@@ -66,13 +54,7 @@ $result_trees{'documentlanguage'} = {
                   'type' => 'misc_arg'
                 }
               ],
-              'cmdname' => 'c',
-              'extra' => {
-                'misc_args' => [
-                  ' is important to test that in the Parser, as converters 
initialized with
-'
-                ]
-              }
+              'cmdname' => 'c'
             },
             {
               'args' => [
@@ -82,13 +64,7 @@ $result_trees{'documentlanguage'} = {
                   'type' => 'misc_arg'
                 }
               ],
-              'cmdname' => 'c',
-              'extra' => {
-                'misc_args' => [
-                  ' Texinfo::Convert::Converter converter() and with values 
accessed by
-'
-                ]
-              }
+              'cmdname' => 'c'
             },
             {
               'args' => [
@@ -98,13 +74,7 @@ $result_trees{'documentlanguage'} = {
                   'type' => 'misc_arg'
                 }
               ],
-              'cmdname' => 'c',
-              'extra' => {
-                'misc_args' => [
-                  ' get_conf() will use the command line.
-'
-                ]
-              }
+              'cmdname' => 'c'
             },
             {
               'args' => [
@@ -114,13 +84,7 @@ $result_trees{'documentlanguage'} = {
                   'type' => 'misc_arg'
                 }
               ],
-              'cmdname' => 'c',
-              'extra' => {
-                'misc_args' => [
-                  ' This is tricky to demonstrate, as documentlanguage is not 
used much
-'
-                ]
-              }
+              'cmdname' => 'c'
             },
             {
               'args' => [
@@ -130,13 +94,7 @@ $result_trees{'documentlanguage'} = {
                   'type' => 'misc_arg'
                 }
               ],
-              'cmdname' => 'c',
-              'extra' => {
-                'misc_args' => [
-                  ' in Parser.  It is used in two places to set the 
documentlanguage extra
-'
-                ]
-              }
+              'cmdname' => 'c'
             },
             {
               'args' => [
@@ -146,13 +104,7 @@ $result_trees{'documentlanguage'} = {
                   'type' => 'misc_arg'
                 }
               ],
-              'cmdname' => 'c',
-              'extra' => {
-                'misc_args' => [
-                  ' value, 
-'
-                ]
-              }
+              'cmdname' => 'c'
             },
             {
               'args' => [
@@ -162,13 +114,7 @@ $result_trees{'documentlanguage'} = {
                   'type' => 'misc_arg'
                 }
               ],
-              'cmdname' => 'c',
-              'extra' => {
-                'misc_args' => [
-                  ' 1) for the untranslated type, for the prefix of @def* and 
-'
-                ]
-              }
+              'cmdname' => 'c'
             },
             {
               'args' => [
@@ -178,13 +124,7 @@ $result_trees{'documentlanguage'} = {
                   'type' => 'misc_arg'
                 }
               ],
-              'cmdname' => 'c',
-              'extra' => {
-                'misc_args' => [
-                  ' 2) for the @def* line commands with added index entries 
that need to 
-'
-                ]
-              }
+              'cmdname' => 'c'
             },
             {
               'args' => [
@@ -194,13 +134,7 @@ $result_trees{'documentlanguage'} = {
                   'type' => 'misc_arg'
                 }
               ],
-              'cmdname' => 'c',
-              'extra' => {
-                'misc_args' => [
-                  '    be translated, like \'{name} of {class}\'.
-'
-                ]
-              }
+              'cmdname' => 'c'
             },
             {
               'args' => [
@@ -210,13 +144,7 @@ $result_trees{'documentlanguage'} = {
                   'type' => 'misc_arg'
                 }
               ],
-              'cmdname' => 'c',
-              'extra' => {
-                'misc_args' => [
-                  ' The untranslated type is in general translated in the 
converters
-'
-                ]
-              }
+              'cmdname' => 'c'
             },
             {
               'args' => [
@@ -226,13 +154,7 @@ $result_trees{'documentlanguage'} = {
                   'type' => 'misc_arg'
                 }
               ],
-              'cmdname' => 'c',
-              'extra' => {
-                'misc_args' => [
-                  ' without using the extra documentlanguage key value, so 
getting it 
-'
-                ]
-              }
+              'cmdname' => 'c'
             },
             {
               'args' => [
@@ -242,13 +164,7 @@ $result_trees{'documentlanguage'} = {
                   'type' => 'misc_arg'
                 }
               ],
-              'cmdname' => 'c',
-              'extra' => {
-                'misc_args' => [
-                  ' wrong does not have any consequence.
-'
-                ]
-              }
+              'cmdname' => 'c'
             },
             {
               'args' => [
@@ -258,13 +174,7 @@ $result_trees{'documentlanguage'} = {
                   'type' => 'misc_arg'
                 }
               ],
-              'cmdname' => 'c',
-              'extra' => {
-                'misc_args' => [
-                  ' The @def* translated added indices are translated 
relatively early,
-'
-                ]
-              }
+              'cmdname' => 'c'
             },
             {
               'args' => [
@@ -274,13 +184,7 @@ $result_trees{'documentlanguage'} = {
                   'type' => 'misc_arg'
                 }
               ],
-              'cmdname' => 'c',
-              'extra' => {
-                'misc_args' => [
-                  ' before the converter, and the extra documentlanguage key 
is used to
-'
-                ]
-              }
+              'cmdname' => 'c'
             },
             {
               'args' => [
@@ -290,13 +194,7 @@ $result_trees{'documentlanguage'} = {
                   'type' => 'misc_arg'
                 }
               ],
-              'cmdname' => 'c',
-              'extra' => {
-                'misc_args' => [
-                  ' get the language, so if the wrong language is set, it will 
show up
-'
-                ]
-              }
+              'cmdname' => 'c'
             },
             {
               'args' => [
@@ -306,13 +204,7 @@ $result_trees{'documentlanguage'} = {
                   'type' => 'misc_arg'
                 }
               ],
-              'cmdname' => 'c',
-              'extra' => {
-                'misc_args' => [
-                  ' in the index generated by @printindex.
-'
-                ]
-              }
+              'cmdname' => 'c'
             },
             {
               'text' => '
diff --git a/tp/t/results/languages/documentlanguage_option.pl 
b/tp/t/results/languages/documentlanguage_option.pl
index e0d58ef1ce..31b9c255f0 100644
--- a/tp/t/results/languages/documentlanguage_option.pl
+++ b/tp/t/results/languages/documentlanguage_option.pl
@@ -34,13 +34,7 @@ $result_trees{'documentlanguage_option'} = {
                   'type' => 'misc_arg'
                 }
               ],
-              'cmdname' => 'c',
-              'extra' => {
-                'misc_args' => [
-                  ' this document is setup to detect when the documentlanguage 
was not
-'
-                ]
-              }
+              'cmdname' => 'c'
             },
             {
               'args' => [
@@ -50,13 +44,7 @@ $result_trees{'documentlanguage_option'} = {
                   'type' => 'misc_arg'
                 }
               ],
-              'cmdname' => 'c',
-              'extra' => {
-                'misc_args' => [
-                  ' set according to command line, but according to document.  
This
-'
-                ]
-              }
+              'cmdname' => 'c'
             },
             {
               'args' => [
@@ -66,13 +54,7 @@ $result_trees{'documentlanguage_option'} = {
                   'type' => 'misc_arg'
                 }
               ],
-              'cmdname' => 'c',
-              'extra' => {
-                'misc_args' => [
-                  ' is important to test that in the Parser, as converters 
initialized with
-'
-                ]
-              }
+              'cmdname' => 'c'
             },
             {
               'args' => [
@@ -82,13 +64,7 @@ $result_trees{'documentlanguage_option'} = {
                   'type' => 'misc_arg'
                 }
               ],
-              'cmdname' => 'c',
-              'extra' => {
-                'misc_args' => [
-                  ' Texinfo::Convert::Converter converter() and with values 
accessed by
-'
-                ]
-              }
+              'cmdname' => 'c'
             },
             {
               'args' => [
@@ -98,13 +74,7 @@ $result_trees{'documentlanguage_option'} = {
                   'type' => 'misc_arg'
                 }
               ],
-              'cmdname' => 'c',
-              'extra' => {
-                'misc_args' => [
-                  ' get_conf() will use the command line.
-'
-                ]
-              }
+              'cmdname' => 'c'
             },
             {
               'args' => [
@@ -114,13 +84,7 @@ $result_trees{'documentlanguage_option'} = {
                   'type' => 'misc_arg'
                 }
               ],
-              'cmdname' => 'c',
-              'extra' => {
-                'misc_args' => [
-                  ' This is tricky to demonstrate, as documentlanguage is not 
used much
-'
-                ]
-              }
+              'cmdname' => 'c'
             },
             {
               'args' => [
@@ -130,13 +94,7 @@ $result_trees{'documentlanguage_option'} = {
                   'type' => 'misc_arg'
                 }
               ],
-              'cmdname' => 'c',
-              'extra' => {
-                'misc_args' => [
-                  ' in Parser.  It is used in two places to set the 
documentlanguage extra
-'
-                ]
-              }
+              'cmdname' => 'c'
             },
             {
               'args' => [
@@ -146,13 +104,7 @@ $result_trees{'documentlanguage_option'} = {
                   'type' => 'misc_arg'
                 }
               ],
-              'cmdname' => 'c',
-              'extra' => {
-                'misc_args' => [
-                  ' value, 
-'
-                ]
-              }
+              'cmdname' => 'c'
             },
             {
               'args' => [
@@ -162,13 +114,7 @@ $result_trees{'documentlanguage_option'} = {
                   'type' => 'misc_arg'
                 }
               ],
-              'cmdname' => 'c',
-              'extra' => {
-                'misc_args' => [
-                  ' 1) for the untranslated type, for the prefix of @def* and 
-'
-                ]
-              }
+              'cmdname' => 'c'
             },
             {
               'args' => [
@@ -178,13 +124,7 @@ $result_trees{'documentlanguage_option'} = {
                   'type' => 'misc_arg'
                 }
               ],
-              'cmdname' => 'c',
-              'extra' => {
-                'misc_args' => [
-                  ' 2) for the @def* line commands with added index entries 
that need to 
-'
-                ]
-              }
+              'cmdname' => 'c'
             },
             {
               'args' => [
@@ -194,13 +134,7 @@ $result_trees{'documentlanguage_option'} = {
                   'type' => 'misc_arg'
                 }
               ],
-              'cmdname' => 'c',
-              'extra' => {
-                'misc_args' => [
-                  '    be translated, like \'{name} of {class}\'.
-'
-                ]
-              }
+              'cmdname' => 'c'
             },
             {
               'args' => [
@@ -210,13 +144,7 @@ $result_trees{'documentlanguage_option'} = {
                   'type' => 'misc_arg'
                 }
               ],
-              'cmdname' => 'c',
-              'extra' => {
-                'misc_args' => [
-                  ' The untranslated type is in general translated in the 
converters
-'
-                ]
-              }
+              'cmdname' => 'c'
             },
             {
               'args' => [
@@ -226,13 +154,7 @@ $result_trees{'documentlanguage_option'} = {
                   'type' => 'misc_arg'
                 }
               ],
-              'cmdname' => 'c',
-              'extra' => {
-                'misc_args' => [
-                  ' without using the extra documentlanguage key value, so 
getting it 
-'
-                ]
-              }
+              'cmdname' => 'c'
             },
             {
               'args' => [
@@ -242,13 +164,7 @@ $result_trees{'documentlanguage_option'} = {
                   'type' => 'misc_arg'
                 }
               ],
-              'cmdname' => 'c',
-              'extra' => {
-                'misc_args' => [
-                  ' wrong does not have any consequence.
-'
-                ]
-              }
+              'cmdname' => 'c'
             },
             {
               'args' => [
@@ -258,13 +174,7 @@ $result_trees{'documentlanguage_option'} = {
                   'type' => 'misc_arg'
                 }
               ],
-              'cmdname' => 'c',
-              'extra' => {
-                'misc_args' => [
-                  ' The @def* translated added indices are translated 
relatively early,
-'
-                ]
-              }
+              'cmdname' => 'c'
             },
             {
               'args' => [
@@ -274,13 +184,7 @@ $result_trees{'documentlanguage_option'} = {
                   'type' => 'misc_arg'
                 }
               ],
-              'cmdname' => 'c',
-              'extra' => {
-                'misc_args' => [
-                  ' before the converter, and the extra documentlanguage key 
is used to
-'
-                ]
-              }
+              'cmdname' => 'c'
             },
             {
               'args' => [
@@ -290,13 +194,7 @@ $result_trees{'documentlanguage_option'} = {
                   'type' => 'misc_arg'
                 }
               ],
-              'cmdname' => 'c',
-              'extra' => {
-                'misc_args' => [
-                  ' get the language, so if the wrong language is set, it will 
show up
-'
-                ]
-              }
+              'cmdname' => 'c'
             },
             {
               'args' => [
@@ -306,13 +204,7 @@ $result_trees{'documentlanguage_option'} = {
                   'type' => 'misc_arg'
                 }
               ],
-              'cmdname' => 'c',
-              'extra' => {
-                'misc_args' => [
-                  ' in the index generated by @printindex.
-'
-                ]
-              }
+              'cmdname' => 'c'
             },
             {
               'text' => '
diff --git a/tp/t/results/languages/documentlanguage_unknown.pl 
b/tp/t/results/languages/documentlanguage_unknown.pl
index f9860d2db5..140810c9f8 100644
--- a/tp/t/results/languages/documentlanguage_unknown.pl
+++ b/tp/t/results/languages/documentlanguage_unknown.pl
@@ -34,13 +34,7 @@ $result_trees{'documentlanguage_unknown'} = {
                   'type' => 'misc_arg'
                 }
               ],
-              'cmdname' => 'c',
-              'extra' => {
-                'misc_args' => [
-                  ' this document is setup to detect when the documentlanguage 
was not
-'
-                ]
-              }
+              'cmdname' => 'c'
             },
             {
               'args' => [
@@ -50,13 +44,7 @@ $result_trees{'documentlanguage_unknown'} = {
                   'type' => 'misc_arg'
                 }
               ],
-              'cmdname' => 'c',
-              'extra' => {
-                'misc_args' => [
-                  ' set according to command line, but according to document.  
This
-'
-                ]
-              }
+              'cmdname' => 'c'
             },
             {
               'args' => [
@@ -66,13 +54,7 @@ $result_trees{'documentlanguage_unknown'} = {
                   'type' => 'misc_arg'
                 }
               ],
-              'cmdname' => 'c',
-              'extra' => {
-                'misc_args' => [
-                  ' is important to test that in the Parser, as converters 
initialized with
-'
-                ]
-              }
+              'cmdname' => 'c'
             },
             {
               'args' => [
@@ -82,13 +64,7 @@ $result_trees{'documentlanguage_unknown'} = {
                   'type' => 'misc_arg'
                 }
               ],
-              'cmdname' => 'c',
-              'extra' => {
-                'misc_args' => [
-                  ' Texinfo::Convert::Converter converter() and with values 
accessed by
-'
-                ]
-              }
+              'cmdname' => 'c'
             },
             {
               'args' => [
@@ -98,13 +74,7 @@ $result_trees{'documentlanguage_unknown'} = {
                   'type' => 'misc_arg'
                 }
               ],
-              'cmdname' => 'c',
-              'extra' => {
-                'misc_args' => [
-                  ' get_conf() will use the command line.
-'
-                ]
-              }
+              'cmdname' => 'c'
             },
             {
               'args' => [
@@ -114,13 +84,7 @@ $result_trees{'documentlanguage_unknown'} = {
                   'type' => 'misc_arg'
                 }
               ],
-              'cmdname' => 'c',
-              'extra' => {
-                'misc_args' => [
-                  ' This is tricky to demonstrate, as documentlanguage is not 
used much
-'
-                ]
-              }
+              'cmdname' => 'c'
             },
             {
               'args' => [
@@ -130,13 +94,7 @@ $result_trees{'documentlanguage_unknown'} = {
                   'type' => 'misc_arg'
                 }
               ],
-              'cmdname' => 'c',
-              'extra' => {
-                'misc_args' => [
-                  ' in Parser.  It is used in two places to set the 
documentlanguage extra
-'
-                ]
-              }
+              'cmdname' => 'c'
             },
             {
               'args' => [
@@ -146,13 +104,7 @@ $result_trees{'documentlanguage_unknown'} = {
                   'type' => 'misc_arg'
                 }
               ],
-              'cmdname' => 'c',
-              'extra' => {
-                'misc_args' => [
-                  ' value, 
-'
-                ]
-              }
+              'cmdname' => 'c'
             },
             {
               'args' => [
@@ -162,13 +114,7 @@ $result_trees{'documentlanguage_unknown'} = {
                   'type' => 'misc_arg'
                 }
               ],
-              'cmdname' => 'c',
-              'extra' => {
-                'misc_args' => [
-                  ' 1) for the untranslated type, for the prefix of @def* and 
-'
-                ]
-              }
+              'cmdname' => 'c'
             },
             {
               'args' => [
@@ -178,13 +124,7 @@ $result_trees{'documentlanguage_unknown'} = {
                   'type' => 'misc_arg'
                 }
               ],
-              'cmdname' => 'c',
-              'extra' => {
-                'misc_args' => [
-                  ' 2) for the @def* line commands with added index entries 
that need to 
-'
-                ]
-              }
+              'cmdname' => 'c'
             },
             {
               'args' => [
@@ -194,13 +134,7 @@ $result_trees{'documentlanguage_unknown'} = {
                   'type' => 'misc_arg'
                 }
               ],
-              'cmdname' => 'c',
-              'extra' => {
-                'misc_args' => [
-                  '    be translated, like \'{name} of {class}\'.
-'
-                ]
-              }
+              'cmdname' => 'c'
             },
             {
               'args' => [
@@ -210,13 +144,7 @@ $result_trees{'documentlanguage_unknown'} = {
                   'type' => 'misc_arg'
                 }
               ],
-              'cmdname' => 'c',
-              'extra' => {
-                'misc_args' => [
-                  ' The untranslated type is in general translated in the 
converters
-'
-                ]
-              }
+              'cmdname' => 'c'
             },
             {
               'args' => [
@@ -226,13 +154,7 @@ $result_trees{'documentlanguage_unknown'} = {
                   'type' => 'misc_arg'
                 }
               ],
-              'cmdname' => 'c',
-              'extra' => {
-                'misc_args' => [
-                  ' without using the extra documentlanguage key value, so 
getting it 
-'
-                ]
-              }
+              'cmdname' => 'c'
             },
             {
               'args' => [
@@ -242,13 +164,7 @@ $result_trees{'documentlanguage_unknown'} = {
                   'type' => 'misc_arg'
                 }
               ],
-              'cmdname' => 'c',
-              'extra' => {
-                'misc_args' => [
-                  ' wrong does not have any consequence.
-'
-                ]
-              }
+              'cmdname' => 'c'
             },
             {
               'args' => [
@@ -258,13 +174,7 @@ $result_trees{'documentlanguage_unknown'} = {
                   'type' => 'misc_arg'
                 }
               ],
-              'cmdname' => 'c',
-              'extra' => {
-                'misc_args' => [
-                  ' The @def* translated added indices are translated 
relatively early,
-'
-                ]
-              }
+              'cmdname' => 'c'
             },
             {
               'args' => [
@@ -274,13 +184,7 @@ $result_trees{'documentlanguage_unknown'} = {
                   'type' => 'misc_arg'
                 }
               ],
-              'cmdname' => 'c',
-              'extra' => {
-                'misc_args' => [
-                  ' before the converter, and the extra documentlanguage key 
is used to
-'
-                ]
-              }
+              'cmdname' => 'c'
             },
             {
               'args' => [
@@ -290,13 +194,7 @@ $result_trees{'documentlanguage_unknown'} = {
                   'type' => 'misc_arg'
                 }
               ],
-              'cmdname' => 'c',
-              'extra' => {
-                'misc_args' => [
-                  ' get the language, so if the wrong language is set, it will 
show up
-'
-                ]
-              }
+              'cmdname' => 'c'
             },
             {
               'args' => [
@@ -306,13 +204,7 @@ $result_trees{'documentlanguage_unknown'} = {
                   'type' => 'misc_arg'
                 }
               ],
-              'cmdname' => 'c',
-              'extra' => {
-                'misc_args' => [
-                  ' in the index generated by @printindex.
-'
-                ]
-              }
+              'cmdname' => 'c'
             },
             {
               'text' => '
diff --git a/tp/t/results/languages/multiple_lang_chapters.pl 
b/tp/t/results/languages/multiple_lang_chapters.pl
index 228c3c19aa..4ee66adf1b 100644
--- a/tp/t/results/languages/multiple_lang_chapters.pl
+++ b/tp/t/results/languages/multiple_lang_chapters.pl
@@ -69,12 +69,6 @@ $result_trees{'multiple_lang_chapters'} = {
                 }
               ],
               'cmdname' => 'c',
-              'extra' => {
-                'misc_args' => [
-                  ' @node Top is ignored in TeX and LaTeX, so switch here
-'
-                ]
-              },
               'source_marks' => [
                 {
                   'counter' => 1,
diff --git a/tp/t/results/languages/multiple_lang_chapters_latex.pl 
b/tp/t/results/languages/multiple_lang_chapters_latex.pl
index b4fdd97214..475203219d 100644
--- a/tp/t/results/languages/multiple_lang_chapters_latex.pl
+++ b/tp/t/results/languages/multiple_lang_chapters_latex.pl
@@ -69,12 +69,6 @@ $result_trees{'multiple_lang_chapters_latex'} = {
                 }
               ],
               'cmdname' => 'c',
-              'extra' => {
-                'misc_args' => [
-                  ' @node Top is ignored in TeX and LaTeX, so switch here
-'
-                ]
-              },
               'source_marks' => [
                 {
                   'counter' => 1,
diff --git a/tp/t/results/languages/multiple_lang_chapters_texi2html.pl 
b/tp/t/results/languages/multiple_lang_chapters_texi2html.pl
index 70457f36c0..1f26cf694d 100644
--- a/tp/t/results/languages/multiple_lang_chapters_texi2html.pl
+++ b/tp/t/results/languages/multiple_lang_chapters_texi2html.pl
@@ -69,12 +69,6 @@ $result_trees{'multiple_lang_chapters_texi2html'} = {
                 }
               ],
               'cmdname' => 'c',
-              'extra' => {
-                'misc_args' => [
-                  ' @node Top is ignored in TeX and LaTeX, so switch here
-'
-                ]
-              },
               'source_marks' => [
                 {
                   'counter' => 1,
diff --git a/tp/t/results/latex_tests/custom_heading_with_include.pl 
b/tp/t/results/latex_tests/custom_heading_with_include.pl
index 996cd6588d..81b09c5d07 100644
--- a/tp/t/results/latex_tests/custom_heading_with_include.pl
+++ b/tp/t/results/latex_tests/custom_heading_with_include.pl
@@ -266,12 +266,6 @@ $result_trees{'custom_heading_with_include'} = {
             }
           ],
           'cmdname' => 'set',
-          'extra' => {
-            'misc_args' => [
-              'do-top',
-              ''
-            ]
-          },
           'info' => {
             'arg_line' => ' do-top
 '
@@ -329,13 +323,7 @@ $result_trees{'custom_heading_with_include'} = {
                   'type' => 'misc_arg'
                 }
               ],
-              'cmdname' => 'c',
-              'extra' => {
-                'misc_args' => [
-                  ' -*-texinfo-*-
-'
-                ]
-              }
+              'cmdname' => 'c'
             }
           ],
           'type' => 'paragraph'
diff --git a/tp/t/results/latex_tests/custom_heading_with_include_in_command.pl 
b/tp/t/results/latex_tests/custom_heading_with_include_in_command.pl
index ee23bf4a61..04453b9ad6 100644
--- a/tp/t/results/latex_tests/custom_heading_with_include_in_command.pl
+++ b/tp/t/results/latex_tests/custom_heading_with_include_in_command.pl
@@ -281,12 +281,6 @@ $result_trees{'custom_heading_with_include_in_command'} = {
             }
           ],
           'cmdname' => 'set',
-          'extra' => {
-            'misc_args' => [
-              'do-top',
-              ''
-            ]
-          },
           'info' => {
             'arg_line' => ' do-top
 '
@@ -344,13 +338,7 @@ $result_trees{'custom_heading_with_include_in_command'} = {
                   'type' => 'misc_arg'
                 }
               ],
-              'cmdname' => 'c',
-              'extra' => {
-                'misc_args' => [
-                  ' -*-texinfo-*-
-'
-                ]
-              }
+              'cmdname' => 'c'
             }
           ],
           'type' => 'paragraph'
diff --git a/tp/t/results/latex_tests/indices.pl 
b/tp/t/results/latex_tests/indices.pl
index 07a5cb5ba9..ed05ee3750 100644
--- a/tp/t/results/latex_tests/indices.pl
+++ b/tp/t/results/latex_tests/indices.pl
@@ -33,12 +33,6 @@ $result_trees{'indices'} = {
                 }
               ],
               'cmdname' => 'set',
-              'extra' => {
-                'misc_args' => [
-                  'txiindexbackslashignore',
-                  ''
-                ]
-              },
               'info' => {
                 'arg_line' => ' txiindexbackslashignore
 '
@@ -927,11 +921,6 @@ $result_trees{'indices'} = {
             }
           ],
           'cmdname' => 'clear',
-          'extra' => {
-            'misc_args' => [
-              'txiindexbackslashignore'
-            ]
-          },
           'info' => {
             'arg_line' => ' txiindexbackslashignore
 '
@@ -977,13 +966,7 @@ $result_trees{'indices'} = {
                       'type' => 'misc_arg'
                     }
                   ],
-                  'cmdname' => 'c',
-                  'extra' => {
-                    'misc_args' => [
-                      ' comment
-'
-                    ]
-                  }
+                  'cmdname' => 'c'
                 },
                 'spaces_after_argument' => {
                   'text' => ' '
diff --git a/tp/t/results/latex_tests/indices_disable_encoding.pl 
b/tp/t/results/latex_tests/indices_disable_encoding.pl
index 6d9cdbfede..d3868c6661 100644
--- a/tp/t/results/latex_tests/indices_disable_encoding.pl
+++ b/tp/t/results/latex_tests/indices_disable_encoding.pl
@@ -33,12 +33,6 @@ $result_trees{'indices_disable_encoding'} = {
                 }
               ],
               'cmdname' => 'set',
-              'extra' => {
-                'misc_args' => [
-                  'txiindexbackslashignore',
-                  ''
-                ]
-              },
               'info' => {
                 'arg_line' => ' txiindexbackslashignore
 '
@@ -927,11 +921,6 @@ $result_trees{'indices_disable_encoding'} = {
             }
           ],
           'cmdname' => 'clear',
-          'extra' => {
-            'misc_args' => [
-              'txiindexbackslashignore'
-            ]
-          },
           'info' => {
             'arg_line' => ' txiindexbackslashignore
 '
@@ -977,13 +966,7 @@ $result_trees{'indices_disable_encoding'} = {
                       'type' => 'misc_arg'
                     }
                   ],
-                  'cmdname' => 'c',
-                  'extra' => {
-                    'misc_args' => [
-                      ' comment
-'
-                    ]
-                  }
+                  'cmdname' => 'c'
                 },
                 'spaces_after_argument' => {
                   'text' => ' '
diff --git a/tp/t/results/latex_tests/titlepage_classical.pl 
b/tp/t/results/latex_tests/titlepage_classical.pl
index a1ff6b80a3..334ce26f6f 100644
--- a/tp/t/results/latex_tests/titlepage_classical.pl
+++ b/tp/t/results/latex_tests/titlepage_classical.pl
@@ -266,13 +266,7 @@ $result_trees{'titlepage_classical'} = {
                       'type' => 'misc_arg'
                     }
                   ],
-                  'cmdname' => 'c',
-                  'extra' => {
-                    'misc_args' => [
-                      ' The following two commands start the copyright page.
-'
-                    ]
-                  }
+                  'cmdname' => 'c'
                 },
                 {
                   'args' => [
@@ -292,13 +286,7 @@ $result_trees{'titlepage_classical'} = {
                       'type' => 'misc_arg'
                     }
                   ],
-                  'cmdname' => 'vskip',
-                  'extra' => {
-                    'misc_args' => [
-                      ' 0pt plus 1filll
-'
-                    ]
-                  }
+                  'cmdname' => 'vskip'
                 },
                 {
                   'args' => [
diff --git a/tp/t/results/latex_tests/titlepage_with_commands_classical.pl 
b/tp/t/results/latex_tests/titlepage_with_commands_classical.pl
index 1a877c9fa7..0df3fa692b 100644
--- a/tp/t/results/latex_tests/titlepage_with_commands_classical.pl
+++ b/tp/t/results/latex_tests/titlepage_with_commands_classical.pl
@@ -419,13 +419,7 @@ $result_trees{'titlepage_with_commands_classical'} = {
                       'type' => 'misc_arg'
                     }
                   ],
-                  'cmdname' => 'c',
-                  'extra' => {
-                    'misc_args' => [
-                      ' The following two commands start the copyright page.
-'
-                    ]
-                  }
+                  'cmdname' => 'c'
                 },
                 {
                   'args' => [
@@ -445,13 +439,7 @@ $result_trees{'titlepage_with_commands_classical'} = {
                       'type' => 'misc_arg'
                     }
                   ],
-                  'cmdname' => 'vskip',
-                  'extra' => {
-                    'misc_args' => [
-                      ' 0pt plus 1filll
-'
-                    ]
-                  }
+                  'cmdname' => 'vskip'
                 },
                 {
                   'args' => [
diff --git a/tp/t/results/macro/arg_body_expansion_order.pl 
b/tp/t/results/macro/arg_body_expansion_order.pl
index 007141550f..fff41c221b 100644
--- a/tp/t/results/macro/arg_body_expansion_order.pl
+++ b/tp/t/results/macro/arg_body_expansion_order.pl
@@ -194,11 +194,6 @@ $result_trees{'arg_body_expansion_order'} = {
             }
           ],
           'cmdname' => 'unmacro',
-          'extra' => {
-            'misc_args' => [
-              'othermacro'
-            ]
-          },
           'info' => {
             'arg_line' => ' othermacro
 '
diff --git a/tp/t/results/macro/bib_example.pl 
b/tp/t/results/macro/bib_example.pl
index 8436fa4388..1344175722 100644
--- a/tp/t/results/macro/bib_example.pl
+++ b/tp/t/results/macro/bib_example.pl
@@ -29,13 +29,7 @@ $result_trees{'bib_example'} = {
                   'type' => 'misc_arg'
                 }
               ],
-              'cmdname' => 'c',
-              'extra' => {
-                'misc_args' => [
-                  ' % Copyright (C) 2004  Aaron S. Hawley
-'
-                ]
-              }
+              'cmdname' => 'c'
             },
             {
               'text' => '
@@ -50,13 +44,7 @@ $result_trees{'bib_example'} = {
                   'type' => 'misc_arg'
                 }
               ],
-              'cmdname' => 'c',
-              'extra' => {
-                'misc_args' => [
-                  ' % Author: Aaron S. Hawley <ashawley@gnu.uvm.edu>
-'
-                ]
-              }
+              'cmdname' => 'c'
             },
             {
               'args' => [
@@ -66,13 +54,7 @@ $result_trees{'bib_example'} = {
                   'type' => 'misc_arg'
                 }
               ],
-              'cmdname' => 'c',
-              'extra' => {
-                'misc_args' => [
-                  ' % Keywords: docs, texinfo, extensions, bib
-'
-                ]
-              }
+              'cmdname' => 'c'
             },
             {
               'text' => '
@@ -87,13 +69,7 @@ $result_trees{'bib_example'} = {
                   'type' => 'misc_arg'
                 }
               ],
-              'cmdname' => 'c',
-              'extra' => {
-                'misc_args' => [
-                  ' % This file is free software; you can redistribute it 
and/or modify
-'
-                ]
-              }
+              'cmdname' => 'c'
             },
             {
               'args' => [
@@ -103,13 +79,7 @@ $result_trees{'bib_example'} = {
                   'type' => 'misc_arg'
                 }
               ],
-              'cmdname' => 'c',
-              'extra' => {
-                'misc_args' => [
-                  ' % it under the terms of the GNU General Public License as 
published by
-'
-                ]
-              }
+              'cmdname' => 'c'
             },
             {
               'args' => [
@@ -119,13 +89,7 @@ $result_trees{'bib_example'} = {
                   'type' => 'misc_arg'
                 }
               ],
-              'cmdname' => 'c',
-              'extra' => {
-                'misc_args' => [
-                  ' % the Free Software Foundation; either version 2, or (at 
your option)
-'
-                ]
-              }
+              'cmdname' => 'c'
             },
             {
               'args' => [
@@ -135,13 +99,7 @@ $result_trees{'bib_example'} = {
                   'type' => 'misc_arg'
                 }
               ],
-              'cmdname' => 'c',
-              'extra' => {
-                'misc_args' => [
-                  ' % any later version.
-'
-                ]
-              }
+              'cmdname' => 'c'
             },
             {
               'text' => '
@@ -156,13 +114,7 @@ $result_trees{'bib_example'} = {
                   'type' => 'misc_arg'
                 }
               ],
-              'cmdname' => 'c',
-              'extra' => {
-                'misc_args' => [
-                  ' % This file is distributed in the hope that it will be 
useful,
-'
-                ]
-              }
+              'cmdname' => 'c'
             },
             {
               'args' => [
@@ -172,13 +124,7 @@ $result_trees{'bib_example'} = {
                   'type' => 'misc_arg'
                 }
               ],
-              'cmdname' => 'c',
-              'extra' => {
-                'misc_args' => [
-                  ' % but WITHOUT ANY WARRANTY; without even the implied 
warranty of
-'
-                ]
-              }
+              'cmdname' => 'c'
             },
             {
               'args' => [
@@ -188,13 +134,7 @@ $result_trees{'bib_example'} = {
                   'type' => 'misc_arg'
                 }
               ],
-              'cmdname' => 'c',
-              'extra' => {
-                'misc_args' => [
-                  ' % MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  
See the
-'
-                ]
-              }
+              'cmdname' => 'c'
             },
             {
               'args' => [
@@ -204,13 +144,7 @@ $result_trees{'bib_example'} = {
                   'type' => 'misc_arg'
                 }
               ],
-              'cmdname' => 'c',
-              'extra' => {
-                'misc_args' => [
-                  ' % GNU General Public License for more details.
-'
-                ]
-              }
+              'cmdname' => 'c'
             },
             {
               'text' => '
@@ -225,13 +159,7 @@ $result_trees{'bib_example'} = {
                   'type' => 'misc_arg'
                 }
               ],
-              'cmdname' => 'c',
-              'extra' => {
-                'misc_args' => [
-                  ' % You should have received a copy of the GNU General 
Public License
-'
-                ]
-              }
+              'cmdname' => 'c'
             },
             {
               'args' => [
@@ -241,13 +169,7 @@ $result_trees{'bib_example'} = {
                   'type' => 'misc_arg'
                 }
               ],
-              'cmdname' => 'c',
-              'extra' => {
-                'misc_args' => [
-                  ' % along with texi2html; see the file COPYING.  If not, 
write to
-'
-                ]
-              }
+              'cmdname' => 'c'
             },
             {
               'args' => [
@@ -257,13 +179,7 @@ $result_trees{'bib_example'} = {
                   'type' => 'misc_arg'
                 }
               ],
-              'cmdname' => 'c',
-              'extra' => {
-                'misc_args' => [
-                  ' % the Free Software Foundation, Inc., 59 Temple Place - 
Suite 330,
-'
-                ]
-              }
+              'cmdname' => 'c'
             },
             {
               'args' => [
@@ -273,13 +189,7 @@ $result_trees{'bib_example'} = {
                   'type' => 'misc_arg'
                 }
               ],
-              'cmdname' => 'c',
-              'extra' => {
-                'misc_args' => [
-                  ' % Boston, MA 02111-1307, USA.
-'
-                ]
-              }
+              'cmdname' => 'c'
             },
             {
               'text' => '
@@ -294,13 +204,7 @@ $result_trees{'bib_example'} = {
                   'type' => 'misc_arg'
                 }
               ],
-              'cmdname' => 'comment',
-              'extra' => {
-                'misc_args' => [
-                  ' %**start of header
-'
-                ]
-              }
+              'cmdname' => 'comment'
             },
             {
               'args' => [
@@ -384,13 +288,7 @@ $result_trees{'bib_example'} = {
                   'type' => 'misc_arg'
                 }
               ],
-              'cmdname' => 'c',
-              'extra' => {
-                'misc_args' => [
-                  ' \\input texinfo   @c -*-texinfo-*-
-'
-                ]
-              }
+              'cmdname' => 'c'
             },
             {
               'args' => [
@@ -400,13 +298,7 @@ $result_trees{'bib_example'} = {
                   'type' => 'misc_arg'
                 }
               ],
-              'cmdname' => 'c',
-              'extra' => {
-                'misc_args' => [
-                  ' %% my-bib-macros.texi --- Texinfo macros providing a crude
-'
-                ]
-              }
+              'cmdname' => 'c'
             },
             {
               'args' => [
@@ -416,13 +308,7 @@ $result_trees{'bib_example'} = {
                   'type' => 'misc_arg'
                 }
               ],
-              'cmdname' => 'c',
-              'extra' => {
-                'misc_args' => [
-                  ' %% bibliography and citation capability.
-'
-                ]
-              }
+              'cmdname' => 'c'
             },
             {
               'text' => '
@@ -437,13 +323,7 @@ $result_trees{'bib_example'} = {
                   'type' => 'misc_arg'
                 }
               ],
-              'cmdname' => 'c',
-              'extra' => {
-                'misc_args' => [
-                  ' % Copyright (C) 2004  Aaron S. Hawley
-'
-                ]
-              }
+              'cmdname' => 'c'
             },
             {
               'text' => '
@@ -458,13 +338,7 @@ $result_trees{'bib_example'} = {
                   'type' => 'misc_arg'
                 }
               ],
-              'cmdname' => 'c',
-              'extra' => {
-                'misc_args' => [
-                  ' % Author: Aaron S. Hawley <ashawley@gnu.uvm.edu>
-'
-                ]
-              }
+              'cmdname' => 'c'
             },
             {
               'args' => [
@@ -474,13 +348,7 @@ $result_trees{'bib_example'} = {
                   'type' => 'misc_arg'
                 }
               ],
-              'cmdname' => 'c',
-              'extra' => {
-                'misc_args' => [
-                  ' % Keywords: docs, texinfo, extensions, bib
-'
-                ]
-              }
+              'cmdname' => 'c'
             },
             {
               'text' => '
@@ -495,13 +363,7 @@ $result_trees{'bib_example'} = {
                   'type' => 'misc_arg'
                 }
               ],
-              'cmdname' => 'c',
-              'extra' => {
-                'misc_args' => [
-                  ' % This file is free software; you can redistribute it 
and/or modify
-'
-                ]
-              }
+              'cmdname' => 'c'
             },
             {
               'args' => [
@@ -511,13 +373,7 @@ $result_trees{'bib_example'} = {
                   'type' => 'misc_arg'
                 }
               ],
-              'cmdname' => 'c',
-              'extra' => {
-                'misc_args' => [
-                  ' % it under the terms of the GNU General Public License as 
published by
-'
-                ]
-              }
+              'cmdname' => 'c'
             },
             {
               'args' => [
@@ -527,13 +383,7 @@ $result_trees{'bib_example'} = {
                   'type' => 'misc_arg'
                 }
               ],
-              'cmdname' => 'c',
-              'extra' => {
-                'misc_args' => [
-                  ' % the Free Software Foundation; either version 2, or (at 
your option)
-'
-                ]
-              }
+              'cmdname' => 'c'
             },
             {
               'args' => [
@@ -543,13 +393,7 @@ $result_trees{'bib_example'} = {
                   'type' => 'misc_arg'
                 }
               ],
-              'cmdname' => 'c',
-              'extra' => {
-                'misc_args' => [
-                  ' % any later version.
-'
-                ]
-              }
+              'cmdname' => 'c'
             },
             {
               'text' => '
@@ -564,13 +408,7 @@ $result_trees{'bib_example'} = {
                   'type' => 'misc_arg'
                 }
               ],
-              'cmdname' => 'c',
-              'extra' => {
-                'misc_args' => [
-                  ' % This file is distributed in the hope that it will be 
useful,
-'
-                ]
-              }
+              'cmdname' => 'c'
             },
             {
               'args' => [
@@ -580,13 +418,7 @@ $result_trees{'bib_example'} = {
                   'type' => 'misc_arg'
                 }
               ],
-              'cmdname' => 'c',
-              'extra' => {
-                'misc_args' => [
-                  ' % but WITHOUT ANY WARRANTY; without even the implied 
warranty of
-'
-                ]
-              }
+              'cmdname' => 'c'
             },
             {
               'args' => [
@@ -596,13 +428,7 @@ $result_trees{'bib_example'} = {
                   'type' => 'misc_arg'
                 }
               ],
-              'cmdname' => 'c',
-              'extra' => {
-                'misc_args' => [
-                  ' % MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  
See the
-'
-                ]
-              }
+              'cmdname' => 'c'
             },
             {
               'args' => [
@@ -612,13 +438,7 @@ $result_trees{'bib_example'} = {
                   'type' => 'misc_arg'
                 }
               ],
-              'cmdname' => 'c',
-              'extra' => {
-                'misc_args' => [
-                  ' % GNU General Public License for more details.
-'
-                ]
-              }
+              'cmdname' => 'c'
             },
             {
               'text' => '
@@ -633,13 +453,7 @@ $result_trees{'bib_example'} = {
                   'type' => 'misc_arg'
                 }
               ],
-              'cmdname' => 'c',
-              'extra' => {
-                'misc_args' => [
-                  ' % You should have received a copy of the GNU General 
Public License
-'
-                ]
-              }
+              'cmdname' => 'c'
             },
             {
               'args' => [
@@ -649,13 +463,7 @@ $result_trees{'bib_example'} = {
                   'type' => 'misc_arg'
                 }
               ],
-              'cmdname' => 'c',
-              'extra' => {
-                'misc_args' => [
-                  ' % along with texi2html; see the file COPYING.  If not, 
write to
-'
-                ]
-              }
+              'cmdname' => 'c'
             },
             {
               'args' => [
@@ -665,13 +473,7 @@ $result_trees{'bib_example'} = {
                   'type' => 'misc_arg'
                 }
               ],
-              'cmdname' => 'c',
-              'extra' => {
-                'misc_args' => [
-                  ' % the Free Software Foundation, Inc., 59 Temple Place - 
Suite 330,
-'
-                ]
-              }
+              'cmdname' => 'c'
             },
             {
               'args' => [
@@ -681,13 +483,7 @@ $result_trees{'bib_example'} = {
                   'type' => 'misc_arg'
                 }
               ],
-              'cmdname' => 'c',
-              'extra' => {
-                'misc_args' => [
-                  ' % Boston, MA 02111-1307, USA.
-'
-                ]
-              }
+              'cmdname' => 'c'
             },
             {
               'text' => '
@@ -702,13 +498,7 @@ $result_trees{'bib_example'} = {
                   'type' => 'misc_arg'
                 }
               ],
-              'cmdname' => 'c',
-              'extra' => {
-                'misc_args' => [
-                  ' %% Commentary:
-'
-                ]
-              }
+              'cmdname' => 'c'
             },
             {
               'text' => '
@@ -723,13 +513,7 @@ $result_trees{'bib_example'} = {
                   'type' => 'misc_arg'
                 }
               ],
-              'cmdname' => 'c',
-              'extra' => {
-                'misc_args' => [
-                  ' %%% Introduction
-'
-                ]
-              }
+              'cmdname' => 'c'
             },
             {
               'text' => '
@@ -744,13 +528,7 @@ $result_trees{'bib_example'} = {
                   'type' => 'misc_arg'
                 }
               ],
-              'cmdname' => 'c',
-              'extra' => {
-                'misc_args' => [
-                  ' %% Creates references to a ``Bibliography\'\' or 
``References\'\'
-'
-                ]
-              }
+              'cmdname' => 'c'
             },
             {
               'args' => [
@@ -760,13 +538,7 @@ $result_trees{'bib_example'} = {
                   'type' => 'misc_arg'
                 }
               ],
-              'cmdname' => 'c',
-              'extra' => {
-                'misc_args' => [
-                  ' %% section of a Texinfo document, using Texinfo\'s
-'
-                ]
-              }
+              'cmdname' => 'c'
             },
             {
               'args' => [
@@ -776,13 +548,7 @@ $result_trees{'bib_example'} = {
                   'type' => 'misc_arg'
                 }
               ],
-              'cmdname' => 'c',
-              'extra' => {
-                'misc_args' => [
-                  ' %% macro system.  Although not as terse a way to cite 
systems as is
-'
-                ]
-              }
+              'cmdname' => 'c'
             },
             {
               'args' => [
@@ -792,13 +558,7 @@ $result_trees{'bib_example'} = {
                   'type' => 'misc_arg'
                 }
               ],
-              'cmdname' => 'c',
-              'extra' => {
-                'misc_args' => [
-                  ' %% found in document systems like TeX, the format is 
simpler and
-'
-                ]
-              }
+              'cmdname' => 'c'
             },
             {
               'args' => [
@@ -808,13 +568,7 @@ $result_trees{'bib_example'} = {
                   'type' => 'misc_arg'
                 }
               ],
-              'cmdname' => 'c',
-              'extra' => {
-                'misc_args' => [
-                  ' %% the rendering  is easier for non-academic readers.
-'
-                ]
-              }
+              'cmdname' => 'c'
             },
             {
               'text' => '
@@ -829,13 +583,7 @@ $result_trees{'bib_example'} = {
                   'type' => 'misc_arg'
                 }
               ],
-              'cmdname' => 'c',
-              'extra' => {
-                'misc_args' => [
-                  ' %
-'
-                ]
-              }
+              'cmdname' => 'c'
             },
             {
               'text' => '
@@ -850,13 +598,7 @@ $result_trees{'bib_example'} = {
                   'type' => 'misc_arg'
                 }
               ],
-              'cmdname' => 'c',
-              'extra' => {
-                'misc_args' => [
-                  ' %%% Usage
-'
-                ]
-              }
+              'cmdname' => 'c'
             },
             {
               'text' => '
@@ -871,13 +613,7 @@ $result_trees{'bib_example'} = {
                   'type' => 'misc_arg'
                 }
               ],
-              'cmdname' => 'c',
-              'extra' => {
-                'misc_args' => [
-                  ' %% References to cited works can be put in any section of 
a document.
-'
-                ]
-              }
+              'cmdname' => 'c'
             },
             {
               'args' => [
@@ -887,13 +623,7 @@ $result_trees{'bib_example'} = {
                   'type' => 'misc_arg'
                 }
               ],
-              'cmdname' => 'c',
-              'extra' => {
-                'misc_args' => [
-                  ' %% The cited works must be put in either a Texinfo table 
(for
-'
-                ]
-              }
+              'cmdname' => 'c'
             },
             {
               'args' => [
@@ -903,13 +633,7 @@ $result_trees{'bib_example'} = {
                   'type' => 'misc_arg'
                 }
               ],
-              'cmdname' => 'c',
-              'extra' => {
-                'misc_args' => [
-                  ' %% instance with ``@table @asis ... @end table\'\') or 
within a
-'
-                ]
-              }
+              'cmdname' => 'c'
             },
             {
               'args' => [
@@ -919,13 +643,7 @@ $result_trees{'bib_example'} = {
                   'type' => 'misc_arg'
                 }
               ],
-              'cmdname' => 'c',
-              'extra' => {
-                'misc_args' => [
-                  ' %% Texinfo list (something like ``@enumerate ... @end 
enumerate\'\'
-'
-                ]
-              }
+              'cmdname' => 'c'
             },
             {
               'args' => [
@@ -935,13 +653,7 @@ $result_trees{'bib_example'} = {
                   'type' => 'misc_arg'
                 }
               ],
-              'cmdname' => 'c',
-              'extra' => {
-                'misc_args' => [
-                  ' %% or ``@itemize @bullet ... @end itemize\'\').  They are 
created
-'
-                ]
-              }
+              'cmdname' => 'c'
             },
             {
               'args' => [
@@ -951,13 +663,7 @@ $result_trees{'bib_example'} = {
                   'type' => 'misc_arg'
                 }
               ],
-              'cmdname' => 'c',
-              'extra' => {
-                'misc_args' => [
-                  ' %% with the command ``@mybibitem{REF-NAME}\'\'.  To cite a 
reference
-'
-                ]
-              }
+              'cmdname' => 'c'
             },
             {
               'args' => [
@@ -967,13 +673,7 @@ $result_trees{'bib_example'} = {
                   'type' => 'misc_arg'
                 }
               ],
-              'cmdname' => 'c',
-              'extra' => {
-                'misc_args' => [
-                  ' %% with a @mybibitem use ``@mybibcite{REF-NAME}\'\'.
-'
-                ]
-              }
+              'cmdname' => 'c'
             },
             {
               'text' => '
@@ -988,13 +688,7 @@ $result_trees{'bib_example'} = {
                   'type' => 'misc_arg'
                 }
               ],
-              'cmdname' => 'c',
-              'extra' => {
-                'misc_args' => [
-                  ' %% The beginning of a document must include (using the 
@include
-'
-                ]
-              }
+              'cmdname' => 'c'
             },
             {
               'args' => [
@@ -1004,13 +698,7 @@ $result_trees{'bib_example'} = {
                   'type' => 'misc_arg'
                 }
               ],
-              'cmdname' => 'c',
-              'extra' => {
-                'misc_args' => [
-                  ' %% command) the file my-bib-macros.texi, which should be 
made
-'
-                ]
-              }
+              'cmdname' => 'c'
             },
             {
               'args' => [
@@ -1020,13 +708,7 @@ $result_trees{'bib_example'} = {
                   'type' => 'misc_arg'
                 }
               ],
-              'cmdname' => 'c',
-              'extra' => {
-                'misc_args' => [
-                  ' %% available in the current directory of the parent file.  
A single
-'
-                ]
-              }
+              'cmdname' => 'c'
             },
             {
               'args' => [
@@ -1036,13 +718,7 @@ $result_trees{'bib_example'} = {
                   'type' => 'misc_arg'
                 }
               ],
-              'cmdname' => 'c',
-              'extra' => {
-                'misc_args' => [
-                  ' %% call should be made to choose to use a list or a table. 
 The
-'
-                ]
-              }
+              'cmdname' => 'c'
             },
             {
               'args' => [
@@ -1052,13 +728,7 @@ $result_trees{'bib_example'} = {
                   'type' => 'misc_arg'
                 }
               ],
-              'cmdname' => 'c',
-              'extra' => {
-                'misc_args' => [
-                  ' %% command to chose is called @mybibuselist{NODE}, where 
NODE is
-'
-                ]
-              }
+              'cmdname' => 'c'
             },
             {
               'args' => [
@@ -1068,13 +738,7 @@ $result_trees{'bib_example'} = {
                   'type' => 'misc_arg'
                 }
               ],
-              'cmdname' => 'c',
-              'extra' => {
-                'misc_args' => [
-                  ' %% the node containing the location where the references 
are listed.
-'
-                ]
-              }
+              'cmdname' => 'c'
             },
             {
               'text' => '
@@ -1089,13 +753,7 @@ $result_trees{'bib_example'} = {
                   'type' => 'misc_arg'
                 }
               ],
-              'cmdname' => 'c',
-              'extra' => {
-                'misc_args' => [
-                  ' %
-'
-                ]
-              }
+              'cmdname' => 'c'
             },
             {
               'text' => '
@@ -1110,13 +768,7 @@ $result_trees{'bib_example'} = {
                   'type' => 'misc_arg'
                 }
               ],
-              'cmdname' => 'c',
-              'extra' => {
-                'misc_args' => [
-                  ' %%% Example
-'
-                ]
-              }
+              'cmdname' => 'c'
             },
             {
               'text' => '
@@ -1131,13 +783,7 @@ $result_trees{'bib_example'} = {
                   'type' => 'misc_arg'
                 }
               ],
-              'cmdname' => 'c',
-              'extra' => {
-                'misc_args' => [
-                  ' %% \\input texinfo   @c -*-texinfo-*-
-'
-                ]
-              }
+              'cmdname' => 'c'
             },
             {
               'args' => [
@@ -1147,13 +793,7 @@ $result_trees{'bib_example'} = {
                   'type' => 'misc_arg'
                 }
               ],
-              'cmdname' => 'c',
-              'extra' => {
-                'misc_args' => [
-                  ' %% @comment %**start of header
-'
-                ]
-              }
+              'cmdname' => 'c'
             },
             {
               'args' => [
@@ -1163,13 +803,7 @@ $result_trees{'bib_example'} = {
                   'type' => 'misc_arg'
                 }
               ],
-              'cmdname' => 'c',
-              'extra' => {
-                'misc_args' => [
-                  ' %% @setfilename my-file-with-bib.info
-'
-                ]
-              }
+              'cmdname' => 'c'
             },
             {
               'args' => [
@@ -1179,13 +813,7 @@ $result_trees{'bib_example'} = {
                   'type' => 'misc_arg'
                 }
               ],
-              'cmdname' => 'c',
-              'extra' => {
-                'misc_args' => [
-                  ' %% @settitle Texinfo with a Bibliography and References
-'
-                ]
-              }
+              'cmdname' => 'c'
             },
             {
               'args' => [
@@ -1195,13 +823,7 @@ $result_trees{'bib_example'} = {
                   'type' => 'misc_arg'
                 }
               ],
-              'cmdname' => 'c',
-              'extra' => {
-                'misc_args' => [
-                  ' %%
-'
-                ]
-              }
+              'cmdname' => 'c'
             },
             {
               'args' => [
@@ -1211,13 +833,7 @@ $result_trees{'bib_example'} = {
                   'type' => 'misc_arg'
                 }
               ],
-              'cmdname' => 'c',
-              'extra' => {
-                'misc_args' => [
-                  ' %% @include my-bib-macros.texi
-'
-                ]
-              }
+              'cmdname' => 'c'
             },
             {
               'args' => [
@@ -1227,13 +843,7 @@ $result_trees{'bib_example'} = {
                   'type' => 'misc_arg'
                 }
               ],
-              'cmdname' => 'c',
-              'extra' => {
-                'misc_args' => [
-                  ' %% @mybibuselist{References}
-'
-                ]
-              }
+              'cmdname' => 'c'
             },
             {
               'args' => [
@@ -1243,13 +853,7 @@ $result_trees{'bib_example'} = {
                   'type' => 'misc_arg'
                 }
               ],
-              'cmdname' => 'c',
-              'extra' => {
-                'misc_args' => [
-                  ' %%
-'
-                ]
-              }
+              'cmdname' => 'c'
             },
             {
               'args' => [
@@ -1259,13 +863,7 @@ $result_trees{'bib_example'} = {
                   'type' => 'misc_arg'
                 }
               ],
-              'cmdname' => 'c',
-              'extra' => {
-                'misc_args' => [
-                  ' %% @comment %**end of header
-'
-                ]
-              }
+              'cmdname' => 'c'
             },
             {
               'args' => [
@@ -1275,13 +873,7 @@ $result_trees{'bib_example'} = {
                   'type' => 'misc_arg'
                 }
               ],
-              'cmdname' => 'c',
-              'extra' => {
-                'misc_args' => [
-                  ' %%
-'
-                ]
-              }
+              'cmdname' => 'c'
             },
             {
               'args' => [
@@ -1291,13 +883,7 @@ $result_trees{'bib_example'} = {
                   'type' => 'misc_arg'
                 }
               ],
-              'cmdname' => 'c',
-              'extra' => {
-                'misc_args' => [
-                  ' %% @node Top
-'
-                ]
-              }
+              'cmdname' => 'c'
             },
             {
               'args' => [
@@ -1307,13 +893,7 @@ $result_trees{'bib_example'} = {
                   'type' => 'misc_arg'
                 }
               ],
-              'cmdname' => 'c',
-              'extra' => {
-                'misc_args' => [
-                  ' %% @top Top
-'
-                ]
-              }
+              'cmdname' => 'c'
             },
             {
               'args' => [
@@ -1323,13 +903,7 @@ $result_trees{'bib_example'} = {
                   'type' => 'misc_arg'
                 }
               ],
-              'cmdname' => 'c',
-              'extra' => {
-                'misc_args' => [
-                  ' %%
-'
-                ]
-              }
+              'cmdname' => 'c'
             },
             {
               'args' => [
@@ -1339,13 +913,7 @@ $result_trees{'bib_example'} = {
                   'type' => 'misc_arg'
                 }
               ],
-              'cmdname' => 'c',
-              'extra' => {
-                'misc_args' => [
-                  ' %% @menu
-'
-                ]
-              }
+              'cmdname' => 'c'
             },
             {
               'args' => [
@@ -1355,13 +923,7 @@ $result_trees{'bib_example'} = {
                   'type' => 'misc_arg'
                 }
               ],
-              'cmdname' => 'c',
-              'extra' => {
-                'misc_args' => [
-                  ' %% * Introduction::
-'
-                ]
-              }
+              'cmdname' => 'c'
             },
             {
               'args' => [
@@ -1371,13 +933,7 @@ $result_trees{'bib_example'} = {
                   'type' => 'misc_arg'
                 }
               ],
-              'cmdname' => 'c',
-              'extra' => {
-                'misc_args' => [
-                  ' %% * @mybibnode{}::
-'
-                ]
-              }
+              'cmdname' => 'c'
             },
             {
               'args' => [
@@ -1387,13 +943,7 @@ $result_trees{'bib_example'} = {
                   'type' => 'misc_arg'
                 }
               ],
-              'cmdname' => 'c',
-              'extra' => {
-                'misc_args' => [
-                  ' %%
-'
-                ]
-              }
+              'cmdname' => 'c'
             },
             {
               'args' => [
@@ -1403,13 +953,7 @@ $result_trees{'bib_example'} = {
                   'type' => 'misc_arg'
                 }
               ],
-              'cmdname' => 'c',
-              'extra' => {
-                'misc_args' => [
-                  ' %% @end menu
-'
-                ]
-              }
+              'cmdname' => 'c'
             },
             {
               'args' => [
@@ -1419,13 +963,7 @@ $result_trees{'bib_example'} = {
                   'type' => 'misc_arg'
                 }
               ],
-              'cmdname' => 'c',
-              'extra' => {
-                'misc_args' => [
-                  ' %%
-'
-                ]
-              }
+              'cmdname' => 'c'
             },
             {
               'args' => [
@@ -1435,13 +973,7 @@ $result_trees{'bib_example'} = {
                   'type' => 'misc_arg'
                 }
               ],
-              'cmdname' => 'c',
-              'extra' => {
-                'misc_args' => [
-                  ' %% @node Introduction
-'
-                ]
-              }
+              'cmdname' => 'c'
             },
             {
               'args' => [
@@ -1451,13 +983,7 @@ $result_trees{'bib_example'} = {
                   'type' => 'misc_arg'
                 }
               ],
-              'cmdname' => 'c',
-              'extra' => {
-                'misc_args' => [
-                  ' %% @chapter Introduction
-'
-                ]
-              }
+              'cmdname' => 'c'
             },
             {
               'args' => [
@@ -1467,13 +993,7 @@ $result_trees{'bib_example'} = {
                   'type' => 'misc_arg'
                 }
               ],
-              'cmdname' => 'c',
-              'extra' => {
-                'misc_args' => [
-                  ' %%
-'
-                ]
-              }
+              'cmdname' => 'c'
             },
             {
               'args' => [
@@ -1483,13 +1003,7 @@ $result_trees{'bib_example'} = {
                   'type' => 'misc_arg'
                 }
               ],
-              'cmdname' => 'c',
-              'extra' => {
-                'misc_args' => [
-                  ' %% The ability of a documentation format to make cross 
references to a
-'
-                ]
-              }
+              'cmdname' => 'c'
             },
             {
               'args' => [
@@ -1499,13 +1013,7 @@ $result_trees{'bib_example'} = {
                   'type' => 'misc_arg'
                 }
               ],
-              'cmdname' => 'c',
-              'extra' => {
-                'misc_args' => [
-                  ' %% bibliography, a feature of LaTeX @mybibcite{LaTeX2e}, 
isn\'t
-'
-                ]
-              }
+              'cmdname' => 'c'
             },
             {
               'args' => [
@@ -1515,13 +1023,7 @@ $result_trees{'bib_example'} = {
                   'type' => 'misc_arg'
                 }
               ],
-              'cmdname' => 'c',
-              'extra' => {
-                'misc_args' => [
-                  ' %% currently supported in Texinfo.
-'
-                ]
-              }
+              'cmdname' => 'c'
             },
             {
               'args' => [
@@ -1531,13 +1033,7 @@ $result_trees{'bib_example'} = {
                   'type' => 'misc_arg'
                 }
               ],
-              'cmdname' => 'c',
-              'extra' => {
-                'misc_args' => [
-                  ' %%
-'
-                ]
-              }
+              'cmdname' => 'c'
             },
             {
               'args' => [
@@ -1547,13 +1043,7 @@ $result_trees{'bib_example'} = {
                   'type' => 'misc_arg'
                 }
               ],
-              'cmdname' => 'c',
-              'extra' => {
-                'misc_args' => [
-                  ' %% @node @mybibnode{}
-'
-                ]
-              }
+              'cmdname' => 'c'
             },
             {
               'args' => [
@@ -1563,13 +1053,7 @@ $result_trees{'bib_example'} = {
                   'type' => 'misc_arg'
                 }
               ],
-              'cmdname' => 'c',
-              'extra' => {
-                'misc_args' => [
-                  ' %% @chapter References
-'
-                ]
-              }
+              'cmdname' => 'c'
             },
             {
               'args' => [
@@ -1579,13 +1063,7 @@ $result_trees{'bib_example'} = {
                   'type' => 'misc_arg'
                 }
               ],
-              'cmdname' => 'c',
-              'extra' => {
-                'misc_args' => [
-                  ' %%
-'
-                ]
-              }
+              'cmdname' => 'c'
             },
             {
               'args' => [
@@ -1595,13 +1073,7 @@ $result_trees{'bib_example'} = {
                   'type' => 'misc_arg'
                 }
               ],
-              'cmdname' => 'c',
-              'extra' => {
-                'misc_args' => [
-                  ' %% @itemize @asis
-'
-                ]
-              }
+              'cmdname' => 'c'
             },
             {
               'args' => [
@@ -1611,13 +1083,7 @@ $result_trees{'bib_example'} = {
                   'type' => 'misc_arg'
                 }
               ],
-              'cmdname' => 'c',
-              'extra' => {
-                'misc_args' => [
-                  ' %%
-'
-                ]
-              }
+              'cmdname' => 'c'
             },
             {
               'args' => [
@@ -1627,13 +1093,7 @@ $result_trees{'bib_example'} = {
                   'type' => 'misc_arg'
                 }
               ],
-              'cmdname' => 'c',
-              'extra' => {
-                'misc_args' => [
-                  ' %% @mybibitem{LaTeX2e} Leslie Lamport, LaTeX User\'s Guide 
and
-'
-                ]
-              }
+              'cmdname' => 'c'
             },
             {
               'args' => [
@@ -1643,13 +1103,7 @@ $result_trees{'bib_example'} = {
                   'type' => 'misc_arg'
                 }
               ],
-              'cmdname' => 'c',
-              'extra' => {
-                'misc_args' => [
-                  ' %% Reference Manual, 2nd edition, Addison-Wesley, Reading,
-'
-                ]
-              }
+              'cmdname' => 'c'
             },
             {
               'args' => [
@@ -1659,13 +1113,7 @@ $result_trees{'bib_example'} = {
                   'type' => 'misc_arg'
                 }
               ],
-              'cmdname' => 'c',
-              'extra' => {
-                'misc_args' => [
-                  ' %% Massachusetts, 1994.
-'
-                ]
-              }
+              'cmdname' => 'c'
             },
             {
               'args' => [
@@ -1675,13 +1123,7 @@ $result_trees{'bib_example'} = {
                   'type' => 'misc_arg'
                 }
               ],
-              'cmdname' => 'c',
-              'extra' => {
-                'misc_args' => [
-                  ' %%
-'
-                ]
-              }
+              'cmdname' => 'c'
             },
             {
               'args' => [
@@ -1691,13 +1133,7 @@ $result_trees{'bib_example'} = {
                   'type' => 'misc_arg'
                 }
               ],
-              'cmdname' => 'c',
-              'extra' => {
-                'misc_args' => [
-                  ' %% @end itemize
-'
-                ]
-              }
+              'cmdname' => 'c'
             },
             {
               'args' => [
@@ -1706,14 +1142,8 @@ $result_trees{'bib_example'} = {
 ',
                   'type' => 'misc_arg'
                 }
-              ],
-              'cmdname' => 'c',
-              'extra' => {
-                'misc_args' => [
-                  ' %%
-'
-                ]
-              }
+              ],
+              'cmdname' => 'c'
             },
             {
               'args' => [
@@ -1723,13 +1153,7 @@ $result_trees{'bib_example'} = {
                   'type' => 'misc_arg'
                 }
               ],
-              'cmdname' => 'c',
-              'extra' => {
-                'misc_args' => [
-                  ' %% @bye
-'
-                ]
-              }
+              'cmdname' => 'c'
             },
             {
               'text' => '
@@ -1744,13 +1168,7 @@ $result_trees{'bib_example'} = {
                   'type' => 'misc_arg'
                 }
               ],
-              'cmdname' => 'c',
-              'extra' => {
-                'misc_args' => [
-                  ' %%
-'
-                ]
-              }
+              'cmdname' => 'c'
             },
             {
               'text' => '
@@ -1765,13 +1183,7 @@ $result_trees{'bib_example'} = {
                   'type' => 'misc_arg'
                 }
               ],
-              'cmdname' => 'c',
-              'extra' => {
-                'misc_args' => [
-                  ' %% This example produces (in Info):
-'
-                ]
-              }
+              'cmdname' => 'c'
             },
             {
               'text' => '
@@ -1786,13 +1198,7 @@ $result_trees{'bib_example'} = {
                   'type' => 'misc_arg'
                 }
               ],
-              'cmdname' => 'c',
-              'extra' => {
-                'misc_args' => [
-                  ' %%       1 Introduction
-'
-                ]
-              }
+              'cmdname' => 'c'
             },
             {
               'args' => [
@@ -1802,13 +1208,7 @@ $result_trees{'bib_example'} = {
                   'type' => 'misc_arg'
                 }
               ],
-              'cmdname' => 'c',
-              'extra' => {
-                'misc_args' => [
-                  ' %%       **************
-'
-                ]
-              }
+              'cmdname' => 'c'
             },
             {
               'args' => [
@@ -1818,13 +1218,7 @@ $result_trees{'bib_example'} = {
                   'type' => 'misc_arg'
                 }
               ],
-              'cmdname' => 'c',
-              'extra' => {
-                'misc_args' => [
-                  ' %%
-'
-                ]
-              }
+              'cmdname' => 'c'
             },
             {
               'args' => [
@@ -1834,13 +1228,7 @@ $result_trees{'bib_example'} = {
                   'type' => 'misc_arg'
                 }
               ],
-              'cmdname' => 'c',
-              'extra' => {
-                'misc_args' => [
-                  ' %%       The ability of a documentation format to make 
cross
-'
-                ]
-              }
+              'cmdname' => 'c'
             },
             {
               'args' => [
@@ -1850,13 +1238,7 @@ $result_trees{'bib_example'} = {
                   'type' => 'misc_arg'
                 }
               ],
-              'cmdname' => 'c',
-              'extra' => {
-                'misc_args' => [
-                  ' %%       references to a bibliography, a feature of LaTeX 
(See item
-'
-                ]
-              }
+              'cmdname' => 'c'
             },
             {
               'args' => [
@@ -1866,13 +1248,7 @@ $result_trees{'bib_example'} = {
                   'type' => 'misc_arg'
                 }
               ],
-              'cmdname' => 'c',
-              'extra' => {
-                'misc_args' => [
-                  ' %%       [LaTeX2e] in *Note LaTeX2e: References.), is not 
currently
-'
-                ]
-              }
+              'cmdname' => 'c'
             },
             {
               'args' => [
@@ -1882,13 +1258,7 @@ $result_trees{'bib_example'} = {
                   'type' => 'misc_arg'
                 }
               ],
-              'cmdname' => 'c',
-              'extra' => {
-                'misc_args' => [
-                  ' %%       supported in Texinfo.
-'
-                ]
-              }
+              'cmdname' => 'c'
             },
             {
               'args' => [
@@ -1898,13 +1268,7 @@ $result_trees{'bib_example'} = {
                   'type' => 'misc_arg'
                 }
               ],
-              'cmdname' => 'c',
-              'extra' => {
-                'misc_args' => [
-                  ' %%
-'
-                ]
-              }
+              'cmdname' => 'c'
             },
             {
               'args' => [
@@ -1914,13 +1278,7 @@ $result_trees{'bib_example'} = {
                   'type' => 'misc_arg'
                 }
               ],
-              'cmdname' => 'c',
-              'extra' => {
-                'misc_args' => [
-                  ' %%
-'
-                ]
-              }
+              'cmdname' => 'c'
             },
             {
               'args' => [
@@ -1930,13 +1288,7 @@ $result_trees{'bib_example'} = {
                   'type' => 'misc_arg'
                 }
               ],
-              'cmdname' => 'c',
-              'extra' => {
-                'misc_args' => [
-                  ' %%       2 References
-'
-                ]
-              }
+              'cmdname' => 'c'
             },
             {
               'args' => [
@@ -1946,13 +1298,7 @@ $result_trees{'bib_example'} = {
                   'type' => 'misc_arg'
                 }
               ],
-              'cmdname' => 'c',
-              'extra' => {
-                'misc_args' => [
-                  ' %%       ************
-'
-                ]
-              }
+              'cmdname' => 'c'
             },
             {
               'args' => [
@@ -1962,13 +1308,7 @@ $result_trees{'bib_example'} = {
                   'type' => 'misc_arg'
                 }
               ],
-              'cmdname' => 'c',
-              'extra' => {
-                'misc_args' => [
-                  ' %%
-'
-                ]
-              }
+              'cmdname' => 'c'
             },
             {
               'args' => [
@@ -1978,13 +1318,7 @@ $result_trees{'bib_example'} = {
                   'type' => 'misc_arg'
                 }
               ],
-              'cmdname' => 'c',
-              'extra' => {
-                'misc_args' => [
-                  ' %%       [LaTeX2e] Leslie Lamport, LaTeX User\'s Guide and 
Reference
-'
-                ]
-              }
+              'cmdname' => 'c'
             },
             {
               'args' => [
@@ -1994,13 +1328,7 @@ $result_trees{'bib_example'} = {
                   'type' => 'misc_arg'
                 }
               ],
-              'cmdname' => 'c',
-              'extra' => {
-                'misc_args' => [
-                  ' %%       Manual, 2nd edition, Addison-Wesley, Reading,
-'
-                ]
-              }
+              'cmdname' => 'c'
             },
             {
               'args' => [
@@ -2010,13 +1338,7 @@ $result_trees{'bib_example'} = {
                   'type' => 'misc_arg'
                 }
               ],
-              'cmdname' => 'c',
-              'extra' => {
-                'misc_args' => [
-                  ' %%       Massachusetts, 1994.
-'
-                ]
-              }
+              'cmdname' => 'c'
             },
             {
               'text' => '
@@ -2031,13 +1353,7 @@ $result_trees{'bib_example'} = {
                   'type' => 'misc_arg'
                 }
               ],
-              'cmdname' => 'c',
-              'extra' => {
-                'misc_args' => [
-                  ' %% and (in printed output):
-'
-                ]
-              }
+              'cmdname' => 'c'
             },
             {
               'text' => '
@@ -2052,13 +1368,7 @@ $result_trees{'bib_example'} = {
                   'type' => 'misc_arg'
                 }
               ],
-              'cmdname' => 'c',
-              'extra' => {
-                'misc_args' => [
-                  ' %%       1 Introduction
-'
-                ]
-              }
+              'cmdname' => 'c'
             },
             {
               'args' => [
@@ -2068,13 +1378,7 @@ $result_trees{'bib_example'} = {
                   'type' => 'misc_arg'
                 }
               ],
-              'cmdname' => 'c',
-              'extra' => {
-                'misc_args' => [
-                  ' %%       **************
-'
-                ]
-              }
+              'cmdname' => 'c'
             },
             {
               'args' => [
@@ -2084,13 +1388,7 @@ $result_trees{'bib_example'} = {
                   'type' => 'misc_arg'
                 }
               ],
-              'cmdname' => 'c',
-              'extra' => {
-                'misc_args' => [
-                  ' %%
-'
-                ]
-              }
+              'cmdname' => 'c'
             },
             {
               'args' => [
@@ -2100,13 +1398,7 @@ $result_trees{'bib_example'} = {
                   'type' => 'misc_arg'
                 }
               ],
-              'cmdname' => 'c',
-              'extra' => {
-                'misc_args' => [
-                  ' %%       The ability of a documentation format to make 
cross
-'
-                ]
-              }
+              'cmdname' => 'c'
             },
             {
               'args' => [
@@ -2116,13 +1408,7 @@ $result_trees{'bib_example'} = {
                   'type' => 'misc_arg'
                 }
               ],
-              'cmdname' => 'c',
-              'extra' => {
-                'misc_args' => [
-                  ' %%       references to a bibliography, a feature of LaTeX 
(See item
-'
-                ]
-              }
+              'cmdname' => 'c'
             },
             {
               'args' => [
@@ -2132,13 +1418,7 @@ $result_trees{'bib_example'} = {
                   'type' => 'misc_arg'
                 }
               ],
-              'cmdname' => 'c',
-              'extra' => {
-                'misc_args' => [
-                  ' %%       [LaTeX2e] in Chapter 2 [References], page 3.), is 
not
-'
-                ]
-              }
+              'cmdname' => 'c'
             },
             {
               'args' => [
@@ -2148,13 +1428,7 @@ $result_trees{'bib_example'} = {
                   'type' => 'misc_arg'
                 }
               ],
-              'cmdname' => 'c',
-              'extra' => {
-                'misc_args' => [
-                  ' %%       currently supported in Texinfo.
-'
-                ]
-              }
+              'cmdname' => 'c'
             },
             {
               'args' => [
@@ -2164,13 +1438,7 @@ $result_trees{'bib_example'} = {
                   'type' => 'misc_arg'
                 }
               ],
-              'cmdname' => 'c',
-              'extra' => {
-                'misc_args' => [
-                  ' %%
-'
-                ]
-              }
+              'cmdname' => 'c'
             },
             {
               'args' => [
@@ -2180,13 +1448,7 @@ $result_trees{'bib_example'} = {
                   'type' => 'misc_arg'
                 }
               ],
-              'cmdname' => 'c',
-              'extra' => {
-                'misc_args' => [
-                  ' %%
-'
-                ]
-              }
+              'cmdname' => 'c'
             },
             {
               'args' => [
@@ -2196,13 +1458,7 @@ $result_trees{'bib_example'} = {
                   'type' => 'misc_arg'
                 }
               ],
-              'cmdname' => 'c',
-              'extra' => {
-                'misc_args' => [
-                  ' %%       2 References
-'
-                ]
-              }
+              'cmdname' => 'c'
             },
             {
               'args' => [
@@ -2212,13 +1468,7 @@ $result_trees{'bib_example'} = {
                   'type' => 'misc_arg'
                 }
               ],
-              'cmdname' => 'c',
-              'extra' => {
-                'misc_args' => [
-                  ' %%       ************
-'
-                ]
-              }
+              'cmdname' => 'c'
             },
             {
               'args' => [
@@ -2228,13 +1478,7 @@ $result_trees{'bib_example'} = {
                   'type' => 'misc_arg'
                 }
               ],
-              'cmdname' => 'c',
-              'extra' => {
-                'misc_args' => [
-                  ' %%
-'
-                ]
-              }
+              'cmdname' => 'c'
             },
             {
               'args' => [
@@ -2244,13 +1488,7 @@ $result_trees{'bib_example'} = {
                   'type' => 'misc_arg'
                 }
               ],
-              'cmdname' => 'c',
-              'extra' => {
-                'misc_args' => [
-                  ' %%       [LaTeX2e] Leslie Lamport, LaTeX User\'s Guide and 
Reference
-'
-                ]
-              }
+              'cmdname' => 'c'
             },
             {
               'args' => [
@@ -2260,13 +1498,7 @@ $result_trees{'bib_example'} = {
                   'type' => 'misc_arg'
                 }
               ],
-              'cmdname' => 'c',
-              'extra' => {
-                'misc_args' => [
-                  ' %%       Manual, 2nd edition, Addison-Wesley, Reading,
-'
-                ]
-              }
+              'cmdname' => 'c'
             },
             {
               'args' => [
@@ -2276,13 +1508,7 @@ $result_trees{'bib_example'} = {
                   'type' => 'misc_arg'
                 }
               ],
-              'cmdname' => 'c',
-              'extra' => {
-                'misc_args' => [
-                  ' %%       Massachusetts, 1994.
-'
-                ]
-              }
+              'cmdname' => 'c'
             },
             {
               'text' => '
@@ -2297,13 +1523,7 @@ $result_trees{'bib_example'} = {
                   'type' => 'misc_arg'
                 }
               ],
-              'cmdname' => 'c',
-              'extra' => {
-                'misc_args' => [
-                  ' %
-'
-                ]
-              }
+              'cmdname' => 'c'
             },
             {
               'text' => '
@@ -2318,13 +1538,7 @@ $result_trees{'bib_example'} = {
                   'type' => 'misc_arg'
                 }
               ],
-              'cmdname' => 'c',
-              'extra' => {
-                'misc_args' => [
-                  ' %%% Notes
-'
-                ]
-              }
+              'cmdname' => 'c'
             },
             {
               'text' => '
@@ -2339,13 +1553,7 @@ $result_trees{'bib_example'} = {
                   'type' => 'misc_arg'
                 }
               ],
-              'cmdname' => 'c',
-              'extra' => {
-                'misc_args' => [
-                  ' %% The pointers to references will be functional in 
hypertext
-'
-                ]
-              }
+              'cmdname' => 'c'
             },
             {
               'args' => [
@@ -2355,13 +1563,7 @@ $result_trees{'bib_example'} = {
                   'type' => 'misc_arg'
                 }
               ],
-              'cmdname' => 'c',
-              'extra' => {
-                'misc_args' => [
-                  ' %% documentation (info, HTML, XML and others) and properly 
rendered
-'
-                ]
-              }
+              'cmdname' => 'c'
             },
             {
               'args' => [
@@ -2371,13 +1573,7 @@ $result_trees{'bib_example'} = {
                   'type' => 'misc_arg'
                 }
               ],
-              'cmdname' => 'c',
-              'extra' => {
-                'misc_args' => [
-                  ' %% in print documents, because they are implemented with 
Texinfo\'s
-'
-                ]
-              }
+              'cmdname' => 'c'
             },
             {
               'args' => [
@@ -2387,13 +1583,7 @@ $result_trees{'bib_example'} = {
                   'type' => 'misc_arg'
                 }
               ],
-              'cmdname' => 'c',
-              'extra' => {
-                'misc_args' => [
-                  ' %% cross referencing capabilities (using @anchor and 
@ref).  Failures
-'
-                ]
-              }
+              'cmdname' => 'c'
             },
             {
               'args' => [
@@ -2403,13 +1593,7 @@ $result_trees{'bib_example'} = {
                   'type' => 'misc_arg'
                 }
               ],
-              'cmdname' => 'c',
-              'extra' => {
-                'misc_args' => [
-                  ' %% by an author to make proper references with 
``my-bib-macros\'\' in
-'
-                ]
-              }
+              'cmdname' => 'c'
             },
             {
               'args' => [
@@ -2419,13 +1603,7 @@ $result_trees{'bib_example'} = {
                   'type' => 'misc_arg'
                 }
               ],
-              'cmdname' => 'c',
-              'extra' => {
-                'misc_args' => [
-                  ' %% their document will give cross referencing errors by 
Texinfo
-'
-                ]
-              }
+              'cmdname' => 'c'
             },
             {
               'args' => [
@@ -2435,13 +1613,7 @@ $result_trees{'bib_example'} = {
                   'type' => 'misc_arg'
                 }
               ],
-              'cmdname' => 'c',
-              'extra' => {
-                'misc_args' => [
-                  ' %% conversion tools.
-'
-                ]
-              }
+              'cmdname' => 'c'
             },
             {
               'text' => '
@@ -2456,13 +1628,7 @@ $result_trees{'bib_example'} = {
                   'type' => 'misc_arg'
                 }
               ],
-              'cmdname' => 'c',
-              'extra' => {
-                'misc_args' => [
-                  ' %% Only one ``Reference\'\' section is allowed per 
document.
-'
-                ]
-              }
+              'cmdname' => 'c'
             },
             {
               'text' => '
@@ -2477,13 +1643,7 @@ $result_trees{'bib_example'} = {
                   'type' => 'misc_arg'
                 }
               ],
-              'cmdname' => 'c',
-              'extra' => {
-                'misc_args' => [
-                  ' %% An improvement of this system would create cross 
references
-'
-                ]
-              }
+              'cmdname' => 'c'
             },
             {
               'args' => [
@@ -2493,13 +1653,7 @@ $result_trees{'bib_example'} = {
                   'type' => 'misc_arg'
                 }
               ],
-              'cmdname' => 'c',
-              'extra' => {
-                'misc_args' => [
-                  ' %% (with @xref) at each cited work to all the originating 
cross
-'
-                ]
-              }
+              'cmdname' => 'c'
             },
             {
               'args' => [
@@ -2509,13 +1663,7 @@ $result_trees{'bib_example'} = {
                   'type' => 'misc_arg'
                 }
               ],
-              'cmdname' => 'c',
-              'extra' => {
-                'misc_args' => [
-                  ' %% refererences.
-'
-                ]
-              }
+              'cmdname' => 'c'
             },
             {
               'text' => '
@@ -2530,13 +1678,7 @@ $result_trees{'bib_example'} = {
                   'type' => 'misc_arg'
                 }
               ],
-              'cmdname' => 'c',
-              'extra' => {
-                'misc_args' => [
-                  ' %
-'
-                ]
-              }
+              'cmdname' => 'c'
             },
             {
               'text' => '
@@ -2551,13 +1693,7 @@ $result_trees{'bib_example'} = {
                   'type' => 'misc_arg'
                 }
               ],
-              'cmdname' => 'c',
-              'extra' => {
-                'misc_args' => [
-                  ' %% Code:
-'
-                ]
-              }
+              'cmdname' => 'c'
             },
             {
               'text' => '
@@ -2572,13 +1708,7 @@ $result_trees{'bib_example'} = {
                   'type' => 'misc_arg'
                 }
               ],
-              'cmdname' => 'c',
-              'extra' => {
-                'misc_args' => [
-                  ' % Configuration Options
-'
-                ]
-              }
+              'cmdname' => 'c'
             },
             {
               'text' => '
@@ -2593,13 +1723,7 @@ $result_trees{'bib_example'} = {
                   'type' => 'misc_arg'
                 }
               ],
-              'cmdname' => 'c',
-              'extra' => {
-                'misc_args' => [
-                  ' %% @mybibsetrefnode : Defines the name of the node to 
contain
-'
-                ]
-              }
+              'cmdname' => 'c'
             },
             {
               'args' => [
@@ -2609,13 +1733,7 @@ $result_trees{'bib_example'} = {
                   'type' => 'misc_arg'
                 }
               ],
-              'cmdname' => 'c',
-              'extra' => {
-                'misc_args' => [
-                  ' %% references.
-'
-                ]
-              }
+              'cmdname' => 'c'
             },
             {
               'text' => '
@@ -2696,13 +1814,7 @@ $result_trees{'bib_example'} = {
                   'type' => 'misc_arg'
                 }
               ],
-              'cmdname' => 'c',
-              'extra' => {
-                'misc_args' => [
-                  ' %% @mybibnode{} : Macro to be placed at node containing 
references
-'
-                ]
-              }
+              'cmdname' => 'c'
             },
             {
               'args' => [
@@ -2712,13 +1824,7 @@ $result_trees{'bib_example'} = {
                   'type' => 'misc_arg'
                 }
               ],
-              'cmdname' => 'c',
-              'extra' => {
-                'misc_args' => [
-                  ' %% and calls to @mybibcite{}
-'
-                ]
-              }
+              'cmdname' => 'c'
             },
             {
               'text' => '
@@ -2795,13 +1901,7 @@ $result_trees{'bib_example'} = {
                   'type' => 'misc_arg'
                 }
               ],
-              'cmdname' => 'c',
-              'extra' => {
-                'misc_args' => [
-                  ' %% @mybibusetable : Whether each @mybibitem will be put in 
a
-'
-                ]
-              }
+              'cmdname' => 'c'
             },
             {
               'args' => [
@@ -2811,13 +1911,7 @@ $result_trees{'bib_example'} = {
                   'type' => 'misc_arg'
                 }
               ],
-              'cmdname' => 'c',
-              'extra' => {
-                'misc_args' => [
-                  ' %% table.
-'
-                ]
-              }
+              'cmdname' => 'c'
             },
             {
               'text' => '
@@ -2918,13 +2012,7 @@ $result_trees{'bib_example'} = {
                   'type' => 'misc_arg'
                 }
               ],
-              'cmdname' => 'c',
-              'extra' => {
-                'misc_args' => [
-                  ' %% @mybibuselist : Whether each @mybibitem will be put in a
-'
-                ]
-              }
+              'cmdname' => 'c'
             },
             {
               'args' => [
@@ -2934,13 +2022,7 @@ $result_trees{'bib_example'} = {
                   'type' => 'misc_arg'
                 }
               ],
-              'cmdname' => 'c',
-              'extra' => {
-                'misc_args' => [
-                  ' %% list.
-'
-                ]
-              }
+              'cmdname' => 'c'
             },
             {
               'text' => '
@@ -3046,13 +2128,7 @@ $result_trees{'bib_example'} = {
                   'type' => 'misc_arg'
                 }
               ],
-              'cmdname' => 'c',
-              'extra' => {
-                'misc_args' => [
-                  ' %% @mybibcite{REF} : Cites the cross reference REF.
-'
-                ]
-              }
+              'cmdname' => 'c'
             },
             {
               'text' => '
@@ -3238,13 +2314,7 @@ $result_trees{'bib_example'} = {
                   'type' => 'misc_arg'
                 }
               ],
-              'cmdname' => 'c',
-              'extra' => {
-                'misc_args' => [
-                  ' %% @mybibcite{REF} : Creates a cross referenced citation 
REF.
-'
-                ]
-              }
+              'cmdname' => 'c'
             },
             {
               'text' => '
@@ -3391,12 +2461,6 @@ $result_trees{'bib_example'} = {
                 }
               ],
               'cmdname' => 'c',
-              'extra' => {
-                'misc_args' => [
-                  ' %% my-bib-macros.texi ends here
-'
-                ]
-              },
               'source_marks' => [
                 {
                   'counter' => 1,
@@ -3438,12 +2502,6 @@ $result_trees{'bib_example'} = {
                 }
               ],
               'cmdname' => 'set',
-              'extra' => {
-                'misc_args' => [
-                  'mybiblist',
-                  'true'
-                ]
-              },
               'info' => {
                 'arg_line' => ' mybiblist true
 '
@@ -3566,12 +2624,6 @@ $result_trees{'bib_example'} = {
                 }
               ],
               'cmdname' => 'set',
-              'extra' => {
-                'misc_args' => [
-                  'mybibrefnode',
-                  'References'
-                ]
-              },
               'info' => {
                 'arg_line' => ' mybibrefnode References
 '
@@ -3590,13 +2642,7 @@ $result_trees{'bib_example'} = {
                   'type' => 'misc_arg'
                 }
               ],
-              'cmdname' => 'comment',
-              'extra' => {
-                'misc_args' => [
-                  ' %**end of header
-'
-                ]
-              }
+              'cmdname' => 'comment'
             },
             {
               'text' => '
@@ -4058,12 +3104,6 @@ $result_trees{'bib_example'} = {
                 }
               ],
               'cmdname' => 'c',
-              'extra' => {
-                'misc_args' => [
-                  ' %**else if
-'
-                ]
-              },
               'source_marks' => [
                 {
                   'counter' => 1,
@@ -4716,12 +3756,6 @@ $result_trees{'bib_example'} = {
                         }
                       ],
                       'cmdname' => 'c',
-                      'extra' => {
-                        'misc_args' => [
-                          ' %**else if
-'
-                        ]
-                      },
                       'source_marks' => [
                         {
                           'counter' => 5,
diff --git a/tp/t/results/macro/complex_argument.pl 
b/tp/t/results/macro/complex_argument.pl
index 824781823c..d7bb1bb9f4 100644
--- a/tp/t/results/macro/complex_argument.pl
+++ b/tp/t/results/macro/complex_argument.pl
@@ -308,13 +308,7 @@ macroseven defined
                   'type' => 'misc_arg'
                 }
               ],
-              'cmdname' => 'c',
-              'extra' => {
-                'misc_args' => [
-                  ' @macrofour
-'
-                ]
-              }
+              'cmdname' => 'c'
             },
             {
               'args' => [
diff --git a/tp/t/results/macro/glossary.pl b/tp/t/results/macro/glossary.pl
index ac8b7d2c55..5296557528 100644
--- a/tp/t/results/macro/glossary.pl
+++ b/tp/t/results/macro/glossary.pl
@@ -749,11 +749,6 @@ $result_trees{'glossary'} = {
                 }
               ],
               'cmdname' => 'unmacro',
-              'extra' => {
-                'misc_args' => [
-                  'expandglossary'
-                ]
-              },
               'info' => {
                 'arg_line' => ' expandglossary
 '
@@ -876,11 +871,6 @@ $result_trees{'glossary'} = {
                 }
               ],
               'cmdname' => 'unmacro',
-              'extra' => {
-                'misc_args' => [
-                  'glossarytext'
-                ]
-              },
               'info' => {
                 'arg_line' => ' glossarytext
 '
@@ -1194,11 +1184,6 @@ $result_trees{'glossary'} = {
                 }
               ],
               'cmdname' => 'unmacro',
-              'extra' => {
-                'misc_args' => [
-                  'expandglossary'
-                ]
-              },
               'info' => {
                 'arg_line' => ' expandglossary
 '
@@ -1321,11 +1306,6 @@ $result_trees{'glossary'} = {
                 }
               ],
               'cmdname' => 'unmacro',
-              'extra' => {
-                'misc_args' => [
-                  'glossarytext'
-                ]
-              },
               'info' => {
                 'arg_line' => ' glossarytext
 '
diff --git a/tp/t/results/macro/macro_expansion_end_in_conditional_end.pl 
b/tp/t/results/macro/macro_expansion_end_in_conditional_end.pl
index 597dfa4aae..22e4619ae8 100644
--- a/tp/t/results/macro/macro_expansion_end_in_conditional_end.pl
+++ b/tp/t/results/macro/macro_expansion_end_in_conditional_end.pl
@@ -93,12 +93,6 @@ $result_trees{'macro_expansion_end_in_conditional_end'} = {
             }
           ],
           'cmdname' => 'set',
-          'extra' => {
-            'misc_args' => [
-              'flag',
-              '1'
-            ]
-          },
           'info' => {
             'arg_line' => ' flag 1
 '
diff --git a/tp/t/results/macro/macro_expansion_end_in_conditional_line.pl 
b/tp/t/results/macro/macro_expansion_end_in_conditional_line.pl
index c40878da1d..a4e94804bc 100644
--- a/tp/t/results/macro/macro_expansion_end_in_conditional_line.pl
+++ b/tp/t/results/macro/macro_expansion_end_in_conditional_line.pl
@@ -83,12 +83,6 @@ $result_trees{'macro_expansion_end_in_conditional_line'} = {
             }
           ],
           'cmdname' => 'set',
-          'extra' => {
-            'misc_args' => [
-              'flag',
-              '1'
-            ]
-          },
           'info' => {
             'arg_line' => ' flag 1
 '
diff --git a/tp/t/results/macro/macro_in_menu_comment_like_entry.pl 
b/tp/t/results/macro/macro_in_menu_comment_like_entry.pl
index 8c2cf2086e..20c1c56875 100644
--- a/tp/t/results/macro/macro_in_menu_comment_like_entry.pl
+++ b/tp/t/results/macro/macro_in_menu_comment_like_entry.pl
@@ -222,13 +222,7 @@ $result_trees{'macro_in_menu_comment_like_entry'} = {
                           'type' => 'misc_arg'
                         }
                       ],
-                      'cmdname' => 'c',
-                      'extra' => {
-                        'misc_args' => [
-                          ' c
-'
-                        ]
-                      }
+                      'cmdname' => 'c'
                     }
                   ],
                   'type' => 'preformatted'
diff --git a/tp/t/results/macro/macro_in_misc_commands.pl 
b/tp/t/results/macro/macro_in_misc_commands.pl
index e3e648f4c2..f0e92c68ae 100644
--- a/tp/t/results/macro/macro_in_misc_commands.pl
+++ b/tp/t/results/macro/macro_in_misc_commands.pl
@@ -311,13 +311,7 @@ $result_trees{'macro_in_misc_commands'} = {
                   'type' => 'misc_arg'
                 }
               ],
-              'cmdname' => 'c',
-              'extra' => {
-                'misc_args' => [
-                  ' comment @text{}
-'
-                ]
-              }
+              'cmdname' => 'c'
             },
             {
               'args' => [
@@ -327,13 +321,7 @@ $result_trees{'macro_in_misc_commands'} = {
                   'type' => 'misc_arg'
                 }
               ],
-              'cmdname' => 'c',
-              'extra' => {
-                'misc_args' => [
-                  ' comment @text{}
-'
-                ]
-              }
+              'cmdname' => 'c'
             }
           ],
           'type' => 'paragraph'
@@ -3329,13 +3317,7 @@ $result_trees{'macro_in_misc_commands'} = {
               'type' => 'misc_arg'
             }
           ],
-          'cmdname' => 'c',
-          'extra' => {
-            'misc_args' => [
-              ' accepts 10 or 11
-'
-            ]
-          }
+          'cmdname' => 'c'
         },
         {
           'args' => [
@@ -3463,13 +3445,7 @@ $result_trees{'macro_in_misc_commands'} = {
               'type' => 'misc_arg'
             }
           ],
-          'cmdname' => 'c',
-          'extra' => {
-            'misc_args' => [
-              ' accept false or true
-'
-            ]
-          }
+          'cmdname' => 'c'
         },
         {
           'args' => [
@@ -4505,13 +4481,7 @@ $result_trees{'macro_in_misc_commands'} = {
               'type' => 'misc_arg'
             }
           ],
-          'cmdname' => 'vskip',
-          'extra' => {
-            'misc_args' => [
-              ' @atext{}
-'
-            ]
-          }
+          'cmdname' => 'vskip'
         },
         {
           'text' => '
@@ -4827,11 +4797,6 @@ $result_trees{'macro_in_misc_commands'} = {
             }
           ],
           'cmdname' => 'clickstyle',
-          'extra' => {
-            'misc_args' => [
-              '@resultmacro'
-            ]
-          },
           'info' => {
             'arg_line' => ' @resultmacro{}
 '
diff --git a/tp/t/results/menu/comment_on_menu_line.pl 
b/tp/t/results/menu/comment_on_menu_line.pl
index 6217e63989..05f046455b 100644
--- a/tp/t/results/menu/comment_on_menu_line.pl
+++ b/tp/t/results/menu/comment_on_menu_line.pl
@@ -46,13 +46,7 @@ $result_trees{'comment_on_menu_line'} = {
                       'type' => 'misc_arg'
                     }
                   ],
-                  'cmdname' => 'c',
-                  'extra' => {
-                    'misc_args' => [
-                      '
-'
-                    ]
-                  }
+                  'cmdname' => 'c'
                 }
               },
               'type' => 'block_line_arg'
diff --git a/tp/t/results/menu/menu_entry_name_comment.pl 
b/tp/t/results/menu/menu_entry_name_comment.pl
index fe52481736..affadcaad9 100644
--- a/tp/t/results/menu/menu_entry_name_comment.pl
+++ b/tp/t/results/menu/menu_entry_name_comment.pl
@@ -79,13 +79,7 @@ $result_trees{'menu_entry_name_comment'} = {
                               'type' => 'misc_arg'
                             }
                           ],
-                          'cmdname' => 'c',
-                          'extra' => {
-                            'misc_args' => [
-                              ' c
-'
-                            ]
-                          }
+                          'cmdname' => 'c'
                         }
                       ],
                       'type' => 'preformatted'
@@ -162,13 +156,7 @@ $result_trees{'menu_entry_name_comment'} = {
                               'type' => 'misc_arg'
                             }
                           ],
-                          'cmdname' => 'c',
-                          'extra' => {
-                            'misc_args' => [
-                              ' c
-'
-                            ]
-                          }
+                          'cmdname' => 'c'
                         }
                       ],
                       'type' => 'preformatted'
@@ -244,13 +232,7 @@ $result_trees{'menu_entry_name_comment'} = {
                               'type' => 'misc_arg'
                             }
                           ],
-                          'cmdname' => 'c',
-                          'extra' => {
-                            'misc_args' => [
-                              ' c
-'
-                            ]
-                          }
+                          'cmdname' => 'c'
                         }
                       ],
                       'type' => 'preformatted'
@@ -326,13 +308,7 @@ $result_trees{'menu_entry_name_comment'} = {
                               'type' => 'misc_arg'
                             }
                           ],
-                          'cmdname' => 'c',
-                          'extra' => {
-                            'misc_args' => [
-                              ' c
-'
-                            ]
-                          }
+                          'cmdname' => 'c'
                         }
                       ],
                       'type' => 'preformatted'
@@ -411,13 +387,7 @@ $result_trees{'menu_entry_name_comment'} = {
                               'type' => 'misc_arg'
                             }
                           ],
-                          'cmdname' => 'c',
-                          'extra' => {
-                            'misc_args' => [
-                              ' c
-'
-                            ]
-                          }
+                          'cmdname' => 'c'
                         }
                       ],
                       'type' => 'preformatted'
diff --git a/tp/t/results/menu/menu_entry_no_entry.pl 
b/tp/t/results/menu/menu_entry_no_entry.pl
index 9bb4f412f8..94ae79a2ea 100644
--- a/tp/t/results/menu/menu_entry_no_entry.pl
+++ b/tp/t/results/menu/menu_entry_no_entry.pl
@@ -46,13 +46,7 @@ $result_trees{'menu_entry_no_entry'} = {
                           'type' => 'misc_arg'
                         }
                       ],
-                      'cmdname' => 'c',
-                      'extra' => {
-                        'misc_args' => [
-                          ' c
-'
-                        ]
-                      }
+                      'cmdname' => 'c'
                     },
                     {
                       'text' => '* a2c:  '
@@ -65,13 +59,7 @@ $result_trees{'menu_entry_no_entry'} = {
                           'type' => 'misc_arg'
                         }
                       ],
-                      'cmdname' => 'c',
-                      'extra' => {
-                        'misc_args' => [
-                          ' c
-'
-                        ]
-                      }
+                      'cmdname' => 'c'
                     },
                     {
                       'text' => '* a4'
@@ -130,13 +118,7 @@ $result_trees{'menu_entry_no_entry'} = {
                           'type' => 'misc_arg'
                         }
                       ],
-                      'cmdname' => 'c',
-                      'extra' => {
-                        'misc_args' => [
-                          ' c
-'
-                        ]
-                      }
+                      'cmdname' => 'c'
                     }
                   ],
                   'type' => 'preformatted'
diff --git a/tp/t/results/menu/menu_entry_node_comments.pl 
b/tp/t/results/menu/menu_entry_node_comments.pl
index 7a725ca540..02dffb1367 100644
--- a/tp/t/results/menu/menu_entry_node_comments.pl
+++ b/tp/t/results/menu/menu_entry_node_comments.pl
@@ -71,13 +71,7 @@ $result_trees{'menu_entry_node_comments'} = {
                               'type' => 'misc_arg'
                             }
                           ],
-                          'cmdname' => 'c',
-                          'extra' => {
-                            'misc_args' => [
-                              ' c
-'
-                            ]
-                          }
+                          'cmdname' => 'c'
                         }
                       ],
                       'type' => 'preformatted'
@@ -141,13 +135,7 @@ $result_trees{'menu_entry_node_comments'} = {
                               'type' => 'misc_arg'
                             }
                           ],
-                          'cmdname' => 'c',
-                          'extra' => {
-                            'misc_args' => [
-                              ' c
-'
-                            ]
-                          }
+                          'cmdname' => 'c'
                         }
                       ],
                       'type' => 'preformatted'
@@ -214,13 +202,7 @@ $result_trees{'menu_entry_node_comments'} = {
                               'type' => 'misc_arg'
                             }
                           ],
-                          'cmdname' => 'c',
-                          'extra' => {
-                            'misc_args' => [
-                              ' c
-'
-                            ]
-                          }
+                          'cmdname' => 'c'
                         }
                       ],
                       'type' => 'preformatted'
@@ -292,13 +274,7 @@ $result_trees{'menu_entry_node_comments'} = {
                               'type' => 'misc_arg'
                             }
                           ],
-                          'cmdname' => 'c',
-                          'extra' => {
-                            'misc_args' => [
-                              ' c
-'
-                            ]
-                          }
+                          'cmdname' => 'c'
                         }
                       ],
                       'type' => 'preformatted'
diff --git a/tp/t/results/misc_commands/also_not_line.pl 
b/tp/t/results/misc_commands/also_not_line.pl
index b7dac39db7..cf47c13ed7 100644
--- a/tp/t/results/misc_commands/also_not_line.pl
+++ b/tp/t/results/misc_commands/also_not_line.pl
@@ -288,13 +288,7 @@ $result_trees{'also_not_line'} = {
                   'type' => 'misc_arg'
                 }
               ],
-              'cmdname' => 'vskip',
-              'extra' => {
-                'misc_args' => [
-                  ' 
-'
-                ]
-              }
+              'cmdname' => 'vskip'
             }
           ],
           'type' => 'paragraph'
diff --git a/tp/t/results/misc_commands/clickstyle.pl 
b/tp/t/results/misc_commands/clickstyle.pl
index ac4fccca0c..fec8846284 100644
--- a/tp/t/results/misc_commands/clickstyle.pl
+++ b/tp/t/results/misc_commands/clickstyle.pl
@@ -17,11 +17,6 @@ $result_trees{'clickstyle'} = {
             }
           ],
           'cmdname' => 'clickstyle',
-          'extra' => {
-            'misc_args' => [
-              '@result'
-            ]
-          },
           'info' => {
             'arg_line' => ' @result
 '
@@ -78,11 +73,6 @@ $result_trees{'clickstyle'} = {
             }
           ],
           'cmdname' => 'clickstyle',
-          'extra' => {
-            'misc_args' => [
-              '@equiv'
-            ]
-          },
           'info' => {
             'arg_line' => '@equiv
 '
diff --git a/tp/t/results/misc_commands/clickstyle_and_comments.pl 
b/tp/t/results/misc_commands/clickstyle_and_comments.pl
index 9265851834..4c80008b33 100644
--- a/tp/t/results/misc_commands/clickstyle_and_comments.pl
+++ b/tp/t/results/misc_commands/clickstyle_and_comments.pl
@@ -17,11 +17,6 @@ $result_trees{'clickstyle_and_comments'} = {
             }
           ],
           'cmdname' => 'clickstyle',
-          'extra' => {
-            'misc_args' => [
-              '@comment'
-            ]
-          },
           'info' => {
             'arg_line' => '@comment a
 '
@@ -40,11 +35,6 @@ $result_trees{'clickstyle_and_comments'} = {
             }
           ],
           'cmdname' => 'clickstyle',
-          'extra' => {
-            'misc_args' => [
-              '@comment'
-            ]
-          },
           'info' => {
             'arg_line' => ' @comment b
 '
@@ -87,11 +77,6 @@ $result_trees{'clickstyle_and_comments'} = {
             }
           ],
           'cmdname' => 'clickstyle',
-          'extra' => {
-            'misc_args' => [
-              '@result'
-            ]
-          },
           'info' => {
             'arg_line' => ' @result@comment e
 '
@@ -110,11 +95,6 @@ $result_trees{'clickstyle_and_comments'} = {
             }
           ],
           'cmdname' => 'clickstyle',
-          'extra' => {
-            'misc_args' => [
-              '@result'
-            ]
-          },
           'info' => {
             'arg_line' => ' @result   @comment f
 '
@@ -133,11 +113,6 @@ $result_trees{'clickstyle_and_comments'} = {
             }
           ],
           'cmdname' => 'clickstyle',
-          'extra' => {
-            'misc_args' => [
-              '@result'
-            ]
-          },
           'info' => {
             'arg_line' => ' @result on the same line @comment g
 '
diff --git a/tp/t/results/misc_commands/clickstyle_no_end_of_line.pl 
b/tp/t/results/misc_commands/clickstyle_no_end_of_line.pl
index ed70151290..d4e88ddec5 100644
--- a/tp/t/results/misc_commands/clickstyle_no_end_of_line.pl
+++ b/tp/t/results/misc_commands/clickstyle_no_end_of_line.pl
@@ -17,11 +17,6 @@ $result_trees{'clickstyle_no_end_of_line'} = {
             }
           ],
           'cmdname' => 'clickstyle',
-          'extra' => {
-            'misc_args' => [
-              '@result'
-            ]
-          },
           'info' => {
             'arg_line' => ' @result'
           },
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 119e6db651..6cfebbbb84 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
@@ -29,13 +29,7 @@ $result_trees{'comment_space_command_on_line'} = {
                       'type' => 'misc_arg'
                     }
                   ],
-                  'cmdname' => 'c',
-                  'extra' => {
-                    'misc_args' => [
-                      ' settittle
-'
-                    ]
-                  }
+                  'cmdname' => 'c'
                 }
               },
               'type' => 'line_arg'
@@ -79,13 +73,7 @@ $result_trees{'comment_space_command_on_line'} = {
                   'type' => 'misc_arg'
                 }
               ],
-              'cmdname' => 'comment',
-              'extra' => {
-                'misc_args' => [
-                  ' @node Top
-'
-                ]
-              }
+              'cmdname' => 'comment'
             },
             'spaces_after_argument' => {
               'text' => '  '
@@ -129,13 +117,7 @@ $result_trees{'comment_space_command_on_line'} = {
                   'type' => 'misc_arg'
                 }
               ],
-              'cmdname' => 'comment',
-              'extra' => {
-                'misc_args' => [
-                  ' @top
-'
-                ]
-              }
+              'cmdname' => 'comment'
             },
             'spaces_after_argument' => {
               'text' => ' '
@@ -181,13 +163,7 @@ $result_trees{'comment_space_command_on_line'} = {
                   'type' => 'misc_arg'
                 }
               ],
-              'cmdname' => 'comment',
-              'extra' => {
-                'misc_args' => [
-                  ' @node chap
-'
-                ]
-              }
+              'cmdname' => 'comment'
             },
             'spaces_after_argument' => {
               'text' => ' '
@@ -232,13 +208,7 @@ $result_trees{'comment_space_command_on_line'} = {
                   'type' => 'misc_arg'
                 }
               ],
-              'cmdname' => 'comment',
-              'extra' => {
-                'misc_args' => [
-                  ' @chapter
-'
-                ]
-              }
+              'cmdname' => 'comment'
             },
             'spaces_after_argument' => {
               'text' => ' '
@@ -271,13 +241,7 @@ $result_trees{'comment_space_command_on_line'} = {
                       'type' => 'misc_arg'
                     }
                   ],
-                  'cmdname' => 'c',
-                  'extra' => {
-                    'misc_args' => [
-                      ' comment frenchspacing
-'
-                    ]
-                  }
+                  'cmdname' => 'c'
                 },
                 'spaces_after_argument' => {
                   'text' => ' '
@@ -325,13 +289,7 @@ $result_trees{'comment_space_command_on_line'} = {
                       'type' => 'misc_arg'
                     }
                   ],
-                  'cmdname' => 'c',
-                  'extra' => {
-                    'misc_args' => [
-                      ' comment microtype
-'
-                    ]
-                  }
+                  'cmdname' => 'c'
                 }
               },
               'type' => 'line_arg'
@@ -379,13 +337,7 @@ $result_trees{'comment_space_command_on_line'} = {
                       'type' => 'misc_arg'
                     }
                   ],
-                  'cmdname' => 'c',
-                  'extra' => {
-                    'misc_args' => [
-                      ' index entry
-'
-                    ]
-                  }
+                  'cmdname' => 'c'
                 },
                 'spaces_after_argument' => {
                   'text' => ' '
@@ -441,13 +393,7 @@ $result_trees{'comment_space_command_on_line'} = {
                       'type' => 'misc_arg'
                     }
                   ],
-                  'cmdname' => 'c',
-                  'extra' => {
-                    'misc_args' => [
-                      ' heading
-'
-                    ]
-                  }
+                  'cmdname' => 'c'
                 },
                 'spaces_after_argument' => {
                   'text' => '    '
@@ -490,13 +436,7 @@ $result_trees{'comment_space_command_on_line'} = {
                       'type' => 'misc_arg'
                     }
                   ],
-                  'cmdname' => 'c',
-                  'extra' => {
-                    'misc_args' => [
-                      ' printindex 
-'
-                    ]
-                  }
+                  'cmdname' => 'c'
                 },
                 'spaces_after_argument' => {
                   'text' => ' '
@@ -583,13 +523,7 @@ $result_trees{'comment_space_command_on_line'} = {
                           'type' => 'misc_arg'
                         }
                       ],
-                      'cmdname' => 'c',
-                      'extra' => {
-                        'misc_args' => [
-                          ' end
-'
-                        ]
-                      }
+                      'cmdname' => 'c'
                     },
                     'spaces_after_argument' => {
                       'text' => ' '
@@ -655,13 +589,7 @@ $result_trees{'comment_space_command_on_line'} = {
                       'type' => 'misc_arg'
                     }
                   ],
-                  'cmdname' => 'c',
-                  'extra' => {
-                    'misc_args' => [
-                      ' listoffloats
-'
-                    ]
-                  }
+                  'cmdname' => 'c'
                 }
               },
               'type' => 'line_arg'
diff --git a/tp/t/results/misc_commands/comments_in_text.pl 
b/tp/t/results/misc_commands/comments_in_text.pl
index f7afc28772..0d90f21b8b 100644
--- a/tp/t/results/misc_commands/comments_in_text.pl
+++ b/tp/t/results/misc_commands/comments_in_text.pl
@@ -22,13 +22,7 @@ $result_trees{'comments_in_text'} = {
               'type' => 'misc_arg'
             }
           ],
-          'cmdname' => 'c',
-          'extra' => {
-            'misc_args' => [
-              ' lone comment
-'
-            ]
-          }
+          'cmdname' => 'c'
         },
         {
           'text' => '
@@ -48,13 +42,7 @@ $result_trees{'comments_in_text'} = {
                   'type' => 'misc_arg'
                 }
               ],
-              'cmdname' => 'c',
-              'extra' => {
-                'misc_args' => [
-                  ' comment
-'
-                ]
-              }
+              'cmdname' => 'c'
             },
             {
               'args' => [
@@ -64,13 +52,7 @@ $result_trees{'comments_in_text'} = {
                   'type' => 'misc_arg'
                 }
               ],
-              'cmdname' => 'c',
-              'extra' => {
-                'misc_args' => [
-                  ' comment
-'
-                ]
-              }
+              'cmdname' => 'c'
             },
             {
               'text' => 'Text line after the comment followed by a comment '
@@ -83,13 +65,7 @@ $result_trees{'comments_in_text'} = {
                   'type' => 'misc_arg'
                 }
               ],
-              'cmdname' => 'comment',
-              'extra' => {
-                'misc_args' => [
-                  ' c
-'
-                ]
-              }
+              'cmdname' => 'comment'
             },
             {
               'text' => 'Text line after the text line followed by the comment.
@@ -116,13 +92,7 @@ $result_trees{'comments_in_text'} = {
                   'type' => 'misc_arg'
                 }
               ],
-              'cmdname' => 'c',
-              'extra' => {
-                'misc_args' => [
-                  ' comment
-'
-                ]
-              }
+              'cmdname' => 'c'
             }
           ],
           'type' => 'paragraph'
diff --git a/tp/t/results/misc_commands/invalid_clickstyle.pl 
b/tp/t/results/misc_commands/invalid_clickstyle.pl
index 3b3b5a5cce..f02d2a5ffc 100644
--- a/tp/t/results/misc_commands/invalid_clickstyle.pl
+++ b/tp/t/results/misc_commands/invalid_clickstyle.pl
@@ -22,11 +22,6 @@ $result_trees{'invalid_clickstyle'} = {
             }
           ],
           'cmdname' => 'clickstyle',
-          'extra' => {
-            'misc_args' => [
-              '@result'
-            ]
-          },
           'info' => {
             'arg_line' => ' @result on the same line
 '
@@ -83,11 +78,6 @@ $result_trees{'invalid_clickstyle'} = {
             }
           ],
           'cmdname' => 'clickstyle',
-          'extra' => {
-            'misc_args' => [
-              '@nocmd'
-            ]
-          },
           'info' => {
             'arg_line' => ' @nocmd
 '
diff --git a/tp/t/results/misc_commands/invalid_documentencoding.pl 
b/tp/t/results/misc_commands/invalid_documentencoding.pl
index 93078b2660..a93e285f5c 100644
--- a/tp/t/results/misc_commands/invalid_documentencoding.pl
+++ b/tp/t/results/misc_commands/invalid_documentencoding.pl
@@ -17,13 +17,7 @@ $result_trees{'invalid_documentencoding'} = {
               'type' => 'misc_arg'
             }
           ],
-          'cmdname' => 'c',
-          'extra' => {
-            'misc_args' => [
-              ' this one is valid
-'
-            ]
-          }
+          'cmdname' => 'c'
         },
         {
           'args' => [
diff --git a/tp/t/results/misc_commands/setfilename.pl 
b/tp/t/results/misc_commands/setfilename.pl
index 2d59992991..410fe0be2f 100644
--- a/tp/t/results/misc_commands/setfilename.pl
+++ b/tp/t/results/misc_commands/setfilename.pl
@@ -28,13 +28,7 @@ $result_trees{'setfilename'} = {
                           'type' => 'misc_arg'
                         }
                       ],
-                      'cmdname' => 'c',
-                      'extra' => {
-                        'misc_args' => [
-                          ' comment
-'
-                        ]
-                      }
+                      'cmdname' => 'c'
                     }
                   },
                   'type' => 'line_arg'
@@ -104,13 +98,7 @@ $result_trees{'setfilename'} = {
                           'type' => 'misc_arg'
                         }
                       ],
-                      'cmdname' => 'c',
-                      'extra' => {
-                        'misc_args' => [
-                          ' comment
-'
-                        ]
-                      }
+                      'cmdname' => 'c'
                     },
                     'spaces_after_argument' => {
                       'text' => ' '
diff --git a/tp/t/results/misc_commands/vskip.pl 
b/tp/t/results/misc_commands/vskip.pl
index 5774ba02ce..216a6ddf24 100644
--- a/tp/t/results/misc_commands/vskip.pl
+++ b/tp/t/results/misc_commands/vskip.pl
@@ -17,13 +17,7 @@ $result_trees{'vskip'} = {
               'type' => 'misc_arg'
             }
           ],
-          'cmdname' => 'vskip',
-          'extra' => {
-            'misc_args' => [
-              ' 0pt plus 1filll
-'
-            ]
-          }
+          'cmdname' => 'vskip'
         }
       ],
       'type' => 'before_node_section'
diff --git a/tp/t/results/moresectioning/raiselowersections.pl 
b/tp/t/results/moresectioning/raiselowersections.pl
index 8349388795..be6aa58260 100644
--- a/tp/t/results/moresectioning/raiselowersections.pl
+++ b/tp/t/results/moresectioning/raiselowersections.pl
@@ -22,13 +22,7 @@ $result_trees{'raiselowersections'} = {
                   'type' => 'misc_arg'
                 }
               ],
-              'cmdname' => 'c',
-              'extra' => {
-                'misc_args' => [
-                  ' -*-texinfo-*-
-'
-                ]
-              }
+              'cmdname' => 'c'
             }
           ],
           'type' => 'paragraph'
@@ -495,12 +489,6 @@ $result_trees{'raiselowersections'} = {
             }
           ],
           'cmdname' => 'set',
-          'extra' => {
-            'misc_args' => [
-              'do-top',
-              ''
-            ]
-          },
           'info' => {
             'arg_line' => ' do-top
 '
@@ -614,13 +602,7 @@ $result_trees{'raiselowersections'} = {
                   'type' => 'misc_arg'
                 }
               ],
-              'cmdname' => 'c',
-              'extra' => {
-                'misc_args' => [
-                  ' -*-texinfo-*-
-'
-                ]
-              }
+              'cmdname' => 'c'
             }
           ],
           'type' => 'paragraph'
@@ -1406,11 +1388,6 @@ $result_trees{'raiselowersections'} = {
             }
           ],
           'cmdname' => 'clear',
-          'extra' => {
-            'misc_args' => [
-              'do-top'
-            ]
-          },
           'info' => {
             'arg_line' => ' do-top
 '
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 5fad9e5ed6..2fe32a22d7 100644
--- a/tp/t/results/multitable/inter_item_commands_in_multitable.pl
+++ b/tp/t/results/multitable/inter_item_commands_in_multitable.pl
@@ -43,13 +43,7 @@ $result_trees{'inter_item_commands_in_multitable'} = {
                       'type' => 'misc_arg'
                     }
                   ],
-                  'cmdname' => 'c',
-                  'extra' => {
-                    'misc_args' => [
-                      ' comment before first item
-'
-                    ]
-                  }
+                  'cmdname' => 'c'
                 },
                 {
                   'text' => '
@@ -166,13 +160,7 @@ $result_trees{'inter_item_commands_in_multitable'} = {
                                   'type' => 'misc_arg'
                                 }
                               ],
-                              'cmdname' => 'c',
-                              'extra' => {
-                                'misc_args' => [
-                                  ' last comment
-'
-                                ]
-                              }
+                              'cmdname' => 'c'
                             }
                           ],
                           'type' => 'paragraph'
@@ -415,13 +403,7 @@ $result_trees{'inter_item_commands_in_multitable'} = {
                                   'type' => 'misc_arg'
                                 }
                               ],
-                              'cmdname' => 'c',
-                              'extra' => {
-                                'misc_args' => [
-                                  ' comment in multitable
-'
-                                ]
-                              }
+                              'cmdname' => 'c'
                             }
                           ],
                           'type' => 'paragraph'
diff --git 
a/tp/t/results/multitable/multitable_bracketed_prototype_empty_not_closed_comment.pl
 
b/tp/t/results/multitable/multitable_bracketed_prototype_empty_not_closed_comment.pl
index 4a68119654..1f444cda71 100644
--- 
a/tp/t/results/multitable/multitable_bracketed_prototype_empty_not_closed_comment.pl
+++ 
b/tp/t/results/multitable/multitable_bracketed_prototype_empty_not_closed_comment.pl
@@ -28,13 +28,7 @@ 
$result_trees{'multitable_bracketed_prototype_empty_not_closed_comment'} = {
                           'type' => 'misc_arg'
                         }
                       ],
-                      'cmdname' => 'comment',
-                      'extra' => {
-                        'misc_args' => [
-                          ' comment
-'
-                        ]
-                      }
+                      'cmdname' => 'comment'
                     }
                   ],
                   'type' => 'bracketed'
diff --git 
a/tp/t/results/multitable/multitable_bracketed_prototype_empty_spaces_not_closed_comment.pl
 
b/tp/t/results/multitable/multitable_bracketed_prototype_empty_spaces_not_closed_comment.pl
index f8c7d2954f..a8ed5d2669 100644
--- 
a/tp/t/results/multitable/multitable_bracketed_prototype_empty_spaces_not_closed_comment.pl
+++ 
b/tp/t/results/multitable/multitable_bracketed_prototype_empty_spaces_not_closed_comment.pl
@@ -28,13 +28,7 @@ 
$result_trees{'multitable_bracketed_prototype_empty_spaces_not_closed_comment'}
                           'type' => 'misc_arg'
                         }
                       ],
-                      'cmdname' => 'comment',
-                      'extra' => {
-                        'misc_args' => [
-                          ' comment
-'
-                        ]
-                      }
+                      'cmdname' => 'comment'
                     }
                   ],
                   'info' => {
diff --git 
a/tp/t/results/multitable/multitable_bracketed_prototype_not_closed_comment.pl 
b/tp/t/results/multitable/multitable_bracketed_prototype_not_closed_comment.pl
index 1e9bbaebed..0d82425ef0 100644
--- 
a/tp/t/results/multitable/multitable_bracketed_prototype_not_closed_comment.pl
+++ 
b/tp/t/results/multitable/multitable_bracketed_prototype_not_closed_comment.pl
@@ -31,13 +31,7 @@ 
$result_trees{'multitable_bracketed_prototype_not_closed_comment'} = {
                           'type' => 'misc_arg'
                         }
                       ],
-                      'cmdname' => 'c',
-                      'extra' => {
-                        'misc_args' => [
-                          ' comment
-'
-                        ]
-                      }
+                      'cmdname' => 'c'
                     }
                   ],
                   'type' => 'bracketed'
diff --git 
a/tp/t/results/multitable/multitable_bracketed_prototype_not_closed_space_comment.pl
 
b/tp/t/results/multitable/multitable_bracketed_prototype_not_closed_space_comment.pl
index b3457da3bb..7b52c5651c 100644
--- 
a/tp/t/results/multitable/multitable_bracketed_prototype_not_closed_space_comment.pl
+++ 
b/tp/t/results/multitable/multitable_bracketed_prototype_not_closed_space_comment.pl
@@ -31,13 +31,7 @@ 
$result_trees{'multitable_bracketed_prototype_not_closed_space_comment'} = {
                           'type' => 'misc_arg'
                         }
                       ],
-                      'cmdname' => 'c',
-                      'extra' => {
-                        'misc_args' => [
-                          ' comment
-'
-                        ]
-                      }
+                      'cmdname' => 'c'
                     }
                   ],
                   'type' => 'bracketed'
diff --git a/tp/t/results/multitable/prototype_brace_no_brace_comment.pl 
b/tp/t/results/multitable/prototype_brace_no_brace_comment.pl
index 6d9428ee3a..9c13a23f01 100644
--- a/tp/t/results/multitable/prototype_brace_no_brace_comment.pl
+++ b/tp/t/results/multitable/prototype_brace_no_brace_comment.pl
@@ -34,13 +34,7 @@ $result_trees{'prototype_brace_no_brace_comment'} = {
                       'type' => 'misc_arg'
                     }
                   ],
-                  'cmdname' => 'comment',
-                  'extra' => {
-                    'misc_args' => [
-                      ' cc
-'
-                    ]
-                  }
+                  'cmdname' => 'comment'
                 }
               },
               'type' => 'block_line_arg'
diff --git a/tp/t/results/paragraph/comment_between_text.pl 
b/tp/t/results/paragraph/comment_between_text.pl
index 76fd2ca982..14360c9877 100644
--- a/tp/t/results/paragraph/comment_between_text.pl
+++ b/tp/t/results/paragraph/comment_between_text.pl
@@ -23,13 +23,7 @@ $result_trees{'comment_between_text'} = {
                   'type' => 'misc_arg'
                 }
               ],
-              'cmdname' => 'c',
-              'extra' => {
-                'misc_args' => [
-                  ' comment
-'
-                ]
-              }
+              'cmdname' => 'c'
             },
             {
               'text' => 'end para'
diff --git a/tp/t/results/paragraph/comment_in_quotation.pl 
b/tp/t/results/paragraph/comment_in_quotation.pl
index e23774acaa..6af2fc27dc 100644
--- a/tp/t/results/paragraph/comment_in_quotation.pl
+++ b/tp/t/results/paragraph/comment_in_quotation.pl
@@ -41,13 +41,7 @@ $result_trees{'comment_in_quotation'} = {
                       'type' => 'misc_arg'
                     }
                   ],
-                  'cmdname' => 'c',
-                  'extra' => {
-                    'misc_args' => [
-                      '
-'
-                    ]
-                  }
+                  'cmdname' => 'c'
                 }
               ],
               'type' => 'paragraph'
@@ -123,13 +117,7 @@ $result_trees{'comment_in_quotation'} = {
                       'type' => 'misc_arg'
                     }
                   ],
-                  'cmdname' => 'c',
-                  'extra' => {
-                    'misc_args' => [
-                      '
-'
-                    ]
-                  }
+                  'cmdname' => 'c'
                 }
               ],
               'type' => 'paragraph'
diff --git a/tp/t/results/paragraph/text_comment.pl 
b/tp/t/results/paragraph/text_comment.pl
index b6e1bf4201..a0c15db07c 100644
--- a/tp/t/results/paragraph/text_comment.pl
+++ b/tp/t/results/paragraph/text_comment.pl
@@ -21,12 +21,7 @@ $result_trees{'text_comment'} = {
                   'type' => 'misc_arg'
                 }
               ],
-              'cmdname' => 'c',
-              'extra' => {
-                'misc_args' => [
-                  ' comment'
-                ]
-              }
+              'cmdname' => 'c'
             }
           ],
           'type' => 'paragraph'
diff --git a/tp/t/results/paragraph/text_space_comment.pl 
b/tp/t/results/paragraph/text_space_comment.pl
index 152aa9676b..567fcac367 100644
--- a/tp/t/results/paragraph/text_space_comment.pl
+++ b/tp/t/results/paragraph/text_space_comment.pl
@@ -25,12 +25,7 @@ $result_trees{'text_space_comment'} = {
                   'type' => 'misc_arg'
                 }
               ],
-              'cmdname' => 'c',
-              'extra' => {
-                'misc_args' => [
-                  ' space comment'
-                ]
-              }
+              'cmdname' => 'c'
             }
           ],
           'type' => 'paragraph'
diff --git a/tp/t/results/plaintext_tests/characters_and_commands_in_var.pl 
b/tp/t/results/plaintext_tests/characters_and_commands_in_var.pl
index 92472c6a78..893a8b4996 100644
--- a/tp/t/results/plaintext_tests/characters_and_commands_in_var.pl
+++ b/tp/t/results/plaintext_tests/characters_and_commands_in_var.pl
@@ -121,13 +121,7 @@ $result_trees{'characters_and_commands_in_var'} = {
                           'type' => 'misc_arg'
                         }
                       ],
-                      'cmdname' => 'c',
-                      'extra' => {
-                        'misc_args' => [
-                          ' ]
-'
-                        ]
-                      }
+                      'cmdname' => 'c'
                     },
                     {
                       'text' => 'vvar'
diff --git a/tp/t/results/plaintext_tests/no_empty_line_after_section.pl 
b/tp/t/results/plaintext_tests/no_empty_line_after_section.pl
index 9ff9dea306..7f8111649c 100644
--- a/tp/t/results/plaintext_tests/no_empty_line_after_section.pl
+++ b/tp/t/results/plaintext_tests/no_empty_line_after_section.pl
@@ -93,13 +93,7 @@ $result_trees{'no_empty_line_after_section'} = {
               'type' => 'misc_arg'
             }
           ],
-          'cmdname' => 'c',
-          'extra' => {
-            'misc_args' => [
-              ' comment
-'
-            ]
-          }
+          'cmdname' => 'c'
         },
         {
           'text' => '
@@ -120,13 +114,7 @@ $result_trees{'no_empty_line_after_section'} = {
                   'type' => 'misc_arg'
                 }
               ],
-              'cmdname' => 'comment',
-              'extra' => {
-                'misc_args' => [
-                  ' c
-'
-                ]
-              }
+              'cmdname' => 'comment'
             }
           ],
           'type' => 'paragraph'
diff --git a/tp/t/results/preformatted/comment_example_and_blank_lines.pl 
b/tp/t/results/preformatted/comment_example_and_blank_lines.pl
index 31d16b9165..5f5bdf1731 100644
--- a/tp/t/results/preformatted/comment_example_and_blank_lines.pl
+++ b/tp/t/results/preformatted/comment_example_and_blank_lines.pl
@@ -50,13 +50,7 @@ $result_trees{'comment_example_and_blank_lines'} = {
                       'type' => 'misc_arg'
                     }
                   ],
-                  'cmdname' => 'c',
-                  'extra' => {
-                    'misc_args' => [
-                      ' comment
-'
-                    ]
-                  }
+                  'cmdname' => 'c'
                 }
               ],
               'type' => 'preformatted'
@@ -146,13 +140,7 @@ $result_trees{'comment_example_and_blank_lines'} = {
                       'type' => 'misc_arg'
                     }
                   ],
-                  'cmdname' => 'c',
-                  'extra' => {
-                    'misc_args' => [
-                      ' comment
-'
-                    ]
-                  }
+                  'cmdname' => 'c'
                 }
               ],
               'type' => 'preformatted'
diff --git a/tp/t/results/preformatted/comments_in_example.pl 
b/tp/t/results/preformatted/comments_in_example.pl
index f84c0b9cbc..f32552c806 100644
--- a/tp/t/results/preformatted/comments_in_example.pl
+++ b/tp/t/results/preformatted/comments_in_example.pl
@@ -45,13 +45,7 @@ $result_trees{'comments_in_example'} = {
                       'type' => 'misc_arg'
                     }
                   ],
-                  'cmdname' => 'c',
-                  'extra' => {
-                    'misc_args' => [
-                      ' comment
-'
-                    ]
-                  }
+                  'cmdname' => 'c'
                 },
                 {
                   'text' => 'second line '
@@ -64,13 +58,7 @@ $result_trees{'comments_in_example'} = {
                       'type' => 'misc_arg'
                     }
                   ],
-                  'cmdname' => 'c',
-                  'extra' => {
-                    'misc_args' => [
-                      ' comment
-'
-                    ]
-                  }
+                  'cmdname' => 'c'
                 }
               ],
               'type' => 'preformatted'
@@ -155,13 +143,7 @@ $result_trees{'comments_in_example'} = {
                       'type' => 'misc_arg'
                     }
                   ],
-                  'cmdname' => 'c',
-                  'extra' => {
-                    'misc_args' => [
-                      ' comment
-'
-                    ]
-                  }
+                  'cmdname' => 'c'
                 }
               ],
               'type' => 'preformatted'
@@ -246,13 +228,7 @@ $result_trees{'comments_in_example'} = {
                       'type' => 'misc_arg'
                     }
                   ],
-                  'cmdname' => 'c',
-                  'extra' => {
-                    'misc_args' => [
-                      ' comment
-'
-                    ]
-                  }
+                  'cmdname' => 'c'
                 },
                 {
                   'text' => '
diff --git a/tp/t/results/preformatted/nested_example_and_comment.pl 
b/tp/t/results/preformatted/nested_example_and_comment.pl
index 4413711c0c..9a5cfc4a1a 100644
--- a/tp/t/results/preformatted/nested_example_and_comment.pl
+++ b/tp/t/results/preformatted/nested_example_and_comment.pl
@@ -36,13 +36,7 @@ $result_trees{'nested_example_and_comment'} = {
                       'type' => 'misc_arg'
                     }
                   ],
-                  'cmdname' => 'c',
-                  'extra' => {
-                    'misc_args' => [
-                      '
-'
-                    ]
-                  }
+                  'cmdname' => 'c'
                 }
               ],
               'type' => 'preformatted'
@@ -189,13 +183,7 @@ $result_trees{'nested_example_and_comment'} = {
                       'type' => 'misc_arg'
                     }
                   ],
-                  'cmdname' => 'c',
-                  'extra' => {
-                    'misc_args' => [
-                      '
-'
-                    ]
-                  }
+                  'cmdname' => 'c'
                 }
               ],
               'type' => 'preformatted'
@@ -227,13 +215,7 @@ $result_trees{'nested_example_and_comment'} = {
                           'type' => 'misc_arg'
                         }
                       ],
-                      'cmdname' => 'c',
-                      'extra' => {
-                        'misc_args' => [
-                          '
-'
-                        ]
-                      }
+                      'cmdname' => 'c'
                     }
                   ],
                   'type' => 'preformatted'
@@ -357,13 +339,7 @@ $result_trees{'nested_example_and_comment'} = {
                       'type' => 'misc_arg'
                     }
                   ],
-                  'cmdname' => 'c',
-                  'extra' => {
-                    'misc_args' => [
-                      '
-'
-                    ]
-                  }
+                  'cmdname' => 'c'
                 }
               ],
               'type' => 'preformatted'
@@ -395,13 +371,7 @@ $result_trees{'nested_example_and_comment'} = {
                           'type' => 'misc_arg'
                         }
                       ],
-                      'cmdname' => 'c',
-                      'extra' => {
-                        'misc_args' => [
-                          '
-'
-                        ]
-                      }
+                      'cmdname' => 'c'
                     }
                   ],
                   'type' => 'preformatted'
@@ -458,13 +428,7 @@ $result_trees{'nested_example_and_comment'} = {
                       'type' => 'misc_arg'
                     }
                   ],
-                  'cmdname' => 'c',
-                  'extra' => {
-                    'misc_args' => [
-                      '
-'
-                    ]
-                  }
+                  'cmdname' => 'c'
                 }
               ],
               'type' => 'preformatted'
diff --git a/tp/t/results/quotation/comment_on_quotation_line.pl 
b/tp/t/results/quotation/comment_on_quotation_line.pl
index 5817b6cd97..044712c1f4 100644
--- a/tp/t/results/quotation/comment_on_quotation_line.pl
+++ b/tp/t/results/quotation/comment_on_quotation_line.pl
@@ -29,13 +29,7 @@ $result_trees{'comment_on_quotation_line'} = {
                       'type' => 'misc_arg'
                     }
                   ],
-                  'cmdname' => 'c',
-                  'extra' => {
-                    'misc_args' => [
-                      ' quotation 
-'
-                    ]
-                  }
+                  'cmdname' => 'c'
                 }
               },
               'type' => 'block_line_arg'
diff --git a/tp/t/results/quotation/only_comment_on_quotation_line.pl 
b/tp/t/results/quotation/only_comment_on_quotation_line.pl
index 04c0e2933b..ec21c07061 100644
--- a/tp/t/results/quotation/only_comment_on_quotation_line.pl
+++ b/tp/t/results/quotation/only_comment_on_quotation_line.pl
@@ -21,13 +21,7 @@ $result_trees{'only_comment_on_quotation_line'} = {
                       'type' => 'misc_arg'
                     }
                   ],
-                  'cmdname' => 'c',
-                  'extra' => {
-                    'misc_args' => [
-                      ' comment
-'
-                    ]
-                  }
+                  'cmdname' => 'c'
                 }
               },
               'type' => 'block_line_arg'
diff --git a/tp/t/results/raw/misc_raw_comments.pl 
b/tp/t/results/raw/misc_raw_comments.pl
index eaa8d1eec5..d25e42700a 100644
--- a/tp/t/results/raw/misc_raw_comments.pl
+++ b/tp/t/results/raw/misc_raw_comments.pl
@@ -26,13 +26,7 @@ $result_trees{'misc_raw_comments'} = {
                       'type' => 'misc_arg'
                     }
                   ],
-                  'cmdname' => 'c',
-                  'extra' => {
-                    'misc_args' => [
-                      ' comment space
-'
-                    ]
-                  }
+                  'cmdname' => 'c'
                 }
               },
               'type' => 'block_line_arg'
@@ -65,13 +59,7 @@ $result_trees{'misc_raw_comments'} = {
                           'type' => 'misc_arg'
                         }
                       ],
-                      'cmdname' => 'c',
-                      'extra' => {
-                        'misc_args' => [
-                          ' comment no space
-'
-                        ]
-                      }
+                      'cmdname' => 'c'
                     }
                   },
                   'type' => 'line_arg'
@@ -145,13 +133,7 @@ $result_trees{'misc_raw_comments'} = {
                           'type' => 'misc_arg'
                         }
                       ],
-                      'cmdname' => 'c',
-                      'extra' => {
-                        'misc_args' => [
-                          ' comment after end tex
-'
-                        ]
-                      }
+                      'cmdname' => 'c'
                     },
                     'spaces_after_argument' => {
                       'text' => '    '
diff --git a/tp/t/results/sectioning/empty_nodes_with_commands.pl 
b/tp/t/results/sectioning/empty_nodes_with_commands.pl
index 4b5900eeec..84d6593938 100644
--- a/tp/t/results/sectioning/empty_nodes_with_commands.pl
+++ b/tp/t/results/sectioning/empty_nodes_with_commands.pl
@@ -29,13 +29,7 @@ $result_trees{'empty_nodes_with_commands'} = {
                   'type' => 'misc_arg'
                 }
               ],
-              'cmdname' => 'c',
-              'extra' => {
-                'misc_args' => [
-                  ' comment
-'
-                ]
-              }
+              'cmdname' => 'c'
             }
           },
           'type' => 'line_arg'
diff --git a/tp/t/results/sectioning/empty_ref_arg.pl 
b/tp/t/results/sectioning/empty_ref_arg.pl
index 8ef8f9fa82..45ed43b41b 100644
--- a/tp/t/results/sectioning/empty_ref_arg.pl
+++ b/tp/t/results/sectioning/empty_ref_arg.pl
@@ -206,13 +206,7 @@ $result_trees{'empty_ref_arg'} = {
                           'type' => 'misc_arg'
                         }
                       ],
-                      'cmdname' => 'c',
-                      'extra' => {
-                        'misc_args' => [
-                          ' aaa
-'
-                        ]
-                      }
+                      'cmdname' => 'c'
                     },
                     {
                       'text' => ' '
@@ -232,13 +226,7 @@ $result_trees{'empty_ref_arg'} = {
                           'type' => 'misc_arg'
                         }
                       ],
-                      'cmdname' => 'c',
-                      'extra' => {
-                        'misc_args' => [
-                          ' ggg
-'
-                        ]
-                      }
+                      'cmdname' => 'c'
                     }
                   ],
                   'info' => {
@@ -258,13 +246,7 @@ $result_trees{'empty_ref_arg'} = {
                           'type' => 'misc_arg'
                         }
                       ],
-                      'cmdname' => 'c',
-                      'extra' => {
-                        'misc_args' => [
-                          ' fff
-'
-                        ]
-                      }
+                      'cmdname' => 'c'
                     },
                     {
                       'args' => [
@@ -274,13 +256,7 @@ $result_trees{'empty_ref_arg'} = {
                           'type' => 'misc_arg'
                         }
                       ],
-                      'cmdname' => 'c',
-                      'extra' => {
-                        'misc_args' => [
-                          '
-'
-                        ]
-                      }
+                      'cmdname' => 'c'
                     }
                   ],
                   'info' => {
diff --git a/tp/t/results/sectioning/node_line_arguments.pl 
b/tp/t/results/sectioning/node_line_arguments.pl
index e524b781ec..13c4d7147a 100644
--- a/tp/t/results/sectioning/node_line_arguments.pl
+++ b/tp/t/results/sectioning/node_line_arguments.pl
@@ -364,13 +364,7 @@ $result_trees{'node_line_arguments'} = {
                   'type' => 'misc_arg'
                 }
               ],
-              'cmdname' => 'comment',
-              'extra' => {
-                'misc_args' => [
-                  '
-'
-                ]
-              }
+              'cmdname' => 'comment'
             },
             'spaces_after_argument' => {
               'text' => ' '
@@ -501,13 +495,7 @@ $result_trees{'node_line_arguments'} = {
                   'type' => 'misc_arg'
                 }
               ],
-              'cmdname' => 'c',
-              'extra' => {
-                'misc_args' => [
-                  ' comma , end
-'
-                ]
-              }
+              'cmdname' => 'c'
             },
             'spaces_after_argument' => {
               'text' => ' '
diff --git a/tp/t/results/value/begin_like_comment_on_set_line.pl 
b/tp/t/results/value/begin_like_comment_on_set_line.pl
index 174564ce3a..5b7cb72f8b 100644
--- a/tp/t/results/value/begin_like_comment_on_set_line.pl
+++ b/tp/t/results/value/begin_like_comment_on_set_line.pl
@@ -28,12 +28,6 @@ $result_trees{'begin_like_comment_on_set_line'} = {
             }
           ],
           'cmdname' => 'set',
-          'extra' => {
-            'misc_args' => [
-              'y',
-              'some thing @commentary is it'
-            ]
-          },
           'info' => {
             'arg_line' => ' y some thing @commentary is it
 '
diff --git a/tp/t/results/value/clear_no_end_of_line.pl 
b/tp/t/results/value/clear_no_end_of_line.pl
index 4143b581e1..2dbc8021c6 100644
--- a/tp/t/results/value/clear_no_end_of_line.pl
+++ b/tp/t/results/value/clear_no_end_of_line.pl
@@ -17,11 +17,6 @@ $result_trees{'clear_no_end_of_line'} = {
             }
           ],
           'cmdname' => 'clear',
-          'extra' => {
-            'misc_args' => [
-              'jj'
-            ]
-          },
           'info' => {
             'arg_line' => ' jj'
           }
diff --git a/tp/t/results/value/comment_on_clear_line.pl 
b/tp/t/results/value/comment_on_clear_line.pl
index fb7d968c50..239256dd91 100644
--- a/tp/t/results/value/comment_on_clear_line.pl
+++ b/tp/t/results/value/comment_on_clear_line.pl
@@ -21,12 +21,6 @@ $result_trees{'comment_on_clear_line'} = {
             }
           ],
           'cmdname' => 'set',
-          'extra' => {
-            'misc_args' => [
-              'x',
-              ''
-            ]
-          },
           'info' => {
             'arg_line' => ' x
 '
@@ -44,12 +38,6 @@ $result_trees{'comment_on_clear_line'} = {
             }
           ],
           'cmdname' => 'set',
-          'extra' => {
-            'misc_args' => [
-              'y',
-              ''
-            ]
-          },
           'info' => {
             'arg_line' => ' y
 '
@@ -67,12 +55,6 @@ $result_trees{'comment_on_clear_line'} = {
             }
           ],
           'cmdname' => 'set',
-          'extra' => {
-            'misc_args' => [
-              'z',
-              'g'
-            ]
-          },
           'info' => {
             'arg_line' => ' z g
 '
@@ -90,12 +72,6 @@ $result_trees{'comment_on_clear_line'} = {
             }
           ],
           'cmdname' => 'set',
-          'extra' => {
-            'misc_args' => [
-              't',
-              'a vv'
-            ]
-          },
           'info' => {
             'arg_line' => ' t a vv @comment@ggg
 '
@@ -114,11 +90,6 @@ $result_trees{'comment_on_clear_line'} = {
             }
           ],
           'cmdname' => 'clear',
-          'extra' => {
-            'misc_args' => [
-              'x'
-            ]
-          },
           'info' => {
             'arg_line' => ' x@c
 '
@@ -132,11 +103,6 @@ $result_trees{'comment_on_clear_line'} = {
             }
           ],
           'cmdname' => 'clear',
-          'extra' => {
-            'misc_args' => [
-              'y'
-            ]
-          },
           'info' => {
             'arg_line' => ' y @c
 '
diff --git a/tp/t/results/value/comment_on_set_line.pl 
b/tp/t/results/value/comment_on_set_line.pl
index e0026ed83a..9eb37833e6 100644
--- a/tp/t/results/value/comment_on_set_line.pl
+++ b/tp/t/results/value/comment_on_set_line.pl
@@ -21,12 +21,6 @@ $result_trees{'comment_on_set_line'} = {
             }
           ],
           'cmdname' => 'set',
-          'extra' => {
-            'misc_args' => [
-              'x',
-              ''
-            ]
-          },
           'info' => {
             'arg_line' => ' x@c
 '
@@ -44,12 +38,6 @@ $result_trees{'comment_on_set_line'} = {
             }
           ],
           'cmdname' => 'set',
-          'extra' => {
-            'misc_args' => [
-              'y',
-              ''
-            ]
-          },
           'info' => {
             'arg_line' => ' y @c
 '
@@ -67,12 +55,6 @@ $result_trees{'comment_on_set_line'} = {
             }
           ],
           'cmdname' => 'set',
-          'extra' => {
-            'misc_args' => [
-              'z',
-              'g'
-            ]
-          },
           'info' => {
             'arg_line' => ' z g@c
 '
@@ -90,12 +72,6 @@ $result_trees{'comment_on_set_line'} = {
             }
           ],
           'cmdname' => 'set',
-          'extra' => {
-            'misc_args' => [
-              't',
-              'a vv'
-            ]
-          },
           'info' => {
             'arg_line' => ' t a vv @comment@ggg
 '
diff --git a/tp/t/results/value/empty_set.pl b/tp/t/results/value/empty_set.pl
index f549a0d059..57aca187ec 100644
--- a/tp/t/results/value/empty_set.pl
+++ b/tp/t/results/value/empty_set.pl
@@ -21,12 +21,6 @@ $result_trees{'empty_set'} = {
             }
           ],
           'cmdname' => 'set',
-          'extra' => {
-            'misc_args' => [
-              'myspace',
-              ''
-            ]
-          },
           'info' => {
             'arg_line' => ' myspace
 '
diff --git a/tp/t/results/value/empty_value_in_line.pl 
b/tp/t/results/value/empty_value_in_line.pl
index 484be1d2e0..8dc6086edc 100644
--- a/tp/t/results/value/empty_value_in_line.pl
+++ b/tp/t/results/value/empty_value_in_line.pl
@@ -21,12 +21,6 @@ $result_trees{'empty_value_in_line'} = {
             }
           ],
           'cmdname' => 'set',
-          'extra' => {
-            'misc_args' => [
-              'myspace',
-              ''
-            ]
-          },
           'info' => {
             'arg_line' => ' myspace
 '
diff --git a/tp/t/results/value/ignored_value_definition.pl 
b/tp/t/results/value/ignored_value_definition.pl
index 60b87fdbef..bb93e30aef 100644
--- a/tp/t/results/value/ignored_value_definition.pl
+++ b/tp/t/results/value/ignored_value_definition.pl
@@ -21,12 +21,6 @@ $result_trees{'ignored_value_definition'} = {
             }
           ],
           'cmdname' => 'set',
-          'extra' => {
-            'misc_args' => [
-              'aa',
-              'outside'
-            ]
-          },
           'info' => {
             'arg_line' => ' aa outside
 '
diff --git a/tp/t/results/value/not_only_characters.pl 
b/tp/t/results/value/not_only_characters.pl
index 7e00b8ec10..a419858809 100644
--- a/tp/t/results/value/not_only_characters.pl
+++ b/tp/t/results/value/not_only_characters.pl
@@ -21,12 +21,6 @@ $result_trees{'not_only_characters'} = {
             }
           ],
           'cmdname' => 'set',
-          'extra' => {
-            'misc_args' => [
-              '-e_\'::;',
-              'hh'
-            ]
-          },
           'info' => {
             'arg_line' => ' -e_\'::; hh
 '
diff --git a/tp/t/results/value/recursive_expansion_in_set.pl 
b/tp/t/results/value/recursive_expansion_in_set.pl
index 1d07a26f55..2972a11d85 100644
--- a/tp/t/results/value/recursive_expansion_in_set.pl
+++ b/tp/t/results/value/recursive_expansion_in_set.pl
@@ -21,12 +21,6 @@ $result_trees{'recursive_expansion_in_set'} = {
             }
           ],
           'cmdname' => 'set',
-          'extra' => {
-            'misc_args' => [
-              'V',
-              '@value{V}'
-            ]
-          },
           'info' => {
             'arg_line' => ' V @value{V}
 '
diff --git a/tp/t/results/value/set_form_feed.pl 
b/tp/t/results/value/set_form_feed.pl
index 0f3ca97896..4d991bfefb 100644
--- a/tp/t/results/value/set_form_feed.pl
+++ b/tp/t/results/value/set_form_feed.pl
@@ -21,12 +21,6 @@ $result_trees{'set_form_feed'} = {
             }
           ],
           'cmdname' => 'set',
-          'extra' => {
-            'misc_args' => [
-              'gg',
-              'a\\a\\f\\\\'
-            ]
-          },
           'info' => {
             'arg_line' => ' gg  a\\a\\f\\\\
 '
@@ -44,12 +38,6 @@ $result_trees{'set_form_feed'} = {
             }
           ],
           'cmdname' => 'set',
-          'extra' => {
-            'misc_args' => [
-              'hh',
-              ''
-            ]
-          },
           'info' => {
             'arg_line' => ' hh
 '
@@ -67,12 +55,6 @@ $result_trees{'set_form_feed'} = {
             }
           ],
           'cmdname' => 'set',
-          'extra' => {
-            'misc_args' => [
-              'll',
-              ''
-            ]
-          },
           'info' => {
             'arg_line' => ' ll 
 '
diff --git a/tp/t/results/value/set_in_item_missing_line.pl 
b/tp/t/results/value/set_in_item_missing_line.pl
index 3629e11bc1..60a8674a23 100644
--- a/tp/t/results/value/set_in_item_missing_line.pl
+++ b/tp/t/results/value/set_in_item_missing_line.pl
@@ -57,12 +57,6 @@ $result_trees{'set_in_item_missing_line'} = {
                                 }
                               ],
                               'cmdname' => 'set',
-                              'extra' => {
-                                'misc_args' => [
-                                  'n',
-                                  ''
-                                ]
-                              },
                               'info' => {
                                 'arg_line' => ' n
 '
@@ -229,12 +223,6 @@ $result_trees{'set_in_item_missing_line'} = {
                                 }
                               ],
                               'cmdname' => 'set',
-                              'extra' => {
-                                'misc_args' => [
-                                  'cn',
-                                  ''
-                                ]
-                              },
                               'info' => {
                                 'arg_line' => ' cn@c
 '
diff --git a/tp/t/results/value/set_no_end_of_line.pl 
b/tp/t/results/value/set_no_end_of_line.pl
index b6971c4c35..1c144c3740 100644
--- a/tp/t/results/value/set_no_end_of_line.pl
+++ b/tp/t/results/value/set_no_end_of_line.pl
@@ -21,12 +21,6 @@ $result_trees{'set_no_end_of_line'} = {
             }
           ],
           'cmdname' => 'set',
-          'extra' => {
-            'misc_args' => [
-              'arg',
-              ''
-            ]
-          },
           'info' => {
             'arg_line' => ' arg'
           }
diff --git a/tp/t/results/value/set_on_item_line.pl 
b/tp/t/results/value/set_on_item_line.pl
index 15410d153c..3677c301b6 100644
--- a/tp/t/results/value/set_on_item_line.pl
+++ b/tp/t/results/value/set_on_item_line.pl
@@ -54,12 +54,6 @@ $result_trees{'set_on_item_line'} = {
                                 }
                               ],
                               'cmdname' => 'set',
-                              'extra' => {
-                                'misc_args' => [
-                                  'ca',
-                                  'b'
-                                ]
-                              },
                               'info' => {
                                 'arg_line' => ' ca b@c
 '
@@ -133,12 +127,6 @@ $result_trees{'set_on_item_line'} = {
                                 }
                               ],
                               'cmdname' => 'set',
-                              'extra' => {
-                                'misc_args' => [
-                                  'cj',
-                                  ''
-                                ]
-                              },
                               'info' => {
                                 'arg_line' => ' cj@c
 '
@@ -198,12 +186,6 @@ $result_trees{'set_on_item_line'} = {
                                 }
                               ],
                               'cmdname' => 'set',
-                              'extra' => {
-                                'misc_args' => [
-                                  'cg',
-                                  ''
-                                ]
-                              },
                               'info' => {
                                 'arg_line' => ' cg@c
 '
@@ -328,12 +310,6 @@ $result_trees{'set_on_item_line'} = {
                                 }
                               ],
                               'cmdname' => 'set',
-                              'extra' => {
-                                'misc_args' => [
-                                  'a',
-                                  'b'
-                                ]
-                              },
                               'info' => {
                                 'arg_line' => ' a b
 '
@@ -402,12 +378,6 @@ $result_trees{'set_on_item_line'} = {
                                 }
                               ],
                               'cmdname' => 'set',
-                              'extra' => {
-                                'misc_args' => [
-                                  'j',
-                                  ''
-                                ]
-                              },
                               'info' => {
                                 'arg_line' => ' j
 '
@@ -472,12 +442,6 @@ $result_trees{'set_on_item_line'} = {
                                 }
                               ],
                               'cmdname' => 'set',
-                              'extra' => {
-                                'misc_args' => [
-                                  'g',
-                                  ''
-                                ]
-                              },
                               'info' => {
                                 'arg_line' => ' g
 '
diff --git a/tp/t/results/value/simple.pl b/tp/t/results/value/simple.pl
index 1a902989cc..5ae3deb1d2 100644
--- a/tp/t/results/value/simple.pl
+++ b/tp/t/results/value/simple.pl
@@ -21,12 +21,6 @@ $result_trees{'simple'} = {
             }
           ],
           'cmdname' => 'set',
-          'extra' => {
-            'misc_args' => [
-              'a-_5b',
-              'the value @b{b}'
-            ]
-          },
           'info' => {
             'arg_line' => ' a-_5b the value @b{b} @c comment
 '
diff --git a/tp/t/results/value/spaces_before_value.pl 
b/tp/t/results/value/spaces_before_value.pl
index 08a7bf8707..32cb2f029c 100644
--- a/tp/t/results/value/spaces_before_value.pl
+++ b/tp/t/results/value/spaces_before_value.pl
@@ -21,12 +21,6 @@ $result_trees{'spaces_before_value'} = {
             }
           ],
           'cmdname' => 'set',
-          'extra' => {
-            'misc_args' => [
-              'var',
-              'val'
-            ]
-          },
           'info' => {
             'arg_line' => ' var val
 '
diff --git a/tp/t/results/value/value_after_accent.pl 
b/tp/t/results/value/value_after_accent.pl
index 4abce7775b..7de33570ee 100644
--- a/tp/t/results/value/value_after_accent.pl
+++ b/tp/t/results/value/value_after_accent.pl
@@ -21,12 +21,6 @@ $result_trees{'value_after_accent'} = {
             }
           ],
           'cmdname' => 'set',
-          'extra' => {
-            'misc_args' => [
-              'a_letter',
-              'a'
-            ]
-          },
           'info' => {
             'arg_line' => ' a_letter a
 '
diff --git a/tp/t/results/value/value_after_brace_command.pl 
b/tp/t/results/value/value_after_brace_command.pl
index efd0c4fe17..59ef6e268b 100644
--- a/tp/t/results/value/value_after_brace_command.pl
+++ b/tp/t/results/value/value_after_brace_command.pl
@@ -21,12 +21,6 @@ $result_trees{'value_after_brace_command'} = {
             }
           ],
           'cmdname' => 'set',
-          'extra' => {
-            'misc_args' => [
-              'bracedletter',
-              '{a}'
-            ]
-          },
           'info' => {
             'arg_line' => ' bracedletter {a}
 '
@@ -44,12 +38,6 @@ $result_trees{'value_after_brace_command'} = {
             }
           ],
           'cmdname' => 'set',
-          'extra' => {
-            'misc_args' => [
-              'unknowncmd',
-              '@unknown'
-            ]
-          },
           'info' => {
             'arg_line' => ' unknowncmd @unknown
 '
diff --git a/tp/t/results/value/value_in_index_commands.pl 
b/tp/t/results/value/value_in_index_commands.pl
index df995bdd7d..c63d085f45 100644
--- a/tp/t/results/value/value_in_index_commands.pl
+++ b/tp/t/results/value/value_in_index_commands.pl
@@ -21,12 +21,6 @@ $result_trees{'value_in_index_commands'} = {
             }
           ],
           'cmdname' => 'set',
-          'extra' => {
-            'misc_args' => [
-              'cp',
-              'cp'
-            ]
-          },
           'info' => {
             'arg_line' => ' cp cp
 '
@@ -44,12 +38,6 @@ $result_trees{'value_in_index_commands'} = {
             }
           ],
           'cmdname' => 'set',
-          'extra' => {
-            'misc_args' => [
-              'fn',
-              'fn'
-            ]
-          },
           'info' => {
             'arg_line' => ' fn fn
 '
@@ -67,12 +55,6 @@ $result_trees{'value_in_index_commands'} = {
             }
           ],
           'cmdname' => 'set',
-          'extra' => {
-            'misc_args' => [
-              'syncodeindex_command',
-              '@syncodeindex'
-            ]
-          },
           'info' => {
             'arg_line' => ' syncodeindex_command @syncodeindex
 '
@@ -239,12 +221,6 @@ $result_trees{'value_in_index_commands'} = {
             }
           ],
           'cmdname' => 'set',
-          'extra' => {
-            'misc_args' => [
-              'truc',
-              'truc'
-            ]
-          },
           'info' => {
             'arg_line' => ' truc truc
 '
@@ -344,12 +320,6 @@ $result_trees{'value_in_index_commands'} = {
             }
           ],
           'cmdname' => 'set',
-          'extra' => {
-            'misc_args' => [
-              'trucindex_command',
-              '@trucindex'
-            ]
-          },
           'info' => {
             'arg_line' => ' trucindex_command @trucindex
 '
@@ -372,12 +342,6 @@ $result_trees{'value_in_index_commands'} = {
             }
           ],
           'cmdname' => 'set',
-          'extra' => {
-            'misc_args' => [
-              'codeidx',
-              'codeidx'
-            ]
-          },
           'info' => {
             'arg_line' => ' codeidx codeidx
 '
@@ -464,12 +428,6 @@ $result_trees{'value_in_index_commands'} = {
             }
           ],
           'cmdname' => 'set',
-          'extra' => {
-            'misc_args' => [
-              'defcodeindex_entry',
-              'a @var{index entry} t@\'e @^{@dotless{i}}'
-            ]
-          },
           'info' => {
             'arg_line' => ' defcodeindex_entry a @var{index entry} t@\'e 
@^{@dotless{i}}
 '
diff --git a/tp/t/results/value/value_in_invalid_documentencoding.pl 
b/tp/t/results/value/value_in_invalid_documentencoding.pl
index bb095130de..0e4182ca5d 100644
--- a/tp/t/results/value/value_in_invalid_documentencoding.pl
+++ b/tp/t/results/value/value_in_invalid_documentencoding.pl
@@ -21,12 +21,6 @@ $result_trees{'value_in_invalid_documentencoding'} = {
             }
           ],
           'cmdname' => 'set',
-          'extra' => {
-            'misc_args' => [
-              'badvalue',
-              'bad'
-            ]
-          },
           'info' => {
             'arg_line' => ' badvalue bad
 '
diff --git a/tp/t/results/value/value_in_misc_commands.pl 
b/tp/t/results/value/value_in_misc_commands.pl
index 6957124e45..c1ebf6396f 100644
--- a/tp/t/results/value/value_in_misc_commands.pl
+++ b/tp/t/results/value/value_in_misc_commands.pl
@@ -21,12 +21,6 @@ $result_trees{'value_in_misc_commands'} = {
             }
           ],
           'cmdname' => 'set',
-          'extra' => {
-            'misc_args' => [
-              'text',
-              'atext'
-            ]
-          },
           'info' => {
             'arg_line' => ' text atext
 '
@@ -226,13 +220,7 @@ $result_trees{'value_in_misc_commands'} = {
                   'type' => 'misc_arg'
                 }
               ],
-              'cmdname' => 'c',
-              'extra' => {
-                'misc_args' => [
-                  ' comment @value{text}
-'
-                ]
-              }
+              'cmdname' => 'c'
             },
             {
               'args' => [
@@ -242,13 +230,7 @@ $result_trees{'value_in_misc_commands'} = {
                   'type' => 'misc_arg'
                 }
               ],
-              'cmdname' => 'c',
-              'extra' => {
-                'misc_args' => [
-                  ' comment @value{text}
-'
-                ]
-              }
+              'cmdname' => 'c'
             }
           ],
           'type' => 'paragraph'
@@ -270,12 +252,6 @@ $result_trees{'value_in_misc_commands'} = {
             }
           ],
           'cmdname' => 'set',
-          'extra' => {
-            'misc_args' => [
-              'pagesizes_arg',
-              '200mm,150mm'
-            ]
-          },
           'info' => {
             'arg_line' => ' pagesizes_arg 200mm,150mm
 '
@@ -293,12 +269,6 @@ $result_trees{'value_in_misc_commands'} = {
             }
           ],
           'cmdname' => 'set',
-          'extra' => {
-            'misc_args' => [
-              'afourpaper_macro',
-              '@afourpaper'
-            ]
-          },
           'info' => {
             'arg_line' => ' afourpaper_macro @afourpaper
 '
@@ -636,12 +606,6 @@ $result_trees{'value_in_misc_commands'} = {
             }
           ],
           'cmdname' => 'set',
-          'extra' => {
-            'misc_args' => [
-              'need_arg',
-              '0.1'
-            ]
-          },
           'info' => {
             'arg_line' => ' need_arg 0.1
 '
@@ -794,12 +758,6 @@ $result_trees{'value_in_misc_commands'} = {
             }
           ],
           'cmdname' => 'set',
-          'extra' => {
-            'misc_args' => [
-              'raisesections_macro',
-              '@raisesections'
-            ]
-          },
           'info' => {
             'arg_line' => ' raisesections_macro @raisesections
 '
@@ -848,12 +806,6 @@ $result_trees{'value_in_misc_commands'} = {
             }
           ],
           'cmdname' => 'set',
-          'extra' => {
-            'misc_args' => [
-              'lowersections_macro',
-              '@lowersections'
-            ]
-          },
           'info' => {
             'arg_line' => ' lowersections_macro @lowersections
 '
@@ -904,12 +856,6 @@ $result_trees{'value_in_misc_commands'} = {
             }
           ],
           'cmdname' => 'c',
-          'extra' => {
-            'misc_args' => [
-              ' tex error: Use of \\ doesn\'t match its definition.
-'
-            ]
-          },
           'source_marks' => [
             {
               'counter' => 3,
@@ -1078,12 +1024,6 @@ $result_trees{'value_in_misc_commands'} = {
             }
           ],
           'cmdname' => 'set',
-          'extra' => {
-            'misc_args' => [
-              'definfoenclose_name',
-              'phi'
-            ]
-          },
           'info' => {
             'arg_line' => ' definfoenclose_name phi
 '
@@ -1204,12 +1144,6 @@ $result_trees{'value_in_misc_commands'} = {
             }
           ],
           'cmdname' => 'set',
-          'extra' => {
-            'misc_args' => [
-              'strong_macro',
-              '@strong'
-            ]
-          },
           'info' => {
             'arg_line' => ' strong_macro @strong
 '
@@ -1227,12 +1161,6 @@ $result_trees{'value_in_misc_commands'} = {
             }
           ],
           'cmdname' => 'set',
-          'extra' => {
-            'misc_args' => [
-              'strong_name',
-              'strong'
-            ]
-          },
           'info' => {
             'arg_line' => ' strong_name strong
 '
@@ -1501,12 +1429,6 @@ $result_trees{'value_in_misc_commands'} = {
             }
           ],
           'cmdname' => 'set',
-          'extra' => {
-            'misc_args' => [
-              'kbdinputstyle_arg',
-              'code'
-            ]
-          },
           'info' => {
             'arg_line' => ' kbdinputstyle_arg code
 '
@@ -1711,12 +1633,6 @@ $result_trees{'value_in_misc_commands'} = {
             }
           ],
           'cmdname' => 'set',
-          'extra' => {
-            'misc_args' => [
-              'asis_arg',
-              'asis'
-            ]
-          },
           'info' => {
             'arg_line' => ' asis_arg asis
 '
@@ -1734,12 +1650,6 @@ $result_trees{'value_in_misc_commands'} = {
             }
           ],
           'cmdname' => 'set',
-          'extra' => {
-            'misc_args' => [
-              'zero',
-              '0'
-            ]
-          },
           'info' => {
             'arg_line' => ' zero 0
 '
@@ -1757,12 +1667,6 @@ $result_trees{'value_in_misc_commands'} = {
             }
           ],
           'cmdname' => 'set',
-          'extra' => {
-            'misc_args' => [
-              'none_arg',
-              'none'
-            ]
-          },
           'info' => {
             'arg_line' => ' none_arg none
 '
@@ -1780,12 +1684,6 @@ $result_trees{'value_in_misc_commands'} = {
             }
           ],
           'cmdname' => 'set',
-          'extra' => {
-            'misc_args' => [
-              'four',
-              '4'
-            ]
-          },
           'info' => {
             'arg_line' => ' four 4
 '
@@ -1803,12 +1701,6 @@ $result_trees{'value_in_misc_commands'} = {
             }
           ],
           'cmdname' => 'set',
-          'extra' => {
-            'misc_args' => [
-              'six',
-              '6'
-            ]
-          },
           'info' => {
             'arg_line' => ' six 6
 '
@@ -2190,12 +2082,6 @@ $result_trees{'value_in_misc_commands'} = {
             }
           ],
           'cmdname' => 'set',
-          'extra' => {
-            'misc_args' => [
-              'end_arg',
-              'end'
-            ]
-          },
           'info' => {
             'arg_line' => ' end_arg end
 '
@@ -2213,12 +2099,6 @@ $result_trees{'value_in_misc_commands'} = {
             }
           ],
           'cmdname' => 'set',
-          'extra' => {
-            'misc_args' => [
-              'separate_arg',
-              'separate'
-            ]
-          },
           'info' => {
             'arg_line' => ' separate_arg separate 
 '
@@ -2359,12 +2239,6 @@ $result_trees{'value_in_misc_commands'} = {
             }
           ],
           'cmdname' => 'set',
-          'extra' => {
-            'misc_args' => [
-              'latin1',
-              'ISO-8859-1'
-            ]
-          },
           'info' => {
             'arg_line' => ' latin1 ISO-8859-1
 '
@@ -2446,12 +2320,6 @@ $result_trees{'value_in_misc_commands'} = {
             }
           ],
           'cmdname' => 'set',
-          'extra' => {
-            'misc_args' => [
-              'en',
-              'en'
-            ]
-          },
           'info' => {
             'arg_line' => ' en en
 '
@@ -2469,12 +2337,6 @@ $result_trees{'value_in_misc_commands'} = {
             }
           ],
           'cmdname' => 'set',
-          'extra' => {
-            'misc_args' => [
-              'documentlanguage_command',
-              '@documentlanguage'
-            ]
-          },
           'info' => {
             'arg_line' => ' documentlanguage_command @documentlanguage
 '
@@ -2641,12 +2503,6 @@ $result_trees{'value_in_misc_commands'} = {
             }
           ],
           'cmdname' => 'set',
-          'extra' => {
-            'misc_args' => [
-              'on_arg',
-              'on'
-            ]
-          },
           'info' => {
             'arg_line' => ' on_arg on
 '
@@ -2664,12 +2520,6 @@ $result_trees{'value_in_misc_commands'} = {
             }
           ],
           'cmdname' => 'set',
-          'extra' => {
-            'misc_args' => [
-              'off_arg',
-              'off'
-            ]
-          },
           'info' => {
             'arg_line' => ' off_arg off
 '
@@ -2806,13 +2656,7 @@ $result_trees{'value_in_misc_commands'} = {
               'type' => 'misc_arg'
             }
           ],
-          'cmdname' => 'c',
-          'extra' => {
-            'misc_args' => [
-              ' accepts 10 or 11
-'
-            ]
-          }
+          'cmdname' => 'c'
         },
         {
           'args' => [
@@ -2826,12 +2670,6 @@ $result_trees{'value_in_misc_commands'} = {
             }
           ],
           'cmdname' => 'set',
-          'extra' => {
-            'misc_args' => [
-              'ten',
-              '10'
-            ]
-          },
           'info' => {
             'arg_line' => ' ten 10
 '
@@ -2909,13 +2747,7 @@ $result_trees{'value_in_misc_commands'} = {
               'type' => 'misc_arg'
             }
           ],
-          'cmdname' => 'c',
-          'extra' => {
-            'misc_args' => [
-              ' accept false or true
-'
-            ]
-          }
+          'cmdname' => 'c'
         },
         {
           'args' => [
@@ -2925,13 +2757,7 @@ $result_trees{'value_in_misc_commands'} = {
               'type' => 'misc_arg'
             }
           ],
-          'cmdname' => 'c',
-          'extra' => {
-            'misc_args' => [
-              ' makeinfo don\'t care about the arg and remove the remaining of 
the line
-'
-            ]
-          }
+          'cmdname' => 'c'
         },
         {
           'args' => [
@@ -2945,12 +2771,6 @@ $result_trees{'value_in_misc_commands'} = {
             }
           ],
           'cmdname' => 'set',
-          'extra' => {
-            'misc_args' => [
-              'false_arg',
-              'false'
-            ]
-          },
           'info' => {
             'arg_line' => ' false_arg false
 '
@@ -2968,12 +2788,6 @@ $result_trees{'value_in_misc_commands'} = {
             }
           ],
           'cmdname' => 'set',
-          'extra' => {
-            'misc_args' => [
-              'true_arg',
-              'true'
-            ]
-          },
           'info' => {
             'arg_line' => ' true_arg true
 '
@@ -3119,12 +2933,6 @@ $result_trees{'value_in_misc_commands'} = {
             }
           ],
           'cmdname' => 'set',
-          'extra' => {
-            'misc_args' => [
-              'page_macro',
-              '@page'
-            ]
-          },
           'info' => {
             'arg_line' => ' page_macro @page
 '
@@ -3142,12 +2950,6 @@ $result_trees{'value_in_misc_commands'} = {
             }
           ],
           'cmdname' => 'set',
-          'extra' => {
-            'misc_args' => [
-              'noindent_macro',
-              '@noindent'
-            ]
-          },
           'info' => {
             'arg_line' => ' noindent_macro @noindent
 '
@@ -3165,12 +2967,6 @@ $result_trees{'value_in_misc_commands'} = {
             }
           ],
           'cmdname' => 'set',
-          'extra' => {
-            'misc_args' => [
-              'refill_macro',
-              '@refill'
-            ]
-          },
           'info' => {
             'arg_line' => ' refill_macro @refill
 '
@@ -3459,12 +3255,6 @@ $result_trees{'value_in_misc_commands'} = {
             }
           ],
           'cmdname' => 'set',
-          'extra' => {
-            'misc_args' => [
-              'contents_macro',
-              '@contents'
-            ]
-          },
           'info' => {
             'arg_line' => ' contents_macro @contents
 '
@@ -3519,13 +3309,7 @@ $result_trees{'value_in_misc_commands'} = {
               'type' => 'misc_arg'
             }
           ],
-          'cmdname' => 'vskip',
-          'extra' => {
-            'misc_args' => [
-              ' @value{text}
-'
-            ]
-          }
+          'cmdname' => 'vskip'
         },
         {
           'text' => '
@@ -3544,12 +3328,6 @@ $result_trees{'value_in_misc_commands'} = {
             }
           ],
           'cmdname' => 'set',
-          'extra' => {
-            'misc_args' => [
-              'exdent_macro',
-              '@exdent'
-            ]
-          },
           'info' => {
             'arg_line' => ' exdent_macro @exdent
 '
@@ -3624,12 +3402,6 @@ $result_trees{'value_in_misc_commands'} = {
             }
           ],
           'cmdname' => 'set',
-          'extra' => {
-            'misc_args' => [
-              'two',
-              '2'
-            ]
-          },
           'info' => {
             'arg_line' => ' two 2
 '
@@ -3711,12 +3483,6 @@ $result_trees{'value_in_misc_commands'} = {
             }
           ],
           'cmdname' => 'set',
-          'extra' => {
-            'misc_args' => [
-              'result_macro',
-              '@result'
-            ]
-          },
           'info' => {
             'arg_line' => ' result_macro @result
 '
@@ -3735,11 +3501,6 @@ $result_trees{'value_in_misc_commands'} = {
             }
           ],
           'cmdname' => 'clickstyle',
-          'extra' => {
-            'misc_args' => [
-              '@value'
-            ]
-          },
           'info' => {
             'arg_line' => ' @value{result_macro}
 '
@@ -3810,12 +3571,6 @@ $result_trees{'value_in_misc_commands'} = {
             }
           ],
           'cmdname' => 'set',
-          'extra' => {
-            'misc_args' => [
-              'shortcontents_macro',
-              '@shortcontents'
-            ]
-          },
           'info' => {
             'arg_line' => ' shortcontents_macro @shortcontents
 '
@@ -3874,12 +3629,6 @@ $result_trees{'value_in_misc_commands'} = {
             }
           ],
           'cmdname' => 'set',
-          'extra' => {
-            'misc_args' => [
-              'bye_macro',
-              '@bye'
-            ]
-          },
           'info' => {
             'arg_line' => ' bye_macro @bye
 '
diff --git a/tp/t/results/value/value_in_node.pl 
b/tp/t/results/value/value_in_node.pl
index 11f96346bc..dcc4ac7804 100644
--- a/tp/t/results/value/value_in_node.pl
+++ b/tp/t/results/value/value_in_node.pl
@@ -21,12 +21,6 @@ $result_trees{'value_in_node'} = {
             }
           ],
           'cmdname' => 'set',
-          'extra' => {
-            'misc_args' => [
-              'node1',
-              'Node 1'
-            ]
-          },
           'info' => {
             'arg_line' => ' node1 Node 1
 '
@@ -442,12 +436,6 @@ $result_trees{'value_in_node'} = {
             }
           ],
           'cmdname' => 'set',
-          'extra' => {
-            'misc_args' => [
-              'sec1',
-              'Section 1.1'
-            ]
-          },
           'info' => {
             'arg_line' => ' sec1 Section 1.1
 '
diff --git a/tp/t/results/value/value_node_directions.pl 
b/tp/t/results/value/value_node_directions.pl
index 1a53777949..ac05a12eba 100644
--- a/tp/t/results/value/value_node_directions.pl
+++ b/tp/t/results/value/value_node_directions.pl
@@ -21,12 +21,6 @@ $result_trees{'value_node_directions'} = {
             }
           ],
           'cmdname' => 'set',
-          'extra' => {
-            'misc_args' => [
-              'a--foo',
-              'bar'
-            ]
-          },
           'info' => {
             'arg_line' => ' a--foo bar
 '
diff --git a/tp/t/results/value/value_zero.pl b/tp/t/results/value/value_zero.pl
index 3968c1ec7d..05479f13f6 100644
--- a/tp/t/results/value/value_zero.pl
+++ b/tp/t/results/value/value_zero.pl
@@ -21,12 +21,6 @@ $result_trees{'value_zero'} = {
             }
           ],
           'cmdname' => 'set',
-          'extra' => {
-            'misc_args' => [
-              'zero',
-              '0'
-            ]
-          },
           'info' => {
             'arg_line' => ' zero 0
 '
diff --git a/tp/t/results/value_and_macro/comma_value_in_macro_arg.pl 
b/tp/t/results/value_and_macro/comma_value_in_macro_arg.pl
index 5911c0968d..0bba9e2ee2 100644
--- a/tp/t/results/value_and_macro/comma_value_in_macro_arg.pl
+++ b/tp/t/results/value_and_macro/comma_value_in_macro_arg.pl
@@ -21,12 +21,6 @@ $result_trees{'comma_value_in_macro_arg'} = {
             }
           ],
           'cmdname' => 'set',
-          'extra' => {
-            'misc_args' => [
-              'comma',
-              ','
-            ]
-          },
           'info' => {
             'arg_line' => ' comma ,
 '
diff --git a/tp/t/results/value_and_macro/macro_in_value.pl 
b/tp/t/results/value_and_macro/macro_in_value.pl
index f988c7ca6f..2d778549ae 100644
--- a/tp/t/results/value_and_macro/macro_in_value.pl
+++ b/tp/t/results/value_and_macro/macro_in_value.pl
@@ -93,12 +93,6 @@ $result_trees{'macro_in_value'} = {
             }
           ],
           'cmdname' => 'set',
-          'extra' => {
-            'misc_args' => [
-              'flagab',
-              '@ab'
-            ]
-          },
           'info' => {
             'arg_line' => ' flagab @ab
 '
diff --git a/tp/t/results/value_and_macro/value_in_macro_body.pl 
b/tp/t/results/value_and_macro/value_in_macro_body.pl
index a93a4eff93..da26cda72b 100644
--- a/tp/t/results/value_and_macro/value_in_macro_body.pl
+++ b/tp/t/results/value_and_macro/value_in_macro_body.pl
@@ -21,12 +21,6 @@ $result_trees{'value_in_macro_body'} = {
             }
           ],
           'cmdname' => 'set',
-          'extra' => {
-            'misc_args' => [
-              'bodyarg',
-              '\\arg\\'
-            ]
-          },
           'info' => {
             'arg_line' => ' bodyarg \\arg\\ 
 '
diff --git a/tp/t/results/value_and_macro/value_in_macro_formal_arg.pl 
b/tp/t/results/value_and_macro/value_in_macro_formal_arg.pl
index 1e7c4a7dbe..dcc85fccee 100644
--- a/tp/t/results/value_and_macro/value_in_macro_formal_arg.pl
+++ b/tp/t/results/value_and_macro/value_in_macro_formal_arg.pl
@@ -21,12 +21,6 @@ $result_trees{'value_in_macro_formal_arg'} = {
             }
           ],
           'cmdname' => 'set',
-          'extra' => {
-            'misc_args' => [
-              'argument',
-              'arg'
-            ]
-          },
           'info' => {
             'arg_line' => ' argument arg 
 '
diff --git a/tp/t/results/verb/comments.pl b/tp/t/results/verb/comments.pl
index d8734d8572..9b13768934 100644
--- a/tp/t/results/verb/comments.pl
+++ b/tp/t/results/verb/comments.pl
@@ -46,13 +46,7 @@ $result_trees{'comments'} = {
                   'type' => 'misc_arg'
                 }
               ],
-              'cmdname' => 'c',
-              'extra' => {
-                'misc_args' => [
-                  ' comment
-'
-                ]
-              }
+              'cmdname' => 'c'
             }
           ],
           'type' => 'paragraph'
@@ -99,12 +93,7 @@ $result_trees{'comments'} = {
                   'type' => 'misc_arg'
                 }
               ],
-              'cmdname' => 'c',
-              'extra' => {
-                'misc_args' => [
-                  ' other comment'
-                ]
-              }
+              'cmdname' => 'c'
             }
           ],
           'type' => 'paragraph'
diff --git a/tp/t/results/xml_tests/commands_and_spaces.pl 
b/tp/t/results/xml_tests/commands_and_spaces.pl
index 858423b28c..c544b6ac1f 100644
--- a/tp/t/results/xml_tests/commands_and_spaces.pl
+++ b/tp/t/results/xml_tests/commands_and_spaces.pl
@@ -21,12 +21,6 @@ $result_trees{'commands_and_spaces'} = {
             }
           ],
           'cmdname' => 'set',
-          'extra' => {
-            'misc_args' => [
-              'foo',
-              'some @value'
-            ]
-          },
           'info' => {
             'arg_line' => '  foo   some @value
 '
@@ -82,11 +76,6 @@ $result_trees{'commands_and_spaces'} = {
             }
           ],
           'cmdname' => 'unmacro',
-          'extra' => {
-            'misc_args' => [
-              'ggg'
-            ]
-          },
           'info' => {
             'arg_line' => '  ggg
 '
@@ -105,11 +94,6 @@ $result_trees{'commands_and_spaces'} = {
             }
           ],
           'cmdname' => 'clickstyle',
-          'extra' => {
-            'misc_args' => [
-              '@arrow'
-            ]
-          },
           'info' => {
             'arg_line' => '  @arrow
 '
diff --git a/tp/t/results/xml_tests/comments_end_lines.pl 
b/tp/t/results/xml_tests/comments_end_lines.pl
index 1951fad2ae..50624e65d0 100644
--- a/tp/t/results/xml_tests/comments_end_lines.pl
+++ b/tp/t/results/xml_tests/comments_end_lines.pl
@@ -72,13 +72,7 @@ $result_trees{'comments_end_lines'} = {
                           'type' => 'misc_arg'
                         }
                       ],
-                      'cmdname' => 'c',
-                      'extra' => {
-                        'misc_args' => [
-                          ' comment itemize
-'
-                        ]
-                      }
+                      'cmdname' => 'c'
                     },
                     'spaces_after_argument' => {
                       'text' => '  '
@@ -148,13 +142,7 @@ $result_trees{'comments_end_lines'} = {
                           'type' => 'misc_arg'
                         }
                       ],
-                      'cmdname' => 'c',
-                      'extra' => {
-                        'misc_args' => [
-                          ' comm
-'
-                        ]
-                      }
+                      'cmdname' => 'c'
                     },
                     'spaces_after_argument' => {
                       'text' => ' '
@@ -274,13 +262,7 @@ $result_trees{'comments_end_lines'} = {
                           'type' => 'misc_arg'
                         }
                       ],
-                      'cmdname' => 'c',
-                      'extra' => {
-                        'misc_args' => [
-                          ' table
-'
-                        ]
-                      }
+                      'cmdname' => 'c'
                     },
                     'spaces_after_argument' => {
                       'text' => ' '
@@ -364,13 +346,7 @@ $result_trees{'comments_end_lines'} = {
                           'type' => 'misc_arg'
                         }
                       ],
-                      'cmdname' => 'c',
-                      'extra' => {
-                        'misc_args' => [
-                          ' quot no arg
-'
-                        ]
-                      }
+                      'cmdname' => 'c'
                     },
                     'spaces_after_argument' => {
                       'text' => ' '
@@ -446,13 +422,7 @@ $result_trees{'comments_end_lines'} = {
                           'type' => 'misc_arg'
                         }
                       ],
-                      'cmdname' => 'c',
-                      'extra' => {
-                        'misc_args' => [
-                          ' comm
-'
-                        ]
-                      }
+                      'cmdname' => 'c'
                     },
                     'spaces_after_argument' => {
                       'text' => ' '
@@ -528,13 +498,7 @@ $result_trees{'comments_end_lines'} = {
                           'type' => 'misc_arg'
                         }
                       ],
-                      'cmdname' => 'c',
-                      'extra' => {
-                        'misc_args' => [
-                          ' comm
-'
-                        ]
-                      }
+                      'cmdname' => 'c'
                     },
                     'spaces_after_argument' => {
                       'text' => ' '
@@ -696,13 +660,7 @@ $result_trees{'comments_end_lines'} = {
                           'type' => 'misc_arg'
                         }
                       ],
-                      'cmdname' => 'c',
-                      'extra' => {
-                        'misc_args' => [
-                          ' comm
-'
-                        ]
-                      }
+                      'cmdname' => 'c'
                     },
                     'spaces_after_argument' => {
                       'text' => ' '
@@ -800,13 +758,7 @@ $result_trees{'comments_end_lines'} = {
                           'type' => 'misc_arg'
                         }
                       ],
-                      'cmdname' => 'c',
-                      'extra' => {
-                        'misc_args' => [
-                          ' comm
-'
-                        ]
-                      }
+                      'cmdname' => 'c'
                     },
                     'spaces_after_argument' => {
                       'text' => '  '
@@ -891,13 +843,7 @@ $result_trees{'comments_end_lines'} = {
                           'type' => 'misc_arg'
                         }
                       ],
-                      'cmdname' => 'c',
-                      'extra' => {
-                        'misc_args' => [
-                          ' comm
-'
-                        ]
-                      }
+                      'cmdname' => 'c'
                     },
                     'spaces_after_argument' => {
                       'text' => ' '
@@ -973,13 +919,7 @@ $result_trees{'comments_end_lines'} = {
                           'type' => 'misc_arg'
                         }
                       ],
-                      'cmdname' => 'c',
-                      'extra' => {
-                        'misc_args' => [
-                          ' comm
-'
-                        ]
-                      }
+                      'cmdname' => 'c'
                     },
                     'spaces_after_argument' => {
                       'text' => ' '
diff --git a/tp/t/results/xml_tests/comments_on_block_command_lines.pl 
b/tp/t/results/xml_tests/comments_on_block_command_lines.pl
index d19673f1cb..fbb8530258 100644
--- a/tp/t/results/xml_tests/comments_on_block_command_lines.pl
+++ b/tp/t/results/xml_tests/comments_on_block_command_lines.pl
@@ -27,13 +27,7 @@ $result_trees{'comments_on_block_command_lines'} = {
                       'type' => 'misc_arg'
                     }
                   ],
-                  'cmdname' => 'c',
-                  'extra' => {
-                    'misc_args' => [
-                      ' comm
-'
-                    ]
-                  }
+                  'cmdname' => 'c'
                 }
               },
               'type' => 'block_line_arg'
@@ -136,13 +130,7 @@ $result_trees{'comments_on_block_command_lines'} = {
                       'type' => 'misc_arg'
                     }
                   ],
-                  'cmdname' => 'c',
-                  'extra' => {
-                    'misc_args' => [
-                      ' comm
-'
-                    ]
-                  }
+                  'cmdname' => 'c'
                 },
                 'spaces_after_argument' => {
                   'text' => ' '
@@ -251,13 +239,7 @@ $result_trees{'comments_on_block_command_lines'} = {
                       'type' => 'misc_arg'
                     }
                   ],
-                  'cmdname' => 'c',
-                  'extra' => {
-                    'misc_args' => [
-                      ' comm
-'
-                    ]
-                  }
+                  'cmdname' => 'c'
                 },
                 'spaces_after_argument' => {
                   'text' => ' '
@@ -374,13 +356,7 @@ $result_trees{'comments_on_block_command_lines'} = {
                       'type' => 'misc_arg'
                     }
                   ],
-                  'cmdname' => 'c',
-                  'extra' => {
-                    'misc_args' => [
-                      ' comm
-'
-                    ]
-                  }
+                  'cmdname' => 'c'
                 },
                 'spaces_after_argument' => {
                   'text' => ' '
@@ -481,13 +457,7 @@ $result_trees{'comments_on_block_command_lines'} = {
                       'type' => 'misc_arg'
                     }
                   ],
-                  'cmdname' => 'c',
-                  'extra' => {
-                    'misc_args' => [
-                      ' comm
-'
-                    ]
-                  }
+                  'cmdname' => 'c'
                 }
               },
               'type' => 'block_line_arg'
@@ -590,13 +560,7 @@ $result_trees{'comments_on_block_command_lines'} = {
                       'type' => 'misc_arg'
                     }
                   ],
-                  'cmdname' => 'c',
-                  'extra' => {
-                    'misc_args' => [
-                      ' comm
-'
-                    ]
-                  }
+                  'cmdname' => 'c'
                 },
                 'spaces_after_argument' => {
                   'text' => ' '
@@ -708,13 +672,7 @@ $result_trees{'comments_on_block_command_lines'} = {
                       'type' => 'misc_arg'
                     }
                   ],
-                  'cmdname' => 'c',
-                  'extra' => {
-                    'misc_args' => [
-                      ' table
-'
-                    ]
-                  }
+                  'cmdname' => 'c'
                 },
                 'spaces_after_argument' => {
                   'text' => ' '
@@ -828,13 +786,7 @@ $result_trees{'comments_on_block_command_lines'} = {
                       'type' => 'misc_arg'
                     }
                   ],
-                  'cmdname' => 'c',
-                  'extra' => {
-                    'misc_args' => [
-                      ' quot no arg
-'
-                    ]
-                  }
+                  'cmdname' => 'c'
                 }
               },
               'type' => 'block_line_arg'
@@ -917,13 +869,7 @@ $result_trees{'comments_on_block_command_lines'} = {
                       'type' => 'misc_arg'
                     }
                   ],
-                  'cmdname' => 'c',
-                  'extra' => {
-                    'misc_args' => [
-                      ' quot arg
-'
-                    ]
-                  }
+                  'cmdname' => 'c'
                 },
                 'spaces_after_argument' => {
                   'text' => ' '
@@ -1004,13 +950,7 @@ $result_trees{'comments_on_block_command_lines'} = {
                       'type' => 'misc_arg'
                     }
                   ],
-                  'cmdname' => 'c',
-                  'extra' => {
-                    'misc_args' => [
-                      ' comm
-'
-                    ]
-                  }
+                  'cmdname' => 'c'
                 }
               },
               'type' => 'block_line_arg'
@@ -1088,13 +1028,7 @@ $result_trees{'comments_on_block_command_lines'} = {
                       'type' => 'misc_arg'
                     }
                   ],
-                  'cmdname' => 'c',
-                  'extra' => {
-                    'misc_args' => [
-                      ' comm
-'
-                    ]
-                  }
+                  'cmdname' => 'c'
                 }
               },
               'type' => 'block_line_arg'
@@ -1206,13 +1140,7 @@ $result_trees{'comments_on_block_command_lines'} = {
                       'type' => 'misc_arg'
                     }
                   ],
-                  'cmdname' => 'c',
-                  'extra' => {
-                    'misc_args' => [
-                      ' comm
-'
-                    ]
-                  }
+                  'cmdname' => 'c'
                 },
                 'spaces_after_argument' => {
                   'text' => ' '
@@ -1322,13 +1250,7 @@ $result_trees{'comments_on_block_command_lines'} = {
                       'type' => 'misc_arg'
                     }
                   ],
-                  'cmdname' => 'c',
-                  'extra' => {
-                    'misc_args' => [
-                      ' comm
-'
-                    ]
-                  }
+                  'cmdname' => 'c'
                 },
                 'spaces_after_argument' => {
                   'text' => ' '
@@ -1446,13 +1368,7 @@ $result_trees{'comments_on_block_command_lines'} = {
                       'type' => 'misc_arg'
                     }
                   ],
-                  'cmdname' => 'c',
-                  'extra' => {
-                    'misc_args' => [
-                      ' comm
-'
-                    ]
-                  }
+                  'cmdname' => 'c'
                 },
                 'spaces_after_argument' => {
                   'text' => ' '
@@ -1536,13 +1452,7 @@ $result_trees{'comments_on_block_command_lines'} = {
                       'type' => 'misc_arg'
                     }
                   ],
-                  'cmdname' => 'c',
-                  'extra' => {
-                    'misc_args' => [
-                      ' comm
-'
-                    ]
-                  }
+                  'cmdname' => 'c'
                 }
               },
               'type' => 'block_line_arg'
@@ -1629,13 +1539,7 @@ $result_trees{'comments_on_block_command_lines'} = {
                               'type' => 'misc_arg'
                             }
                           ],
-                          'cmdname' => 'c',
-                          'extra' => {
-                            'misc_args' => [
-                              ' comm
-'
-                            ]
-                          }
+                          'cmdname' => 'c'
                         },
                         'spaces_after_argument' => {
                           'text' => ' '
@@ -1818,13 +1722,7 @@ $result_trees{'comments_on_block_command_lines'} = {
                       'type' => 'misc_arg'
                     }
                   ],
-                  'cmdname' => 'c',
-                  'extra' => {
-                    'misc_args' => [
-                      ' c
-'
-                    ]
-                  }
+                  'cmdname' => 'c'
                 },
                 'spaces_after_argument' => {
                   'text' => ' '
@@ -1990,13 +1888,7 @@ $result_trees{'comments_on_block_command_lines'} = {
                       'type' => 'misc_arg'
                     }
                   ],
-                  'cmdname' => 'c',
-                  'extra' => {
-                    'misc_args' => [
-                      ' comm
-'
-                    ]
-                  }
+                  'cmdname' => 'c'
                 },
                 'spaces_after_argument' => {
                   'text' => ' '
@@ -2081,13 +1973,7 @@ $result_trees{'comments_on_block_command_lines'} = {
                       'type' => 'misc_arg'
                     }
                   ],
-                  'cmdname' => 'c',
-                  'extra' => {
-                    'misc_args' => [
-                      ' comm
-'
-                    ]
-                  }
+                  'cmdname' => 'c'
                 }
               },
               'type' => 'block_line_arg'
@@ -2165,13 +2051,7 @@ $result_trees{'comments_on_block_command_lines'} = {
                       'type' => 'misc_arg'
                     }
                   ],
-                  'cmdname' => 'c',
-                  'extra' => {
-                    'misc_args' => [
-                      ' comm
-'
-                    ]
-                  }
+                  'cmdname' => 'c'
                 }
               },
               'type' => 'block_line_arg'
diff --git a/tp/t/results/xml_tests/comments_on_misc_command_line.pl 
b/tp/t/results/xml_tests/comments_on_misc_command_line.pl
index 68d8b4aef5..504016a7fc 100644
--- a/tp/t/results/xml_tests/comments_on_misc_command_line.pl
+++ b/tp/t/results/xml_tests/comments_on_misc_command_line.pl
@@ -26,13 +26,7 @@ $result_trees{'comments_on_misc_command_line'} = {
                       'type' => 'misc_arg'
                     }
                   ],
-                  'cmdname' => 'c',
-                  'extra' => {
-                    'misc_args' => [
-                      ' setfilename (text)
-'
-                    ]
-                  }
+                  'cmdname' => 'c'
                 },
                 'spaces_after_argument' => {
                   'text' => '  '
@@ -73,13 +67,7 @@ $result_trees{'comments_on_misc_command_line'} = {
                       'type' => 'misc_arg'
                     }
                   ],
-                  'cmdname' => 'c',
-                  'extra' => {
-                    'misc_args' => [
-                      ' definfoenclose (number)
-'
-                    ]
-                  }
+                  'cmdname' => 'c'
                 },
                 'spaces_after_argument' => {
                   'text' => '  '
@@ -124,13 +112,7 @@ $result_trees{'comments_on_misc_command_line'} = {
                       'type' => 'misc_arg'
                     }
                   ],
-                  'cmdname' => 'c',
-                  'extra' => {
-                    'misc_args' => [
-                      ' c (number)
-'
-                    ]
-                  }
+                  'cmdname' => 'c'
                 },
                 'spaces_after_argument' => {
                   'text' => ' '
@@ -198,13 +180,7 @@ $result_trees{'comments_on_misc_command_line'} = {
                       'type' => 'misc_arg'
                     }
                   ],
-                  'cmdname' => 'c',
-                  'extra' => {
-                    'misc_args' => [
-                      ' pagesizes  (line)
-'
-                    ]
-                  }
+                  'cmdname' => 'c'
                 },
                 'spaces_after_argument' => {
                   'text' => ' '
@@ -251,13 +227,7 @@ $result_trees{'comments_on_misc_command_line'} = {
                       'type' => 'misc_arg'
                     }
                   ],
-                  'cmdname' => 'c',
-                  'extra' => {
-                    'misc_args' => [
-                      ' everyheading (lineraw)
-'
-                    ]
-                  }
+                  'cmdname' => 'c'
                 },
                 'spaces_after_argument' => {
                   'text' => ' '
@@ -303,13 +273,7 @@ $result_trees{'comments_on_misc_command_line'} = {
               'type' => 'misc_arg'
             }
           ],
-          'cmdname' => 'c',
-          'extra' => {
-            'misc_args' => [
-              ' indent (skipspace)
-'
-            ]
-          }
+          'cmdname' => 'c'
         },
         {
           'contents' => [
diff --git a/tp/t/results/xml_tests/raw_and_comments.pl 
b/tp/t/results/xml_tests/raw_and_comments.pl
index 151daab306..c3126d62f2 100644
--- a/tp/t/results/xml_tests/raw_and_comments.pl
+++ b/tp/t/results/xml_tests/raw_and_comments.pl
@@ -21,13 +21,7 @@ $result_trees{'raw_and_comments'} = {
                       'type' => 'misc_arg'
                     }
                   ],
-                  'cmdname' => 'c',
-                  'extra' => {
-                    'misc_args' => [
-                      ' comment
-'
-                    ]
-                  }
+                  'cmdname' => 'c'
                 }
               },
               'type' => 'block_line_arg'
@@ -61,13 +55,7 @@ $result_trees{'raw_and_comments'} = {
                           'type' => 'misc_arg'
                         }
                       ],
-                      'cmdname' => 'comment',
-                      'extra' => {
-                        'misc_args' => [
-                          ' other comment
-'
-                        ]
-                      }
+                      'cmdname' => 'comment'
                     },
                     'spaces_after_argument' => {
                       'text' => '  '
@@ -126,13 +114,7 @@ $result_trees{'raw_and_comments'} = {
                           'type' => 'misc_arg'
                         }
                       ],
-                      'cmdname' => 'c',
-                      'extra' => {
-                        'misc_args' => [
-                          ' in xml comment
-'
-                        ]
-                      }
+                      'cmdname' => 'c'
                     }
                   },
                   'type' => 'block_line_arg'
@@ -166,13 +148,7 @@ $result_trees{'raw_and_comments'} = {
                               'type' => 'misc_arg'
                             }
                           ],
-                          'cmdname' => 'comment',
-                          'extra' => {
-                            'misc_args' => [
-                              ' end xml comment
-'
-                            ]
-                          }
+                          'cmdname' => 'comment'
                         },
                         'spaces_after_argument' => {
                           'text' => '  '
diff --git a/tp/t/results/xtable/accent_on_table_line.pl 
b/tp/t/results/xtable/accent_on_table_line.pl
index 45b54ae87a..afb1018fcb 100644
--- a/tp/t/results/xtable/accent_on_table_line.pl
+++ b/tp/t/results/xtable/accent_on_table_line.pl
@@ -393,13 +393,7 @@ $result_trees{'accent_on_table_line'} = {
                       'type' => 'misc_arg'
                     }
                   ],
-                  'cmdname' => 'comment',
-                  'extra' => {
-                    'misc_args' => [
-                      '
-'
-                    ]
-                  }
+                  'cmdname' => 'comment'
                 }
               },
               'type' => 'block_line_arg'
diff --git a/tp/t/results/xtable/block_commands_in_table.pl 
b/tp/t/results/xtable/block_commands_in_table.pl
index a9ecaaf1bf..01e94d681b 100644
--- a/tp/t/results/xtable/block_commands_in_table.pl
+++ b/tp/t/results/xtable/block_commands_in_table.pl
@@ -776,13 +776,7 @@ $result_trees{'block_commands_in_table'} = {
                               'type' => 'misc_arg'
                             }
                           ],
-                          'cmdname' => 'c',
-                          'extra' => {
-                            'misc_args' => [
-                              ' comment
-'
-                            ]
-                          }
+                          'cmdname' => 'c'
                         }
                       ],
                       'type' => 'inter_item'
diff --git a/tp/t/results/xtable/comment_and_itemx_before_item.pl 
b/tp/t/results/xtable/comment_and_itemx_before_item.pl
index 5090b52336..d56ff2e286 100644
--- a/tp/t/results/xtable/comment_and_itemx_before_item.pl
+++ b/tp/t/results/xtable/comment_and_itemx_before_item.pl
@@ -46,13 +46,7 @@ $result_trees{'comment_and_itemx_before_item'} = {
                           'type' => 'misc_arg'
                         }
                       ],
-                      'cmdname' => 'c',
-                      'extra' => {
-                        'misc_args' => [
-                          ' comment
-'
-                        ]
-                      }
+                      'cmdname' => 'c'
                     },
                     {
                       'args' => [
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 e920d766ab..80084f2e8f 100644
--- a/tp/t/results/xtable/inter_item_commands_in_table.pl
+++ b/tp/t/results/xtable/inter_item_commands_in_table.pl
@@ -178,13 +178,7 @@ $result_trees{'inter_item_commands_in_table'} = {
                           'type' => 'misc_arg'
                         }
                       ],
-                      'cmdname' => 'c',
-                      'extra' => {
-                        'misc_args' => [
-                          ' comment in table
-'
-                        ]
-                      }
+                      'cmdname' => 'c'
                     },
                     {
                       'args' => [
@@ -373,13 +367,7 @@ $result_trees{'inter_item_commands_in_table'} = {
                               'type' => 'misc_arg'
                             }
                           ],
-                          'cmdname' => 'c',
-                          'extra' => {
-                            'misc_args' => [
-                              ' comment between item and itemx
-'
-                            ]
-                          }
+                          'cmdname' => 'c'
                         }
                       ],
                       'type' => 'inter_item'
@@ -610,13 +598,7 @@ $result_trees{'inter_item_commands_in_table'} = {
                               'type' => 'misc_arg'
                             }
                           ],
-                          'cmdname' => 'c',
-                          'extra' => {
-                            'misc_args' => [
-                              ' and a comment
-'
-                            ]
-                          }
+                          'cmdname' => 'c'
                         },
                         {
                           'args' => [
@@ -626,13 +608,7 @@ $result_trees{'inter_item_commands_in_table'} = {
                               'type' => 'misc_arg'
                             }
                           ],
-                          'cmdname' => 'comment',
-                          'extra' => {
-                            'misc_args' => [
-                              ' and another comment
-'
-                            ]
-                          }
+                          'cmdname' => 'comment'
                         }
                       ],
                       'type' => 'inter_item'
@@ -752,13 +728,7 @@ $result_trees{'inter_item_commands_in_table'} = {
                               'type' => 'misc_arg'
                             }
                           ],
-                          'cmdname' => 'c',
-                          'extra' => {
-                            'misc_args' => [
-                              ' comment between lines
-'
-                            ]
-                          }
+                          'cmdname' => 'c'
                         },
                         {
                           'text' => '
@@ -824,13 +794,7 @@ $result_trees{'inter_item_commands_in_table'} = {
                           'type' => 'misc_arg'
                         }
                       ],
-                      'cmdname' => 'c',
-                      'extra' => {
-                        'misc_args' => [
-                          ' comment at end
-'
-                        ]
-                      }
+                      'cmdname' => 'c'
                     }
                   ],
                   'type' => 'table_definition'
@@ -1187,13 +1151,7 @@ $result_trees{'inter_item_commands_in_table'} = {
                           'type' => 'misc_arg'
                         }
                       ],
-                      'cmdname' => 'c',
-                      'extra' => {
-                        'misc_args' => [
-                          ' comment in table
-'
-                        ]
-                      }
+                      'cmdname' => 'c'
                     },
                     {
                       'args' => [
@@ -1541,13 +1499,7 @@ $result_trees{'inter_item_commands_in_table'} = {
                           'type' => 'misc_arg'
                         }
                       ],
-                      'cmdname' => 'c',
-                      'extra' => {
-                        'misc_args' => [
-                          ' samp comment in table
-'
-                        ]
-                      }
+                      'cmdname' => 'c'
                     },
                     {
                       'args' => [
@@ -2395,13 +2347,7 @@ $result_trees{'inter_item_commands_in_table'} = {
                           'type' => 'misc_arg'
                         }
                       ],
-                      'cmdname' => 'c',
-                      'extra' => {
-                        'misc_args' => [
-                          ' commant
-'
-                        ]
-                      }
+                      'cmdname' => 'c'
                     },
                     {
                       'args' => [
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 78a0a8137b..b7981287bd 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
@@ -135,13 +135,7 @@ $result_trees{'inter_item_commands_in_table_in_example'} = 
{
                                       'type' => 'misc_arg'
                                     }
                                   ],
-                                  'cmdname' => 'c',
-                                  'extra' => {
-                                    'misc_args' => [
-                                      ' and a comment
-'
-                                    ]
-                                  }
+                                  'cmdname' => 'c'
                                 },
                                 {
                                   'args' => [
@@ -151,13 +145,7 @@ $result_trees{'inter_item_commands_in_table_in_example'} = 
{
                                       'type' => 'misc_arg'
                                     }
                                   ],
-                                  'cmdname' => 'comment',
-                                  'extra' => {
-                                    'misc_args' => [
-                                      ' and another comment
-'
-                                    ]
-                                  }
+                                  'cmdname' => 'comment'
                                 }
                               ],
                               'type' => 'preformatted'



reply via email to

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