texinfo-commits
[Top][All Lists]
Advanced

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

branch master updated: use contents for definition lines instead of args


From: Patrice Dumas
Subject: branch master updated: use contents for definition lines instead of args
Date: Tue, 24 Dec 2024 10:11:38 -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 eb4b68c882 use contents for definition lines instead of args
eb4b68c882 is described below

commit eb4b68c8825c8161ccf41eaf59b1268fa6a4cb4f
Author: Patrice Dumas <pertusus@free.fr>
AuthorDate: Tue Nov 12 23:48:37 2024 +0100

    use contents for definition lines instead of args
    
    * tp/Texinfo/ParserNonXS.pm (_handle_line_command)
    (_handle_block_command), tp/Texinfo/Translations.pm
    (complete_indices), tp/Texinfo/XS/parsetexi/handle_commands.c
    (handle_line_command, handle_block_command),
    tp/Texinfo/XS/parsetexi/indices.c (complete_indices): use contents for
    definition lines in tree instead of args.
    
    * tp/Texinfo/Convert/DocBook.pm (_convert),
    tp/Texinfo/Convert/LaTeX.pm (_convert),
    tp/Texinfo/Convert/Plaintext.pm (_convert),
    tp/Texinfo/Convert/TexinfoMarkup.pm (_convert),
    tp/Texinfo/Convert/Text.pm (_convert): return right after converting
    definition line.
    
    * tp/Texinfo/Convert/DocBook.pm (_convert_def_line),
    tp/Texinfo/Convert/TexinfoMarkup.pm (_end_line_spaces)
    (_convert_def_line), tp/Texinfo/Convert/Utils.pm
    (definition_arguments_content, definition_category_tree),
    tp/Texinfo/XS/main/convert_utils.c (definition_arguments_content)
    (definition_category_tree): update for change in definition line in
    tree.
    
    * tp/Texinfo/Convert/Texinfo.pm (_convert_to_texinfo)
    (_expand_cmd_args_to_texi), tp/Texinfo/XS/main/convert_to_texinfo.c
    (expand_cmd_args_to_texi, convert_to_texinfo_internal): update for
    change in definition line in tree.  Simplify code by handling
    definition lines as regular contents containers and by simplifying the
    cases if arguments formatting.
    
    * tp/Texinfo/Convert/TextContent.pm (%ignored_types, _convert): update
    for change in definition line in tree.  Format argument container type
    like any other container.
---
 ChangeLog                                          |  37 +++
 tp/Texinfo/Convert/DocBook.pm                      |   8 +-
 tp/Texinfo/Convert/LaTeX.pm                        |   2 +
 tp/Texinfo/Convert/Plaintext.pm                    |   2 +
 tp/Texinfo/Convert/Texinfo.pm                      |  53 +---
 tp/Texinfo/Convert/TexinfoMarkup.pm                |  22 +-
 tp/Texinfo/Convert/Text.pm                         |   7 +-
 tp/Texinfo/Convert/TextContent.pm                  |  32 +--
 tp/Texinfo/Convert/Utils.pm                        |   8 +-
 tp/Texinfo/ParserNonXS.pm                          |  21 +-
 tp/Texinfo/Translations.pm                         |   4 +-
 tp/Texinfo/XS/main/convert_to_texinfo.c            |  39 +--
 tp/Texinfo/XS/main/convert_to_text.c               |   2 +
 tp/Texinfo/XS/main/convert_utils.c                 |   8 +-
 tp/Texinfo/XS/parsetexi/handle_commands.c          |  18 +-
 tp/Texinfo/XS/parsetexi/indices.c                  |   2 +-
 tp/t/results/conditionals/defcondx_Dbar.pl         |   6 +-
 tp/t/results/conditionals/defcondx_Ubar.pl         |   2 +-
 tp/t/results/converters_tests/complex_nestings.pl  |  14 +-
 .../conversion_with_undef_customization.pl         |   2 +-
 .../converters_tests/definition_commands.pl        | 278 ++++++++++-----------
 tp/t/results/converters_tests/form_feeds.pl        |   6 +-
 .../converters_tests/frenchspacing_and_code.pl     |   8 +-
 .../converters_tests/test_deftypefnnewline.pl      |  28 +--
 tp/t/results/coverage/def.pl                       |  54 ++--
 tp/t/results/def/adjacent_defline.pl               |   8 +-
 tp/t/results/def/all_commands.pl                   |  54 ++--
 tp/t/results/def/all_commands_delimiters.pl        |  94 +++----
 .../def/all_commands_delimiters_printindex.pl      |  94 +++----
 tp/t/results/def/all_commands_printindex.pl        |  54 ++--
 tp/t/results/def/all_empty_def.pl                  |  18 +-
 tp/t/results/def/ampchar.pl                        |   2 +-
 tp/t/results/def/bracketed_arg_no_space.pl         |   2 +-
 tp/t/results/def/code_in_def.pl                    |   2 +-
 tp/t/results/def/comment_index_before_defline.pl   |   4 +-
 tp/t/results/def/def_defx_mismatch.pl              |   6 +-
 tp/t/results/def/def_groupings_args.pl             |   6 +-
 tp/t/results/def/defline_no_params.pl              |   4 +-
 tp/t/results/def/deftypeline.pl                    |   4 +-
 tp/t/results/def/defx_after_comment.pl             |   6 +-
 tp/t/results/def/defx_after_comment_in_example.pl  |   6 +-
 tp/t/results/def/defx_after_empty_line.pl          |   6 +-
 .../def/defx_after_empty_line_in_example.pl        |   6 +-
 tp/t/results/def/defx_after_paragraph_end.pl       |   6 +-
 .../def/defx_after_preformatted_with_text.pl       |   6 +-
 tp/t/results/def/defx_after_text.pl                |   6 +-
 tp/t/results/def/defx_in_example.pl                |   6 +-
 tp/t/results/def/double_command.pl                 |  10 +-
 tp/t/results/def/empty_def_arguments.pl            |  34 +--
 tp/t/results/def/empty_def_command.pl              |   8 +-
 tp/t/results/def/empty_deftype.pl                  |   8 +-
 tp/t/results/def/empty_deftypeop_name.pl           |   2 +-
 tp/t/results/def/empty_main_def_arguments.pl       |   2 +-
 tp/t/results/def/end_of_line_end_file.pl           |   2 +-
 tp/t/results/def/end_of_line_protect_at_end.pl     |   2 +-
 tp/t/results/def/end_of_lines_protected.pl         |   2 +-
 .../def/end_of_lines_protected_in_footnote.pl      |   2 +-
 .../def/end_of_lines_protected_non_ascii.pl        |   2 +-
 tp/t/results/def/inter_item_commands_in_def.pl     |  10 +-
 .../def/inter_item_commands_in_def_in_example.pl   |  10 +-
 tp/t/results/def/leading_space_in_def_arg.pl       |   2 +-
 tp/t/results/def/multiple_defline.pl               |   8 +-
 tp/t/results/def/no_category_or_no_name.pl         |  14 +-
 tp/t/results/def/not_closed.pl                     |   8 +-
 tp/t/results/def/omit_def_space.pl                 |   6 +-
 tp/t/results/def/protected_brace.pl                |   2 +-
 tp/t/results/def/ref_in_def.pl                     |  26 +-
 tp/t/results/def/space_in_def_for_index.pl         |   6 +-
 tp/t/results/def/text_block_before_defline.pl      |   4 +-
 tp/t/results/def/wrong_braces_simple.pl            |  26 +-
 tp/t/results/def/wrong_braces_with_end_of_lines.pl |   4 +-
 .../deftypefnnewline_for_copying_after.pl          |   4 +-
 .../deftypefnnewline_for_copying_before.pl         |   4 +-
 tp/t/results/indices/empty_index_entry.pl          |   2 +-
 tp/t/results/indices/empty_string_index_entry.pl   |   6 +-
 tp/t/results/indices/index_special_region.pl       |  10 +-
 .../index_special_region_no_insertcopying.pl       |  10 +-
 ...egion_no_insertcopying_no_titlepage_no_nodes.pl |  10 +-
 ...l_region_no_insertcopying_titlepage_no_nodes.pl |  10 +-
 ...copying_titlepage_no_nodes_footnotes_default.pl |  10 +-
 .../index_special_region_no_titlepage_no_nodes.pl  |  10 +-
 .../index_special_region_titlepage_no_nodes.pl     |  10 +-
 ..._region_titlepage_no_nodes_footnotes_default.pl |  10 +-
 .../indices/printindex_index_entry_in_copying.pl   |   6 +-
 ...ndex_index_entry_in_copying_no_insertcopying.pl |   6 +-
 .../indices/same_index_entry_merged_indices.pl     |   4 +-
 tp/t/results/info_tests/colon_in_index_entry.pl    |   6 +-
 tp/t/results/info_tests/def_in_copying.pl          |  12 +-
 tp/t/results/info_tests/test_index.pl              |   6 +-
 .../translation_in_parser_in_translation.pl        |   2 +-
 .../results/invalid_nestings/block_not_matching.pl |   2 +-
 .../invalid_nestings/def_in_style_command.pl       |   2 +-
 .../def_not_closed_in_menu_description.pl          |   2 +-
 tp/t/results/invalid_nestings/on_def_line.pl       |   6 +-
 .../invalid_nestings/section_on_def_line.pl        |   2 +-
 .../invalid_nestings/section_on_defx_line.pl       |   6 +-
 tp/t/results/languages/documentlanguage.pl         |   2 +-
 tp/t/results/languages/documentlanguage_option.pl  |   2 +-
 tp/t/results/languages/documentlanguage_unknown.pl |   2 +-
 .../results/languages/multiple_documentlanguage.pl |   6 +-
 tp/t/results/languages/multiple_in_preamble.pl     |   6 +-
 .../languages/multiple_in_preamble_before_node.pl  |   4 +-
 tp/t/results/languages/multiple_lang_chapters.pl   |   6 +-
 .../languages/multiple_lang_chapters_latex.pl      |   6 +-
 .../languages/multiple_lang_chapters_texi2html.pl  |   6 +-
 tp/t/results/languages/simple_documentlanguage.pl  |   2 +-
 tp/t/results/languages/unknown_region.pl           |   2 +-
 tp/t/results/latex_tests/brace_in_index.pl         |   2 +-
 tp/t/results/linemacro/api_doc_with_linemacro.pl   |  24 +-
 .../linemacro/block_begin_end_in_linemacro_call.pl |   4 +-
 tp/t/results/linemacro/braces_after_text.pl        |   4 +-
 tp/t/results/linemacro/empty_last_argument.pl      |  12 +-
 .../results/linemacro/last_argument_with_braces.pl |  24 +-
 tp/t/results/linemacro/nested_linemacro_calls.pl   |   4 +-
 .../linemacro/newline_and_continuation_in_brace.pl |   4 +-
 tp/t/results/linemacro/protected_spaces_on_line.pl |   6 +-
 .../linemacro/simple_nested_linemacro_calls.pl     |   4 +-
 .../linemacro/spaces_after_command_in_call.pl      |   4 +-
 ...paces_after_macro_linemacro_commands_in_call.pl |   8 +-
 .../spaces_after_unknown_command_in_call.pl        |   4 +-
 tp/t/results/linemacro/spaces_in_args.pl           |   4 +-
 tp/t/results/linemacro/spaces_in_call.pl           |   4 +-
 tp/t/results/linemacro/verb_in_linemacro_call.pl   |   4 +-
 tp/t/results/macro/macro_in_def_delimiters.pl      |   2 +-
 tp/t/results/menu/menu_in_deffn.pl                 |   2 +-
 tp/t/results/preformatted/def_in_example.pl        |   2 +-
 tp/t/results/xml_tests/commands_and_spaces.pl      |   2 +-
 127 files changed, 798 insertions(+), 791 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index bb8965486b..95e6144f64 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,40 @@
+2024-11-12  Patrice Dumas  <pertusus@free.fr>
+
+       use contents for definition lines instead of args
+
+       * tp/Texinfo/ParserNonXS.pm (_handle_line_command)
+       (_handle_block_command), tp/Texinfo/Translations.pm
+       (complete_indices), tp/Texinfo/XS/parsetexi/handle_commands.c
+       (handle_line_command, handle_block_command),
+       tp/Texinfo/XS/parsetexi/indices.c (complete_indices): use contents for
+       definition lines in tree instead of args.
+
+       * tp/Texinfo/Convert/DocBook.pm (_convert),
+       tp/Texinfo/Convert/LaTeX.pm (_convert),
+       tp/Texinfo/Convert/Plaintext.pm (_convert),
+       tp/Texinfo/Convert/TexinfoMarkup.pm (_convert),
+       tp/Texinfo/Convert/Text.pm (_convert): return right after converting
+       definition line.
+
+       * tp/Texinfo/Convert/DocBook.pm (_convert_def_line),
+       tp/Texinfo/Convert/TexinfoMarkup.pm (_end_line_spaces)
+       (_convert_def_line), tp/Texinfo/Convert/Utils.pm
+       (definition_arguments_content, definition_category_tree),
+       tp/Texinfo/XS/main/convert_utils.c (definition_arguments_content)
+       (definition_category_tree): update for change in definition line in
+       tree.
+
+       * tp/Texinfo/Convert/Texinfo.pm (_convert_to_texinfo)
+       (_expand_cmd_args_to_texi), tp/Texinfo/XS/main/convert_to_texinfo.c
+       (expand_cmd_args_to_texi, convert_to_texinfo_internal): update for
+       change in definition line in tree.  Simplify code by handling
+       definition lines as regular contents containers and by simplifying the
+       cases if arguments formatting.
+
+       * tp/Texinfo/Convert/TextContent.pm (%ignored_types, _convert): update
+       for change in definition line in tree.  Format argument container type
+       like any other container.
+
 2024-11-12  Patrice Dumas  <pertusus@free.fr>
 
        remaining non-definition block commands 'argument' container in contents
diff --git a/tp/Texinfo/Convert/DocBook.pm b/tp/Texinfo/Convert/DocBook.pm
index 917cf3cf03..a9c7631a3c 100644
--- a/tp/Texinfo/Convert/DocBook.pm
+++ b/tp/Texinfo/Convert/DocBook.pm
@@ -737,8 +737,8 @@ sub _convert_def_line($$)
   _new_document_context($self);
   $self->{'document_context'}->[-1]->{'monospace'}->[0] = 1;
   $self->{'document_context'}->[-1]->{'inline'}++;
-  if ($element->{'args'}
-      and $element->{'args'}->[0]->{'contents'}) {
+  if ($element->{'contents'}
+      and $element->{'contents'}->[0]->{'contents'}) {
     my $main_command;
     if ($Texinfo::Common::def_aliases{$element->{'extra'}->{'def_command'}}) {
       $main_command
@@ -746,7 +746,7 @@ sub _convert_def_line($$)
     } else {
       $main_command = $element->{'extra'}->{'def_command'};
     }
-    foreach my $arg (@{$element->{'args'}->[0]->{'contents'}}) {
+    foreach my $arg (@{$element->{'contents'}->[0]->{'contents'}}) {
       my $type = $arg->{'type'};
 
       my $content = _convert($self, $arg);
@@ -1065,6 +1065,7 @@ sub _convert($$;$)
         my $def_line_result = _convert_def_line($self, $element);
         next if (!defined($def_line_result));
         $result .= $def_line_result;
+        return $result;
       } elsif (exists ($docbook_line_elements_with_arg_map{$cmdname})) {
         my ($docbook_element, $attribute_text)
           = _parse_attribute($docbook_line_elements_with_arg_map{$cmdname});
@@ -1767,6 +1768,7 @@ sub _convert($$;$)
       my $def_line_result = _convert_def_line($self, $element);
       next if (!defined($def_line_result));
       $result .= $def_line_result;
+      return $result;
     } elsif ($element->{'type'} eq 'table_term') {
       # should be closed by the @item.  Allows to have the index entries in
       # term, which is better than out.
diff --git a/tp/Texinfo/Convert/LaTeX.pm b/tp/Texinfo/Convert/LaTeX.pm
index 01182e2228..c49be67fc3 100644
--- a/tp/Texinfo/Convert/LaTeX.pm
+++ b/tp/Texinfo/Convert/LaTeX.pm
@@ -3145,6 +3145,7 @@ sub _convert($$)
       return $result;
     } elsif ($def_line_commands{$cmdname}) {
       $result .= _convert_def_line($self, $element);
+      return $result;
     } elsif ($cmdname eq 'dmn') {
       $result .= '\\thinspace ';
       if ($element->{'contents'}) {
@@ -4308,6 +4309,7 @@ sub _convert($$)
     }
     if ($element->{'type'} eq 'def_line') {
       $result .= _convert_def_line($self, $element);
+      return $result;
     } elsif ($element->{'type'} eq 'def_item') {
       $result .= "\\begin{quote}\n";
       # Remove vertical space and start paragaph, avoiding adding
diff --git a/tp/Texinfo/Convert/Plaintext.pm b/tp/Texinfo/Convert/Plaintext.pm
index 8e6db6c0d2..7ec0a8d35d 100644
--- a/tp/Texinfo/Convert/Plaintext.pm
+++ b/tp/Texinfo/Convert/Plaintext.pm
@@ -3630,6 +3630,7 @@ sub _convert($$)
     # not block commands and not brace commands
     } elsif ($def_commands{$cmdname}) {
       _convert_def_line($self, $element);
+      return;
     } elsif ($cmdname eq 'center') {
       #my ($counts, $new_locations);
       push @{$self->{'count_context'}}, {'lines' => 0, 'bytes' => 0,
@@ -3903,6 +3904,7 @@ sub _convert($$)
       }
     } elsif ($type eq 'def_line') {
       _convert_def_line($self, $element);
+      return;
     } elsif ($type eq 'menu_entry') {
       my $entry_name_seen = 0;
       my $menu_entry_node;
diff --git a/tp/Texinfo/Convert/Texinfo.pm b/tp/Texinfo/Convert/Texinfo.pm
index 352dea05c4..85b8a0f2df 100644
--- a/tp/Texinfo/Convert/Texinfo.pm
+++ b/tp/Texinfo/Convert/Texinfo.pm
@@ -202,8 +202,7 @@ sub _convert_to_texinfo($)
   if (defined($element->{'text'})) {
     $result .= $element->{'text'};
   } else {
-    if ($element->{'cmdname'}
-        or ($element->{'type'} and $element->{'type'} eq 'def_line')) {
+    if ($element->{'cmdname'}) {
       $result .= _expand_cmd_args_to_texi($element);
       if ($element->{'cmdname'}
           and (exists($brace_commands{$element->{'cmdname'}})
@@ -252,7 +251,7 @@ sub _expand_cmd_args_to_texi($) {
     $result = '@'.$cmdname;
 
     # this is done here otherwise for some constructs, there are
-    # no 'args', and so the space is never readded.
+    # no arguments and the space is not output.
     if ($cmd->{'info'}
         and $cmd->{'info'}->{'spaces_after_cmd_before_arg'}) {
       $result .= $cmd->{'info'}->{'spaces_after_cmd_before_arg'}->{'text'};
@@ -266,21 +265,11 @@ sub _expand_cmd_args_to_texi($) {
   } elsif ($cmd->{'args'}) {
     $result .= $cmd->{'info'}->{'spaces_before_argument'}->{'text'}
        if ($cmd->{'info'} and $cmd->{'info'}->{'spaces_before_argument'});
-    my $with_commas = 0;
-    if (($block_commands{$cmdname}
-         # block line commands with arguments not separated by commas
-         and not ($def_commands{$cmdname}
-                  or $block_commands{$cmdname} eq 'multitable'))
-        or $cmdname eq 'node') {
-      $with_commas = 1;
-    }
     my $arg_nr = 0;
     foreach my $arg (@{$cmd->{'args'}}) {
       next if ($arg->{'info'} and $arg->{'info'}->{'inserted'});
-      if ($with_commas) {
-        $result .= ',' if ($arg_nr);
-        $arg_nr++;
-      }
+      $result .= ',' if ($arg_nr);
+      $arg_nr++;
       $result .= _convert_to_texinfo($arg);
     }
    # TODO consider moving the braces command code to _convert_to_texinfo.
@@ -290,12 +279,8 @@ sub _expand_cmd_args_to_texi($) {
            and (exists($brace_commands{$cmdname})
                 or ($cmd->{'type'}
                     and $cmd->{'type'} eq 'definfoenclose_command'))) {
-    my $braces;
-    $braces = 1 if (scalar(@{$cmd->{'contents'}})
-                    and ($cmd->{'contents'}->[0]->{'type'}
-                        and ($cmd->{'contents'}->[0]->{'type'} eq 
'brace_container'
-                             or $cmd->{'contents'}->[0]->{'type'} eq 
'brace_arg'
-                             or $cmd->{'contents'}->[0]->{'type'} eq 
'brace_command_context')));
+    my $braces = 1;
+    $braces = 0 if ($cmd->{'contents'}->[0]->{'type'} eq 'following_arg');
     $result .= '{' if ($braces);
     if ($cmdname eq 'verb') {
       $result .= $cmd->{'info'}->{'delimiter'};
@@ -314,29 +299,17 @@ sub _expand_cmd_args_to_texi($) {
     }
     $result .= '}' if ($braces);
   } elsif ($cmd->{'contents'}
-           and $cmd->{'contents'}->[0]->{'type'}
-           and $cmd->{'contents'}->[0]->{'type'} eq 'argument') {
+           and ($cmd->{'contents'}->[0]->{'type'}
+                and $cmd->{'contents'}->[0]->{'type'} eq 'argument')) {
     $result .= $cmd->{'info'}->{'spaces_before_argument'}->{'text'}
       if $cmd->{'info'} and $cmd->{'info'}->{'spaces_before_argument'};
-    my $with_commas = 0;
-    if (($block_commands{$cmdname}
-         # block line commands with arguments not separated by commas
-         and not ($def_commands{$cmdname}
-                  or $block_commands{$cmdname} eq 'multitable'))
-        or $cmdname eq 'node') {
-      $with_commas = 1;
-    }
     my $arg_nr = 0;
     my $argument = $cmd->{'contents'}->[0];
-    if ($argument->{'contents'}) {
-      foreach my $arg (@{$argument->{'contents'}}) {
-        next if ($arg->{'info'} and $arg->{'info'}->{'inserted'});
-        if ($with_commas) {
-          $result .= ',' if ($arg_nr);
-          $arg_nr++;
-        }
-        $result .= _convert_to_texinfo($arg);
-      }
+    foreach my $arg (@{$argument->{'contents'}}) {
+      next if ($arg->{'info'} and $arg->{'info'}->{'inserted'});
+      $result .= ',' if ($arg_nr);
+      $arg_nr++;
+      $result .= _convert_to_texinfo($arg);
     }
   } else {
     $result .= $cmd->{'info'}->{'spaces_before_argument'}->{'text'}
diff --git a/tp/Texinfo/Convert/TexinfoMarkup.pm 
b/tp/Texinfo/Convert/TexinfoMarkup.pm
index 3c349df6df..603d1d942e 100644
--- a/tp/Texinfo/Convert/TexinfoMarkup.pm
+++ b/tp/Texinfo/Convert/TexinfoMarkup.pm
@@ -468,8 +468,13 @@ sub _end_line_spaces
   if ($element->{'args'}) {
     $arguments_list = $element->{'args'};
   } elsif ($element->{'contents'} and scalar(@{$element->{'contents'}})
-           and $element->{'contents'}->[0]->{'contents'}) {
+           and $element->{'contents'}->[0]->{'type'}
+           and $element->{'contents'}->[0]->{'type'} eq 'argument') {
     $arguments_list = $element->{'contents'}->[0]->{'contents'};
+  } elsif (($element->{'cmdname'}
+           and $Texinfo::Commands::def_commands{$element->{'cmdname'}})
+           or ($element->{'type'} and $element->{'type'} eq 'def_line')) {
+    $arguments_list = $element->{'contents'};
   }
   if ($arguments_list->[-1]
       and $arguments_list->[-1]->{'info'}
@@ -616,8 +621,8 @@ sub _convert_def_line($$)
   $result .= $self->_index_entry($element);
   push @{$self->{'document_context'}->[-1]->{'monospace'}}, 1;
   my $def_command = $element->{'extra'}->{'def_command'};
-  if ($element->{'args'} and @{$element->{'args'}}
-      and $element->{'args'}->[0]->{'contents'}) {
+  if ($element->{'contents'} and @{$element->{'contents'}}
+      and $element->{'contents'}->[0]->{'contents'}) {
     my $main_command;
     my $alias;
     if ($Texinfo::Common::def_aliases{$def_command}) {
@@ -628,7 +633,7 @@ sub _convert_def_line($$)
       $main_command = $def_command;
       $alias = 0;
     }
-    foreach my $arg (@{$element->{'args'}->[0]->{'contents'}}) {
+    foreach my $arg (@{$element->{'contents'}->[0]->{'contents'}}) {
       my $type = $arg->{'type'};
       # should only happen for dubious trees in which the def line
       # was not split in def roles
@@ -999,6 +1004,7 @@ sub _convert($$;$)
           }
         } elsif ($Texinfo::Commands::def_commands{$cmdname}) {
           $result .= _convert_def_line($self, $element);
+          return $result;
         } else {
           my $attribute = [_leading_spaces_arg($element)];
           if ($cmdname eq 'listoffloats') {
@@ -1431,10 +1437,9 @@ sub _convert($$;$)
                                     @end_command_spaces])
                    .${prepended_elements};
         my $arguments_list;
-        if ($element->{'args'}) {
-          $arguments_list = $element->{'args'};
-        } elsif ($element->{'contents'} and scalar(@{$element->{'contents'}})
-                 and $element->{'contents'}->[0]->{'contents'}) {
+        if ($element->{'contents'} and scalar(@{$element->{'contents'}})
+            and $element->{'contents'}->[0]->{'type'}
+            and $element->{'contents'}->[0]->{'type'} eq 'argument') {
           $arguments_list = $element->{'contents'}->[0]->{'contents'};
         }
         if ($arguments_list) {
@@ -1620,6 +1625,7 @@ sub _convert($$;$)
                                           $attribute);
     } elsif ($element->{'type'} eq 'def_line') {
       $result .= _convert_def_line($self, $element);
+      return $result;
     # case of bracketed in def line not corresponding to a def* argument
     # by itself, for example, in the following '{a b}{c d}' is the
     # argument, it is not a bracketed by itself, but contains two
diff --git a/tp/Texinfo/Convert/Text.pm b/tp/Texinfo/Convert/Text.pm
index ad37e80ac9..fd5e54e94b 100644
--- a/tp/Texinfo/Convert/Text.pm
+++ b/tp/Texinfo/Convert/Text.pm
@@ -687,6 +687,8 @@ sub _convert($$)
              or $cmdname eq 'smallquotation'
              or $cmdname eq 'float'
              or $cmdname eq 'cartouche') {
+      # TODO the first condition is never true, the second can be
+      # simplified
       if ($element->{'args'}) {
         foreach my $arg (@{$element->{'args'}}) {
           my $converted_arg = _convert($options, $arg);
@@ -727,10 +729,10 @@ sub _convert($$)
           $result .= "\n";
         }
       }
-    } elsif ($converted_formattable_line_commands{$cmdname}
-             and $element->{'args'}) {
+    } elsif ($converted_formattable_line_commands{$cmdname}) {
       if ($def_commands{$cmdname}) {
         $result = _convert_def_line($options, $element);
+        return $result;
       } elsif ($cmdname eq 'sp') {
         if ($element->{'extra'} and $element->{'extra'}->{'misc_args'}
             and $element->{'extra'}->{'misc_args'}->[0]) {
@@ -766,6 +768,7 @@ sub _convert($$)
   if ($element->{'type'}) {
     if ($element->{'type'} eq 'def_line') {
       $result = _convert_def_line($options, $element);
+      return $result;
     } elsif ($element->{'type'} eq 'untranslated_def_line_arg') {
       my $tree;
       my $category_text = $element->{'contents'}->[0]->{'text'};
diff --git a/tp/Texinfo/Convert/TextContent.pm 
b/tp/Texinfo/Convert/TextContent.pm
index 6915df37b9..0f0278f39f 100644
--- a/tp/Texinfo/Convert/TextContent.pm
+++ b/tp/Texinfo/Convert/TextContent.pm
@@ -53,7 +53,7 @@ foreach my $type ('ignorable_spaces_after_command',
             'postamble_after_end',
             'preamble_before_beginning',
             'spaces_before_paragraph',
-            'spaces_after_close_brace', 'argument') {
+            'spaces_after_close_brace') {
   $ignored_types{$type} = 1;
 }
 
@@ -134,6 +134,9 @@ sub _convert($$)
 
   return '' if (!($element->{'type'} and $element->{'type'} eq 'def_line')
      and (($element->{'type'} and $ignored_types{$element->{'type'}})
+          or ($element->{'type'} and $element->{'type'} eq 'argument'
+              and $Texinfo::Commands::blockitem_commands{
+                                $element->{'parent'}->{'cmdname'}})
           or ($element->{'cmdname'}
              and ($ignored_brace_commands{$element->{'cmdname'}}
                  or ($ignored_block_commands{$element->{'cmdname'}}
@@ -176,31 +179,10 @@ sub _convert($$)
   if ($element->{'args'}) {
     foreach my $arg (@{$element->{'args'}}) {
       $result .= _convert($self, $arg);
-      if ($arg->{'type'}
-          and $arg->{'type'} eq 'block_line_arg'
-          and $arg->{'info'} and $arg->{'info'}->{'spaces_after_argument'}
-          and $result =~ /\S/) {
-        $result .= $arg->{'info'}->{'spaces_after_argument'}->{'text'};
-      }
     }
   }
   if ($element->{'contents'}) {
     my $contents_nr = scalar(@{$element->{'contents'}});
-    if ($contents_nr and $element->{'contents'}->[0]->{'type'}
-        and $element->{'contents'}->[0]->{'type'} eq 'argument'
-        and (!$element->{'cmdname'}
-         or !$Texinfo::Commands::blockitem_commands{$element->{'cmdname'}})) {
-      my $argument = $element->{'contents'}->[0];
-      foreach my $arg (@{$argument->{'contents'}}) {
-        $result .= _convert($self, $arg);
-        if ($arg->{'type'}
-            and $arg->{'type'} eq 'block_line_arg'
-            and $arg->{'info'} and $arg->{'info'}->{'spaces_after_argument'}
-            and $result =~ /\S/) {
-          $result .= $arg->{'info'}->{'spaces_after_argument'}->{'text'};
-        }
-      }
-    }
 
     my $start = 0;
     if ($element->{'cmdname'}
@@ -211,6 +193,12 @@ sub _convert($$)
     for (my $i = $start; $i < $contents_nr; $i++) {
       my $content = $element->{'contents'}->[$i];
       $result .= _convert($self, $content);
+      if ($content->{'type'}
+          and $content->{'type'} eq 'block_line_arg'
+          and $content->{'info'} and 
$content->{'info'}->{'spaces_after_argument'}
+          and $result =~ /\S/) {
+        $result .= $content->{'info'}->{'spaces_after_argument'}->{'text'};
+      }
     }
   }
 
diff --git a/tp/Texinfo/Convert/Utils.pm b/tp/Texinfo/Convert/Utils.pm
index d561f94761..4c9950544b 100644
--- a/tp/Texinfo/Convert/Utils.pm
+++ b/tp/Texinfo/Convert/Utils.pm
@@ -235,9 +235,9 @@ sub definition_arguments_content($)
 
   my ($category, $class, $type, $name, $args);
   return ($category, $class, $type, $name, $args)
-     if (!$element->{'args'}->[0]->{'contents'});
+     if (!$element->{'contents'}->[0]->{'contents'});
 
-  my @args = @{$element->{'args'}->[0]->{'contents'}};
+  my @args = @{$element->{'contents'}->[0]->{'contents'}};
   while (@args) {
     my $arg_type = $args[0]->{'type'};
     if ($arg_type eq 'def_category') {
@@ -266,14 +266,14 @@ sub definition_category_tree($$)
   my $self = shift;
   my $current = shift;
 
-  return undef if (!$current->{'args'}->[0]->{'contents'});
+  return undef if (!$current->{'contents'}->[0]->{'contents'});
 
   # NOTE we take care of not changing the parent of the tree elements.
   # We could also copy them and set the parent (as in the XS code).
 
   my $arg_category;
   my $arg_class;
-  foreach my $arg (@{$current->{'args'}->[0]->{'contents'}}) {
+  foreach my $arg (@{$current->{'contents'}->[0]->{'contents'}}) {
     my $type = $arg->{'type'};
     if ($type eq 'def_category') {
       $arg_category = $arg;
diff --git a/tp/Texinfo/ParserNonXS.pm b/tp/Texinfo/ParserNonXS.pm
index 19882a71d2..03f8f9b4eb 100644
--- a/tp/Texinfo/ParserNonXS.pm
+++ b/tp/Texinfo/ParserNonXS.pm
@@ -5974,8 +5974,13 @@ sub _handle_line_command($$$$$$)
       }
     }
     $current = $current->{'contents'}->[-1];
-    $current->{'args'} = [{ 'type' => 'line_arg',
-                            'parent' => $current }];
+    if ($def_commands{$data_cmdname}) {
+      $current->{'contents'} = [{ 'type' => 'line_arg',
+                                  'parent' => $current }];
+    } else {
+      $current->{'args'} = [{ 'type' => 'line_arg',
+                              'parent' => $current }];
+    }
     if ($self->{'basic_inline_commands'}
         and $self->{'basic_inline_commands'}->{$data_cmdname}) {
       push @{$self->{'nesting_context'}->{'basic_inline_stack_on_line'}},
@@ -6031,9 +6036,12 @@ sub _handle_line_command($$$$$$)
       }
     }
 
-    $current = $current->{'args'}->[-1];
-    $self->_push_context('ct_line', $command)
-      unless ($def_commands{$data_cmdname});
+    if ($def_commands{$data_cmdname}) {
+      $current = $current->{'contents'}->[-1];
+    } else {
+      $current = $current->{'args'}->[-1];
+      $self->_push_context('ct_line', $command);
+    }
     $line = _start_empty_line_after_command($self, $line, $current, 
$command_e);
   }
   _register_global_command($self, $command_e, $source_info)
@@ -6186,7 +6194,6 @@ sub _handle_block_command($$$$$)
   # bla = block line argument
   my $bla_element;
 
-  #if ($command eq 'float' or $blockitem_commands{$command}) {
   if (!$def_commands{$command}) {
     my $argument = {'type' => 'argument', 'parent' => $block_line_e};
     $block_line_e->{'contents'} = [$argument];
@@ -6199,7 +6206,7 @@ sub _handle_block_command($$$$$)
                  'type' => 'block_line_arg',
                  'parent' => $block_line_e};
 
-    $block_line_e->{'args'} = [$bla_element];
+    $block_line_e->{'contents'} = [$bla_element];
   }
 
   if ($self->{'basic_inline_commands'}->{$command}) {
diff --git a/tp/Texinfo/Translations.pm b/tp/Texinfo/Translations.pm
index 357face89d..d986c104d6 100644
--- a/tp/Texinfo/Translations.pm
+++ b/tp/Texinfo/Translations.pm
@@ -419,8 +419,8 @@ sub complete_indices($;$)
           and $main_entry_element->{'extra'}->{'def_command'}
           and not $main_entry_element->{'extra'}->{'def_index_element'}) {
         my ($name, $class);
-        if ($main_entry_element->{'args'}->[0]->{'contents'}) {
-          foreach my $arg 
(@{$main_entry_element->{'args'}->[0]->{'contents'}}) {
+        if ($main_entry_element->{'contents'}->[0]->{'contents'}) {
+          foreach my $arg 
(@{$main_entry_element->{'contents'}->[0]->{'contents'}}) {
             my $type = $arg->{'type'};
             if ($type eq 'def_name') {
               $name = $arg;
diff --git a/tp/Texinfo/XS/main/convert_to_texinfo.c 
b/tp/Texinfo/XS/main/convert_to_texinfo.c
index 176071b757..61df92efa9 100644
--- a/tp/Texinfo/XS/main/convert_to_texinfo.c
+++ b/tp/Texinfo/XS/main/convert_to_texinfo.c
@@ -83,17 +83,10 @@ expand_cmd_args_to_texi (const ELEMENT *e, TEXT *result)
   else if (e->e.c->args.number > 0)
     {
       size_t i, arg_nr;
-      int with_commas = 0;
 
       if (spc_before_arg)
         ADD((char *)spc_before_arg->e.text->text);
 
-      if ((builtin_command_data[cmd].flags & CF_block
-           && ! (builtin_command_data[cmd].flags & CF_def
-                 || cmd == CM_multitable))
-          || cmd == CM_node)
-        with_commas = 1;
-
       arg_nr = 0;
       for (i = 0; i < e->e.c->args.number; i++)
         {
@@ -101,12 +94,9 @@ expand_cmd_args_to_texi (const ELEMENT *e, TEXT *result)
           if (arg->flags & EF_inserted)
             continue;
 
-          if (with_commas)
-            {
-              if (arg_nr)
-                ADD(",");
-              arg_nr++;
-            }
+          if (arg_nr)
+            ADD(",");
+          arg_nr++;
           convert_to_texinfo_internal (arg, result);
         }
     }
@@ -117,9 +107,7 @@ expand_cmd_args_to_texi (const ELEMENT *e, TEXT *result)
       size_t i, arg_nr;
       int braces;
 
-      braces = (e->e.c->contents.list[0]->type == ET_brace_container
-                || e->e.c->contents.list[0]->type == ET_brace_arg
-                || e->e.c->contents.list[0]->type == ET_brace_command_context);
+      braces = !(e->e.c->contents.list[0]->type == ET_following_arg);
       if (braces)
         ADD("{");
 
@@ -158,18 +146,11 @@ expand_cmd_args_to_texi (const ELEMENT *e, TEXT *result)
            && e->e.c->contents.list[0]->type == ET_argument)
     {
       size_t i, arg_nr;
-      int with_commas = 0;
       ELEMENT *argument = e->e.c->contents.list[0];
 
       if (spc_before_arg)
         ADD((char *)spc_before_arg->e.text->text);
 
-      if ((builtin_command_data[cmd].flags & CF_block
-           && ! (builtin_command_data[cmd].flags & CF_def
-                 || cmd == CM_multitable))
-          || cmd == CM_node)
-        with_commas = 1;
-
       arg_nr = 0;
       for (i = 0; i < argument->e.c->contents.number; i++)
         {
@@ -177,12 +158,9 @@ expand_cmd_args_to_texi (const ELEMENT *e, TEXT *result)
           if (arg->flags & EF_inserted)
             continue;
 
-          if (with_commas)
-            {
-              if (arg_nr)
-                ADD(",");
-              arg_nr++;
-            }
+          if (arg_nr)
+            ADD(",");
+          arg_nr++;
           convert_to_texinfo_internal (arg, result);
         }
     }
@@ -207,8 +185,7 @@ convert_to_texinfo_internal (const ELEMENT *e, TEXT *result)
     }
   else
     {
-      if (e->e.c->cmd
-          || e->type == ET_def_line)
+      if (e->e.c->cmd)
         {
           enum command_id cmd = element_builtin_cmd (e);
           expand_cmd_args_to_texi (e, result);
diff --git a/tp/Texinfo/XS/main/convert_to_text.c 
b/tp/Texinfo/XS/main/convert_to_text.c
index d78912f0b9..a5a6590c8d 100644
--- a/tp/Texinfo/XS/main/convert_to_text.c
+++ b/tp/Texinfo/XS/main/convert_to_text.c
@@ -982,6 +982,7 @@ convert_to_text_internal (const ELEMENT *element, 
TEXT_OPTIONS *text_options,
                && builtin_command_data[data_cmd].flags & CF_def)
         {
           convert_def_line (element, text_options, result);
+          return;
         }
       else if (data_cmd == CM_sp)
         {
@@ -1047,6 +1048,7 @@ convert_to_text_internal (const ELEMENT *element, 
TEXT_OPTIONS *text_options,
   if (element->type == ET_def_line)
     {
       convert_def_line (element, text_options, result);
+      return;
     }
    else if (element->type == ET_untranslated_def_line_arg)
     {
diff --git a/tp/Texinfo/XS/main/convert_utils.c 
b/tp/Texinfo/XS/main/convert_utils.c
index 3e1560b0bb..a235578175 100644
--- a/tp/Texinfo/XS/main/convert_utils.c
+++ b/tp/Texinfo/XS/main/convert_utils.c
@@ -471,10 +471,10 @@ definition_arguments_content (const ELEMENT *element)
   PARSED_DEF *result = malloc (sizeof (PARSED_DEF));
   memset (result, 0, sizeof (PARSED_DEF));
   /* this condition is most probably always true */
-  if (element->e.c->args.number > 0)
+  if (element->e.c->contents.number > 0)
     {
       size_t i;
-      const ELEMENT *def_line = element->e.c->args.list[0];
+      const ELEMENT *def_line = element->e.c->contents.list[0];
       if (def_line->e.c->contents.number > 0)
         {
           for (i = 0; i < def_line->e.c->contents.number; i++)
@@ -527,10 +527,10 @@ definition_category_tree (OPTIONS * options, const 
ELEMENT *current)
   ELEMENT *class_copy;
   char *def_command;
 
-  if (current->e.c->args.number > 0)
+  if (current->e.c->contents.number > 0)
     {
       size_t i;
-      const ELEMENT *def_line = current->e.c->args.list[0];
+      const ELEMENT *def_line = current->e.c->contents.list[0];
       for (i = 0; i < def_line->e.c->contents.number; i++)
         {
           ELEMENT *arg = def_line->e.c->contents.list[i];
diff --git a/tp/Texinfo/XS/parsetexi/handle_commands.c 
b/tp/Texinfo/XS/parsetexi/handle_commands.c
index 2667f7f908..376e12a286 100644
--- a/tp/Texinfo/XS/parsetexi/handle_commands.c
+++ b/tp/Texinfo/XS/parsetexi/handle_commands.c
@@ -925,7 +925,10 @@ handle_line_command (ELEMENT *current, const char 
**line_inout,
       /* change 'current' to its last child.  This is command_e.  */
       current = last_contents_child (current);
       arg = new_element (ET_line_arg);
-      add_to_element_args (current, arg);
+      if (command_data(data_cmd).flags & CF_def)
+        add_to_element_contents (current, arg);
+      else
+        add_to_element_args (current, arg);
 
       if (command_data(data_cmd).flags & CF_contain_basic_inline)
         push_command (&nesting_context.basic_inline_stack_on_line, cmd);
@@ -973,12 +976,17 @@ handle_line_command (ELEMENT *current, const char 
**line_inout,
       else if (cmd == CM_printindex && current_node)
         current_node->flags |= EF_isindex;
 
-      current = last_args_child (current);
 
+      if (command_data(data_cmd).flags & CF_def)
+        current = last_contents_child (current);
+      else
+        {
+          current = last_args_child (current);
       /* add 'line' to context_stack.  This will be the
          case while we read the argument on this line. */
-      if (!(command_data(data_cmd).flags & CF_def))
-        push_context (ct_line, cmd);
+          push_context (ct_line, cmd);
+        }
+
       start_empty_line_after_command (current, &line, command_e);
     }
 
@@ -1161,7 +1169,7 @@ handle_block_command (ELEMENT *current, const char 
**line_inout,
     }
   else
     {
-      add_to_element_args (block_line_e, bla_element);
+      add_to_element_contents (block_line_e, bla_element);
     }
 
 
diff --git a/tp/Texinfo/XS/parsetexi/indices.c 
b/tp/Texinfo/XS/parsetexi/indices.c
index 0fec342510..16972c4412 100644
--- a/tp/Texinfo/XS/parsetexi/indices.c
+++ b/tp/Texinfo/XS/parsetexi/indices.c
@@ -407,7 +407,7 @@ complete_indices (DOCUMENT *document, int debug_level)
                 {
                   ELEMENT *name = 0;
                   ELEMENT *class = 0;
-                  ELEMENT *def_l_e = main_entry_element->e.c->args.list[0];
+                  ELEMENT *def_l_e = main_entry_element->e.c->contents.list[0];
                   if (def_l_e->e.c->contents.number > 0)
                     {
                       size_t ic;
diff --git a/tp/t/results/conditionals/defcondx_Dbar.pl 
b/tp/t/results/conditionals/defcondx_Dbar.pl
index 3b46be745d..185df86df3 100644
--- a/tp/t/results/conditionals/defcondx_Dbar.pl
+++ b/tp/t/results/conditionals/defcondx_Dbar.pl
@@ -100,7 +100,7 @@ $result_trees{'defcondx_Dbar'} = {
           'cmdname' => 'deffn',
           'contents' => [
             {
-              'args' => [
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -188,7 +188,8 @@ $result_trees{'defcondx_Dbar'} = {
               'type' => 'inter_def_item'
             },
             {
-              'args' => [
+              'cmdname' => 'deffnx',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -214,7 +215,6 @@ $result_trees{'defcondx_Dbar'} = {
                   'type' => 'line_arg'
                 }
               ],
-              'cmdname' => 'deffnx',
               'extra' => {
                 'def_command' => 'deffn',
                 'original_def_cmdname' => 'deffnx'
diff --git a/tp/t/results/conditionals/defcondx_Ubar.pl 
b/tp/t/results/conditionals/defcondx_Ubar.pl
index 6a1c5a2f41..4aea091340 100644
--- a/tp/t/results/conditionals/defcondx_Ubar.pl
+++ b/tp/t/results/conditionals/defcondx_Ubar.pl
@@ -100,7 +100,7 @@ $result_trees{'defcondx_Ubar'} = {
           'cmdname' => 'deffn',
           'contents' => [
             {
-              'args' => [
+              'contents' => [
                 {
                   'contents' => [
                     {
diff --git a/tp/t/results/converters_tests/complex_nestings.pl 
b/tp/t/results/converters_tests/complex_nestings.pl
index f92cc5ad7f..5f7209f844 100644
--- a/tp/t/results/converters_tests/complex_nestings.pl
+++ b/tp/t/results/converters_tests/complex_nestings.pl
@@ -161,7 +161,7 @@ $result_trees{'complex_nestings'} = {
               'cmdname' => 'defun',
               'contents' => [
                 {
-                  'args' => [
+                  'contents' => [
                     {
                       'contents' => [
                         {
@@ -313,7 +313,8 @@ $result_trees{'complex_nestings'} = {
                   'type' => 'def_line'
                 },
                 {
-                  'args' => [
+                  'cmdname' => 'defunx',
+                  'contents' => [
                     {
                       'contents' => [
                         {
@@ -399,7 +400,6 @@ $result_trees{'complex_nestings'} = {
                       'type' => 'line_arg'
                     }
                   ],
-                  'cmdname' => 'defunx',
                   'extra' => {
                     'def_command' => 'defun',
                     'def_index_element' => {
@@ -437,7 +437,7 @@ $result_trees{'complex_nestings'} = {
                       'cmdname' => 'deffn',
                       'contents' => [
                         {
-                          'args' => [
+                          'contents' => [
                             {
                               'contents' => [
                                 {
@@ -587,7 +587,7 @@ $result_trees{'complex_nestings'} = {
                               'cmdname' => 'defvar',
                               'contents' => [
                                 {
-                                  'args' => [
+                                  'contents' => [
                                     {
                                       'contents' => [
                                         {
@@ -699,7 +699,8 @@ $result_trees{'complex_nestings'} = {
                                   'type' => 'inter_def_item'
                                 },
                                 {
-                                  'args' => [
+                                  'cmdname' => 'defvarx',
+                                  'contents' => [
                                     {
                                       'contents' => [
                                         {
@@ -768,7 +769,6 @@ $result_trees{'complex_nestings'} = {
                                       'type' => 'line_arg'
                                     }
                                   ],
-                                  'cmdname' => 'defvarx',
                                   'extra' => {
                                     'def_command' => 'defvar',
                                     'def_index_element' => {
diff --git 
a/tp/t/results/converters_tests/conversion_with_undef_customization.pl 
b/tp/t/results/converters_tests/conversion_with_undef_customization.pl
index 18b0905dcb..9a9828e9fd 100644
--- a/tp/t/results/converters_tests/conversion_with_undef_customization.pl
+++ b/tp/t/results/converters_tests/conversion_with_undef_customization.pl
@@ -407,7 +407,7 @@ $result_trees{'conversion_with_undef_customization'} = {
           'cmdname' => 'deftypefn',
           'contents' => [
             {
-              'args' => [
+              'contents' => [
                 {
                   'contents' => [
                     {
diff --git a/tp/t/results/converters_tests/definition_commands.pl 
b/tp/t/results/converters_tests/definition_commands.pl
index 8757cbca1b..5fb10a0960 100644
--- a/tp/t/results/converters_tests/definition_commands.pl
+++ b/tp/t/results/converters_tests/definition_commands.pl
@@ -140,7 +140,7 @@ $result_trees{'definition_commands'} = {
           'cmdname' => 'deffn',
           'contents' => [
             {
-              'args' => [
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -345,7 +345,7 @@ $result_trees{'definition_commands'} = {
           'cmdname' => 'deffn',
           'contents' => [
             {
-              'args' => [
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -576,7 +576,7 @@ $result_trees{'definition_commands'} = {
           'cmdname' => 'deffn',
           'contents' => [
             {
-              'args' => [
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -833,7 +833,7 @@ $result_trees{'definition_commands'} = {
           'cmdname' => 'defspec',
           'contents' => [
             {
-              'args' => [
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -1019,7 +1019,8 @@ $result_trees{'definition_commands'} = {
               'type' => 'def_line'
             },
             {
-              'args' => [
+              'cmdname' => 'defspecx',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -1239,7 +1240,6 @@ $result_trees{'definition_commands'} = {
                   'type' => 'line_arg'
                 }
               ],
-              'cmdname' => 'defspecx',
               'extra' => {
                 'def_command' => 'defspec',
                 'def_index_element' => {
@@ -1272,7 +1272,8 @@ $result_trees{'definition_commands'} = {
               }
             },
             {
-              'args' => [
+              'cmdname' => 'defspecx',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -1492,7 +1493,6 @@ $result_trees{'definition_commands'} = {
                   'type' => 'line_arg'
                 }
               ],
-              'cmdname' => 'defspecx',
               'extra' => {
                 'def_command' => 'defspec',
                 'def_index_element' => {
@@ -1525,7 +1525,8 @@ $result_trees{'definition_commands'} = {
               }
             },
             {
-              'args' => [
+              'cmdname' => 'defspecx',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -1745,7 +1746,6 @@ $result_trees{'definition_commands'} = {
                   'type' => 'line_arg'
                 }
               ],
-              'cmdname' => 'defspecx',
               'extra' => {
                 'def_command' => 'defspec',
                 'def_index_element' => {
@@ -1778,7 +1778,8 @@ $result_trees{'definition_commands'} = {
               }
             },
             {
-              'args' => [
+              'cmdname' => 'defspecx',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -1998,7 +1999,6 @@ $result_trees{'definition_commands'} = {
                   'type' => 'line_arg'
                 }
               ],
-              'cmdname' => 'defspecx',
               'extra' => {
                 'def_command' => 'defspec',
                 'def_index_element' => {
@@ -2031,7 +2031,8 @@ $result_trees{'definition_commands'} = {
               }
             },
             {
-              'args' => [
+              'cmdname' => 'defspecx',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -2251,7 +2252,6 @@ $result_trees{'definition_commands'} = {
                   'type' => 'line_arg'
                 }
               ],
-              'cmdname' => 'defspecx',
               'extra' => {
                 'def_command' => 'defspec',
                 'def_index_element' => {
@@ -2284,7 +2284,8 @@ $result_trees{'definition_commands'} = {
               }
             },
             {
-              'args' => [
+              'cmdname' => 'defspecx',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -2543,7 +2544,6 @@ $result_trees{'definition_commands'} = {
                   'type' => 'line_arg'
                 }
               ],
-              'cmdname' => 'defspecx',
               'extra' => {
                 'def_command' => 'defspec',
                 'def_index_element' => {
@@ -2576,7 +2576,8 @@ $result_trees{'definition_commands'} = {
               }
             },
             {
-              'args' => [
+              'cmdname' => 'defspecx',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -2835,7 +2836,6 @@ $result_trees{'definition_commands'} = {
                   'type' => 'line_arg'
                 }
               ],
-              'cmdname' => 'defspecx',
               'extra' => {
                 'def_command' => 'defspec',
                 'def_index_element' => {
@@ -2868,7 +2868,8 @@ $result_trees{'definition_commands'} = {
               }
             },
             {
-              'args' => [
+              'cmdname' => 'defspecx',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -3127,7 +3128,6 @@ $result_trees{'definition_commands'} = {
                   'type' => 'line_arg'
                 }
               ],
-              'cmdname' => 'defspecx',
               'extra' => {
                 'def_command' => 'defspec',
                 'def_index_element' => {
@@ -3160,7 +3160,8 @@ $result_trees{'definition_commands'} = {
               }
             },
             {
-              'args' => [
+              'cmdname' => 'defspecx',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -3419,7 +3420,6 @@ $result_trees{'definition_commands'} = {
                   'type' => 'line_arg'
                 }
               ],
-              'cmdname' => 'defspecx',
               'extra' => {
                 'def_command' => 'defspec',
                 'def_index_element' => {
@@ -3452,7 +3452,8 @@ $result_trees{'definition_commands'} = {
               }
             },
             {
-              'args' => [
+              'cmdname' => 'defspecx',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -3711,7 +3712,6 @@ $result_trees{'definition_commands'} = {
                   'type' => 'line_arg'
                 }
               ],
-              'cmdname' => 'defspecx',
               'extra' => {
                 'def_command' => 'defspec',
                 'def_index_element' => {
@@ -3744,7 +3744,8 @@ $result_trees{'definition_commands'} = {
               }
             },
             {
-              'args' => [
+              'cmdname' => 'defspecx',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -4003,7 +4004,6 @@ $result_trees{'definition_commands'} = {
                   'type' => 'line_arg'
                 }
               ],
-              'cmdname' => 'defspecx',
               'extra' => {
                 'def_command' => 'defspec',
                 'def_index_element' => {
@@ -4036,7 +4036,8 @@ $result_trees{'definition_commands'} = {
               }
             },
             {
-              'args' => [
+              'cmdname' => 'defspecx',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -4295,7 +4296,6 @@ $result_trees{'definition_commands'} = {
                   'type' => 'line_arg'
                 }
               ],
-              'cmdname' => 'defspecx',
               'extra' => {
                 'def_command' => 'defspec',
                 'def_index_element' => {
@@ -4328,7 +4328,8 @@ $result_trees{'definition_commands'} = {
               }
             },
             {
-              'args' => [
+              'cmdname' => 'defspecx',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -4587,7 +4588,6 @@ $result_trees{'definition_commands'} = {
                   'type' => 'line_arg'
                 }
               ],
-              'cmdname' => 'defspecx',
               'extra' => {
                 'def_command' => 'defspec',
                 'def_index_element' => {
@@ -4620,7 +4620,8 @@ $result_trees{'definition_commands'} = {
               }
             },
             {
-              'args' => [
+              'cmdname' => 'defspecx',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -4879,7 +4880,6 @@ $result_trees{'definition_commands'} = {
                   'type' => 'line_arg'
                 }
               ],
-              'cmdname' => 'defspecx',
               'extra' => {
                 'def_command' => 'defspec',
                 'def_index_element' => {
@@ -4974,7 +4974,7 @@ $result_trees{'definition_commands'} = {
           'cmdname' => 'defspec',
           'contents' => [
             {
-              'args' => [
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -5085,7 +5085,8 @@ $result_trees{'definition_commands'} = {
               'type' => 'def_line'
             },
             {
-              'args' => [
+              'cmdname' => 'defspecx',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -5181,7 +5182,6 @@ $result_trees{'definition_commands'} = {
                   'type' => 'line_arg'
                 }
               ],
-              'cmdname' => 'defspecx',
               'extra' => {
                 'def_command' => 'defspec',
                 'def_index_element' => {
@@ -5214,7 +5214,8 @@ $result_trees{'definition_commands'} = {
               }
             },
             {
-              'args' => [
+              'cmdname' => 'defspecx',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -5310,7 +5311,6 @@ $result_trees{'definition_commands'} = {
                   'type' => 'line_arg'
                 }
               ],
-              'cmdname' => 'defspecx',
               'extra' => {
                 'def_command' => 'defspec',
                 'def_index_element' => {
@@ -5343,7 +5343,8 @@ $result_trees{'definition_commands'} = {
               }
             },
             {
-              'args' => [
+              'cmdname' => 'defspecx',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -5439,7 +5440,6 @@ $result_trees{'definition_commands'} = {
                   'type' => 'line_arg'
                 }
               ],
-              'cmdname' => 'defspecx',
               'extra' => {
                 'def_command' => 'defspec',
                 'def_index_element' => {
@@ -5472,7 +5472,8 @@ $result_trees{'definition_commands'} = {
               }
             },
             {
-              'args' => [
+              'cmdname' => 'defspecx',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -5568,7 +5569,6 @@ $result_trees{'definition_commands'} = {
                   'type' => 'line_arg'
                 }
               ],
-              'cmdname' => 'defspecx',
               'extra' => {
                 'def_command' => 'defspec',
                 'def_index_element' => {
@@ -5601,7 +5601,8 @@ $result_trees{'definition_commands'} = {
               }
             },
             {
-              'args' => [
+              'cmdname' => 'defspecx',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -5697,7 +5698,6 @@ $result_trees{'definition_commands'} = {
                   'type' => 'line_arg'
                 }
               ],
-              'cmdname' => 'defspecx',
               'extra' => {
                 'def_command' => 'defspec',
                 'def_index_element' => {
@@ -5730,7 +5730,8 @@ $result_trees{'definition_commands'} = {
               }
             },
             {
-              'args' => [
+              'cmdname' => 'defspecx',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -5839,7 +5840,6 @@ $result_trees{'definition_commands'} = {
                   'type' => 'line_arg'
                 }
               ],
-              'cmdname' => 'defspecx',
               'extra' => {
                 'def_command' => 'defspec',
                 'def_index_element' => {
@@ -5872,7 +5872,8 @@ $result_trees{'definition_commands'} = {
               }
             },
             {
-              'args' => [
+              'cmdname' => 'defspecx',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -5981,7 +5982,6 @@ $result_trees{'definition_commands'} = {
                   'type' => 'line_arg'
                 }
               ],
-              'cmdname' => 'defspecx',
               'extra' => {
                 'def_command' => 'defspec',
                 'def_index_element' => {
@@ -6014,7 +6014,8 @@ $result_trees{'definition_commands'} = {
               }
             },
             {
-              'args' => [
+              'cmdname' => 'defspecx',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -6123,7 +6124,6 @@ $result_trees{'definition_commands'} = {
                   'type' => 'line_arg'
                 }
               ],
-              'cmdname' => 'defspecx',
               'extra' => {
                 'def_command' => 'defspec',
                 'def_index_element' => {
@@ -6156,7 +6156,8 @@ $result_trees{'definition_commands'} = {
               }
             },
             {
-              'args' => [
+              'cmdname' => 'defspecx',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -6265,7 +6266,6 @@ $result_trees{'definition_commands'} = {
                   'type' => 'line_arg'
                 }
               ],
-              'cmdname' => 'defspecx',
               'extra' => {
                 'def_command' => 'defspec',
                 'def_index_element' => {
@@ -6298,7 +6298,8 @@ $result_trees{'definition_commands'} = {
               }
             },
             {
-              'args' => [
+              'cmdname' => 'defspecx',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -6407,7 +6408,6 @@ $result_trees{'definition_commands'} = {
                   'type' => 'line_arg'
                 }
               ],
-              'cmdname' => 'defspecx',
               'extra' => {
                 'def_command' => 'defspec',
                 'def_index_element' => {
@@ -6440,7 +6440,8 @@ $result_trees{'definition_commands'} = {
               }
             },
             {
-              'args' => [
+              'cmdname' => 'defspecx',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -6549,7 +6550,6 @@ $result_trees{'definition_commands'} = {
                   'type' => 'line_arg'
                 }
               ],
-              'cmdname' => 'defspecx',
               'extra' => {
                 'def_command' => 'defspec',
                 'def_index_element' => {
@@ -6582,7 +6582,8 @@ $result_trees{'definition_commands'} = {
               }
             },
             {
-              'args' => [
+              'cmdname' => 'defspecx',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -6691,7 +6692,6 @@ $result_trees{'definition_commands'} = {
                   'type' => 'line_arg'
                 }
               ],
-              'cmdname' => 'defspecx',
               'extra' => {
                 'def_command' => 'defspec',
                 'def_index_element' => {
@@ -6724,7 +6724,8 @@ $result_trees{'definition_commands'} = {
               }
             },
             {
-              'args' => [
+              'cmdname' => 'defspecx',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -6833,7 +6834,6 @@ $result_trees{'definition_commands'} = {
                   'type' => 'line_arg'
                 }
               ],
-              'cmdname' => 'defspecx',
               'extra' => {
                 'def_command' => 'defspec',
                 'def_index_element' => {
@@ -6866,7 +6866,8 @@ $result_trees{'definition_commands'} = {
               }
             },
             {
-              'args' => [
+              'cmdname' => 'defspecx',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -6975,7 +6976,6 @@ $result_trees{'definition_commands'} = {
                   'type' => 'line_arg'
                 }
               ],
-              'cmdname' => 'defspecx',
               'extra' => {
                 'def_command' => 'defspec',
                 'def_index_element' => {
@@ -7070,7 +7070,7 @@ $result_trees{'definition_commands'} = {
           'cmdname' => 'deffn',
           'contents' => [
             {
-              'args' => [
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -7215,7 +7215,8 @@ $result_trees{'definition_commands'} = {
               'type' => 'def_line'
             },
             {
-              'args' => [
+              'cmdname' => 'deffnx',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -7325,7 +7326,6 @@ $result_trees{'definition_commands'} = {
                   'type' => 'line_arg'
                 }
               ],
-              'cmdname' => 'deffnx',
               'extra' => {
                 'def_command' => 'deffn',
                 'def_index_element' => {
@@ -7399,7 +7399,8 @@ $result_trees{'definition_commands'} = {
               }
             },
             {
-              'args' => [
+              'cmdname' => 'deffnx',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -7509,7 +7510,6 @@ $result_trees{'definition_commands'} = {
                   'type' => 'line_arg'
                 }
               ],
-              'cmdname' => 'deffnx',
               'extra' => {
                 'def_command' => 'deffn',
                 'def_index_element' => {
@@ -7583,7 +7583,8 @@ $result_trees{'definition_commands'} = {
               }
             },
             {
-              'args' => [
+              'cmdname' => 'deffnx',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -7793,7 +7794,6 @@ $result_trees{'definition_commands'} = {
                   'type' => 'line_arg'
                 }
               ],
-              'cmdname' => 'deffnx',
               'extra' => {
                 'def_command' => 'deffn',
                 'def_index_element' => {
@@ -7872,7 +7872,8 @@ $result_trees{'definition_commands'} = {
               }
             },
             {
-              'args' => [
+              'cmdname' => 'deffnx',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -7928,7 +7929,6 @@ $result_trees{'definition_commands'} = {
                   'type' => 'line_arg'
                 }
               ],
-              'cmdname' => 'deffnx',
               'extra' => {
                 'def_command' => 'deffn',
                 'def_index_element' => {
@@ -8144,7 +8144,7 @@ $result_trees{'definition_commands'} = {
           'cmdname' => 'defspec',
           'contents' => [
             {
-              'args' => [
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -9160,7 +9160,8 @@ $result_trees{'definition_commands'} = {
               'type' => 'def_line'
             },
             {
-              'args' => [
+              'cmdname' => 'defspecx',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -9483,7 +9484,6 @@ $result_trees{'definition_commands'} = {
                   'type' => 'line_arg'
                 }
               ],
-              'cmdname' => 'defspecx',
               'extra' => {
                 'def_command' => 'defspec',
                 'def_index_element' => {
@@ -9578,7 +9578,7 @@ $result_trees{'definition_commands'} = {
           'cmdname' => 'deftypefn',
           'contents' => [
             {
-              'args' => [
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -9886,7 +9886,7 @@ $result_trees{'definition_commands'} = {
           'cmdname' => 'deftypefn',
           'contents' => [
             {
-              'args' => [
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -10242,7 +10242,7 @@ $result_trees{'definition_commands'} = {
           'cmdname' => 'defcv',
           'contents' => [
             {
-              'args' => [
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -10406,7 +10406,7 @@ $result_trees{'definition_commands'} = {
           'cmdname' => 'deftypecv',
           'contents' => [
             {
-              'args' => [
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -10670,7 +10670,7 @@ $result_trees{'definition_commands'} = {
               'cmdname' => 'deftypefn',
               'contents' => [
                 {
-                  'args' => [
+                  'contents' => [
                     {
                       'contents' => [
                         {
@@ -11013,7 +11013,7 @@ $result_trees{'definition_commands'} = {
           'cmdname' => 'defun',
           'contents' => [
             {
-              'args' => [
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -11257,7 +11257,7 @@ $result_trees{'definition_commands'} = {
           'cmdname' => 'defun',
           'contents' => [
             {
-              'args' => [
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -11511,7 +11511,7 @@ $result_trees{'definition_commands'} = {
           'cmdname' => 'deffn',
           'contents' => [
             {
-              'args' => [
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -11957,7 +11957,7 @@ $result_trees{'definition_commands'} = {
           'cmdname' => 'deftypefn',
           'contents' => [
             {
-              'args' => [
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -12179,7 +12179,8 @@ $result_trees{'definition_commands'} = {
               'type' => 'def_line'
             },
             {
-              'args' => [
+              'cmdname' => 'deftypefnx',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -12417,7 +12418,6 @@ $result_trees{'definition_commands'} = {
                   'type' => 'line_arg'
                 }
               ],
-              'cmdname' => 'deftypefnx',
               'extra' => {
                 'def_command' => 'deftypefn',
                 'def_index_element' => {
@@ -12450,7 +12450,8 @@ $result_trees{'definition_commands'} = {
               }
             },
             {
-              'args' => [
+              'cmdname' => 'deftypefnx',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -12688,7 +12689,6 @@ $result_trees{'definition_commands'} = {
                   'type' => 'line_arg'
                 }
               ],
-              'cmdname' => 'deftypefnx',
               'extra' => {
                 'def_command' => 'deftypefn',
                 'def_index_element' => {
@@ -12721,7 +12721,8 @@ $result_trees{'definition_commands'} = {
               }
             },
             {
-              'args' => [
+              'cmdname' => 'deftypefnx',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -12959,7 +12960,6 @@ $result_trees{'definition_commands'} = {
                   'type' => 'line_arg'
                 }
               ],
-              'cmdname' => 'deftypefnx',
               'extra' => {
                 'def_command' => 'deftypefn',
                 'def_index_element' => {
@@ -12992,7 +12992,8 @@ $result_trees{'definition_commands'} = {
               }
             },
             {
-              'args' => [
+              'cmdname' => 'deftypefnx',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -13230,7 +13231,6 @@ $result_trees{'definition_commands'} = {
                   'type' => 'line_arg'
                 }
               ],
-              'cmdname' => 'deftypefnx',
               'extra' => {
                 'def_command' => 'deftypefn',
                 'def_index_element' => {
@@ -13263,7 +13263,8 @@ $result_trees{'definition_commands'} = {
               }
             },
             {
-              'args' => [
+              'cmdname' => 'deftypefnx',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -13501,7 +13502,6 @@ $result_trees{'definition_commands'} = {
                   'type' => 'line_arg'
                 }
               ],
-              'cmdname' => 'deftypefnx',
               'extra' => {
                 'def_command' => 'deftypefn',
                 'def_index_element' => {
@@ -13534,7 +13534,8 @@ $result_trees{'definition_commands'} = {
               }
             },
             {
-              'args' => [
+              'cmdname' => 'deftypefnx',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -13798,7 +13799,6 @@ $result_trees{'definition_commands'} = {
                   'type' => 'line_arg'
                 }
               ],
-              'cmdname' => 'deftypefnx',
               'extra' => {
                 'def_command' => 'deftypefn',
                 'def_index_element' => {
@@ -13831,7 +13831,8 @@ $result_trees{'definition_commands'} = {
               }
             },
             {
-              'args' => [
+              'cmdname' => 'deftypefnx',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -14095,7 +14096,6 @@ $result_trees{'definition_commands'} = {
                   'type' => 'line_arg'
                 }
               ],
-              'cmdname' => 'deftypefnx',
               'extra' => {
                 'def_command' => 'deftypefn',
                 'def_index_element' => {
@@ -14128,7 +14128,8 @@ $result_trees{'definition_commands'} = {
               }
             },
             {
-              'args' => [
+              'cmdname' => 'deftypefnx',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -14392,7 +14393,6 @@ $result_trees{'definition_commands'} = {
                   'type' => 'line_arg'
                 }
               ],
-              'cmdname' => 'deftypefnx',
               'extra' => {
                 'def_command' => 'deftypefn',
                 'def_index_element' => {
@@ -14425,7 +14425,8 @@ $result_trees{'definition_commands'} = {
               }
             },
             {
-              'args' => [
+              'cmdname' => 'deftypefnx',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -14689,7 +14690,6 @@ $result_trees{'definition_commands'} = {
                   'type' => 'line_arg'
                 }
               ],
-              'cmdname' => 'deftypefnx',
               'extra' => {
                 'def_command' => 'deftypefn',
                 'def_index_element' => {
@@ -14722,7 +14722,8 @@ $result_trees{'definition_commands'} = {
               }
             },
             {
-              'args' => [
+              'cmdname' => 'deftypefnx',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -14986,7 +14987,6 @@ $result_trees{'definition_commands'} = {
                   'type' => 'line_arg'
                 }
               ],
-              'cmdname' => 'deftypefnx',
               'extra' => {
                 'def_command' => 'deftypefn',
                 'def_index_element' => {
@@ -15019,7 +15019,8 @@ $result_trees{'definition_commands'} = {
               }
             },
             {
-              'args' => [
+              'cmdname' => 'deftypefnx',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -15283,7 +15284,6 @@ $result_trees{'definition_commands'} = {
                   'type' => 'line_arg'
                 }
               ],
-              'cmdname' => 'deftypefnx',
               'extra' => {
                 'def_command' => 'deftypefn',
                 'def_index_element' => {
@@ -15316,7 +15316,8 @@ $result_trees{'definition_commands'} = {
               }
             },
             {
-              'args' => [
+              'cmdname' => 'deftypefnx',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -15580,7 +15581,6 @@ $result_trees{'definition_commands'} = {
                   'type' => 'line_arg'
                 }
               ],
-              'cmdname' => 'deftypefnx',
               'extra' => {
                 'def_command' => 'deftypefn',
                 'def_index_element' => {
@@ -15613,7 +15613,8 @@ $result_trees{'definition_commands'} = {
               }
             },
             {
-              'args' => [
+              'cmdname' => 'deftypefnx',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -15877,7 +15878,6 @@ $result_trees{'definition_commands'} = {
                   'type' => 'line_arg'
                 }
               ],
-              'cmdname' => 'deftypefnx',
               'extra' => {
                 'def_command' => 'deftypefn',
                 'def_index_element' => {
@@ -15910,7 +15910,8 @@ $result_trees{'definition_commands'} = {
               }
             },
             {
-              'args' => [
+              'cmdname' => 'deftypefnx',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -16174,7 +16175,6 @@ $result_trees{'definition_commands'} = {
                   'type' => 'line_arg'
                 }
               ],
-              'cmdname' => 'deftypefnx',
               'extra' => {
                 'def_command' => 'deftypefn',
                 'def_index_element' => {
@@ -16269,7 +16269,7 @@ $result_trees{'definition_commands'} = {
           'cmdname' => 'deftypefn',
           'contents' => [
             {
-              'args' => [
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -16491,7 +16491,8 @@ $result_trees{'definition_commands'} = {
               'type' => 'def_line'
             },
             {
-              'args' => [
+              'cmdname' => 'deftypefnx',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -16698,7 +16699,6 @@ $result_trees{'definition_commands'} = {
                   'type' => 'line_arg'
                 }
               ],
-              'cmdname' => 'deftypefnx',
               'extra' => {
                 'def_command' => 'deftypefn',
                 'def_index_element' => {
@@ -16731,7 +16731,8 @@ $result_trees{'definition_commands'} = {
               }
             },
             {
-              'args' => [
+              'cmdname' => 'deftypefnx',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -16938,7 +16939,6 @@ $result_trees{'definition_commands'} = {
                   'type' => 'line_arg'
                 }
               ],
-              'cmdname' => 'deftypefnx',
               'extra' => {
                 'def_command' => 'deftypefn',
                 'def_index_element' => {
@@ -16971,7 +16971,8 @@ $result_trees{'definition_commands'} = {
               }
             },
             {
-              'args' => [
+              'cmdname' => 'deftypefnx',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -17178,7 +17179,6 @@ $result_trees{'definition_commands'} = {
                   'type' => 'line_arg'
                 }
               ],
-              'cmdname' => 'deftypefnx',
               'extra' => {
                 'def_command' => 'deftypefn',
                 'def_index_element' => {
@@ -17211,7 +17211,8 @@ $result_trees{'definition_commands'} = {
               }
             },
             {
-              'args' => [
+              'cmdname' => 'deftypefnx',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -17418,7 +17419,6 @@ $result_trees{'definition_commands'} = {
                   'type' => 'line_arg'
                 }
               ],
-              'cmdname' => 'deftypefnx',
               'extra' => {
                 'def_command' => 'deftypefn',
                 'def_index_element' => {
@@ -17451,7 +17451,8 @@ $result_trees{'definition_commands'} = {
               }
             },
             {
-              'args' => [
+              'cmdname' => 'deftypefnx',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -17658,7 +17659,6 @@ $result_trees{'definition_commands'} = {
                   'type' => 'line_arg'
                 }
               ],
-              'cmdname' => 'deftypefnx',
               'extra' => {
                 'def_command' => 'deftypefn',
                 'def_index_element' => {
@@ -17691,7 +17691,8 @@ $result_trees{'definition_commands'} = {
               }
             },
             {
-              'args' => [
+              'cmdname' => 'deftypefnx',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -17911,7 +17912,6 @@ $result_trees{'definition_commands'} = {
                   'type' => 'line_arg'
                 }
               ],
-              'cmdname' => 'deftypefnx',
               'extra' => {
                 'def_command' => 'deftypefn',
                 'def_index_element' => {
@@ -17944,7 +17944,8 @@ $result_trees{'definition_commands'} = {
               }
             },
             {
-              'args' => [
+              'cmdname' => 'deftypefnx',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -18164,7 +18165,6 @@ $result_trees{'definition_commands'} = {
                   'type' => 'line_arg'
                 }
               ],
-              'cmdname' => 'deftypefnx',
               'extra' => {
                 'def_command' => 'deftypefn',
                 'def_index_element' => {
@@ -18197,7 +18197,8 @@ $result_trees{'definition_commands'} = {
               }
             },
             {
-              'args' => [
+              'cmdname' => 'deftypefnx',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -18417,7 +18418,6 @@ $result_trees{'definition_commands'} = {
                   'type' => 'line_arg'
                 }
               ],
-              'cmdname' => 'deftypefnx',
               'extra' => {
                 'def_command' => 'deftypefn',
                 'def_index_element' => {
@@ -18450,7 +18450,8 @@ $result_trees{'definition_commands'} = {
               }
             },
             {
-              'args' => [
+              'cmdname' => 'deftypefnx',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -18670,7 +18671,6 @@ $result_trees{'definition_commands'} = {
                   'type' => 'line_arg'
                 }
               ],
-              'cmdname' => 'deftypefnx',
               'extra' => {
                 'def_command' => 'deftypefn',
                 'def_index_element' => {
@@ -18703,7 +18703,8 @@ $result_trees{'definition_commands'} = {
               }
             },
             {
-              'args' => [
+              'cmdname' => 'deftypefnx',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -18923,7 +18924,6 @@ $result_trees{'definition_commands'} = {
                   'type' => 'line_arg'
                 }
               ],
-              'cmdname' => 'deftypefnx',
               'extra' => {
                 'def_command' => 'deftypefn',
                 'def_index_element' => {
@@ -18956,7 +18956,8 @@ $result_trees{'definition_commands'} = {
               }
             },
             {
-              'args' => [
+              'cmdname' => 'deftypefnx',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -19176,7 +19177,6 @@ $result_trees{'definition_commands'} = {
                   'type' => 'line_arg'
                 }
               ],
-              'cmdname' => 'deftypefnx',
               'extra' => {
                 'def_command' => 'deftypefn',
                 'def_index_element' => {
@@ -19209,7 +19209,8 @@ $result_trees{'definition_commands'} = {
               }
             },
             {
-              'args' => [
+              'cmdname' => 'deftypefnx',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -19429,7 +19430,6 @@ $result_trees{'definition_commands'} = {
                   'type' => 'line_arg'
                 }
               ],
-              'cmdname' => 'deftypefnx',
               'extra' => {
                 'def_command' => 'deftypefn',
                 'def_index_element' => {
@@ -19462,7 +19462,8 @@ $result_trees{'definition_commands'} = {
               }
             },
             {
-              'args' => [
+              'cmdname' => 'deftypefnx',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -19682,7 +19683,6 @@ $result_trees{'definition_commands'} = {
                   'type' => 'line_arg'
                 }
               ],
-              'cmdname' => 'deftypefnx',
               'extra' => {
                 'def_command' => 'deftypefn',
                 'def_index_element' => {
@@ -19715,7 +19715,8 @@ $result_trees{'definition_commands'} = {
               }
             },
             {
-              'args' => [
+              'cmdname' => 'deftypefnx',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -19935,7 +19936,6 @@ $result_trees{'definition_commands'} = {
                   'type' => 'line_arg'
                 }
               ],
-              'cmdname' => 'deftypefnx',
               'extra' => {
                 'def_command' => 'deftypefn',
                 'def_index_element' => {
diff --git a/tp/t/results/converters_tests/form_feeds.pl 
b/tp/t/results/converters_tests/form_feeds.pl
index eb46243635..6462438a9a 100644
--- a/tp/t/results/converters_tests/form_feeds.pl
+++ b/tp/t/results/converters_tests/form_feeds.pl
@@ -578,7 +578,7 @@ $result_trees{'form_feeds'} = {
           'cmdname' => 'deffn',
           'contents' => [
             {
-              'args' => [
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -763,7 +763,8 @@ $result_trees{'form_feeds'} = {
               'type' => 'def_line'
             },
             {
-              'args' => [
+              'cmdname' => 'deffnx',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -912,7 +913,6 @@ $result_trees{'form_feeds'} = {
                   'type' => 'line_arg'
                 }
               ],
-              'cmdname' => 'deffnx',
               'extra' => {
                 'def_command' => 'deffn',
                 'def_index_element' => {
diff --git a/tp/t/results/converters_tests/frenchspacing_and_code.pl 
b/tp/t/results/converters_tests/frenchspacing_and_code.pl
index 9d57815384..6982f9521a 100644
--- a/tp/t/results/converters_tests/frenchspacing_and_code.pl
+++ b/tp/t/results/converters_tests/frenchspacing_and_code.pl
@@ -289,7 +289,7 @@ $result_trees{'frenchspacing_and_code'} = {
           'cmdname' => 'deftypeop',
           'contents' => [
             {
-              'args' => [
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -632,7 +632,7 @@ $result_trees{'frenchspacing_and_code'} = {
           'cmdname' => 'defop',
           'contents' => [
             {
-              'args' => [
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -1165,7 +1165,7 @@ $result_trees{'frenchspacing_and_code'} = {
           'cmdname' => 'deftypeop',
           'contents' => [
             {
-              'args' => [
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -1508,7 +1508,7 @@ $result_trees{'frenchspacing_and_code'} = {
           'cmdname' => 'defop',
           'contents' => [
             {
-              'args' => [
+              'contents' => [
                 {
                   'contents' => [
                     {
diff --git a/tp/t/results/converters_tests/test_deftypefnnewline.pl 
b/tp/t/results/converters_tests/test_deftypefnnewline.pl
index 29fce31181..6379a7f503 100644
--- a/tp/t/results/converters_tests/test_deftypefnnewline.pl
+++ b/tp/t/results/converters_tests/test_deftypefnnewline.pl
@@ -209,7 +209,7 @@ $result_trees{'test_deftypefnnewline'} = {
           'cmdname' => 'deftypefun',
           'contents' => [
             {
-              'args' => [
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -382,7 +382,7 @@ $result_trees{'test_deftypefnnewline'} = {
           'cmdname' => 'deftypefn',
           'contents' => [
             {
-              'args' => [
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -532,7 +532,7 @@ $result_trees{'test_deftypefnnewline'} = {
           'cmdname' => 'deftypeop',
           'contents' => [
             {
-              'args' => [
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -769,7 +769,7 @@ $result_trees{'test_deftypefnnewline'} = {
           'cmdname' => 'deftypeop',
           'contents' => [
             {
-              'args' => [
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -989,7 +989,7 @@ $result_trees{'test_deftypefnnewline'} = {
           'cmdname' => 'deftypecv',
           'contents' => [
             {
-              'args' => [
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -1209,7 +1209,7 @@ $result_trees{'test_deftypefnnewline'} = {
           'cmdname' => 'deftypecv',
           'contents' => [
             {
-              'args' => [
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -1446,7 +1446,7 @@ $result_trees{'test_deftypefnnewline'} = {
           'cmdname' => 'deffn',
           'contents' => [
             {
-              'args' => [
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -1616,7 +1616,7 @@ $result_trees{'test_deftypefnnewline'} = {
           'cmdname' => 'deftypefun',
           'contents' => [
             {
-              'args' => [
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -1789,7 +1789,7 @@ $result_trees{'test_deftypefnnewline'} = {
           'cmdname' => 'deftypefn',
           'contents' => [
             {
-              'args' => [
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -1939,7 +1939,7 @@ $result_trees{'test_deftypefnnewline'} = {
           'cmdname' => 'deftypeop',
           'contents' => [
             {
-              'args' => [
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -2176,7 +2176,7 @@ $result_trees{'test_deftypefnnewline'} = {
           'cmdname' => 'deftypeop',
           'contents' => [
             {
-              'args' => [
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -2396,7 +2396,7 @@ $result_trees{'test_deftypefnnewline'} = {
           'cmdname' => 'deftypecv',
           'contents' => [
             {
-              'args' => [
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -2616,7 +2616,7 @@ $result_trees{'test_deftypefnnewline'} = {
           'cmdname' => 'deftypecv',
           'contents' => [
             {
-              'args' => [
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -2853,7 +2853,7 @@ $result_trees{'test_deftypefnnewline'} = {
           'cmdname' => 'deffn',
           'contents' => [
             {
-              'args' => [
+              'contents' => [
                 {
                   'contents' => [
                     {
diff --git a/tp/t/results/coverage/def.pl b/tp/t/results/coverage/def.pl
index 426fa4fd85..ed7f45bbf5 100644
--- a/tp/t/results/coverage/def.pl
+++ b/tp/t/results/coverage/def.pl
@@ -18,7 +18,7 @@ $result_trees{'def'} = {
           'cmdname' => 'deffn',
           'contents' => [
             {
-              'args' => [
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -170,7 +170,7 @@ $result_trees{'def'} = {
           'cmdname' => 'deffn',
           'contents' => [
             {
-              'args' => [
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -428,7 +428,7 @@ $result_trees{'def'} = {
           'cmdname' => 'deffn',
           'contents' => [
             {
-              'args' => [
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -555,7 +555,8 @@ $result_trees{'def'} = {
               'type' => 'def_line'
             },
             {
-              'args' => [
+              'cmdname' => 'deffnx',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -616,7 +617,6 @@ $result_trees{'def'} = {
                   'type' => 'line_arg'
                 }
               ],
-              'cmdname' => 'deffnx',
               'extra' => {
                 'def_command' => 'deffn',
                 'def_index_element' => {
@@ -648,7 +648,8 @@ $result_trees{'def'} = {
               }
             },
             {
-              'args' => [
+              'cmdname' => 'deffnx',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -709,7 +710,6 @@ $result_trees{'def'} = {
                   'type' => 'line_arg'
                 }
               ],
-              'cmdname' => 'deffnx',
               'extra' => {
                 'def_command' => 'deffn',
                 'def_index_element' => {
@@ -741,7 +741,8 @@ $result_trees{'def'} = {
               }
             },
             {
-              'args' => [
+              'cmdname' => 'deffnx',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -807,7 +808,6 @@ $result_trees{'def'} = {
                   'type' => 'line_arg'
                 }
               ],
-              'cmdname' => 'deffnx',
               'extra' => {
                 'def_command' => 'deffn',
                 'def_index_element' => {
@@ -844,7 +844,8 @@ $result_trees{'def'} = {
               }
             },
             {
-              'args' => [
+              'cmdname' => 'deffnx',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -910,7 +911,6 @@ $result_trees{'def'} = {
                   'type' => 'line_arg'
                 }
               ],
-              'cmdname' => 'deffnx',
               'extra' => {
                 'def_command' => 'deffn',
                 'def_index_element' => {
@@ -947,7 +947,8 @@ $result_trees{'def'} = {
               }
             },
             {
-              'args' => [
+              'cmdname' => 'deffnx',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -1020,7 +1021,6 @@ $result_trees{'def'} = {
                   'type' => 'line_arg'
                 }
               ],
-              'cmdname' => 'deffnx',
               'extra' => {
                 'def_command' => 'deffn',
                 'def_index_element' => {
@@ -1062,7 +1062,8 @@ $result_trees{'def'} = {
               }
             },
             {
-              'args' => [
+              'cmdname' => 'deffnx',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -1154,7 +1155,6 @@ $result_trees{'def'} = {
                   'type' => 'line_arg'
                 }
               ],
-              'cmdname' => 'deffnx',
               'extra' => {
                 'def_command' => 'deffn',
                 'def_index_element' => {
@@ -1212,7 +1212,8 @@ $result_trees{'def'} = {
               }
             },
             {
-              'args' => [
+              'cmdname' => 'deffnx',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -1253,7 +1254,6 @@ $result_trees{'def'} = {
                   'type' => 'line_arg'
                 }
               ],
-              'cmdname' => 'deffnx',
               'extra' => {
                 'def_command' => 'deffn',
                 'def_index_element' => {
@@ -1280,7 +1280,8 @@ $result_trees{'def'} = {
               }
             },
             {
-              'args' => [
+              'cmdname' => 'deffnx',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -1324,7 +1325,6 @@ $result_trees{'def'} = {
                   'type' => 'line_arg'
                 }
               ],
-              'cmdname' => 'deffnx',
               'extra' => {
                 'def_command' => 'deffn',
                 'def_index_element' => {
@@ -1351,7 +1351,8 @@ $result_trees{'def'} = {
               }
             },
             {
-              'args' => [
+              'cmdname' => 'deffnx',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -1397,7 +1398,6 @@ $result_trees{'def'} = {
                   'type' => 'line_arg'
                 }
               ],
-              'cmdname' => 'deffnx',
               'extra' => {
                 'def_command' => 'deffn',
                 'def_index_element' => {
@@ -1424,7 +1424,8 @@ $result_trees{'def'} = {
               }
             },
             {
-              'args' => [
+              'cmdname' => 'deffnx',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -1521,7 +1522,6 @@ $result_trees{'def'} = {
                   'type' => 'line_arg'
                 }
               ],
-              'cmdname' => 'deffnx',
               'extra' => {
                 'def_command' => 'deffn',
                 'def_index_element' => {
@@ -1568,7 +1568,8 @@ $result_trees{'def'} = {
               'type' => 'inter_def_item'
             },
             {
-              'args' => [
+              'cmdname' => 'deffnx',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -1665,7 +1666,6 @@ $result_trees{'def'} = {
                   'type' => 'line_arg'
                 }
               ],
-              'cmdname' => 'deffnx',
               'extra' => {
                 'def_command' => 'deffn',
                 'def_index_element' => {
@@ -1712,7 +1712,8 @@ $result_trees{'def'} = {
               'type' => 'inter_def_item'
             },
             {
-              'args' => [
+              'cmdname' => 'deffnx',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -1809,7 +1810,6 @@ $result_trees{'def'} = {
                   'type' => 'line_arg'
                 }
               ],
-              'cmdname' => 'deffnx',
               'extra' => {
                 'def_command' => 'deffn',
                 'def_index_element' => {
diff --git a/tp/t/results/def/adjacent_defline.pl 
b/tp/t/results/def/adjacent_defline.pl
index 49a7983072..53013e20c8 100644
--- a/tp/t/results/def/adjacent_defline.pl
+++ b/tp/t/results/def/adjacent_defline.pl
@@ -30,7 +30,8 @@ $result_trees{'adjacent_defline'} = {
               'type' => 'argument'
             },
             {
-              'args' => [
+              'cmdname' => 'defline',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -98,7 +99,6 @@ $result_trees{'adjacent_defline'} = {
                   'type' => 'line_arg'
                 }
               ],
-              'cmdname' => 'defline',
               'extra' => {
                 'def_command' => 'defline',
                 'def_index_element' => {
@@ -126,7 +126,8 @@ $result_trees{'adjacent_defline'} = {
               }
             },
             {
-              'args' => [
+              'cmdname' => 'defline',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -215,7 +216,6 @@ $result_trees{'adjacent_defline'} = {
                   'type' => 'line_arg'
                 }
               ],
-              'cmdname' => 'defline',
               'extra' => {
                 'def_command' => 'defline',
                 'def_index_element' => {
diff --git a/tp/t/results/def/all_commands.pl b/tp/t/results/def/all_commands.pl
index 975c54ca9f..4386b3339e 100644
--- a/tp/t/results/def/all_commands.pl
+++ b/tp/t/results/def/all_commands.pl
@@ -13,7 +13,7 @@ $result_trees{'all_commands'} = {
           'cmdname' => 'defvr',
           'contents' => [
             {
-              'args' => [
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -145,7 +145,7 @@ $result_trees{'all_commands'} = {
           'cmdname' => 'deffn',
           'contents' => [
             {
-              'args' => [
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -294,7 +294,7 @@ $result_trees{'all_commands'} = {
           'cmdname' => 'deffn',
           'contents' => [
             {
-              'args' => [
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -426,7 +426,7 @@ $result_trees{'all_commands'} = {
           'cmdname' => 'deftypefn',
           'contents' => [
             {
-              'args' => [
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -592,7 +592,7 @@ $result_trees{'all_commands'} = {
           'cmdname' => 'deftypefn',
           'contents' => [
             {
-              'args' => [
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -741,7 +741,7 @@ $result_trees{'all_commands'} = {
           'cmdname' => 'deftypeop',
           'contents' => [
             {
-              'args' => [
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -977,7 +977,7 @@ $result_trees{'all_commands'} = {
           'cmdname' => 'deftypeop',
           'contents' => [
             {
-              'args' => [
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -1196,7 +1196,7 @@ $result_trees{'all_commands'} = {
           'cmdname' => 'deftypevr',
           'contents' => [
             {
-              'args' => [
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -1345,7 +1345,7 @@ $result_trees{'all_commands'} = {
           'cmdname' => 'defcv',
           'contents' => [
             {
-              'args' => [
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -1494,7 +1494,7 @@ $result_trees{'all_commands'} = {
           'cmdname' => 'defcv',
           'contents' => [
             {
-              'args' => [
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -1660,7 +1660,7 @@ $result_trees{'all_commands'} = {
           'cmdname' => 'deftypecv',
           'contents' => [
             {
-              'args' => [
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -1879,7 +1879,7 @@ $result_trees{'all_commands'} = {
           'cmdname' => 'deftypecv',
           'contents' => [
             {
-              'args' => [
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -2115,7 +2115,7 @@ $result_trees{'all_commands'} = {
           'cmdname' => 'defop',
           'contents' => [
             {
-              'args' => [
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -2334,7 +2334,7 @@ $result_trees{'all_commands'} = {
           'cmdname' => 'defop',
           'contents' => [
             {
-              'args' => [
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -2536,7 +2536,7 @@ $result_trees{'all_commands'} = {
           'cmdname' => 'deftp',
           'contents' => [
             {
-              'args' => [
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -2685,7 +2685,7 @@ $result_trees{'all_commands'} = {
           'cmdname' => 'defun',
           'contents' => [
             {
-              'args' => [
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -2840,7 +2840,7 @@ $result_trees{'all_commands'} = {
           'cmdname' => 'defmac',
           'contents' => [
             {
-              'args' => [
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -2995,7 +2995,7 @@ $result_trees{'all_commands'} = {
           'cmdname' => 'defspec',
           'contents' => [
             {
-              'args' => [
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -3150,7 +3150,7 @@ $result_trees{'all_commands'} = {
           'cmdname' => 'defvar',
           'contents' => [
             {
-              'args' => [
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -3288,7 +3288,7 @@ $result_trees{'all_commands'} = {
           'cmdname' => 'defvar',
           'contents' => [
             {
-              'args' => [
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -3460,7 +3460,7 @@ $result_trees{'all_commands'} = {
           'cmdname' => 'defopt',
           'contents' => [
             {
-              'args' => [
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -3598,7 +3598,7 @@ $result_trees{'all_commands'} = {
           'cmdname' => 'deftypefun',
           'contents' => [
             {
-              'args' => [
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -3770,7 +3770,7 @@ $result_trees{'all_commands'} = {
           'cmdname' => 'deftypevar',
           'contents' => [
             {
-              'args' => [
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -3925,7 +3925,7 @@ $result_trees{'all_commands'} = {
           'cmdname' => 'defivar',
           'contents' => [
             {
-              'args' => [
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -4133,7 +4133,7 @@ $result_trees{'all_commands'} = {
           'cmdname' => 'deftypeivar',
           'contents' => [
             {
-              'args' => [
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -4358,7 +4358,7 @@ $result_trees{'all_commands'} = {
           'cmdname' => 'defmethod',
           'contents' => [
             {
-              'args' => [
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -4583,7 +4583,7 @@ $result_trees{'all_commands'} = {
           'cmdname' => 'deftypemethod',
           'contents' => [
             {
-              'args' => [
+              'contents' => [
                 {
                   'contents' => [
                     {
diff --git a/tp/t/results/def/all_commands_delimiters.pl 
b/tp/t/results/def/all_commands_delimiters.pl
index 32ce085d4b..411a4406d7 100644
--- a/tp/t/results/def/all_commands_delimiters.pl
+++ b/tp/t/results/def/all_commands_delimiters.pl
@@ -13,7 +13,7 @@ $result_trees{'all_commands_delimiters'} = {
           'cmdname' => 'deffn',
           'contents' => [
             {
-              'args' => [
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -480,7 +480,7 @@ $result_trees{'all_commands_delimiters'} = {
           'cmdname' => 'defvr',
           'contents' => [
             {
-              'args' => [
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -894,7 +894,7 @@ $result_trees{'all_commands_delimiters'} = {
           'cmdname' => 'deftypefn',
           'contents' => [
             {
-              'args' => [
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -1138,7 +1138,7 @@ $result_trees{'all_commands_delimiters'} = {
           'cmdname' => 'deftypefn',
           'contents' => [
             {
-              'args' => [
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -1680,7 +1680,7 @@ $result_trees{'all_commands_delimiters'} = {
           'cmdname' => 'deftypefn',
           'contents' => [
             {
-              'args' => [
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -1838,7 +1838,7 @@ $result_trees{'all_commands_delimiters'} = {
           'cmdname' => 'deftypefn',
           'contents' => [
             {
-              'args' => [
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -2210,7 +2210,7 @@ $result_trees{'all_commands_delimiters'} = {
           'cmdname' => 'deftypevr',
           'contents' => [
             {
-              'args' => [
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -2604,7 +2604,7 @@ $result_trees{'all_commands_delimiters'} = {
           'cmdname' => 'deftp',
           'contents' => [
             {
-              'args' => [
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -3015,7 +3015,7 @@ $result_trees{'all_commands_delimiters'} = {
           'cmdname' => 'defcv',
           'contents' => [
             {
-              'args' => [
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -3409,7 +3409,7 @@ $result_trees{'all_commands_delimiters'} = {
           'cmdname' => 'deftypecv',
           'contents' => [
             {
-              'args' => [
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -3886,7 +3886,7 @@ $result_trees{'all_commands_delimiters'} = {
           'cmdname' => 'defop',
           'contents' => [
             {
-              'args' => [
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -4330,7 +4330,7 @@ $result_trees{'all_commands_delimiters'} = {
           'cmdname' => 'deftypeop',
           'contents' => [
             {
-              'args' => [
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -4804,7 +4804,7 @@ $result_trees{'all_commands_delimiters'} = {
           'cmdname' => 'deftypeop',
           'contents' => [
             {
-              'args' => [
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -5056,7 +5056,7 @@ $result_trees{'all_commands_delimiters'} = {
           'cmdname' => 'deftypeop',
           'contents' => [
             {
-              'args' => [
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -5314,7 +5314,7 @@ $result_trees{'all_commands_delimiters'} = {
           'cmdname' => 'deftypeop',
           'contents' => [
             {
-              'args' => [
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -5572,7 +5572,7 @@ $result_trees{'all_commands_delimiters'} = {
           'cmdname' => 'deftypeop',
           'contents' => [
             {
-              'args' => [
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -5824,7 +5824,7 @@ $result_trees{'all_commands_delimiters'} = {
           'cmdname' => 'deftypeop',
           'contents' => [
             {
-              'args' => [
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -6076,7 +6076,7 @@ $result_trees{'all_commands_delimiters'} = {
           'cmdname' => 'deftypeop',
           'contents' => [
             {
-              'args' => [
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -6334,7 +6334,7 @@ $result_trees{'all_commands_delimiters'} = {
           'cmdname' => 'deftypeop',
           'contents' => [
             {
-              'args' => [
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -6592,7 +6592,7 @@ $result_trees{'all_commands_delimiters'} = {
           'cmdname' => 'deftypeop',
           'contents' => [
             {
-              'args' => [
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -6844,7 +6844,7 @@ $result_trees{'all_commands_delimiters'} = {
           'cmdname' => 'deftypeop',
           'contents' => [
             {
-              'args' => [
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -7096,7 +7096,7 @@ $result_trees{'all_commands_delimiters'} = {
           'cmdname' => 'deftypeop',
           'contents' => [
             {
-              'args' => [
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -7354,7 +7354,7 @@ $result_trees{'all_commands_delimiters'} = {
           'cmdname' => 'deftypeop',
           'contents' => [
             {
-              'args' => [
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -7612,7 +7612,7 @@ $result_trees{'all_commands_delimiters'} = {
           'cmdname' => 'deftypeop',
           'contents' => [
             {
-              'args' => [
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -7864,7 +7864,7 @@ $result_trees{'all_commands_delimiters'} = {
           'cmdname' => 'deftypeop',
           'contents' => [
             {
-              'args' => [
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -8116,7 +8116,7 @@ $result_trees{'all_commands_delimiters'} = {
           'cmdname' => 'deftypeop',
           'contents' => [
             {
-              'args' => [
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -8398,7 +8398,7 @@ $result_trees{'all_commands_delimiters'} = {
           'cmdname' => 'defun',
           'contents' => [
             {
-              'args' => [
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -8573,7 +8573,7 @@ $result_trees{'all_commands_delimiters'} = {
           'cmdname' => 'deffn',
           'contents' => [
             {
-              'args' => [
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -8787,7 +8787,7 @@ $result_trees{'all_commands_delimiters'} = {
           'cmdname' => 'deffn',
           'contents' => [
             {
-              'args' => [
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -9001,7 +9001,7 @@ $result_trees{'all_commands_delimiters'} = {
           'cmdname' => 'defvr',
           'contents' => [
             {
-              'args' => [
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -9215,7 +9215,7 @@ $result_trees{'all_commands_delimiters'} = {
           'cmdname' => 'defvr',
           'contents' => [
             {
-              'args' => [
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -9429,7 +9429,7 @@ $result_trees{'all_commands_delimiters'} = {
           'cmdname' => 'deftypefn',
           'contents' => [
             {
-              'args' => [
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -9673,7 +9673,7 @@ $result_trees{'all_commands_delimiters'} = {
           'cmdname' => 'deftypefn',
           'contents' => [
             {
-              'args' => [
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -9917,7 +9917,7 @@ $result_trees{'all_commands_delimiters'} = {
           'cmdname' => 'deftypevr',
           'contents' => [
             {
-              'args' => [
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -10161,7 +10161,7 @@ $result_trees{'all_commands_delimiters'} = {
           'cmdname' => 'deftypevr',
           'contents' => [
             {
-              'args' => [
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -10405,7 +10405,7 @@ $result_trees{'all_commands_delimiters'} = {
           'cmdname' => 'deftp',
           'contents' => [
             {
-              'args' => [
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -10619,7 +10619,7 @@ $result_trees{'all_commands_delimiters'} = {
           'cmdname' => 'deftp',
           'contents' => [
             {
-              'args' => [
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -10833,7 +10833,7 @@ $result_trees{'all_commands_delimiters'} = {
           'cmdname' => 'defcv',
           'contents' => [
             {
-              'args' => [
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -11077,7 +11077,7 @@ $result_trees{'all_commands_delimiters'} = {
           'cmdname' => 'deftp',
           'contents' => [
             {
-              'args' => [
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -11321,7 +11321,7 @@ $result_trees{'all_commands_delimiters'} = {
           'cmdname' => 'deftypecv',
           'contents' => [
             {
-              'args' => [
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -11678,7 +11678,7 @@ $result_trees{'all_commands_delimiters'} = {
           'cmdname' => 'deftypecv',
           'contents' => [
             {
-              'args' => [
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -12035,7 +12035,7 @@ $result_trees{'all_commands_delimiters'} = {
           'cmdname' => 'defop',
           'contents' => [
             {
-              'args' => [
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -12362,7 +12362,7 @@ $result_trees{'all_commands_delimiters'} = {
           'cmdname' => 'defop',
           'contents' => [
             {
-              'args' => [
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -12689,7 +12689,7 @@ $result_trees{'all_commands_delimiters'} = {
           'cmdname' => 'deftypeop',
           'contents' => [
             {
-              'args' => [
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -13046,7 +13046,7 @@ $result_trees{'all_commands_delimiters'} = {
           'cmdname' => 'deftypeop',
           'contents' => [
             {
-              'args' => [
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -13403,7 +13403,7 @@ $result_trees{'all_commands_delimiters'} = {
           'cmdname' => 'deftypefn',
           'contents' => [
             {
-              'args' => [
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -13667,7 +13667,7 @@ $result_trees{'all_commands_delimiters'} = {
           'cmdname' => 'deftypefn',
           'contents' => [
             {
-              'args' => [
+              'contents' => [
                 {
                   'contents' => [
                     {
diff --git a/tp/t/results/def/all_commands_delimiters_printindex.pl 
b/tp/t/results/def/all_commands_delimiters_printindex.pl
index 82833b106d..cd9fbad5d6 100644
--- a/tp/t/results/def/all_commands_delimiters_printindex.pl
+++ b/tp/t/results/def/all_commands_delimiters_printindex.pl
@@ -69,7 +69,7 @@ $result_trees{'all_commands_delimiters_printindex'} = {
           'cmdname' => 'deffn',
           'contents' => [
             {
-              'args' => [
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -537,7 +537,7 @@ $result_trees{'all_commands_delimiters_printindex'} = {
           'cmdname' => 'defvr',
           'contents' => [
             {
-              'args' => [
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -952,7 +952,7 @@ $result_trees{'all_commands_delimiters_printindex'} = {
           'cmdname' => 'deftypefn',
           'contents' => [
             {
-              'args' => [
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -1197,7 +1197,7 @@ $result_trees{'all_commands_delimiters_printindex'} = {
           'cmdname' => 'deftypefn',
           'contents' => [
             {
-              'args' => [
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -1740,7 +1740,7 @@ $result_trees{'all_commands_delimiters_printindex'} = {
           'cmdname' => 'deftypefn',
           'contents' => [
             {
-              'args' => [
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -1899,7 +1899,7 @@ $result_trees{'all_commands_delimiters_printindex'} = {
           'cmdname' => 'deftypefn',
           'contents' => [
             {
-              'args' => [
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -2272,7 +2272,7 @@ $result_trees{'all_commands_delimiters_printindex'} = {
           'cmdname' => 'deftypevr',
           'contents' => [
             {
-              'args' => [
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -2667,7 +2667,7 @@ $result_trees{'all_commands_delimiters_printindex'} = {
           'cmdname' => 'deftp',
           'contents' => [
             {
-              'args' => [
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -3079,7 +3079,7 @@ $result_trees{'all_commands_delimiters_printindex'} = {
           'cmdname' => 'defcv',
           'contents' => [
             {
-              'args' => [
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -3474,7 +3474,7 @@ $result_trees{'all_commands_delimiters_printindex'} = {
           'cmdname' => 'deftypecv',
           'contents' => [
             {
-              'args' => [
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -3952,7 +3952,7 @@ $result_trees{'all_commands_delimiters_printindex'} = {
           'cmdname' => 'defop',
           'contents' => [
             {
-              'args' => [
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -4397,7 +4397,7 @@ $result_trees{'all_commands_delimiters_printindex'} = {
           'cmdname' => 'deftypeop',
           'contents' => [
             {
-              'args' => [
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -4872,7 +4872,7 @@ $result_trees{'all_commands_delimiters_printindex'} = {
           'cmdname' => 'deftypeop',
           'contents' => [
             {
-              'args' => [
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -5125,7 +5125,7 @@ $result_trees{'all_commands_delimiters_printindex'} = {
           'cmdname' => 'deftypeop',
           'contents' => [
             {
-              'args' => [
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -5384,7 +5384,7 @@ $result_trees{'all_commands_delimiters_printindex'} = {
           'cmdname' => 'deftypeop',
           'contents' => [
             {
-              'args' => [
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -5643,7 +5643,7 @@ $result_trees{'all_commands_delimiters_printindex'} = {
           'cmdname' => 'deftypeop',
           'contents' => [
             {
-              'args' => [
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -5896,7 +5896,7 @@ $result_trees{'all_commands_delimiters_printindex'} = {
           'cmdname' => 'deftypeop',
           'contents' => [
             {
-              'args' => [
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -6149,7 +6149,7 @@ $result_trees{'all_commands_delimiters_printindex'} = {
           'cmdname' => 'deftypeop',
           'contents' => [
             {
-              'args' => [
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -6408,7 +6408,7 @@ $result_trees{'all_commands_delimiters_printindex'} = {
           'cmdname' => 'deftypeop',
           'contents' => [
             {
-              'args' => [
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -6667,7 +6667,7 @@ $result_trees{'all_commands_delimiters_printindex'} = {
           'cmdname' => 'deftypeop',
           'contents' => [
             {
-              'args' => [
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -6920,7 +6920,7 @@ $result_trees{'all_commands_delimiters_printindex'} = {
           'cmdname' => 'deftypeop',
           'contents' => [
             {
-              'args' => [
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -7173,7 +7173,7 @@ $result_trees{'all_commands_delimiters_printindex'} = {
           'cmdname' => 'deftypeop',
           'contents' => [
             {
-              'args' => [
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -7432,7 +7432,7 @@ $result_trees{'all_commands_delimiters_printindex'} = {
           'cmdname' => 'deftypeop',
           'contents' => [
             {
-              'args' => [
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -7691,7 +7691,7 @@ $result_trees{'all_commands_delimiters_printindex'} = {
           'cmdname' => 'deftypeop',
           'contents' => [
             {
-              'args' => [
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -7944,7 +7944,7 @@ $result_trees{'all_commands_delimiters_printindex'} = {
           'cmdname' => 'deftypeop',
           'contents' => [
             {
-              'args' => [
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -8197,7 +8197,7 @@ $result_trees{'all_commands_delimiters_printindex'} = {
           'cmdname' => 'deftypeop',
           'contents' => [
             {
-              'args' => [
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -8480,7 +8480,7 @@ $result_trees{'all_commands_delimiters_printindex'} = {
           'cmdname' => 'defun',
           'contents' => [
             {
-              'args' => [
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -8656,7 +8656,7 @@ $result_trees{'all_commands_delimiters_printindex'} = {
           'cmdname' => 'deffn',
           'contents' => [
             {
-              'args' => [
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -8871,7 +8871,7 @@ $result_trees{'all_commands_delimiters_printindex'} = {
           'cmdname' => 'deffn',
           'contents' => [
             {
-              'args' => [
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -9086,7 +9086,7 @@ $result_trees{'all_commands_delimiters_printindex'} = {
           'cmdname' => 'defvr',
           'contents' => [
             {
-              'args' => [
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -9301,7 +9301,7 @@ $result_trees{'all_commands_delimiters_printindex'} = {
           'cmdname' => 'defvr',
           'contents' => [
             {
-              'args' => [
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -9516,7 +9516,7 @@ $result_trees{'all_commands_delimiters_printindex'} = {
           'cmdname' => 'deftypefn',
           'contents' => [
             {
-              'args' => [
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -9761,7 +9761,7 @@ $result_trees{'all_commands_delimiters_printindex'} = {
           'cmdname' => 'deftypefn',
           'contents' => [
             {
-              'args' => [
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -10006,7 +10006,7 @@ $result_trees{'all_commands_delimiters_printindex'} = {
           'cmdname' => 'deftypevr',
           'contents' => [
             {
-              'args' => [
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -10251,7 +10251,7 @@ $result_trees{'all_commands_delimiters_printindex'} = {
           'cmdname' => 'deftypevr',
           'contents' => [
             {
-              'args' => [
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -10496,7 +10496,7 @@ $result_trees{'all_commands_delimiters_printindex'} = {
           'cmdname' => 'deftp',
           'contents' => [
             {
-              'args' => [
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -10711,7 +10711,7 @@ $result_trees{'all_commands_delimiters_printindex'} = {
           'cmdname' => 'deftp',
           'contents' => [
             {
-              'args' => [
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -10926,7 +10926,7 @@ $result_trees{'all_commands_delimiters_printindex'} = {
           'cmdname' => 'defcv',
           'contents' => [
             {
-              'args' => [
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -11171,7 +11171,7 @@ $result_trees{'all_commands_delimiters_printindex'} = {
           'cmdname' => 'deftp',
           'contents' => [
             {
-              'args' => [
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -11416,7 +11416,7 @@ $result_trees{'all_commands_delimiters_printindex'} = {
           'cmdname' => 'deftypecv',
           'contents' => [
             {
-              'args' => [
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -11774,7 +11774,7 @@ $result_trees{'all_commands_delimiters_printindex'} = {
           'cmdname' => 'deftypecv',
           'contents' => [
             {
-              'args' => [
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -12132,7 +12132,7 @@ $result_trees{'all_commands_delimiters_printindex'} = {
           'cmdname' => 'defop',
           'contents' => [
             {
-              'args' => [
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -12460,7 +12460,7 @@ $result_trees{'all_commands_delimiters_printindex'} = {
           'cmdname' => 'defop',
           'contents' => [
             {
-              'args' => [
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -12788,7 +12788,7 @@ $result_trees{'all_commands_delimiters_printindex'} = {
           'cmdname' => 'deftypeop',
           'contents' => [
             {
-              'args' => [
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -13146,7 +13146,7 @@ $result_trees{'all_commands_delimiters_printindex'} = {
           'cmdname' => 'deftypeop',
           'contents' => [
             {
-              'args' => [
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -13504,7 +13504,7 @@ $result_trees{'all_commands_delimiters_printindex'} = {
           'cmdname' => 'deftypefn',
           'contents' => [
             {
-              'args' => [
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -13769,7 +13769,7 @@ $result_trees{'all_commands_delimiters_printindex'} = {
           'cmdname' => 'deftypefn',
           'contents' => [
             {
-              'args' => [
+              'contents' => [
                 {
                   'contents' => [
                     {
diff --git a/tp/t/results/def/all_commands_printindex.pl 
b/tp/t/results/def/all_commands_printindex.pl
index 100f903eb6..15e90dcb97 100644
--- a/tp/t/results/def/all_commands_printindex.pl
+++ b/tp/t/results/def/all_commands_printindex.pl
@@ -69,7 +69,7 @@ $result_trees{'all_commands_printindex'} = {
           'cmdname' => 'defvr',
           'contents' => [
             {
-              'args' => [
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -202,7 +202,7 @@ $result_trees{'all_commands_printindex'} = {
           'cmdname' => 'deffn',
           'contents' => [
             {
-              'args' => [
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -352,7 +352,7 @@ $result_trees{'all_commands_printindex'} = {
           'cmdname' => 'deffn',
           'contents' => [
             {
-              'args' => [
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -485,7 +485,7 @@ $result_trees{'all_commands_printindex'} = {
           'cmdname' => 'deftypefn',
           'contents' => [
             {
-              'args' => [
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -652,7 +652,7 @@ $result_trees{'all_commands_printindex'} = {
           'cmdname' => 'deftypefn',
           'contents' => [
             {
-              'args' => [
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -802,7 +802,7 @@ $result_trees{'all_commands_printindex'} = {
           'cmdname' => 'deftypeop',
           'contents' => [
             {
-              'args' => [
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -1039,7 +1039,7 @@ $result_trees{'all_commands_printindex'} = {
           'cmdname' => 'deftypeop',
           'contents' => [
             {
-              'args' => [
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -1259,7 +1259,7 @@ $result_trees{'all_commands_printindex'} = {
           'cmdname' => 'deftypevr',
           'contents' => [
             {
-              'args' => [
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -1409,7 +1409,7 @@ $result_trees{'all_commands_printindex'} = {
           'cmdname' => 'defcv',
           'contents' => [
             {
-              'args' => [
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -1559,7 +1559,7 @@ $result_trees{'all_commands_printindex'} = {
           'cmdname' => 'defcv',
           'contents' => [
             {
-              'args' => [
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -1726,7 +1726,7 @@ $result_trees{'all_commands_printindex'} = {
           'cmdname' => 'deftypecv',
           'contents' => [
             {
-              'args' => [
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -1946,7 +1946,7 @@ $result_trees{'all_commands_printindex'} = {
           'cmdname' => 'deftypecv',
           'contents' => [
             {
-              'args' => [
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -2183,7 +2183,7 @@ $result_trees{'all_commands_printindex'} = {
           'cmdname' => 'defop',
           'contents' => [
             {
-              'args' => [
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -2403,7 +2403,7 @@ $result_trees{'all_commands_printindex'} = {
           'cmdname' => 'defop',
           'contents' => [
             {
-              'args' => [
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -2606,7 +2606,7 @@ $result_trees{'all_commands_printindex'} = {
           'cmdname' => 'deftp',
           'contents' => [
             {
-              'args' => [
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -2756,7 +2756,7 @@ $result_trees{'all_commands_printindex'} = {
           'cmdname' => 'defun',
           'contents' => [
             {
-              'args' => [
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -2912,7 +2912,7 @@ $result_trees{'all_commands_printindex'} = {
           'cmdname' => 'defmac',
           'contents' => [
             {
-              'args' => [
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -3068,7 +3068,7 @@ $result_trees{'all_commands_printindex'} = {
           'cmdname' => 'defspec',
           'contents' => [
             {
-              'args' => [
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -3224,7 +3224,7 @@ $result_trees{'all_commands_printindex'} = {
           'cmdname' => 'defvar',
           'contents' => [
             {
-              'args' => [
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -3363,7 +3363,7 @@ $result_trees{'all_commands_printindex'} = {
           'cmdname' => 'defvar',
           'contents' => [
             {
-              'args' => [
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -3536,7 +3536,7 @@ $result_trees{'all_commands_printindex'} = {
           'cmdname' => 'defopt',
           'contents' => [
             {
-              'args' => [
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -3675,7 +3675,7 @@ $result_trees{'all_commands_printindex'} = {
           'cmdname' => 'deftypefun',
           'contents' => [
             {
-              'args' => [
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -3848,7 +3848,7 @@ $result_trees{'all_commands_printindex'} = {
           'cmdname' => 'deftypevar',
           'contents' => [
             {
-              'args' => [
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -4004,7 +4004,7 @@ $result_trees{'all_commands_printindex'} = {
           'cmdname' => 'defivar',
           'contents' => [
             {
-              'args' => [
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -4213,7 +4213,7 @@ $result_trees{'all_commands_printindex'} = {
           'cmdname' => 'deftypeivar',
           'contents' => [
             {
-              'args' => [
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -4439,7 +4439,7 @@ $result_trees{'all_commands_printindex'} = {
           'cmdname' => 'defmethod',
           'contents' => [
             {
-              'args' => [
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -4665,7 +4665,7 @@ $result_trees{'all_commands_printindex'} = {
           'cmdname' => 'deftypemethod',
           'contents' => [
             {
-              'args' => [
+              'contents' => [
                 {
                   'contents' => [
                     {
diff --git a/tp/t/results/def/all_empty_def.pl 
b/tp/t/results/def/all_empty_def.pl
index 83faf536f6..4dc6895b64 100644
--- a/tp/t/results/def/all_empty_def.pl
+++ b/tp/t/results/def/all_empty_def.pl
@@ -13,7 +13,7 @@ $result_trees{'all_empty_def'} = {
           'cmdname' => 'deffn',
           'contents' => [
             {
-              'args' => [
+              'contents' => [
                 {
                   'info' => {
                     'spaces_after_argument' => {
@@ -77,7 +77,7 @@ $result_trees{'all_empty_def'} = {
           'cmdname' => 'defvr',
           'contents' => [
             {
-              'args' => [
+              'contents' => [
                 {
                   'info' => {
                     'spaces_after_argument' => {
@@ -141,7 +141,7 @@ $result_trees{'all_empty_def'} = {
           'cmdname' => 'deftypefn',
           'contents' => [
             {
-              'args' => [
+              'contents' => [
                 {
                   'info' => {
                     'spaces_after_argument' => {
@@ -205,7 +205,7 @@ $result_trees{'all_empty_def'} = {
           'cmdname' => 'deftypeop',
           'contents' => [
             {
-              'args' => [
+              'contents' => [
                 {
                   'info' => {
                     'spaces_after_argument' => {
@@ -269,7 +269,7 @@ $result_trees{'all_empty_def'} = {
           'cmdname' => 'deftypevr',
           'contents' => [
             {
-              'args' => [
+              'contents' => [
                 {
                   'info' => {
                     'spaces_after_argument' => {
@@ -333,7 +333,7 @@ $result_trees{'all_empty_def'} = {
           'cmdname' => 'defcv',
           'contents' => [
             {
-              'args' => [
+              'contents' => [
                 {
                   'info' => {
                     'spaces_after_argument' => {
@@ -397,7 +397,7 @@ $result_trees{'all_empty_def'} = {
           'cmdname' => 'deftypecv',
           'contents' => [
             {
-              'args' => [
+              'contents' => [
                 {
                   'info' => {
                     'spaces_after_argument' => {
@@ -461,7 +461,7 @@ $result_trees{'all_empty_def'} = {
           'cmdname' => 'defop',
           'contents' => [
             {
-              'args' => [
+              'contents' => [
                 {
                   'info' => {
                     'spaces_after_argument' => {
@@ -525,7 +525,7 @@ $result_trees{'all_empty_def'} = {
           'cmdname' => 'deftp',
           'contents' => [
             {
-              'args' => [
+              'contents' => [
                 {
                   'info' => {
                     'spaces_after_argument' => {
diff --git a/tp/t/results/def/ampchar.pl b/tp/t/results/def/ampchar.pl
index c9ed0bd4b1..afd7d16c77 100644
--- a/tp/t/results/def/ampchar.pl
+++ b/tp/t/results/def/ampchar.pl
@@ -13,7 +13,7 @@ $result_trees{'ampchar'} = {
           'cmdname' => 'defop',
           'contents' => [
             {
-              'args' => [
+              'contents' => [
                 {
                   'contents' => [
                     {
diff --git a/tp/t/results/def/bracketed_arg_no_space.pl 
b/tp/t/results/def/bracketed_arg_no_space.pl
index eafa99106e..65427cba9f 100644
--- a/tp/t/results/def/bracketed_arg_no_space.pl
+++ b/tp/t/results/def/bracketed_arg_no_space.pl
@@ -13,7 +13,7 @@ $result_trees{'bracketed_arg_no_space'} = {
           'cmdname' => 'deffn',
           'contents' => [
             {
-              'args' => [
+              'contents' => [
                 {
                   'contents' => [
                     {
diff --git a/tp/t/results/def/code_in_def.pl b/tp/t/results/def/code_in_def.pl
index abf89e900d..3a2ce8a5f6 100644
--- a/tp/t/results/def/code_in_def.pl
+++ b/tp/t/results/def/code_in_def.pl
@@ -13,7 +13,7 @@ $result_trees{'code_in_def'} = {
           'cmdname' => 'deftypefn',
           'contents' => [
             {
-              'args' => [
+              'contents' => [
                 {
                   'contents' => [
                     {
diff --git a/tp/t/results/def/comment_index_before_defline.pl 
b/tp/t/results/def/comment_index_before_defline.pl
index dcd1d46d6e..7908728e6b 100644
--- a/tp/t/results/def/comment_index_before_defline.pl
+++ b/tp/t/results/def/comment_index_before_defline.pl
@@ -95,7 +95,8 @@ $result_trees{'comment_index_before_defline'} = {
               'type' => 'before_defline'
             },
             {
-              'args' => [
+              'cmdname' => 'defline',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -172,7 +173,6 @@ $result_trees{'comment_index_before_defline'} = {
                   'type' => 'line_arg'
                 }
               ],
-              'cmdname' => 'defline',
               'extra' => {
                 'def_command' => 'defline',
                 'def_index_element' => {
diff --git a/tp/t/results/def/def_defx_mismatch.pl 
b/tp/t/results/def/def_defx_mismatch.pl
index 2f5f10b579..3e871ce144 100644
--- a/tp/t/results/def/def_defx_mismatch.pl
+++ b/tp/t/results/def/def_defx_mismatch.pl
@@ -13,7 +13,7 @@ $result_trees{'def_defx_mismatch'} = {
           'cmdname' => 'defun',
           'contents' => [
             {
-              'args' => [
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -164,7 +164,8 @@ $result_trees{'def_defx_mismatch'} = {
               'type' => 'def_line'
             },
             {
-              'args' => [
+              'cmdname' => 'deffnx',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -281,7 +282,6 @@ $result_trees{'def_defx_mismatch'} = {
                   'type' => 'line_arg'
                 }
               ],
-              'cmdname' => 'deffnx',
               'extra' => {
                 'def_command' => 'deffn',
                 'def_index_element' => {
diff --git a/tp/t/results/def/def_groupings_args.pl 
b/tp/t/results/def/def_groupings_args.pl
index e4be9aacca..6a3e478450 100644
--- a/tp/t/results/def/def_groupings_args.pl
+++ b/tp/t/results/def/def_groupings_args.pl
@@ -13,7 +13,7 @@ $result_trees{'def_groupings_args'} = {
           'cmdname' => 'deffn',
           'contents' => [
             {
-              'args' => [
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -166,7 +166,7 @@ $result_trees{'def_groupings_args'} = {
           'cmdname' => 'deffn',
           'contents' => [
             {
-              'args' => [
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -266,7 +266,7 @@ $result_trees{'def_groupings_args'} = {
           'cmdname' => 'deffn',
           'contents' => [
             {
-              'args' => [
+              'contents' => [
                 {
                   'contents' => [
                     {
diff --git a/tp/t/results/def/defline_no_params.pl 
b/tp/t/results/def/defline_no_params.pl
index 587261f16c..7edc0503fc 100644
--- a/tp/t/results/def/defline_no_params.pl
+++ b/tp/t/results/def/defline_no_params.pl
@@ -30,7 +30,8 @@ $result_trees{'defline_no_params'} = {
               'type' => 'argument'
             },
             {
-              'args' => [
+              'cmdname' => 'defline',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -73,7 +74,6 @@ $result_trees{'defline_no_params'} = {
                   'type' => 'line_arg'
                 }
               ],
-              'cmdname' => 'defline',
               'extra' => {
                 'def_command' => 'defline',
                 'def_index_element' => {
diff --git a/tp/t/results/def/deftypeline.pl b/tp/t/results/def/deftypeline.pl
index 968030aee5..f828687ef8 100644
--- a/tp/t/results/def/deftypeline.pl
+++ b/tp/t/results/def/deftypeline.pl
@@ -30,7 +30,8 @@ $result_trees{'deftypeline'} = {
               'type' => 'argument'
             },
             {
-              'args' => [
+              'cmdname' => 'deftypeline',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -199,7 +200,6 @@ $result_trees{'deftypeline'} = {
                   'type' => 'line_arg'
                 }
               ],
-              'cmdname' => 'deftypeline',
               'extra' => {
                 'def_command' => 'deftypeline',
                 'def_index_element' => {
diff --git a/tp/t/results/def/defx_after_comment.pl 
b/tp/t/results/def/defx_after_comment.pl
index 2fd87d14ef..6d235166fb 100644
--- a/tp/t/results/def/defx_after_comment.pl
+++ b/tp/t/results/def/defx_after_comment.pl
@@ -13,7 +13,7 @@ $result_trees{'defx_after_comment'} = {
           'cmdname' => 'deffn',
           'contents' => [
             {
-              'args' => [
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -155,7 +155,8 @@ $result_trees{'defx_after_comment'} = {
               'type' => 'inter_def_item'
             },
             {
-              'args' => [
+              'cmdname' => 'deffnx',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -218,7 +219,6 @@ $result_trees{'defx_after_comment'} = {
                   'type' => 'line_arg'
                 }
               ],
-              'cmdname' => 'deffnx',
               'extra' => {
                 'def_command' => 'deffn',
                 'def_index_element' => {
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 48be274a87..5028b6eb59 100644
--- a/tp/t/results/def/defx_after_comment_in_example.pl
+++ b/tp/t/results/def/defx_after_comment_in_example.pl
@@ -30,7 +30,7 @@ $result_trees{'defx_after_comment_in_example'} = {
               'cmdname' => 'deffn',
               'contents' => [
                 {
-                  'args' => [
+                  'contents' => [
                     {
                       'contents' => [
                         {
@@ -177,7 +177,8 @@ $result_trees{'defx_after_comment_in_example'} = {
                   'type' => 'inter_def_item'
                 },
                 {
-                  'args' => [
+                  'cmdname' => 'deffnx',
+                  'contents' => [
                     {
                       'contents' => [
                         {
@@ -240,7 +241,6 @@ $result_trees{'defx_after_comment_in_example'} = {
                       'type' => 'line_arg'
                     }
                   ],
-                  'cmdname' => 'deffnx',
                   'extra' => {
                     'def_command' => 'deffn',
                     'def_index_element' => {
diff --git a/tp/t/results/def/defx_after_empty_line.pl 
b/tp/t/results/def/defx_after_empty_line.pl
index 162fb063c1..24c78b694a 100644
--- a/tp/t/results/def/defx_after_empty_line.pl
+++ b/tp/t/results/def/defx_after_empty_line.pl
@@ -13,7 +13,7 @@ $result_trees{'defx_after_empty_line'} = {
           'cmdname' => 'deffn',
           'contents' => [
             {
-              'args' => [
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -150,7 +150,8 @@ $result_trees{'defx_after_empty_line'} = {
               'type' => 'inter_def_item'
             },
             {
-              'args' => [
+              'cmdname' => 'deffnx',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -213,7 +214,6 @@ $result_trees{'defx_after_empty_line'} = {
                   'type' => 'line_arg'
                 }
               ],
-              'cmdname' => 'deffnx',
               'extra' => {
                 'def_command' => 'deffn',
                 'def_index_element' => {
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 8b60688f91..ff7a767798 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
@@ -30,7 +30,7 @@ $result_trees{'defx_after_empty_line_in_example'} = {
               'cmdname' => 'deffn',
               'contents' => [
                 {
-                  'args' => [
+                  'contents' => [
                     {
                       'contents' => [
                         {
@@ -197,7 +197,8 @@ $result_trees{'defx_after_empty_line_in_example'} = {
                   'type' => 'inter_def_item'
                 },
                 {
-                  'args' => [
+                  'cmdname' => 'deffnx',
+                  'contents' => [
                     {
                       'contents' => [
                         {
@@ -260,7 +261,6 @@ $result_trees{'defx_after_empty_line_in_example'} = {
                       'type' => 'line_arg'
                     }
                   ],
-                  'cmdname' => 'deffnx',
                   'extra' => {
                     'def_command' => 'deffn',
                     'def_index_element' => {
diff --git a/tp/t/results/def/defx_after_paragraph_end.pl 
b/tp/t/results/def/defx_after_paragraph_end.pl
index 62e1e2fea1..7c3e9e739e 100644
--- a/tp/t/results/def/defx_after_paragraph_end.pl
+++ b/tp/t/results/def/defx_after_paragraph_end.pl
@@ -13,7 +13,7 @@ $result_trees{'defx_after_paragraph_end'} = {
           'cmdname' => 'deffn',
           'contents' => [
             {
-              'args' => [
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -159,7 +159,8 @@ $result_trees{'defx_after_paragraph_end'} = {
               'type' => 'inter_def_item'
             },
             {
-              'args' => [
+              'cmdname' => 'deffnx',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -222,7 +223,6 @@ $result_trees{'defx_after_paragraph_end'} = {
                   'type' => 'line_arg'
                 }
               ],
-              'cmdname' => 'deffnx',
               'extra' => {
                 'def_command' => 'deffn',
                 'def_index_element' => {
diff --git a/tp/t/results/def/defx_after_preformatted_with_text.pl 
b/tp/t/results/def/defx_after_preformatted_with_text.pl
index e28388de9e..903c0478d1 100644
--- a/tp/t/results/def/defx_after_preformatted_with_text.pl
+++ b/tp/t/results/def/defx_after_preformatted_with_text.pl
@@ -30,7 +30,7 @@ $result_trees{'defx_after_preformatted_with_text'} = {
               'cmdname' => 'deffn',
               'contents' => [
                 {
-                  'args' => [
+                  'contents' => [
                     {
                       'contents' => [
                         {
@@ -176,7 +176,8 @@ $result_trees{'defx_after_preformatted_with_text'} = {
                   'type' => 'inter_def_item'
                 },
                 {
-                  'args' => [
+                  'cmdname' => 'deffnx',
+                  'contents' => [
                     {
                       'contents' => [
                         {
@@ -239,7 +240,6 @@ $result_trees{'defx_after_preformatted_with_text'} = {
                       'type' => 'line_arg'
                     }
                   ],
-                  'cmdname' => 'deffnx',
                   'extra' => {
                     'def_command' => 'deffn',
                     'def_index_element' => {
diff --git a/tp/t/results/def/defx_after_text.pl 
b/tp/t/results/def/defx_after_text.pl
index bed4aba61d..8d9caef0d6 100644
--- a/tp/t/results/def/defx_after_text.pl
+++ b/tp/t/results/def/defx_after_text.pl
@@ -13,7 +13,7 @@ $result_trees{'defx_after_text'} = {
           'cmdname' => 'deffn',
           'contents' => [
             {
-              'args' => [
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -154,7 +154,8 @@ $result_trees{'defx_after_text'} = {
               'type' => 'inter_def_item'
             },
             {
-              'args' => [
+              'cmdname' => 'deffnx',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -217,7 +218,6 @@ $result_trees{'defx_after_text'} = {
                   'type' => 'line_arg'
                 }
               ],
-              'cmdname' => 'deffnx',
               'extra' => {
                 'def_command' => 'deffn',
                 'def_index_element' => {
diff --git a/tp/t/results/def/defx_in_example.pl 
b/tp/t/results/def/defx_in_example.pl
index 7da0be0a86..655fe4151a 100644
--- a/tp/t/results/def/defx_in_example.pl
+++ b/tp/t/results/def/defx_in_example.pl
@@ -30,7 +30,7 @@ $result_trees{'defx_in_example'} = {
               'cmdname' => 'deffn',
               'contents' => [
                 {
-                  'args' => [
+                  'contents' => [
                     {
                       'contents' => [
                         {
@@ -157,7 +157,8 @@ $result_trees{'defx_in_example'} = {
                   'type' => 'def_line'
                 },
                 {
-                  'args' => [
+                  'cmdname' => 'deffnx',
+                  'contents' => [
                     {
                       'contents' => [
                         {
@@ -220,7 +221,6 @@ $result_trees{'defx_in_example'} = {
                       'type' => 'line_arg'
                     }
                   ],
-                  'cmdname' => 'deffnx',
                   'extra' => {
                     'def_command' => 'deffn',
                     'def_index_element' => {
diff --git a/tp/t/results/def/double_command.pl 
b/tp/t/results/def/double_command.pl
index f77f477992..09a03f59ab 100644
--- a/tp/t/results/def/double_command.pl
+++ b/tp/t/results/def/double_command.pl
@@ -13,7 +13,7 @@ $result_trees{'double_command'} = {
           'cmdname' => 'deffn',
           'contents' => [
             {
-              'args' => [
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -143,7 +143,8 @@ $result_trees{'double_command'} = {
                         {
                           'contents' => [
                             {
-                              'args' => [
+                              'cmdname' => 'deffnx',
+                              'contents' => [
                                 {
                                   'contents' => [
                                     {
@@ -295,7 +296,6 @@ $result_trees{'double_command'} = {
                                   'type' => 'line_arg'
                                 }
                               ],
-                              'cmdname' => 'deffnx',
                               'extra' => {
                                 'def_command' => 'deffn',
                                 'def_index_element' => {
@@ -426,7 +426,7 @@ $result_trees{'double_command'} = {
           'cmdname' => 'deffn',
           'contents' => [
             {
-              'args' => [
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -488,7 +488,7 @@ $result_trees{'double_command'} = {
                               'cmdname' => 'defvr',
                               'contents' => [
                                 {
-                                  'args' => [
+                                  'contents' => [
                                     {
                                       'contents' => [
                                         {
diff --git a/tp/t/results/def/empty_def_arguments.pl 
b/tp/t/results/def/empty_def_arguments.pl
index acdf7db733..5c04a47085 100644
--- a/tp/t/results/def/empty_def_arguments.pl
+++ b/tp/t/results/def/empty_def_arguments.pl
@@ -13,7 +13,7 @@ $result_trees{'empty_def_arguments'} = {
           'cmdname' => 'deffn',
           'contents' => [
             {
-              'args' => [
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -140,7 +140,8 @@ $result_trees{'empty_def_arguments'} = {
               'type' => 'def_line'
             },
             {
-              'args' => [
+              'cmdname' => 'deffnx',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -198,7 +199,6 @@ $result_trees{'empty_def_arguments'} = {
                   'type' => 'line_arg'
                 }
               ],
-              'cmdname' => 'deffnx',
               'extra' => {
                 'def_command' => 'deffn',
                 'original_def_cmdname' => 'deffnx'
@@ -213,7 +213,8 @@ $result_trees{'empty_def_arguments'} = {
               }
             },
             {
-              'args' => [
+              'cmdname' => 'deffnx',
+              'contents' => [
                 {
                   'info' => {
                     'spaces_after_argument' => {
@@ -224,7 +225,6 @@ $result_trees{'empty_def_arguments'} = {
                   'type' => 'line_arg'
                 }
               ],
-              'cmdname' => 'deffnx',
               'extra' => {
                 'def_command' => 'deffn',
                 'original_def_cmdname' => 'deffnx'
@@ -234,7 +234,8 @@ $result_trees{'empty_def_arguments'} = {
               }
             },
             {
-              'args' => [
+              'cmdname' => 'deffnx',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -260,7 +261,6 @@ $result_trees{'empty_def_arguments'} = {
                   'type' => 'line_arg'
                 }
               ],
-              'cmdname' => 'deffnx',
               'extra' => {
                 'def_command' => 'deffn',
                 'original_def_cmdname' => 'deffnx'
@@ -275,7 +275,8 @@ $result_trees{'empty_def_arguments'} = {
               }
             },
             {
-              'args' => [
+              'cmdname' => 'deffnx',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -314,7 +315,6 @@ $result_trees{'empty_def_arguments'} = {
                   'type' => 'line_arg'
                 }
               ],
-              'cmdname' => 'deffnx',
               'extra' => {
                 'def_command' => 'deffn',
                 'original_def_cmdname' => 'deffnx'
@@ -329,7 +329,8 @@ $result_trees{'empty_def_arguments'} = {
               }
             },
             {
-              'args' => [
+              'cmdname' => 'deffnx',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -353,7 +354,6 @@ $result_trees{'empty_def_arguments'} = {
                   'type' => 'line_arg'
                 }
               ],
-              'cmdname' => 'deffnx',
               'extra' => {
                 'def_command' => 'deffn',
                 'original_def_cmdname' => 'deffnx'
@@ -363,7 +363,8 @@ $result_trees{'empty_def_arguments'} = {
               }
             },
             {
-              'args' => [
+              'cmdname' => 'deffnx',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -412,7 +413,6 @@ $result_trees{'empty_def_arguments'} = {
                   'type' => 'line_arg'
                 }
               ],
-              'cmdname' => 'deffnx',
               'extra' => {
                 'def_command' => 'deffn',
                 'original_def_cmdname' => 'deffnx'
@@ -422,7 +422,8 @@ $result_trees{'empty_def_arguments'} = {
               }
             },
             {
-              'args' => [
+              'cmdname' => 'deffnx',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -451,7 +452,6 @@ $result_trees{'empty_def_arguments'} = {
                   'type' => 'line_arg'
                 }
               ],
-              'cmdname' => 'deffnx',
               'extra' => {
                 'def_command' => 'deffn',
                 'original_def_cmdname' => 'deffnx'
@@ -461,7 +461,8 @@ $result_trees{'empty_def_arguments'} = {
               }
             },
             {
-              'args' => [
+              'cmdname' => 'deffnx',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -500,7 +501,6 @@ $result_trees{'empty_def_arguments'} = {
                   'type' => 'line_arg'
                 }
               ],
-              'cmdname' => 'deffnx',
               'extra' => {
                 'def_command' => 'deffn',
                 'original_def_cmdname' => 'deffnx'
diff --git a/tp/t/results/def/empty_def_command.pl 
b/tp/t/results/def/empty_def_command.pl
index e10abf094a..3fc81fed6b 100644
--- a/tp/t/results/def/empty_def_command.pl
+++ b/tp/t/results/def/empty_def_command.pl
@@ -13,7 +13,7 @@ $result_trees{'empty_def_command'} = {
           'cmdname' => 'deffn',
           'contents' => [
             {
-              'args' => [
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -131,7 +131,7 @@ $result_trees{'empty_def_command'} = {
           'cmdname' => 'deffn',
           'contents' => [
             {
-              'args' => [
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -235,7 +235,8 @@ $result_trees{'empty_def_command'} = {
               'type' => 'def_line'
             },
             {
-              'args' => [
+              'cmdname' => 'deffnx',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -278,7 +279,6 @@ $result_trees{'empty_def_command'} = {
                   'type' => 'line_arg'
                 }
               ],
-              'cmdname' => 'deffnx',
               'extra' => {
                 'def_command' => 'deffn',
                 'def_index_element' => {
diff --git a/tp/t/results/def/empty_deftype.pl 
b/tp/t/results/def/empty_deftype.pl
index 2cc4ec257e..04617ceeae 100644
--- a/tp/t/results/def/empty_deftype.pl
+++ b/tp/t/results/def/empty_deftype.pl
@@ -13,7 +13,7 @@ $result_trees{'empty_deftype'} = {
           'cmdname' => 'deftypefun',
           'contents' => [
             {
-              'args' => [
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -225,7 +225,7 @@ $result_trees{'empty_deftype'} = {
           'cmdname' => 'defun',
           'contents' => [
             {
-              'args' => [
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -422,7 +422,7 @@ $result_trees{'empty_deftype'} = {
           'cmdname' => 'deftypemethod',
           'contents' => [
             {
-              'args' => [
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -704,7 +704,7 @@ $result_trees{'empty_deftype'} = {
           'cmdname' => 'defmethod',
           'contents' => [
             {
-              'args' => [
+              'contents' => [
                 {
                   'contents' => [
                     {
diff --git a/tp/t/results/def/empty_deftypeop_name.pl 
b/tp/t/results/def/empty_deftypeop_name.pl
index 6ad9a6378d..1d57071279 100644
--- a/tp/t/results/def/empty_deftypeop_name.pl
+++ b/tp/t/results/def/empty_deftypeop_name.pl
@@ -13,7 +13,7 @@ $result_trees{'empty_deftypeop_name'} = {
           'cmdname' => 'deftypeop',
           'contents' => [
             {
-              'args' => [
+              'contents' => [
                 {
                   'contents' => [
                     {
diff --git a/tp/t/results/def/empty_main_def_arguments.pl 
b/tp/t/results/def/empty_main_def_arguments.pl
index 74b7767378..7017cea120 100644
--- a/tp/t/results/def/empty_main_def_arguments.pl
+++ b/tp/t/results/def/empty_main_def_arguments.pl
@@ -13,7 +13,7 @@ $result_trees{'empty_main_def_arguments'} = {
           'cmdname' => 'deffn',
           'contents' => [
             {
-              'args' => [
+              'contents' => [
                 {
                   'contents' => [
                     {
diff --git a/tp/t/results/def/end_of_line_end_file.pl 
b/tp/t/results/def/end_of_line_end_file.pl
index 46d74ae0a9..5db1b0117a 100644
--- a/tp/t/results/def/end_of_line_end_file.pl
+++ b/tp/t/results/def/end_of_line_end_file.pl
@@ -13,7 +13,7 @@ $result_trees{'end_of_line_end_file'} = {
           'cmdname' => 'deffn',
           'contents' => [
             {
-              'args' => [
+              'contents' => [
                 {
                   'contents' => [
                     {
diff --git a/tp/t/results/def/end_of_line_protect_at_end.pl 
b/tp/t/results/def/end_of_line_protect_at_end.pl
index 7165d594b2..65ec769212 100644
--- a/tp/t/results/def/end_of_line_protect_at_end.pl
+++ b/tp/t/results/def/end_of_line_protect_at_end.pl
@@ -18,7 +18,7 @@ $result_trees{'end_of_line_protect_at_end'} = {
           'cmdname' => 'deffn',
           'contents' => [
             {
-              'args' => [
+              'contents' => [
                 {
                   'contents' => [
                     {
diff --git a/tp/t/results/def/end_of_lines_protected.pl 
b/tp/t/results/def/end_of_lines_protected.pl
index d067229c2d..018c02c4ab 100644
--- a/tp/t/results/def/end_of_lines_protected.pl
+++ b/tp/t/results/def/end_of_lines_protected.pl
@@ -13,7 +13,7 @@ $result_trees{'end_of_lines_protected'} = {
           'cmdname' => 'deffn',
           'contents' => [
             {
-              'args' => [
+              'contents' => [
                 {
                   'contents' => [
                     {
diff --git a/tp/t/results/def/end_of_lines_protected_in_footnote.pl 
b/tp/t/results/def/end_of_lines_protected_in_footnote.pl
index 6aa68f59f0..d18c0a2d6b 100644
--- a/tp/t/results/def/end_of_lines_protected_in_footnote.pl
+++ b/tp/t/results/def/end_of_lines_protected_in_footnote.pl
@@ -20,7 +20,7 @@ $result_trees{'end_of_lines_protected_in_footnote'} = {
                       'cmdname' => 'deffn',
                       'contents' => [
                         {
-                          'args' => [
+                          'contents' => [
                             {
                               'contents' => [
                                 {
diff --git a/tp/t/results/def/end_of_lines_protected_non_ascii.pl 
b/tp/t/results/def/end_of_lines_protected_non_ascii.pl
index 299769c448..d0af892411 100644
--- a/tp/t/results/def/end_of_lines_protected_non_ascii.pl
+++ b/tp/t/results/def/end_of_lines_protected_non_ascii.pl
@@ -26,7 +26,7 @@ $result_trees{'end_of_lines_protected_non_ascii'} = {
           'cmdname' => 'deffn',
           'contents' => [
             {
-              'args' => [
+              'contents' => [
                 {
                   'contents' => [
                     {
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 abc0f72c6f..d23c97ebe7 100644
--- a/tp/t/results/def/inter_item_commands_in_def.pl
+++ b/tp/t/results/def/inter_item_commands_in_def.pl
@@ -13,7 +13,7 @@ $result_trees{'inter_item_commands_in_def'} = {
           'cmdname' => 'deffn',
           'contents' => [
             {
-              'args' => [
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -160,7 +160,8 @@ $result_trees{'inter_item_commands_in_def'} = {
               'type' => 'inter_def_item'
             },
             {
-              'args' => [
+              'cmdname' => 'deffnx',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -226,7 +227,6 @@ $result_trees{'inter_item_commands_in_def'} = {
                   'type' => 'line_arg'
                 }
               ],
-              'cmdname' => 'deffnx',
               'extra' => {
                 'def_command' => 'deffn',
                 'def_index_element' => {
@@ -303,7 +303,8 @@ $result_trees{'inter_item_commands_in_def'} = {
               'type' => 'inter_def_item'
             },
             {
-              'args' => [
+              'cmdname' => 'deffnx',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -395,7 +396,6 @@ $result_trees{'inter_item_commands_in_def'} = {
                   'type' => 'line_arg'
                 }
               ],
-              'cmdname' => 'deffnx',
               'extra' => {
                 'def_command' => 'deffn',
                 'def_index_element' => {
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 ba7bc4ea2d..a38b40ced7 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
@@ -30,7 +30,7 @@ $result_trees{'inter_item_commands_in_def_in_example'} = {
               'cmdname' => 'deffn',
               'contents' => [
                 {
-                  'args' => [
+                  'contents' => [
                     {
                       'contents' => [
                         {
@@ -182,7 +182,8 @@ $result_trees{'inter_item_commands_in_def_in_example'} = {
                   'type' => 'inter_def_item'
                 },
                 {
-                  'args' => [
+                  'cmdname' => 'deffnx',
+                  'contents' => [
                     {
                       'contents' => [
                         {
@@ -248,7 +249,6 @@ $result_trees{'inter_item_commands_in_def_in_example'} = {
                       'type' => 'line_arg'
                     }
                   ],
-                  'cmdname' => 'deffnx',
                   'extra' => {
                     'def_command' => 'deffn',
                     'def_index_element' => {
@@ -330,7 +330,8 @@ $result_trees{'inter_item_commands_in_def_in_example'} = {
                   'type' => 'inter_def_item'
                 },
                 {
-                  'args' => [
+                  'cmdname' => 'deffnx',
+                  'contents' => [
                     {
                       'contents' => [
                         {
@@ -422,7 +423,6 @@ $result_trees{'inter_item_commands_in_def_in_example'} = {
                       'type' => 'line_arg'
                     }
                   ],
-                  'cmdname' => 'deffnx',
                   'extra' => {
                     'def_command' => 'deffn',
                     'def_index_element' => {
diff --git a/tp/t/results/def/leading_space_in_def_arg.pl 
b/tp/t/results/def/leading_space_in_def_arg.pl
index f7a0c512a8..e620e4ede7 100644
--- a/tp/t/results/def/leading_space_in_def_arg.pl
+++ b/tp/t/results/def/leading_space_in_def_arg.pl
@@ -13,7 +13,7 @@ $result_trees{'leading_space_in_def_arg'} = {
           'cmdname' => 'deffn',
           'contents' => [
             {
-              'args' => [
+              'contents' => [
                 {
                   'contents' => [
                     {
diff --git a/tp/t/results/def/multiple_defline.pl 
b/tp/t/results/def/multiple_defline.pl
index 63958c8bcc..b433ab8819 100644
--- a/tp/t/results/def/multiple_defline.pl
+++ b/tp/t/results/def/multiple_defline.pl
@@ -30,7 +30,8 @@ $result_trees{'multiple_defline'} = {
               'type' => 'argument'
             },
             {
-              'args' => [
+              'cmdname' => 'defline',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -98,7 +99,6 @@ $result_trees{'multiple_defline'} = {
                   'type' => 'line_arg'
                 }
               ],
-              'cmdname' => 'defline',
               'extra' => {
                 'def_command' => 'defline',
                 'def_index_element' => {
@@ -144,7 +144,8 @@ $result_trees{'multiple_defline'} = {
               'type' => 'def_item'
             },
             {
-              'args' => [
+              'cmdname' => 'defline',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -233,7 +234,6 @@ $result_trees{'multiple_defline'} = {
                   'type' => 'line_arg'
                 }
               ],
-              'cmdname' => 'defline',
               'extra' => {
                 'def_command' => 'defline',
                 'def_index_element' => {
diff --git a/tp/t/results/def/no_category_or_no_name.pl 
b/tp/t/results/def/no_category_or_no_name.pl
index 378df399aa..b7904b47d4 100644
--- a/tp/t/results/def/no_category_or_no_name.pl
+++ b/tp/t/results/def/no_category_or_no_name.pl
@@ -13,7 +13,7 @@ $result_trees{'no_category_or_no_name'} = {
           'cmdname' => 'deffn',
           'contents' => [
             {
-              'args' => [
+              'contents' => [
                 {
                   'info' => {
                     'spaces_after_argument' => {
@@ -91,7 +91,7 @@ $result_trees{'no_category_or_no_name'} = {
           'cmdname' => 'deffn',
           'contents' => [
             {
-              'args' => [
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -192,7 +192,7 @@ $result_trees{'no_category_or_no_name'} = {
           'cmdname' => 'deffn',
           'contents' => [
             {
-              'args' => [
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -296,7 +296,8 @@ $result_trees{'no_category_or_no_name'} = {
               'type' => 'def_line'
             },
             {
-              'args' => [
+              'cmdname' => 'deffnx',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -322,7 +323,6 @@ $result_trees{'no_category_or_no_name'} = {
                   'type' => 'line_arg'
                 }
               ],
-              'cmdname' => 'deffnx',
               'extra' => {
                 'def_command' => 'deffn',
                 'original_def_cmdname' => 'deffnx'
@@ -337,7 +337,8 @@ $result_trees{'no_category_or_no_name'} = {
               }
             },
             {
-              'args' => [
+              'cmdname' => 'deffnx',
+              'contents' => [
                 {
                   'info' => {
                     'spaces_after_argument' => {
@@ -348,7 +349,6 @@ $result_trees{'no_category_or_no_name'} = {
                   'type' => 'line_arg'
                 }
               ],
-              'cmdname' => 'deffnx',
               'extra' => {
                 'def_command' => 'deffn',
                 'original_def_cmdname' => 'deffnx'
diff --git a/tp/t/results/def/not_closed.pl b/tp/t/results/def/not_closed.pl
index 52d50c7475..bbe1bdb69c 100644
--- a/tp/t/results/def/not_closed.pl
+++ b/tp/t/results/def/not_closed.pl
@@ -13,7 +13,7 @@ $result_trees{'not_closed'} = {
           'cmdname' => 'deffn',
           'contents' => [
             {
-              'args' => [
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -100,7 +100,8 @@ $result_trees{'not_closed'} = {
               'type' => 'def_line'
             },
             {
-              'args' => [
+              'cmdname' => 'deffnx',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -160,7 +161,6 @@ $result_trees{'not_closed'} = {
                   'type' => 'line_arg'
                 }
               ],
-              'cmdname' => 'deffnx',
               'extra' => {
                 'def_command' => 'deffn',
                 'def_index_element' => {
@@ -197,7 +197,7 @@ $result_trees{'not_closed'} = {
                   'cmdname' => 'defvar',
                   'contents' => [
                     {
-                      'args' => [
+                      'contents' => [
                         {
                           'contents' => [
                             {
diff --git a/tp/t/results/def/omit_def_space.pl 
b/tp/t/results/def/omit_def_space.pl
index dcc4c15de1..98d1a420b7 100644
--- a/tp/t/results/def/omit_def_space.pl
+++ b/tp/t/results/def/omit_def_space.pl
@@ -98,7 +98,7 @@ $result_trees{'omit_def_space'} = {
           'cmdname' => 'defun',
           'contents' => [
             {
-              'args' => [
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -222,7 +222,8 @@ $result_trees{'omit_def_space'} = {
               'type' => 'def_line'
             },
             {
-              'args' => [
+              'cmdname' => 'defunx',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -296,7 +297,6 @@ $result_trees{'omit_def_space'} = {
                   'type' => 'line_arg'
                 }
               ],
-              'cmdname' => 'defunx',
               'extra' => {
                 'def_command' => 'defun',
                 'def_index_element' => {
diff --git a/tp/t/results/def/protected_brace.pl 
b/tp/t/results/def/protected_brace.pl
index a2bcb92ed9..d54fcbdb6f 100644
--- a/tp/t/results/def/protected_brace.pl
+++ b/tp/t/results/def/protected_brace.pl
@@ -13,7 +13,7 @@ $result_trees{'protected_brace'} = {
           'cmdname' => 'deffn',
           'contents' => [
             {
-              'args' => [
+              'contents' => [
                 {
                   'contents' => [
                     {
diff --git a/tp/t/results/def/ref_in_def.pl b/tp/t/results/def/ref_in_def.pl
index 719d11c67c..8d4366b34d 100644
--- a/tp/t/results/def/ref_in_def.pl
+++ b/tp/t/results/def/ref_in_def.pl
@@ -45,7 +45,7 @@ $result_trees{'ref_in_def'} = {
           'cmdname' => 'deffn',
           'contents' => [
             {
-              'args' => [
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -292,7 +292,8 @@ $result_trees{'ref_in_def'} = {
               'type' => 'def_line'
             },
             {
-              'args' => [
+              'cmdname' => 'deffnx',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -494,7 +495,6 @@ $result_trees{'ref_in_def'} = {
                   'type' => 'line_arg'
                 }
               ],
-              'cmdname' => 'deffnx',
               'extra' => {
                 'def_command' => 'deffn',
                 'def_index_element' => {
@@ -644,18 +644,18 @@ $result_trees{'ref_in_def'} = {
   ],
   'type' => 'document_root'
 };
-$result_trees{'ref_in_def'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'args'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'ref_in_def'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'args'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[0];
-$result_trees{'ref_in_def'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'args'}[0]{'contents'}[2]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'ref_in_def'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'args'}[0]{'contents'}[2]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[0];
-$result_trees{'ref_in_def'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'args'}[0]{'contents'}[4]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'ref_in_def'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'args'}[0]{'contents'}[4]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[0];
-$result_trees{'ref_in_def'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'args'}[0]{'contents'}[6]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'ref_in_def'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'args'}[0]{'contents'}[6]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[0];
-$result_trees{'ref_in_def'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'args'}[0]{'contents'}[8]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'ref_in_def'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'args'}[0]{'contents'}[8]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[0];
+$result_trees{'ref_in_def'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'ref_in_def'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[0];
+$result_trees{'ref_in_def'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'contents'}[2]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'ref_in_def'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'contents'}[2]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[0];
+$result_trees{'ref_in_def'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'contents'}[4]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'ref_in_def'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'contents'}[4]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[0];
+$result_trees{'ref_in_def'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'contents'}[6]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'ref_in_def'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'contents'}[6]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[0];
+$result_trees{'ref_in_def'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'contents'}[8]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'ref_in_def'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'contents'}[8]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[0];
 
$result_trees{'ref_in_def'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'extra'}{'def_index_element'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'ref_in_def'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'extra'}{'def_index_element'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[0];
 
$result_trees{'ref_in_def'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'extra'}{'element_node'}
 = $result_trees{'ref_in_def'}{'contents'}[1];
-$result_trees{'ref_in_def'}{'contents'}[1]{'contents'}[1]{'contents'}[1]{'args'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'ref_in_def'}{'contents'}[1]{'contents'}[1]{'contents'}[1]{'args'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[0];
-$result_trees{'ref_in_def'}{'contents'}[1]{'contents'}[1]{'contents'}[1]{'args'}[0]{'contents'}[2]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'ref_in_def'}{'contents'}[1]{'contents'}[1]{'contents'}[1]{'args'}[0]{'contents'}[2]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[0];
-$result_trees{'ref_in_def'}{'contents'}[1]{'contents'}[1]{'contents'}[1]{'args'}[0]{'contents'}[4]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'ref_in_def'}{'contents'}[1]{'contents'}[1]{'contents'}[1]{'args'}[0]{'contents'}[4]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[0];
-$result_trees{'ref_in_def'}{'contents'}[1]{'contents'}[1]{'contents'}[1]{'args'}[0]{'contents'}[6]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'ref_in_def'}{'contents'}[1]{'contents'}[1]{'contents'}[1]{'args'}[0]{'contents'}[6]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[0];
-$result_trees{'ref_in_def'}{'contents'}[1]{'contents'}[1]{'contents'}[1]{'args'}[0]{'contents'}[8]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'ref_in_def'}{'contents'}[1]{'contents'}[1]{'contents'}[1]{'args'}[0]{'contents'}[8]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[0];
+$result_trees{'ref_in_def'}{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'ref_in_def'}{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[0];
+$result_trees{'ref_in_def'}{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[0]{'contents'}[2]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'ref_in_def'}{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[0]{'contents'}[2]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[0];
+$result_trees{'ref_in_def'}{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[0]{'contents'}[4]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'ref_in_def'}{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[0]{'contents'}[4]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[0];
+$result_trees{'ref_in_def'}{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[0]{'contents'}[6]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'ref_in_def'}{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[0]{'contents'}[6]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[0];
+$result_trees{'ref_in_def'}{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[0]{'contents'}[8]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'ref_in_def'}{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[0]{'contents'}[8]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[0];
 
$result_trees{'ref_in_def'}{'contents'}[1]{'contents'}[1]{'contents'}[1]{'extra'}{'def_index_element'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'ref_in_def'}{'contents'}[1]{'contents'}[1]{'contents'}[1]{'extra'}{'def_index_element'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[0];
 
$result_trees{'ref_in_def'}{'contents'}[1]{'contents'}[1]{'contents'}[1]{'extra'}{'element_node'}
 = $result_trees{'ref_in_def'}{'contents'}[1];
 
diff --git a/tp/t/results/def/space_in_def_for_index.pl 
b/tp/t/results/def/space_in_def_for_index.pl
index fe8d93733d..87df8151ea 100644
--- a/tp/t/results/def/space_in_def_for_index.pl
+++ b/tp/t/results/def/space_in_def_for_index.pl
@@ -69,7 +69,7 @@ $result_trees{'space_in_def_for_index'} = {
           'cmdname' => 'deffn',
           'contents' => [
             {
-              'args' => [
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -215,7 +215,8 @@ $result_trees{'space_in_def_for_index'} = {
               'type' => 'def_line'
             },
             {
-              'args' => [
+              'cmdname' => 'deffnx',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -281,7 +282,6 @@ $result_trees{'space_in_def_for_index'} = {
                   'type' => 'line_arg'
                 }
               ],
-              'cmdname' => 'deffnx',
               'extra' => {
                 'def_command' => 'deffn',
                 'def_index_element' => {
diff --git a/tp/t/results/def/text_block_before_defline.pl 
b/tp/t/results/def/text_block_before_defline.pl
index 03b9739c19..7208f5a4ec 100644
--- a/tp/t/results/def/text_block_before_defline.pl
+++ b/tp/t/results/def/text_block_before_defline.pl
@@ -372,7 +372,8 @@ $result_trees{'text_block_before_defline'} = {
               'type' => 'before_defline'
             },
             {
-              'args' => [
+              'cmdname' => 'defline',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -449,7 +450,6 @@ $result_trees{'text_block_before_defline'} = {
                   'type' => 'line_arg'
                 }
               ],
-              'cmdname' => 'defline',
               'extra' => {
                 'def_command' => 'defline',
                 'def_index_element' => {
diff --git a/tp/t/results/def/wrong_braces_simple.pl 
b/tp/t/results/def/wrong_braces_simple.pl
index beb4e902e0..4e7ee06acc 100644
--- a/tp/t/results/def/wrong_braces_simple.pl
+++ b/tp/t/results/def/wrong_braces_simple.pl
@@ -13,7 +13,7 @@ $result_trees{'wrong_braces_simple'} = {
           'cmdname' => 'deffn',
           'contents' => [
             {
-              'args' => [
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -182,7 +182,7 @@ $result_trees{'wrong_braces_simple'} = {
           'cmdname' => 'deffn',
           'contents' => [
             {
-              'args' => [
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -368,7 +368,7 @@ $result_trees{'wrong_braces_simple'} = {
           'cmdname' => 'deffn',
           'contents' => [
             {
-              'args' => [
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -552,7 +552,7 @@ $result_trees{'wrong_braces_simple'} = {
           'cmdname' => 'deffn',
           'contents' => [
             {
-              'args' => [
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -744,7 +744,7 @@ $result_trees{'wrong_braces_simple'} = {
           'cmdname' => 'deffn',
           'contents' => [
             {
-              'args' => [
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -865,7 +865,8 @@ $result_trees{'wrong_braces_simple'} = {
               'type' => 'def_line'
             },
             {
-              'args' => [
+              'cmdname' => 'deffnx',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -959,7 +960,6 @@ $result_trees{'wrong_braces_simple'} = {
                   'type' => 'line_arg'
                 }
               ],
-              'cmdname' => 'deffnx',
               'extra' => {
                 'def_command' => 'deffn',
                 'def_index_element' => {
@@ -991,7 +991,8 @@ $result_trees{'wrong_braces_simple'} = {
               }
             },
             {
-              'args' => [
+              'cmdname' => 'deffnx',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -1102,7 +1103,6 @@ $result_trees{'wrong_braces_simple'} = {
                   'type' => 'line_arg'
                 }
               ],
-              'cmdname' => 'deffnx',
               'extra' => {
                 'def_command' => 'deffn',
                 'def_index_element' => {
@@ -1134,7 +1134,8 @@ $result_trees{'wrong_braces_simple'} = {
               }
             },
             {
-              'args' => [
+              'cmdname' => 'deffnx',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -1243,7 +1244,6 @@ $result_trees{'wrong_braces_simple'} = {
                   'type' => 'line_arg'
                 }
               ],
-              'cmdname' => 'deffnx',
               'extra' => {
                 'def_command' => 'deffn',
                 'def_index_element' => {
@@ -1275,7 +1275,8 @@ $result_trees{'wrong_braces_simple'} = {
               }
             },
             {
-              'args' => [
+              'cmdname' => 'deffnx',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -1392,7 +1393,6 @@ $result_trees{'wrong_braces_simple'} = {
                   'type' => 'line_arg'
                 }
               ],
-              'cmdname' => 'deffnx',
               'extra' => {
                 'def_command' => 'deffn',
                 'def_index_element' => {
diff --git a/tp/t/results/def/wrong_braces_with_end_of_lines.pl 
b/tp/t/results/def/wrong_braces_with_end_of_lines.pl
index 72a7179383..d6da7715ae 100644
--- a/tp/t/results/def/wrong_braces_with_end_of_lines.pl
+++ b/tp/t/results/def/wrong_braces_with_end_of_lines.pl
@@ -13,7 +13,7 @@ $result_trees{'wrong_braces_with_end_of_lines'} = {
           'cmdname' => 'deffn',
           'contents' => [
             {
-              'args' => [
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -198,7 +198,7 @@ $result_trees{'wrong_braces_with_end_of_lines'} = {
           'cmdname' => 'deffn',
           'contents' => [
             {
-              'args' => [
+              'contents' => [
                 {
                   'contents' => [
                     {
diff --git a/tp/t/results/html_tests/deftypefnnewline_for_copying_after.pl 
b/tp/t/results/html_tests/deftypefnnewline_for_copying_after.pl
index 032776d497..69c4d2a3f7 100644
--- a/tp/t/results/html_tests/deftypefnnewline_for_copying_after.pl
+++ b/tp/t/results/html_tests/deftypefnnewline_for_copying_after.pl
@@ -30,7 +30,7 @@ $result_trees{'deftypefnnewline_for_copying_after'} = {
               'cmdname' => 'deftypefun',
               'contents' => [
                 {
-                  'args' => [
+                  'contents' => [
                     {
                       'contents' => [
                         {
@@ -437,7 +437,7 @@ $result_trees{'deftypefnnewline_for_copying_after'} = {
           'cmdname' => 'deftypefun',
           'contents' => [
             {
-              'args' => [
+              'contents' => [
                 {
                   'contents' => [
                     {
diff --git a/tp/t/results/html_tests/deftypefnnewline_for_copying_before.pl 
b/tp/t/results/html_tests/deftypefnnewline_for_copying_before.pl
index 9c0ec3f59f..ac302d7c2b 100644
--- a/tp/t/results/html_tests/deftypefnnewline_for_copying_before.pl
+++ b/tp/t/results/html_tests/deftypefnnewline_for_copying_before.pl
@@ -72,7 +72,7 @@ $result_trees{'deftypefnnewline_for_copying_before'} = {
               'cmdname' => 'deftypefun',
               'contents' => [
                 {
-                  'args' => [
+                  'contents' => [
                     {
                       'contents' => [
                         {
@@ -404,7 +404,7 @@ $result_trees{'deftypefnnewline_for_copying_before'} = {
           'cmdname' => 'deftypefun',
           'contents' => [
             {
-              'args' => [
+              'contents' => [
                 {
                   'contents' => [
                     {
diff --git a/tp/t/results/indices/empty_index_entry.pl 
b/tp/t/results/indices/empty_index_entry.pl
index 6b398620fd..ae4e1ef8c5 100644
--- a/tp/t/results/indices/empty_index_entry.pl
+++ b/tp/t/results/indices/empty_index_entry.pl
@@ -81,7 +81,7 @@ $result_trees{'empty_index_entry'} = {
           'cmdname' => 'deffn',
           'contents' => [
             {
-              'args' => [
+              'contents' => [
                 {
                   'contents' => [
                     {
diff --git a/tp/t/results/indices/empty_string_index_entry.pl 
b/tp/t/results/indices/empty_string_index_entry.pl
index 39b23d92b1..991499f989 100644
--- a/tp/t/results/indices/empty_string_index_entry.pl
+++ b/tp/t/results/indices/empty_string_index_entry.pl
@@ -248,7 +248,7 @@ $result_trees{'empty_string_index_entry'} = {
           'cmdname' => 'defun',
           'contents' => [
             {
-              'args' => [
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -371,7 +371,8 @@ $result_trees{'empty_string_index_entry'} = {
               'type' => 'def_line'
             },
             {
-              'args' => [
+              'cmdname' => 'defunx',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -461,7 +462,6 @@ $result_trees{'empty_string_index_entry'} = {
                   'type' => 'line_arg'
                 }
               ],
-              'cmdname' => 'defunx',
               'extra' => {
                 'def_command' => 'defun',
                 'def_index_element' => {
diff --git a/tp/t/results/indices/index_special_region.pl 
b/tp/t/results/indices/index_special_region.pl
index dea2037b36..be8c57cddd 100644
--- a/tp/t/results/indices/index_special_region.pl
+++ b/tp/t/results/indices/index_special_region.pl
@@ -798,7 +798,7 @@ $result_trees{'index_special_region'} = {
           'cmdname' => 'deffn',
           'contents' => [
             {
-              'args' => [
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -860,7 +860,8 @@ $result_trees{'index_special_region'} = {
               'type' => 'def_line'
             },
             {
-              'args' => [
+              'cmdname' => 'deffnx',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -890,7 +891,6 @@ $result_trees{'index_special_region'} = {
                   'type' => 'line_arg'
                 }
               ],
-              'cmdname' => 'deffnx',
               'extra' => {
                 'def_command' => 'deffn',
                 'original_def_cmdname' => 'deffnx'
@@ -901,7 +901,8 @@ $result_trees{'index_special_region'} = {
               }
             },
             {
-              'args' => [
+              'cmdname' => 'deffnx',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -942,7 +943,6 @@ $result_trees{'index_special_region'} = {
                   'type' => 'line_arg'
                 }
               ],
-              'cmdname' => 'deffnx',
               'extra' => {
                 'def_command' => 'deffn',
                 'original_def_cmdname' => 'deffnx'
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 39296d08de..6d629dc890 100644
--- a/tp/t/results/indices/index_special_region_no_insertcopying.pl
+++ b/tp/t/results/indices/index_special_region_no_insertcopying.pl
@@ -793,7 +793,7 @@ $result_trees{'index_special_region_no_insertcopying'} = {
           'cmdname' => 'deffn',
           'contents' => [
             {
-              'args' => [
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -855,7 +855,8 @@ $result_trees{'index_special_region_no_insertcopying'} = {
               'type' => 'def_line'
             },
             {
-              'args' => [
+              'cmdname' => 'deffnx',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -885,7 +886,6 @@ $result_trees{'index_special_region_no_insertcopying'} = {
                   'type' => 'line_arg'
                 }
               ],
-              'cmdname' => 'deffnx',
               'extra' => {
                 'def_command' => 'deffn',
                 'original_def_cmdname' => 'deffnx'
@@ -896,7 +896,8 @@ $result_trees{'index_special_region_no_insertcopying'} = {
               }
             },
             {
-              'args' => [
+              'cmdname' => 'deffnx',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -937,7 +938,6 @@ $result_trees{'index_special_region_no_insertcopying'} = {
                   'type' => 'line_arg'
                 }
               ],
-              'cmdname' => 'deffnx',
               'extra' => {
                 'def_command' => 'deffn',
                 'original_def_cmdname' => 'deffnx'
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 d1faf4fc50..d6960b6b25 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
@@ -793,7 +793,7 @@ 
$result_trees{'index_special_region_no_insertcopying_no_titlepage_no_nodes'} = {
           'cmdname' => 'deffn',
           'contents' => [
             {
-              'args' => [
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -855,7 +855,8 @@ 
$result_trees{'index_special_region_no_insertcopying_no_titlepage_no_nodes'} = {
               'type' => 'def_line'
             },
             {
-              'args' => [
+              'cmdname' => 'deffnx',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -885,7 +886,6 @@ 
$result_trees{'index_special_region_no_insertcopying_no_titlepage_no_nodes'} = {
                   'type' => 'line_arg'
                 }
               ],
-              'cmdname' => 'deffnx',
               'extra' => {
                 'def_command' => 'deffn',
                 'original_def_cmdname' => 'deffnx'
@@ -896,7 +896,8 @@ 
$result_trees{'index_special_region_no_insertcopying_no_titlepage_no_nodes'} = {
               }
             },
             {
-              'args' => [
+              'cmdname' => 'deffnx',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -937,7 +938,6 @@ 
$result_trees{'index_special_region_no_insertcopying_no_titlepage_no_nodes'} = {
                   'type' => 'line_arg'
                 }
               ],
-              'cmdname' => 'deffnx',
               'extra' => {
                 'def_command' => 'deffn',
                 'original_def_cmdname' => 'deffnx'
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 ecde25e273..cdeffa7b82 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
@@ -793,7 +793,7 @@ 
$result_trees{'index_special_region_no_insertcopying_titlepage_no_nodes'} = {
           'cmdname' => 'deffn',
           'contents' => [
             {
-              'args' => [
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -855,7 +855,8 @@ 
$result_trees{'index_special_region_no_insertcopying_titlepage_no_nodes'} = {
               'type' => 'def_line'
             },
             {
-              'args' => [
+              'cmdname' => 'deffnx',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -885,7 +886,6 @@ 
$result_trees{'index_special_region_no_insertcopying_titlepage_no_nodes'} = {
                   'type' => 'line_arg'
                 }
               ],
-              'cmdname' => 'deffnx',
               'extra' => {
                 'def_command' => 'deffn',
                 'original_def_cmdname' => 'deffnx'
@@ -896,7 +896,8 @@ 
$result_trees{'index_special_region_no_insertcopying_titlepage_no_nodes'} = {
               }
             },
             {
-              'args' => [
+              'cmdname' => 'deffnx',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -937,7 +938,6 @@ 
$result_trees{'index_special_region_no_insertcopying_titlepage_no_nodes'} = {
                   'type' => 'line_arg'
                 }
               ],
-              'cmdname' => 'deffnx',
               'extra' => {
                 'def_command' => 'deffn',
                 'original_def_cmdname' => 'deffnx'
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 a9f132946f..bbced8db5c 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
@@ -793,7 +793,7 @@ 
$result_trees{'index_special_region_no_insertcopying_titlepage_no_nodes_footnote
           'cmdname' => 'deffn',
           'contents' => [
             {
-              'args' => [
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -855,7 +855,8 @@ 
$result_trees{'index_special_region_no_insertcopying_titlepage_no_nodes_footnote
               'type' => 'def_line'
             },
             {
-              'args' => [
+              'cmdname' => 'deffnx',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -885,7 +886,6 @@ 
$result_trees{'index_special_region_no_insertcopying_titlepage_no_nodes_footnote
                   'type' => 'line_arg'
                 }
               ],
-              'cmdname' => 'deffnx',
               'extra' => {
                 'def_command' => 'deffn',
                 'original_def_cmdname' => 'deffnx'
@@ -896,7 +896,8 @@ 
$result_trees{'index_special_region_no_insertcopying_titlepage_no_nodes_footnote
               }
             },
             {
-              'args' => [
+              'cmdname' => 'deffnx',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -937,7 +938,6 @@ 
$result_trees{'index_special_region_no_insertcopying_titlepage_no_nodes_footnote
                   'type' => 'line_arg'
                 }
               ],
-              'cmdname' => 'deffnx',
               'extra' => {
                 'def_command' => 'deffn',
                 'original_def_cmdname' => 'deffnx'
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 14a37d12ef..72c253bfcd 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
@@ -798,7 +798,7 @@ $result_trees{'index_special_region_no_titlepage_no_nodes'} 
= {
           'cmdname' => 'deffn',
           'contents' => [
             {
-              'args' => [
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -860,7 +860,8 @@ $result_trees{'index_special_region_no_titlepage_no_nodes'} 
= {
               'type' => 'def_line'
             },
             {
-              'args' => [
+              'cmdname' => 'deffnx',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -890,7 +891,6 @@ $result_trees{'index_special_region_no_titlepage_no_nodes'} 
= {
                   'type' => 'line_arg'
                 }
               ],
-              'cmdname' => 'deffnx',
               'extra' => {
                 'def_command' => 'deffn',
                 'original_def_cmdname' => 'deffnx'
@@ -901,7 +901,8 @@ $result_trees{'index_special_region_no_titlepage_no_nodes'} 
= {
               }
             },
             {
-              'args' => [
+              'cmdname' => 'deffnx',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -942,7 +943,6 @@ $result_trees{'index_special_region_no_titlepage_no_nodes'} 
= {
                   'type' => 'line_arg'
                 }
               ],
-              'cmdname' => 'deffnx',
               'extra' => {
                 'def_command' => 'deffn',
                 'original_def_cmdname' => 'deffnx'
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 3de8dae32a..fe502bd512 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
@@ -798,7 +798,7 @@ $result_trees{'index_special_region_titlepage_no_nodes'} = {
           'cmdname' => 'deffn',
           'contents' => [
             {
-              'args' => [
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -860,7 +860,8 @@ $result_trees{'index_special_region_titlepage_no_nodes'} = {
               'type' => 'def_line'
             },
             {
-              'args' => [
+              'cmdname' => 'deffnx',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -890,7 +891,6 @@ $result_trees{'index_special_region_titlepage_no_nodes'} = {
                   'type' => 'line_arg'
                 }
               ],
-              'cmdname' => 'deffnx',
               'extra' => {
                 'def_command' => 'deffn',
                 'original_def_cmdname' => 'deffnx'
@@ -901,7 +901,8 @@ $result_trees{'index_special_region_titlepage_no_nodes'} = {
               }
             },
             {
-              'args' => [
+              'cmdname' => 'deffnx',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -942,7 +943,6 @@ $result_trees{'index_special_region_titlepage_no_nodes'} = {
                   'type' => 'line_arg'
                 }
               ],
-              'cmdname' => 'deffnx',
               'extra' => {
                 'def_command' => 'deffn',
                 'original_def_cmdname' => 'deffnx'
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 348fd2fe47..e403ae7cf1 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
@@ -798,7 +798,7 @@ 
$result_trees{'index_special_region_titlepage_no_nodes_footnotes_default'} = {
           'cmdname' => 'deffn',
           'contents' => [
             {
-              'args' => [
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -860,7 +860,8 @@ 
$result_trees{'index_special_region_titlepage_no_nodes_footnotes_default'} = {
               'type' => 'def_line'
             },
             {
-              'args' => [
+              'cmdname' => 'deffnx',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -890,7 +891,6 @@ 
$result_trees{'index_special_region_titlepage_no_nodes_footnotes_default'} = {
                   'type' => 'line_arg'
                 }
               ],
-              'cmdname' => 'deffnx',
               'extra' => {
                 'def_command' => 'deffn',
                 'original_def_cmdname' => 'deffnx'
@@ -901,7 +901,8 @@ 
$result_trees{'index_special_region_titlepage_no_nodes_footnotes_default'} = {
               }
             },
             {
-              'args' => [
+              'cmdname' => 'deffnx',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -942,7 +943,6 @@ 
$result_trees{'index_special_region_titlepage_no_nodes_footnotes_default'} = {
                   'type' => 'line_arg'
                 }
               ],
-              'cmdname' => 'deffnx',
               'extra' => {
                 'def_command' => 'deffn',
                 'original_def_cmdname' => 'deffnx'
diff --git a/tp/t/results/indices/printindex_index_entry_in_copying.pl 
b/tp/t/results/indices/printindex_index_entry_in_copying.pl
index 5c21c2e3f4..992a3b1308 100644
--- a/tp/t/results/indices/printindex_index_entry_in_copying.pl
+++ b/tp/t/results/indices/printindex_index_entry_in_copying.pl
@@ -78,7 +78,7 @@ $result_trees{'printindex_index_entry_in_copying'} = {
                   'cmdname' => 'defun',
                   'contents' => [
                     {
-                      'args' => [
+                      'contents' => [
                         {
                           'contents' => [
                             {
@@ -172,7 +172,8 @@ $result_trees{'printindex_index_entry_in_copying'} = {
                       'type' => 'def_line'
                     },
                     {
-                      'args' => [
+                      'cmdname' => 'defunx',
+                      'contents' => [
                         {
                           'contents' => [
                             {
@@ -238,7 +239,6 @@ $result_trees{'printindex_index_entry_in_copying'} = {
                           'type' => 'line_arg'
                         }
                       ],
-                      'cmdname' => 'defunx',
                       'extra' => {
                         'def_command' => 'defun',
                         'def_index_element' => {
diff --git 
a/tp/t/results/indices/printindex_index_entry_in_copying_no_insertcopying.pl 
b/tp/t/results/indices/printindex_index_entry_in_copying_no_insertcopying.pl
index ea78aed669..c4e83ad23b 100644
--- a/tp/t/results/indices/printindex_index_entry_in_copying_no_insertcopying.pl
+++ b/tp/t/results/indices/printindex_index_entry_in_copying_no_insertcopying.pl
@@ -78,7 +78,7 @@ 
$result_trees{'printindex_index_entry_in_copying_no_insertcopying'} = {
                   'cmdname' => 'defun',
                   'contents' => [
                     {
-                      'args' => [
+                      'contents' => [
                         {
                           'contents' => [
                             {
@@ -172,7 +172,8 @@ 
$result_trees{'printindex_index_entry_in_copying_no_insertcopying'} = {
                       'type' => 'def_line'
                     },
                     {
-                      'args' => [
+                      'cmdname' => 'defunx',
+                      'contents' => [
                         {
                           'contents' => [
                             {
@@ -238,7 +239,6 @@ 
$result_trees{'printindex_index_entry_in_copying_no_insertcopying'} = {
                           'type' => 'line_arg'
                         }
                       ],
-                      'cmdname' => 'defunx',
                       'extra' => {
                         'def_command' => 'defun',
                         'def_index_element' => {
diff --git a/tp/t/results/indices/same_index_entry_merged_indices.pl 
b/tp/t/results/indices/same_index_entry_merged_indices.pl
index 4dc597a427..5f35ed60c0 100644
--- a/tp/t/results/indices/same_index_entry_merged_indices.pl
+++ b/tp/t/results/indices/same_index_entry_merged_indices.pl
@@ -185,7 +185,7 @@ $result_trees{'same_index_entry_merged_indices'} = {
           'cmdname' => 'deffn',
           'contents' => [
             {
-              'args' => [
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -348,7 +348,7 @@ $result_trees{'same_index_entry_merged_indices'} = {
           'cmdname' => 'defvar',
           'contents' => [
             {
-              'args' => [
+              'contents' => [
                 {
                   'contents' => [
                     {
diff --git a/tp/t/results/info_tests/colon_in_index_entry.pl 
b/tp/t/results/info_tests/colon_in_index_entry.pl
index e43f64115f..71ca4ef5f7 100644
--- a/tp/t/results/info_tests/colon_in_index_entry.pl
+++ b/tp/t/results/info_tests/colon_in_index_entry.pl
@@ -234,7 +234,7 @@ $result_trees{'colon_in_index_entry'} = {
           'cmdname' => 'defvr',
           'contents' => [
             {
-              'args' => [
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -345,7 +345,8 @@ $result_trees{'colon_in_index_entry'} = {
               'type' => 'def_line'
             },
             {
-              'args' => [
+              'cmdname' => 'defvrx',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -445,7 +446,6 @@ $result_trees{'colon_in_index_entry'} = {
                   'type' => 'line_arg'
                 }
               ],
-              'cmdname' => 'defvrx',
               'extra' => {
                 'def_command' => 'defvr',
                 'def_index_element' => {
diff --git a/tp/t/results/info_tests/def_in_copying.pl 
b/tp/t/results/info_tests/def_in_copying.pl
index 02eb8f9b50..472031545a 100644
--- a/tp/t/results/info_tests/def_in_copying.pl
+++ b/tp/t/results/info_tests/def_in_copying.pl
@@ -193,7 +193,7 @@ $result_trees{'def_in_copying'} = {
               'cmdname' => 'deffn',
               'contents' => [
                 {
-                  'args' => [
+                  'contents' => [
                     {
                       'contents' => [
                         {
@@ -282,7 +282,8 @@ $result_trees{'def_in_copying'} = {
                   'type' => 'def_line'
                 },
                 {
-                  'args' => [
+                  'cmdname' => 'deffnx',
+                  'contents' => [
                     {
                       'contents' => [
                         {
@@ -342,7 +343,6 @@ $result_trees{'def_in_copying'} = {
                       'type' => 'line_arg'
                     }
                   ],
-                  'cmdname' => 'deffnx',
                   'extra' => {
                     'def_command' => 'deffn',
                     'def_index_element' => {
@@ -511,7 +511,7 @@ $result_trees{'def_in_copying'} = {
           'cmdname' => 'deffn',
           'contents' => [
             {
-              'args' => [
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -600,7 +600,8 @@ $result_trees{'def_in_copying'} = {
               'type' => 'def_line'
             },
             {
-              'args' => [
+              'cmdname' => 'deffnx',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -660,7 +661,6 @@ $result_trees{'def_in_copying'} = {
                   'type' => 'line_arg'
                 }
               ],
-              'cmdname' => 'deffnx',
               'extra' => {
                 'def_command' => 'deffn',
                 'def_index_element' => {
diff --git a/tp/t/results/info_tests/test_index.pl 
b/tp/t/results/info_tests/test_index.pl
index ae8aeac348..95f65e2478 100644
--- a/tp/t/results/info_tests/test_index.pl
+++ b/tp/t/results/info_tests/test_index.pl
@@ -273,7 +273,7 @@ $result_trees{'test_index'} = {
           'cmdname' => 'deffn',
           'contents' => [
             {
-              'args' => [
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -401,7 +401,8 @@ $result_trees{'test_index'} = {
               'type' => 'def_line'
             },
             {
-              'args' => [
+              'cmdname' => 'deffnx',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -478,7 +479,6 @@ $result_trees{'test_index'} = {
                   'type' => 'line_arg'
                 }
               ],
-              'cmdname' => 'deffnx',
               'extra' => {
                 'def_command' => 'deffn',
                 'def_index_element' => {
diff --git 
a/tp/t/results/init_files_tests/translation_in_parser_in_translation.pl 
b/tp/t/results/init_files_tests/translation_in_parser_in_translation.pl
index 9d06b39963..66cbe0105d 100644
--- a/tp/t/results/init_files_tests/translation_in_parser_in_translation.pl
+++ b/tp/t/results/init_files_tests/translation_in_parser_in_translation.pl
@@ -177,7 +177,7 @@ $result_trees{'translation_in_parser_in_translation'} = {
           'cmdname' => 'deftypeop',
           'contents' => [
             {
-              'args' => [
+              'contents' => [
                 {
                   'contents' => [
                     {
diff --git a/tp/t/results/invalid_nestings/block_not_matching.pl 
b/tp/t/results/invalid_nestings/block_not_matching.pl
index 09e766db2c..89084bd558 100644
--- a/tp/t/results/invalid_nestings/block_not_matching.pl
+++ b/tp/t/results/invalid_nestings/block_not_matching.pl
@@ -49,7 +49,7 @@ $result_trees{'block_not_matching'} = {
           'cmdname' => 'deffn',
           'contents' => [
             {
-              'args' => [
+              'contents' => [
                 {
                   'contents' => [
                     {
diff --git a/tp/t/results/invalid_nestings/def_in_style_command.pl 
b/tp/t/results/invalid_nestings/def_in_style_command.pl
index e757f0e509..c2e9fc123d 100644
--- a/tp/t/results/invalid_nestings/def_in_style_command.pl
+++ b/tp/t/results/invalid_nestings/def_in_style_command.pl
@@ -35,7 +35,7 @@ $result_trees{'def_in_style_command'} = {
           'cmdname' => 'defun',
           'contents' => [
             {
-              'args' => [
+              'contents' => [
                 {
                   'contents' => [
                     {
diff --git 
a/tp/t/results/invalid_nestings/def_not_closed_in_menu_description.pl 
b/tp/t/results/invalid_nestings/def_not_closed_in_menu_description.pl
index f5657fd0d3..62cea41e6b 100644
--- a/tp/t/results/invalid_nestings/def_not_closed_in_menu_description.pl
+++ b/tp/t/results/invalid_nestings/def_not_closed_in_menu_description.pl
@@ -71,7 +71,7 @@ $result_trees{'def_not_closed_in_menu_description'} = {
                       'cmdname' => 'deffn',
                       'contents' => [
                         {
-                          'args' => [
+                          'contents' => [
                             {
                               'contents' => [
                                 {
diff --git a/tp/t/results/invalid_nestings/on_def_line.pl 
b/tp/t/results/invalid_nestings/on_def_line.pl
index a8b72eda12..dd5c1cdc5f 100644
--- a/tp/t/results/invalid_nestings/on_def_line.pl
+++ b/tp/t/results/invalid_nestings/on_def_line.pl
@@ -13,7 +13,7 @@ $result_trees{'on_def_line'} = {
           'cmdname' => 'deffn',
           'contents' => [
             {
-              'args' => [
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -199,7 +199,8 @@ $result_trees{'on_def_line'} = {
               'type' => 'def_line'
             },
             {
-              'args' => [
+              'cmdname' => 'deffnx',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -347,7 +348,6 @@ $result_trees{'on_def_line'} = {
                   'type' => 'line_arg'
                 }
               ],
-              'cmdname' => 'deffnx',
               'extra' => {
                 'def_command' => 'deffn',
                 'def_index_element' => {
diff --git a/tp/t/results/invalid_nestings/section_on_def_line.pl 
b/tp/t/results/invalid_nestings/section_on_def_line.pl
index baa898b4c9..40595dd5f4 100644
--- a/tp/t/results/invalid_nestings/section_on_def_line.pl
+++ b/tp/t/results/invalid_nestings/section_on_def_line.pl
@@ -13,7 +13,7 @@ $result_trees{'section_on_def_line'} = {
           'cmdname' => 'deffn',
           'contents' => [
             {
-              'args' => [
+              'contents' => [
                 {
                   'contents' => [
                     {
diff --git a/tp/t/results/invalid_nestings/section_on_defx_line.pl 
b/tp/t/results/invalid_nestings/section_on_defx_line.pl
index 19ca4a7e77..2bc5395dba 100644
--- a/tp/t/results/invalid_nestings/section_on_defx_line.pl
+++ b/tp/t/results/invalid_nestings/section_on_defx_line.pl
@@ -13,7 +13,7 @@ $result_trees{'section_on_defx_line'} = {
           'cmdname' => 'deffn',
           'contents' => [
             {
-              'args' => [
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -117,7 +117,8 @@ $result_trees{'section_on_defx_line'} = {
               'type' => 'def_line'
             },
             {
-              'args' => [
+              'cmdname' => 'deffnx',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -159,7 +160,6 @@ $result_trees{'section_on_defx_line'} = {
                   'type' => 'line_arg'
                 }
               ],
-              'cmdname' => 'deffnx',
               'extra' => {
                 'def_command' => 'deffn',
                 'def_index_element' => {
diff --git a/tp/t/results/languages/documentlanguage.pl 
b/tp/t/results/languages/documentlanguage.pl
index 9812c07ee3..054c874d00 100644
--- a/tp/t/results/languages/documentlanguage.pl
+++ b/tp/t/results/languages/documentlanguage.pl
@@ -421,7 +421,7 @@ $result_trees{'documentlanguage'} = {
           'cmdname' => 'deftypemethod',
           'contents' => [
             {
-              'args' => [
+              'contents' => [
                 {
                   'contents' => [
                     {
diff --git a/tp/t/results/languages/documentlanguage_option.pl 
b/tp/t/results/languages/documentlanguage_option.pl
index 77b92b2c53..4ecf7dd4a0 100644
--- a/tp/t/results/languages/documentlanguage_option.pl
+++ b/tp/t/results/languages/documentlanguage_option.pl
@@ -421,7 +421,7 @@ $result_trees{'documentlanguage_option'} = {
           'cmdname' => 'deftypemethod',
           'contents' => [
             {
-              'args' => [
+              'contents' => [
                 {
                   'contents' => [
                     {
diff --git a/tp/t/results/languages/documentlanguage_unknown.pl 
b/tp/t/results/languages/documentlanguage_unknown.pl
index 52be5219db..e2b0feeb78 100644
--- a/tp/t/results/languages/documentlanguage_unknown.pl
+++ b/tp/t/results/languages/documentlanguage_unknown.pl
@@ -421,7 +421,7 @@ $result_trees{'documentlanguage_unknown'} = {
           'cmdname' => 'deftypemethod',
           'contents' => [
             {
-              'args' => [
+              'contents' => [
                 {
                   'contents' => [
                     {
diff --git a/tp/t/results/languages/multiple_documentlanguage.pl 
b/tp/t/results/languages/multiple_documentlanguage.pl
index e4df358d86..047e80a689 100644
--- a/tp/t/results/languages/multiple_documentlanguage.pl
+++ b/tp/t/results/languages/multiple_documentlanguage.pl
@@ -67,7 +67,7 @@ $result_trees{'multiple_documentlanguage'} = {
                   'cmdname' => 'defivar',
                   'contents' => [
                     {
-                      'args' => [
+                      'contents' => [
                         {
                           'contents' => [
                             {
@@ -473,7 +473,7 @@ $result_trees{'multiple_documentlanguage'} = {
           'cmdname' => 'defivar',
           'contents' => [
             {
-              'args' => [
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -805,7 +805,7 @@ $result_trees{'multiple_documentlanguage'} = {
           'cmdname' => 'defivar',
           'contents' => [
             {
-              'args' => [
+              'contents' => [
                 {
                   'contents' => [
                     {
diff --git a/tp/t/results/languages/multiple_in_preamble.pl 
b/tp/t/results/languages/multiple_in_preamble.pl
index 4f830703af..f74766443b 100644
--- a/tp/t/results/languages/multiple_in_preamble.pl
+++ b/tp/t/results/languages/multiple_in_preamble.pl
@@ -67,7 +67,7 @@ $result_trees{'multiple_in_preamble'} = {
                   'cmdname' => 'defivar',
                   'contents' => [
                     {
-                      'args' => [
+                      'contents' => [
                         {
                           'contents' => [
                             {
@@ -507,7 +507,7 @@ $result_trees{'multiple_in_preamble'} = {
           'cmdname' => 'defivar',
           'contents' => [
             {
-              'args' => [
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -785,7 +785,7 @@ $result_trees{'multiple_in_preamble'} = {
           'cmdname' => 'defivar',
           'contents' => [
             {
-              'args' => [
+              'contents' => [
                 {
                   'contents' => [
                     {
diff --git a/tp/t/results/languages/multiple_in_preamble_before_node.pl 
b/tp/t/results/languages/multiple_in_preamble_before_node.pl
index 78b2bcd90a..3250a4efff 100644
--- a/tp/t/results/languages/multiple_in_preamble_before_node.pl
+++ b/tp/t/results/languages/multiple_in_preamble_before_node.pl
@@ -67,7 +67,7 @@ $result_trees{'multiple_in_preamble_before_node'} = {
                   'cmdname' => 'defivar',
                   'contents' => [
                     {
-                      'args' => [
+                      'contents' => [
                         {
                           'contents' => [
                             {
@@ -556,7 +556,7 @@ $result_trees{'multiple_in_preamble_before_node'} = {
           'cmdname' => 'defivar',
           'contents' => [
             {
-              'args' => [
+              'contents' => [
                 {
                   'contents' => [
                     {
diff --git a/tp/t/results/languages/multiple_lang_chapters.pl 
b/tp/t/results/languages/multiple_lang_chapters.pl
index f0cfd6dd2a..d3f6fb7432 100644
--- a/tp/t/results/languages/multiple_lang_chapters.pl
+++ b/tp/t/results/languages/multiple_lang_chapters.pl
@@ -713,7 +713,7 @@ $result_trees{'multiple_lang_chapters'} = {
           'cmdname' => 'defivar',
           'contents' => [
             {
-              'args' => [
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -1065,7 +1065,7 @@ $result_trees{'multiple_lang_chapters'} = {
           'cmdname' => 'defivar',
           'contents' => [
             {
-              'args' => [
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -1381,7 +1381,7 @@ $result_trees{'multiple_lang_chapters'} = {
           'cmdname' => 'defivar',
           'contents' => [
             {
-              'args' => [
+              'contents' => [
                 {
                   'contents' => [
                     {
diff --git a/tp/t/results/languages/multiple_lang_chapters_latex.pl 
b/tp/t/results/languages/multiple_lang_chapters_latex.pl
index ecec848ace..0d4795786c 100644
--- a/tp/t/results/languages/multiple_lang_chapters_latex.pl
+++ b/tp/t/results/languages/multiple_lang_chapters_latex.pl
@@ -713,7 +713,7 @@ $result_trees{'multiple_lang_chapters_latex'} = {
           'cmdname' => 'defivar',
           'contents' => [
             {
-              'args' => [
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -1065,7 +1065,7 @@ $result_trees{'multiple_lang_chapters_latex'} = {
           'cmdname' => 'defivar',
           'contents' => [
             {
-              'args' => [
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -1381,7 +1381,7 @@ $result_trees{'multiple_lang_chapters_latex'} = {
           'cmdname' => 'defivar',
           'contents' => [
             {
-              'args' => [
+              'contents' => [
                 {
                   'contents' => [
                     {
diff --git a/tp/t/results/languages/multiple_lang_chapters_texi2html.pl 
b/tp/t/results/languages/multiple_lang_chapters_texi2html.pl
index 3c711a389a..9afb49263d 100644
--- a/tp/t/results/languages/multiple_lang_chapters_texi2html.pl
+++ b/tp/t/results/languages/multiple_lang_chapters_texi2html.pl
@@ -680,7 +680,7 @@ $result_trees{'multiple_lang_chapters_texi2html'} = {
           'cmdname' => 'defivar',
           'contents' => [
             {
-              'args' => [
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -1032,7 +1032,7 @@ $result_trees{'multiple_lang_chapters_texi2html'} = {
           'cmdname' => 'defivar',
           'contents' => [
             {
-              'args' => [
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -1348,7 +1348,7 @@ $result_trees{'multiple_lang_chapters_texi2html'} = {
           'cmdname' => 'defivar',
           'contents' => [
             {
-              'args' => [
+              'contents' => [
                 {
                   'contents' => [
                     {
diff --git a/tp/t/results/languages/simple_documentlanguage.pl 
b/tp/t/results/languages/simple_documentlanguage.pl
index 234587058d..ed2e356804 100644
--- a/tp/t/results/languages/simple_documentlanguage.pl
+++ b/tp/t/results/languages/simple_documentlanguage.pl
@@ -111,7 +111,7 @@ $result_trees{'simple_documentlanguage'} = {
           'cmdname' => 'defivar',
           'contents' => [
             {
-              'args' => [
+              'contents' => [
                 {
                   'contents' => [
                     {
diff --git a/tp/t/results/languages/unknown_region.pl 
b/tp/t/results/languages/unknown_region.pl
index d533995758..71352fb861 100644
--- a/tp/t/results/languages/unknown_region.pl
+++ b/tp/t/results/languages/unknown_region.pl
@@ -111,7 +111,7 @@ $result_trees{'unknown_region'} = {
           'cmdname' => 'defivar',
           'contents' => [
             {
-              'args' => [
+              'contents' => [
                 {
                   'contents' => [
                     {
diff --git a/tp/t/results/latex_tests/brace_in_index.pl 
b/tp/t/results/latex_tests/brace_in_index.pl
index 33b2191747..4ca242d23c 100644
--- a/tp/t/results/latex_tests/brace_in_index.pl
+++ b/tp/t/results/latex_tests/brace_in_index.pl
@@ -273,7 +273,7 @@ $result_trees{'brace_in_index'} = {
           'cmdname' => 'defun',
           'contents' => [
             {
-              'args' => [
+              'contents' => [
                 {
                   'contents' => [
                     {
diff --git a/tp/t/results/linemacro/api_doc_with_linemacro.pl 
b/tp/t/results/linemacro/api_doc_with_linemacro.pl
index 9c0963ab89..e176174d8a 100644
--- a/tp/t/results/linemacro/api_doc_with_linemacro.pl
+++ b/tp/t/results/linemacro/api_doc_with_linemacro.pl
@@ -255,7 +255,8 @@ $result_trees{'api_doc_with_linemacro'} = {
               'type' => 'argument'
             },
             {
-              'args' => [
+              'cmdname' => 'defline',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -464,7 +465,6 @@ $result_trees{'api_doc_with_linemacro'} = {
                   'type' => 'line_arg'
                 }
               ],
-              'cmdname' => 'defline',
               'extra' => {
                 'def_command' => 'defline',
                 'def_index_element' => {
@@ -565,7 +565,8 @@ $result_trees{'api_doc_with_linemacro'} = {
                       'type' => 'argument'
                     },
                     {
-                      'args' => [
+                      'cmdname' => 'defline',
+                      'contents' => [
                         {
                           'contents' => [
                             {
@@ -660,7 +661,6 @@ $result_trees{'api_doc_with_linemacro'} = {
                           'type' => 'line_arg'
                         }
                       ],
-                      'cmdname' => 'defline',
                       'extra' => {
                         'def_command' => 'defline',
                         'def_index_element' => {
@@ -759,7 +759,8 @@ $result_trees{'api_doc_with_linemacro'} = {
                       'type' => 'def_item'
                     },
                     {
-                      'args' => [
+                      'cmdname' => 'defline',
+                      'contents' => [
                         {
                           'contents' => [
                             {
@@ -854,7 +855,6 @@ $result_trees{'api_doc_with_linemacro'} = {
                           'type' => 'line_arg'
                         }
                       ],
-                      'cmdname' => 'defline',
                       'extra' => {
                         'def_command' => 'defline',
                         'def_index_element' => {
@@ -976,7 +976,8 @@ $result_trees{'api_doc_with_linemacro'} = {
                       'type' => 'def_item'
                     },
                     {
-                      'args' => [
+                      'cmdname' => 'defline',
+                      'contents' => [
                         {
                           'contents' => [
                             {
@@ -1071,7 +1072,6 @@ $result_trees{'api_doc_with_linemacro'} = {
                           'type' => 'line_arg'
                         }
                       ],
-                      'cmdname' => 'defline',
                       'extra' => {
                         'def_command' => 'defline',
                         'def_index_element' => {
@@ -1170,7 +1170,8 @@ $result_trees{'api_doc_with_linemacro'} = {
                       'type' => 'def_item'
                     },
                     {
-                      'args' => [
+                      'cmdname' => 'defline',
+                      'contents' => [
                         {
                           'contents' => [
                             {
@@ -1269,7 +1270,6 @@ $result_trees{'api_doc_with_linemacro'} = {
                           'type' => 'line_arg'
                         }
                       ],
-                      'cmdname' => 'defline',
                       'extra' => {
                         'def_command' => 'defline',
                         'def_index_element' => {
@@ -1355,7 +1355,8 @@ $result_trees{'api_doc_with_linemacro'} = {
                       'type' => 'def_item'
                     },
                     {
-                      'args' => [
+                      'cmdname' => 'defline',
+                      'contents' => [
                         {
                           'contents' => [
                             {
@@ -1410,7 +1411,6 @@ $result_trees{'api_doc_with_linemacro'} = {
                           'type' => 'line_arg'
                         }
                       ],
-                      'cmdname' => 'defline',
                       'extra' => {
                         'def_command' => 'defline',
                         'def_index_element' => {
diff --git a/tp/t/results/linemacro/block_begin_end_in_linemacro_call.pl 
b/tp/t/results/linemacro/block_begin_end_in_linemacro_call.pl
index 3d4388b0c5..b8d48c9827 100644
--- a/tp/t/results/linemacro/block_begin_end_in_linemacro_call.pl
+++ b/tp/t/results/linemacro/block_begin_end_in_linemacro_call.pl
@@ -789,7 +789,8 @@ args \\e\\|\\f\\|
               'type' => 'before_defline'
             },
             {
-              'args' => [
+              'cmdname' => 'defline',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -882,7 +883,6 @@ args \\e\\|\\f\\|
                   'type' => 'line_arg'
                 }
               ],
-              'cmdname' => 'defline',
               'extra' => {
                 'def_command' => 'defline',
                 'def_index_element' => {
diff --git a/tp/t/results/linemacro/braces_after_text.pl 
b/tp/t/results/linemacro/braces_after_text.pl
index 6c5bf24c7c..4816383bbb 100644
--- a/tp/t/results/linemacro/braces_after_text.pl
+++ b/tp/t/results/linemacro/braces_after_text.pl
@@ -153,7 +153,8 @@ $result_trees{'braces_after_text'} = {
               'type' => 'argument'
             },
             {
-              'args' => [
+              'cmdname' => 'defline',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -228,7 +229,6 @@ $result_trees{'braces_after_text'} = {
                   'type' => 'line_arg'
                 }
               ],
-              'cmdname' => 'defline',
               'extra' => {
                 'def_command' => 'defline',
                 'def_index_element' => {
diff --git a/tp/t/results/linemacro/empty_last_argument.pl 
b/tp/t/results/linemacro/empty_last_argument.pl
index 225a9ef1f3..4f53e16540 100644
--- a/tp/t/results/linemacro/empty_last_argument.pl
+++ b/tp/t/results/linemacro/empty_last_argument.pl
@@ -214,7 +214,8 @@ $result_trees{'empty_last_argument'} = {
               'type' => 'before_defline'
             },
             {
-              'args' => [
+              'cmdname' => 'defline',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -265,7 +266,6 @@ $result_trees{'empty_last_argument'} = {
                   'type' => 'line_arg'
                 }
               ],
-              'cmdname' => 'defline',
               'extra' => {
                 'def_command' => 'defline',
                 'def_index_element' => {
@@ -367,7 +367,8 @@ $result_trees{'empty_last_argument'} = {
               'type' => 'def_item'
             },
             {
-              'args' => [
+              'cmdname' => 'defline',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -418,7 +419,6 @@ $result_trees{'empty_last_argument'} = {
                   'type' => 'line_arg'
                 }
               ],
-              'cmdname' => 'defline',
               'extra' => {
                 'def_command' => 'defline',
                 'def_index_element' => {
@@ -534,7 +534,8 @@ $result_trees{'empty_last_argument'} = {
               'type' => 'def_item'
             },
             {
-              'args' => [
+              'cmdname' => 'defline',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -600,7 +601,6 @@ $result_trees{'empty_last_argument'} = {
                   'type' => 'line_arg'
                 }
               ],
-              'cmdname' => 'defline',
               'extra' => {
                 'def_command' => 'defline',
                 'def_index_element' => {
diff --git a/tp/t/results/linemacro/last_argument_with_braces.pl 
b/tp/t/results/linemacro/last_argument_with_braces.pl
index 8b58bff0ac..7c9c4ba4ee 100644
--- a/tp/t/results/linemacro/last_argument_with_braces.pl
+++ b/tp/t/results/linemacro/last_argument_with_braces.pl
@@ -141,7 +141,8 @@ $result_trees{'last_argument_with_braces'} = {
               'type' => 'argument'
             },
             {
-              'args' => [
+              'cmdname' => 'defline',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -218,7 +219,6 @@ $result_trees{'last_argument_with_braces'} = {
                   'type' => 'line_arg'
                 }
               ],
-              'cmdname' => 'defline',
               'extra' => {
                 'def_command' => 'defline',
                 'def_index_element' => {
@@ -247,7 +247,8 @@ $result_trees{'last_argument_with_braces'} = {
               }
             },
             {
-              'args' => [
+              'cmdname' => 'defline',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -398,7 +399,6 @@ $result_trees{'last_argument_with_braces'} = {
                   'type' => 'line_arg'
                 }
               ],
-              'cmdname' => 'defline',
               'extra' => {
                 'def_command' => 'defline',
                 'def_index_element' => {
@@ -478,7 +478,8 @@ $result_trees{'last_argument_with_braces'} = {
               'type' => 'def_item'
             },
             {
-              'args' => [
+              'cmdname' => 'defline',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -555,7 +556,6 @@ $result_trees{'last_argument_with_braces'} = {
                   'type' => 'line_arg'
                 }
               ],
-              'cmdname' => 'defline',
               'extra' => {
                 'def_command' => 'defline',
                 'def_index_element' => {
@@ -584,7 +584,8 @@ $result_trees{'last_argument_with_braces'} = {
               }
             },
             {
-              'args' => [
+              'cmdname' => 'defline',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -683,7 +684,6 @@ $result_trees{'last_argument_with_braces'} = {
                   'type' => 'line_arg'
                 }
               ],
-              'cmdname' => 'defline',
               'extra' => {
                 'def_command' => 'defline',
                 'def_index_element' => {
@@ -763,7 +763,8 @@ $result_trees{'last_argument_with_braces'} = {
               'type' => 'def_item'
             },
             {
-              'args' => [
+              'cmdname' => 'defline',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -840,7 +841,6 @@ $result_trees{'last_argument_with_braces'} = {
                   'type' => 'line_arg'
                 }
               ],
-              'cmdname' => 'defline',
               'extra' => {
                 'def_command' => 'defline',
                 'def_index_element' => {
@@ -869,7 +869,8 @@ $result_trees{'last_argument_with_braces'} = {
               }
             },
             {
-              'args' => [
+              'cmdname' => 'defline',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -1012,7 +1013,6 @@ $result_trees{'last_argument_with_braces'} = {
                   'type' => 'line_arg'
                 }
               ],
-              'cmdname' => 'defline',
               'extra' => {
                 'def_command' => 'defline',
                 'def_index_element' => {
diff --git a/tp/t/results/linemacro/nested_linemacro_calls.pl 
b/tp/t/results/linemacro/nested_linemacro_calls.pl
index 08ad863937..65acc05284 100644
--- a/tp/t/results/linemacro/nested_linemacro_calls.pl
+++ b/tp/t/results/linemacro/nested_linemacro_calls.pl
@@ -228,7 +228,8 @@ $result_trees{'nested_linemacro_calls'} = {
               'type' => 'argument'
             },
             {
-              'args' => [
+              'cmdname' => 'defline',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -394,7 +395,6 @@ $result_trees{'nested_linemacro_calls'} = {
                   'type' => 'line_arg'
                 }
               ],
-              'cmdname' => 'defline',
               'extra' => {
                 'def_command' => 'defline',
                 'def_index_element' => {
diff --git a/tp/t/results/linemacro/newline_and_continuation_in_brace.pl 
b/tp/t/results/linemacro/newline_and_continuation_in_brace.pl
index 9589ca39ff..df280cdc58 100644
--- a/tp/t/results/linemacro/newline_and_continuation_in_brace.pl
+++ b/tp/t/results/linemacro/newline_and_continuation_in_brace.pl
@@ -160,7 +160,8 @@ $result_trees{'newline_and_continuation_in_brace'} = {
               'type' => 'argument'
             },
             {
-              'args' => [
+              'cmdname' => 'defline',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -334,7 +335,6 @@ $result_trees{'newline_and_continuation_in_brace'} = {
                   'type' => 'line_arg'
                 }
               ],
-              'cmdname' => 'defline',
               'extra' => {
                 'def_command' => 'defline',
                 'def_index_element' => {
diff --git a/tp/t/results/linemacro/protected_spaces_on_line.pl 
b/tp/t/results/linemacro/protected_spaces_on_line.pl
index 1504d84584..ec706e59d5 100644
--- a/tp/t/results/linemacro/protected_spaces_on_line.pl
+++ b/tp/t/results/linemacro/protected_spaces_on_line.pl
@@ -133,7 +133,7 @@ $result_trees{'protected_spaces_on_line'} = {
           'cmdname' => 'deffn',
           'contents' => [
             {
-              'args' => [
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -403,7 +403,7 @@ $result_trees{'protected_spaces_on_line'} = {
           'cmdname' => 'deffn',
           'contents' => [
             {
-              'args' => [
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -704,7 +704,7 @@ $result_trees{'protected_spaces_on_line'} = {
           'cmdname' => 'deffn',
           'contents' => [
             {
-              'args' => [
+              'contents' => [
                 {
                   'contents' => [
                     {
diff --git a/tp/t/results/linemacro/simple_nested_linemacro_calls.pl 
b/tp/t/results/linemacro/simple_nested_linemacro_calls.pl
index 753c7d5771..f6af4ed08b 100644
--- a/tp/t/results/linemacro/simple_nested_linemacro_calls.pl
+++ b/tp/t/results/linemacro/simple_nested_linemacro_calls.pl
@@ -257,7 +257,8 @@ $result_trees{'simple_nested_linemacro_calls'} = {
               'type' => 'argument'
             },
             {
-              'args' => [
+              'cmdname' => 'defline',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -476,7 +477,6 @@ $result_trees{'simple_nested_linemacro_calls'} = {
                   'type' => 'line_arg'
                 }
               ],
-              'cmdname' => 'defline',
               'extra' => {
                 'def_command' => 'defline',
                 'def_index_element' => {
diff --git a/tp/t/results/linemacro/spaces_after_command_in_call.pl 
b/tp/t/results/linemacro/spaces_after_command_in_call.pl
index e25695bcbc..4e9c5d7eba 100644
--- a/tp/t/results/linemacro/spaces_after_command_in_call.pl
+++ b/tp/t/results/linemacro/spaces_after_command_in_call.pl
@@ -163,7 +163,8 @@ $result_trees{'spaces_after_command_in_call'} = {
               'type' => 'argument'
             },
             {
-              'args' => [
+              'cmdname' => 'defline',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -312,7 +313,6 @@ $result_trees{'spaces_after_command_in_call'} = {
                   'type' => 'line_arg'
                 }
               ],
-              'cmdname' => 'defline',
               'extra' => {
                 'def_command' => 'defline',
                 'def_index_element' => {
diff --git 
a/tp/t/results/linemacro/spaces_after_macro_linemacro_commands_in_call.pl 
b/tp/t/results/linemacro/spaces_after_macro_linemacro_commands_in_call.pl
index 2cb3e46b7d..1501f1c831 100644
--- a/tp/t/results/linemacro/spaces_after_macro_linemacro_commands_in_call.pl
+++ b/tp/t/results/linemacro/spaces_after_macro_linemacro_commands_in_call.pl
@@ -298,7 +298,8 @@ 
$result_trees{'spaces_after_macro_linemacro_commands_in_call'} = {
               'type' => 'argument'
             },
             {
-              'args' => [
+              'cmdname' => 'defline',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -392,7 +393,6 @@ 
$result_trees{'spaces_after_macro_linemacro_commands_in_call'} = {
                   'type' => 'line_arg'
                 }
               ],
-              'cmdname' => 'defline',
               'extra' => {
                 'def_command' => 'defline',
                 'def_index_element' => {
@@ -561,7 +561,8 @@ 
$result_trees{'spaces_after_macro_linemacro_commands_in_call'} = {
               'type' => 'argument'
             },
             {
-              'args' => [
+              'cmdname' => 'defline',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -758,7 +759,6 @@ 
$result_trees{'spaces_after_macro_linemacro_commands_in_call'} = {
                   'type' => 'line_arg'
                 }
               ],
-              'cmdname' => 'defline',
               'extra' => {
                 'def_command' => 'defline',
                 'original_def_cmdname' => 'defline'
diff --git a/tp/t/results/linemacro/spaces_after_unknown_command_in_call.pl 
b/tp/t/results/linemacro/spaces_after_unknown_command_in_call.pl
index e8d6add852..0318586e5b 100644
--- a/tp/t/results/linemacro/spaces_after_unknown_command_in_call.pl
+++ b/tp/t/results/linemacro/spaces_after_unknown_command_in_call.pl
@@ -164,7 +164,8 @@ $result_trees{'spaces_after_unknown_command_in_call'} = {
               'type' => 'argument'
             },
             {
-              'args' => [
+              'cmdname' => 'defline',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -294,7 +295,6 @@ $result_trees{'spaces_after_unknown_command_in_call'} = {
                   'type' => 'line_arg'
                 }
               ],
-              'cmdname' => 'defline',
               'extra' => {
                 'def_command' => 'defline',
                 'def_index_element' => {
diff --git a/tp/t/results/linemacro/spaces_in_args.pl 
b/tp/t/results/linemacro/spaces_in_args.pl
index b5545e2314..3ccc2d8091 100644
--- a/tp/t/results/linemacro/spaces_in_args.pl
+++ b/tp/t/results/linemacro/spaces_in_args.pl
@@ -166,7 +166,8 @@ $result_trees{'spaces_in_args'} = {
               'type' => 'argument'
             },
             {
-              'args' => [
+              'cmdname' => 'defline',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -277,7 +278,6 @@ $result_trees{'spaces_in_args'} = {
                   'type' => 'line_arg'
                 }
               ],
-              'cmdname' => 'defline',
               'extra' => {
                 'def_command' => 'defline',
                 'def_index_element' => {
diff --git a/tp/t/results/linemacro/spaces_in_call.pl 
b/tp/t/results/linemacro/spaces_in_call.pl
index 4adbb8eddb..5563f16be7 100644
--- a/tp/t/results/linemacro/spaces_in_call.pl
+++ b/tp/t/results/linemacro/spaces_in_call.pl
@@ -134,7 +134,8 @@ $result_trees{'spaces_in_call'} = {
               'type' => 'argument'
             },
             {
-              'args' => [
+              'cmdname' => 'defline',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -244,7 +245,6 @@ $result_trees{'spaces_in_call'} = {
                   'type' => 'line_arg'
                 }
               ],
-              'cmdname' => 'defline',
               'extra' => {
                 'def_command' => 'defline',
                 'def_index_element' => {
diff --git a/tp/t/results/linemacro/verb_in_linemacro_call.pl 
b/tp/t/results/linemacro/verb_in_linemacro_call.pl
index 468edca4be..e468f39fa6 100644
--- a/tp/t/results/linemacro/verb_in_linemacro_call.pl
+++ b/tp/t/results/linemacro/verb_in_linemacro_call.pl
@@ -256,7 +256,8 @@ $result_trees{'verb_in_linemacro_call'} = {
               'type' => 'before_defline'
             },
             {
-              'args' => [
+              'cmdname' => 'defline',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -327,7 +328,6 @@ $result_trees{'verb_in_linemacro_call'} = {
                   'type' => 'line_arg'
                 }
               ],
-              'cmdname' => 'defline',
               'extra' => {
                 'def_command' => 'defline',
                 'def_index_element' => {
diff --git a/tp/t/results/macro/macro_in_def_delimiters.pl 
b/tp/t/results/macro/macro_in_def_delimiters.pl
index 6791a640a0..0e72c44c9c 100644
--- a/tp/t/results/macro/macro_in_def_delimiters.pl
+++ b/tp/t/results/macro/macro_in_def_delimiters.pl
@@ -74,7 +74,7 @@ $result_trees{'macro_in_def_delimiters'} = {
           'cmdname' => 'deffn',
           'contents' => [
             {
-              'args' => [
+              'contents' => [
                 {
                   'contents' => [
                     {
diff --git a/tp/t/results/menu/menu_in_deffn.pl 
b/tp/t/results/menu/menu_in_deffn.pl
index d0993a52e1..93c9c2c27f 100644
--- a/tp/t/results/menu/menu_in_deffn.pl
+++ b/tp/t/results/menu/menu_in_deffn.pl
@@ -38,7 +38,7 @@ $result_trees{'menu_in_deffn'} = {
           'cmdname' => 'deffn',
           'contents' => [
             {
-              'args' => [
+              'contents' => [
                 {
                   'contents' => [
                     {
diff --git a/tp/t/results/preformatted/def_in_example.pl 
b/tp/t/results/preformatted/def_in_example.pl
index d03553e6ad..e018328d8b 100644
--- a/tp/t/results/preformatted/def_in_example.pl
+++ b/tp/t/results/preformatted/def_in_example.pl
@@ -30,7 +30,7 @@ $result_trees{'def_in_example'} = {
               'cmdname' => 'defun',
               'contents' => [
                 {
-                  'args' => [
+                  'contents' => [
                     {
                       'contents' => [
                         {
diff --git a/tp/t/results/xml_tests/commands_and_spaces.pl 
b/tp/t/results/xml_tests/commands_and_spaces.pl
index 25ddb1294a..bbfcc0246c 100644
--- a/tp/t/results/xml_tests/commands_and_spaces.pl
+++ b/tp/t/results/xml_tests/commands_and_spaces.pl
@@ -1394,7 +1394,7 @@ $result_trees{'commands_and_spaces'} = {
           'cmdname' => 'deffn',
           'contents' => [
             {
-              'args' => [
+              'contents' => [
                 {
                   'contents' => [
                     {



reply via email to

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