[8115] do not set command extra value

[gavinsmith0123]

Revision: 8115
          http://svn.sv.gnu.org/viewvc/?view=rev&root=texinfo&revision=8115
Author:   gavin
Date:     2018-08-25 10:29:53 -0400 (Sat, 25 Aug 2018)
Log Message:
-----------
do not set command extra value

Modified Paths:
--------------
    trunk/ChangeLog
    trunk/tp/Texinfo/Parser.pm
    trunk/tp/t/results/conditionals/command_conditionals_user_defined.pl
    trunk/tp/t/results/conditionals/empty_ifset_in_ifset_set.pl
    trunk/tp/t/results/conditionals/end_ifset_in_format.pl
    trunk/tp/t/results/conditionals/macro_in_ifset.pl
    trunk/tp/t/results/conditionals/macro_in_ifset_set.pl
    trunk/tp/t/results/conditionals/nested_ifset_ifclear.pl
    trunk/tp/t/results/conditionals/nested_ignore.pl
    trunk/tp/t/results/converters_tests/at_commands_in_raw.pl
    trunk/tp/t/results/coverage_braces/test_image.pl
    trunk/tp/t/results/html_tests/verbatim_in_multitable_in_example.pl
    trunk/tp/t/results/html_tests/xml_protected_in_verb.pl
    trunk/tp/t/results/include/cpp_lines.pl
    trunk/tp/t/results/include/macro_and_commands_in_early_commands.pl
    trunk/tp/t/results/include/macro_definition_in_include.pl
    trunk/tp/t/results/include/macro_in_early_commands.pl
    trunk/tp/t/results/info_tests/def_in_copying.pl
    trunk/tp/t/results/invalid_nestings/ignore_in_xref.pl
    trunk/tp/t/results/invalid_nestings/verbatim_in_ref.pl
    trunk/tp/t/results/macro/arg_body_expansion_order.pl
    trunk/tp/t/results/macro/arg_not_closed.pl
    trunk/tp/t/results/macro/backslash_in_arg.pl
    trunk/tp/t/results/macro/bad_argument.pl
    trunk/tp/t/results/macro/bad_formal_arg.pl
    trunk/tp/t/results/macro/bad_macro_name_with_underscore.pl
    trunk/tp/t/results/macro/complete_macro_for_end.pl
    trunk/tp/t/results/macro/complex_argument.pl
    trunk/tp/t/results/macro/double_macro_definition.pl
    trunk/tp/t/results/macro/double_recursive_macro_call.pl
    trunk/tp/t/results/macro/empty_end.pl
    trunk/tp/t/results/macro/empty_macro_in_text_no_arg.pl
    trunk/tp/t/results/macro/empty_macro_no_arg.pl
    trunk/tp/t/results/macro/expand_two_same.pl
    trunk/tp/t/results/macro/expansion_order.pl
    trunk/tp/t/results/macro/form_feeds.pl
    trunk/tp/t/results/macro/ifclear_in_macro.pl
    trunk/tp/t/results/macro/ifset_and_end_isef_in_macro.pl
    trunk/tp/t/results/macro/ifset_in_macro.pl
    trunk/tp/t/results/macro/ifset_in_macro_set.pl
    trunk/tp/t/results/macro/ignored_macro_definition.pl
    trunk/tp/t/results/macro/implicit_quoting_one_arg.pl
    trunk/tp/t/results/macro/implicit_quoting_recursion.pl
    trunk/tp/t/results/macro/leading_spaces_no_ignore.pl
    trunk/tp/t/results/macro/line_after_recursive_call.pl
    trunk/tp/t/results/macro/macro_expands_to_empty.pl
    trunk/tp/t/results/macro/macro_expansion.pl
    trunk/tp/t/results/macro/macro_for_end.pl
    trunk/tp/t/results/macro/macro_for_ignored_line_command.pl
    trunk/tp/t/results/macro/macro_in_accent.pl
    trunk/tp/t/results/macro/macro_in_brace_command.pl
    trunk/tp/t/results/macro/macro_in_end_argument.pl
    trunk/tp/t/results/macro/macro_in_ifset.pl
    trunk/tp/t/results/macro/macro_in_ifset_end_in_arg.pl
    trunk/tp/t/results/macro/macro_in_index_commands.pl
    trunk/tp/t/results/macro/macro_in_invalid_documentencoding.pl
    trunk/tp/t/results/macro/macro_in_macro_arg.pl
    trunk/tp/t/results/macro/macro_in_macro_arg_simpler.pl
    trunk/tp/t/results/macro/macro_in_menu.pl
    trunk/tp/t/results/macro/macro_in_misc_commands.pl
    trunk/tp/t/results/macro/macro_name_with_digit.pl
    trunk/tp/t/results/macro/macro_name_with_hyphen.pl
    trunk/tp/t/results/macro/macro_no_arg_bad_expansion.pl
    trunk/tp/t/results/macro/macro_no_arg_expansion.pl
    trunk/tp/t/results/macro/macro_one_arg_end_of_file.pl
    trunk/tp/t/results/macro/macro_with_error_at_end_line_after_macro.pl
    trunk/tp/t/results/macro/macro_zero.pl
    trunk/tp/t/results/macro/nested_macro_call.pl
    trunk/tp/t/results/macro/no_macrobody.pl
    trunk/tp/t/results/macro/paragraph_and_macro.pl
    trunk/tp/t/results/macro/protect_comma_macro_line.pl
    trunk/tp/t/results/macro/protect_in_body.pl
    trunk/tp/t/results/macro/protect_in_body_line_arg.pl
    trunk/tp/t/results/macro/protect_in_body_one_arg.pl
    trunk/tp/t/results/macro/recursive_call_in_argument.pl
    trunk/tp/t/results/macro/recursive_call_in_macro.pl
    trunk/tp/t/results/macro/redefine_texinfo_macro.pl
    trunk/tp/t/results/macro/simple_imbricated_macro.pl
    trunk/tp/t/results/macro/space_macro_after_end.pl
    trunk/tp/t/results/macro/space_macro_after_end_verbatim.pl
    trunk/tp/t/results/macro/text_before_after.pl
    trunk/tp/t/results/macro/too_much_args.pl
    trunk/tp/t/results/macro/two_macros_on_a_line.pl
    trunk/tp/t/results/macro/zero_argument.pl
    trunk/tp/t/results/menu/block_commands_in_menu_description.pl
    trunk/tp/t/results/menu/formats_in_menu.pl
    trunk/tp/t/results/misc_commands/codequoteundirected_codequotebacktick.pl
    trunk/tp/t/results/misc_commands/kbdinputstyle.pl
    trunk/tp/t/results/misc_commands/test_allowcodebreaks.pl
    trunk/tp/t/results/plaintext_tests/star_at_command_formatting.pl
    trunk/tp/t/results/raw/misc_raw.pl
    trunk/tp/t/results/raw/misc_raw_comments.pl
    trunk/tp/t/results/raw/nested_macros.pl
    trunk/tp/t/results/raw/raw_commands_and_end_of_lines.pl
    trunk/tp/t/results/raw/raw_in_para.pl
    trunk/tp/t/results/raw/verbatim_and_verbatiminclude.pl
    trunk/tp/t/results/raw/verbatim_in_brace_command.pl
    trunk/tp/t/results/value_and_macro/comma_value_in_macro_arg.pl
    trunk/tp/t/results/value_and_macro/macro_in_value.pl
    trunk/tp/t/results/value_and_macro/value_in_macro_body.pl
    trunk/tp/t/results/value_and_macro/value_in_macro_formal_arg.pl
    trunk/tp/t/results/xml_tests/commands_and_spaces.pl
    trunk/tp/t/results/xml_tests/macro_and_args.pl
    trunk/tp/t/results/xml_tests/spaces_info_lost.pl
    trunk/tp/t/results/xtable/table_nested.pl

Modified: trunk/ChangeLog
===================================================================
--- trunk/ChangeLog     2018-08-25 14:01:16 UTC (rev 8114)
+++ trunk/ChangeLog     2018-08-25 14:29:53 UTC (rev 8115)
@@ -1,5 +1,10 @@
 2018-08-25  Gavin Smith  <address@hidden>
 
+       * tp/Texinfo/Parser.pm (_parse_texi) <CLOSED raw>: Do
+       not add a 'command' extra value on the 'empty_line_after_command'.
+
+2018-08-25  Gavin Smith  <address@hidden>
+
        * tp/Texinfo/Parser.pm (_end_line) <after @end verbatim>:
        Do not use 'command' extra value to check if we are after
        @end verbatim.

Modified: trunk/tp/Texinfo/Parser.pm
===================================================================
--- trunk/tp/Texinfo/Parser.pm  2018-08-25 14:01:16 UTC (rev 8114)
+++ trunk/tp/Texinfo/Parser.pm  2018-08-25 14:29:53 UTC (rev 8115)
@@ -3781,11 +3781,12 @@
           } else {
             print STDERR "CLOSED raw $end_command\n" if ($self->{'DEBUG'});
             $line =~ s/^([^\S\r\n]*)//;
+            # Start an element to have the spaces at the end of the line
+            # ignored.
             push @{$current->{'contents'}},
                         { 'type' => 'empty_line_after_command',
                           'text' => $1,
                           'parent' => $current,
-                          'extra' => {'command' => $raw_command }
                         };
           }
         } else {

Modified: trunk/tp/t/results/conditionals/command_conditionals_user_defined.pl
===================================================================
--- trunk/tp/t/results/conditionals/command_conditionals_user_defined.pl        
2018-08-25 14:01:16 UTC (rev 8114)
+++ trunk/tp/t/results/conditionals/command_conditionals_user_defined.pl        
2018-08-25 14:29:53 UTC (rev 8115)
@@ -41,9 +41,6 @@
       'parent' => {}
     },
     {
-      'extra' => {
-        'command' => {}
-      },
       'parent' => {},
       'text' => '
 ',
@@ -296,7 +293,6 @@
 
$result_trees{'command_conditionals_user_defined'}{'contents'}[0]{'contents'}[0]{'parent'}
 = $result_trees{'command_conditionals_user_defined'}{'contents'}[0];
 
$result_trees{'command_conditionals_user_defined'}{'contents'}[0]{'contents'}[1]{'parent'}
 = $result_trees{'command_conditionals_user_defined'}{'contents'}[0];
 $result_trees{'command_conditionals_user_defined'}{'contents'}[0]{'parent'} = 
$result_trees{'command_conditionals_user_defined'};
-$result_trees{'command_conditionals_user_defined'}{'contents'}[1]{'extra'}{'command'}
 = $result_trees{'command_conditionals_user_defined'}{'contents'}[0];
 $result_trees{'command_conditionals_user_defined'}{'contents'}[1]{'parent'} = 
$result_trees{'command_conditionals_user_defined'};
 $result_trees{'command_conditionals_user_defined'}{'contents'}[2]{'parent'} = 
$result_trees{'command_conditionals_user_defined'};
 
$result_trees{'command_conditionals_user_defined'}{'contents'}[3]{'args'}[0]{'contents'}[0]{'extra'}{'command'}
 = $result_trees{'command_conditionals_user_defined'}{'contents'}[3];

Modified: trunk/tp/t/results/conditionals/empty_ifset_in_ifset_set.pl
===================================================================
--- trunk/tp/t/results/conditionals/empty_ifset_in_ifset_set.pl 2018-08-25 
14:01:16 UTC (rev 8114)
+++ trunk/tp/t/results/conditionals/empty_ifset_in_ifset_set.pl 2018-08-25 
14:29:53 UTC (rev 8115)
@@ -73,9 +73,6 @@
       'parent' => {}
     },
     {
-      'extra' => {
-        'command' => {}
-      },
       'parent' => {},
       'text' => '
 ',
@@ -94,7 +91,6 @@
 
$result_trees{'empty_ifset_in_ifset_set'}{'contents'}[3]{'contents'}[1]{'parent'}
 = $result_trees{'empty_ifset_in_ifset_set'}{'contents'}[3];
 
$result_trees{'empty_ifset_in_ifset_set'}{'contents'}[3]{'extra'}{'spaces_after_command'}
 = $result_trees{'empty_ifset_in_ifset_set'}{'contents'}[3]{'contents'}[0];
 $result_trees{'empty_ifset_in_ifset_set'}{'contents'}[3]{'parent'} = 
$result_trees{'empty_ifset_in_ifset_set'};
-$result_trees{'empty_ifset_in_ifset_set'}{'contents'}[4]{'extra'}{'command'} = 
$result_trees{'empty_ifset_in_ifset_set'}{'contents'}[3];
 $result_trees{'empty_ifset_in_ifset_set'}{'contents'}[4]{'parent'} = 
$result_trees{'empty_ifset_in_ifset_set'};
 
 $result_texis{'empty_ifset_in_ifset_set'} = '

Modified: trunk/tp/t/results/conditionals/end_ifset_in_format.pl
===================================================================
--- trunk/tp/t/results/conditionals/end_ifset_in_format.pl      2018-08-25 
14:01:16 UTC (rev 8114)
+++ trunk/tp/t/results/conditionals/end_ifset_in_format.pl      2018-08-25 
14:29:53 UTC (rev 8115)
@@ -78,9 +78,6 @@
       'parent' => {}
     },
     {
-      'extra' => {
-        'command' => {}
-      },
       'parent' => {},
       'text' => '
 ',
@@ -133,9 +130,6 @@
       'parent' => {}
     },
     {
-      'extra' => {
-        'command' => {}
-      },
       'parent' => {},
       'text' => '
 ',
@@ -203,7 +197,6 @@
 $result_trees{'end_ifset_in_format'}{'contents'}[3]{'contents'}[2]{'parent'} = 
$result_trees{'end_ifset_in_format'}{'contents'}[3];
 
$result_trees{'end_ifset_in_format'}{'contents'}[3]{'extra'}{'spaces_after_command'}
 = $result_trees{'end_ifset_in_format'}{'contents'}[3]{'contents'}[0];
 $result_trees{'end_ifset_in_format'}{'contents'}[3]{'parent'} = 
$result_trees{'end_ifset_in_format'};
-$result_trees{'end_ifset_in_format'}{'contents'}[4]{'extra'}{'command'} = 
$result_trees{'end_ifset_in_format'}{'contents'}[3];
 $result_trees{'end_ifset_in_format'}{'contents'}[4]{'parent'} = 
$result_trees{'end_ifset_in_format'};
 $result_trees{'end_ifset_in_format'}{'contents'}[5]{'contents'}[0]{'parent'} = 
$result_trees{'end_ifset_in_format'}{'contents'}[5];
 $result_trees{'end_ifset_in_format'}{'contents'}[5]{'parent'} = 
$result_trees{'end_ifset_in_format'};
@@ -213,7 +206,6 @@
 $result_trees{'end_ifset_in_format'}{'contents'}[7]{'contents'}[1]{'parent'} = 
$result_trees{'end_ifset_in_format'}{'contents'}[7];
 
$result_trees{'end_ifset_in_format'}{'contents'}[7]{'extra'}{'spaces_after_command'}
 = $result_trees{'end_ifset_in_format'}{'contents'}[7]{'contents'}[0];
 $result_trees{'end_ifset_in_format'}{'contents'}[7]{'parent'} = 
$result_trees{'end_ifset_in_format'};
-$result_trees{'end_ifset_in_format'}{'contents'}[8]{'extra'}{'command'} = 
$result_trees{'end_ifset_in_format'}{'contents'}[7];
 $result_trees{'end_ifset_in_format'}{'contents'}[8]{'parent'} = 
$result_trees{'end_ifset_in_format'};
 $result_trees{'end_ifset_in_format'}{'contents'}[9]{'parent'} = 
$result_trees{'end_ifset_in_format'};
 
$result_trees{'end_ifset_in_format'}{'contents'}[10]{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'end_ifset_in_format'}{'contents'}[10]{'contents'}[0]{'args'}[0];

Modified: trunk/tp/t/results/conditionals/macro_in_ifset.pl
===================================================================
--- trunk/tp/t/results/conditionals/macro_in_ifset.pl   2018-08-25 14:01:16 UTC 
(rev 8114)
+++ trunk/tp/t/results/conditionals/macro_in_ifset.pl   2018-08-25 14:29:53 UTC 
(rev 8115)
@@ -47,9 +47,6 @@
       'parent' => {}
     },
     {
-      'extra' => {
-        'command' => {}
-      },
       'parent' => {},
       'text' => '
 ',
@@ -86,7 +83,6 @@
 $result_trees{'macro_in_ifset'}{'contents'}[1]{'contents'}[0]{'parent'} = 
$result_trees{'macro_in_ifset'}{'contents'}[1];
 $result_trees{'macro_in_ifset'}{'contents'}[1]{'contents'}[1]{'parent'} = 
$result_trees{'macro_in_ifset'}{'contents'}[1];
 $result_trees{'macro_in_ifset'}{'contents'}[1]{'parent'} = 
$result_trees{'macro_in_ifset'};
-$result_trees{'macro_in_ifset'}{'contents'}[2]{'extra'}{'command'} = 
$result_trees{'macro_in_ifset'}{'contents'}[1];
 $result_trees{'macro_in_ifset'}{'contents'}[2]{'parent'} = 
$result_trees{'macro_in_ifset'};
 $result_trees{'macro_in_ifset'}{'contents'}[3]{'parent'} = 
$result_trees{'macro_in_ifset'};
 $result_trees{'macro_in_ifset'}{'contents'}[4]{'parent'} = 
$result_trees{'macro_in_ifset'};

Modified: trunk/tp/t/results/conditionals/macro_in_ifset_set.pl
===================================================================
--- trunk/tp/t/results/conditionals/macro_in_ifset_set.pl       2018-08-25 
14:01:16 UTC (rev 8114)
+++ trunk/tp/t/results/conditionals/macro_in_ifset_set.pl       2018-08-25 
14:29:53 UTC (rev 8115)
@@ -77,9 +77,6 @@
       'parent' => {}
     },
     {
-      'extra' => {
-        'command' => {}
-      },
       'parent' => {},
       'text' => '
 ',
@@ -143,9 +140,6 @@
       'parent' => {}
     },
     {
-      'extra' => {
-        'command' => {}
-      },
       'parent' => {},
       'text' => '
 ',
@@ -180,7 +174,6 @@
 $result_trees{'macro_in_ifset_set'}{'contents'}[3]{'contents'}[0]{'parent'} = 
$result_trees{'macro_in_ifset_set'}{'contents'}[3];
 $result_trees{'macro_in_ifset_set'}{'contents'}[3]{'contents'}[1]{'parent'} = 
$result_trees{'macro_in_ifset_set'}{'contents'}[3];
 $result_trees{'macro_in_ifset_set'}{'contents'}[3]{'parent'} = 
$result_trees{'macro_in_ifset_set'};
-$result_trees{'macro_in_ifset_set'}{'contents'}[4]{'extra'}{'command'} = 
$result_trees{'macro_in_ifset_set'}{'contents'}[3];
 $result_trees{'macro_in_ifset_set'}{'contents'}[4]{'parent'} = 
$result_trees{'macro_in_ifset_set'};
 $result_trees{'macro_in_ifset_set'}{'contents'}[5]{'parent'} = 
$result_trees{'macro_in_ifset_set'};
 $result_trees{'macro_in_ifset_set'}{'contents'}[6]{'args'}[0]{'parent'} = 
$result_trees{'macro_in_ifset_set'}{'contents'}[6];
@@ -189,7 +182,6 @@
 $result_trees{'macro_in_ifset_set'}{'contents'}[7]{'contents'}[0]{'parent'} = 
$result_trees{'macro_in_ifset_set'}{'contents'}[7];
 $result_trees{'macro_in_ifset_set'}{'contents'}[7]{'contents'}[1]{'parent'} = 
$result_trees{'macro_in_ifset_set'}{'contents'}[7];
 $result_trees{'macro_in_ifset_set'}{'contents'}[7]{'parent'} = 
$result_trees{'macro_in_ifset_set'};
-$result_trees{'macro_in_ifset_set'}{'contents'}[8]{'extra'}{'command'} = 
$result_trees{'macro_in_ifset_set'}{'contents'}[7];
 $result_trees{'macro_in_ifset_set'}{'contents'}[8]{'parent'} = 
$result_trees{'macro_in_ifset_set'};
 $result_trees{'macro_in_ifset_set'}{'contents'}[9]{'parent'} = 
$result_trees{'macro_in_ifset_set'};
 $result_trees{'macro_in_ifset_set'}{'contents'}[10]{'contents'}[0]{'parent'} = 
$result_trees{'macro_in_ifset_set'}{'contents'}[10];

Modified: trunk/tp/t/results/conditionals/nested_ifset_ifclear.pl
===================================================================
--- trunk/tp/t/results/conditionals/nested_ifset_ifclear.pl     2018-08-25 
14:01:16 UTC (rev 8114)
+++ trunk/tp/t/results/conditionals/nested_ifset_ifclear.pl     2018-08-25 
14:29:53 UTC (rev 8115)
@@ -89,9 +89,6 @@
       'parent' => {}
     },
     {
-      'extra' => {
-        'command' => {}
-      },
       'parent' => {},
       'text' => '
 ',
@@ -326,7 +323,6 @@
 $result_trees{'nested_ifset_ifclear'}{'contents'}[1]{'contents'}[7]{'parent'} 
= $result_trees{'nested_ifset_ifclear'}{'contents'}[1];
 $result_trees{'nested_ifset_ifclear'}{'contents'}[1]{'contents'}[8]{'parent'} 
= $result_trees{'nested_ifset_ifclear'}{'contents'}[1];
 $result_trees{'nested_ifset_ifclear'}{'contents'}[1]{'parent'} = 
$result_trees{'nested_ifset_ifclear'};
-$result_trees{'nested_ifset_ifclear'}{'contents'}[2]{'extra'}{'command'} = 
$result_trees{'nested_ifset_ifclear'}{'contents'}[1];
 $result_trees{'nested_ifset_ifclear'}{'contents'}[2]{'parent'} = 
$result_trees{'nested_ifset_ifclear'};
 $result_trees{'nested_ifset_ifclear'}{'contents'}[3]{'parent'} = 
$result_trees{'nested_ifset_ifclear'};
 $result_trees{'nested_ifset_ifclear'}{'contents'}[4]{'args'}[0]{'parent'} = 
$result_trees{'nested_ifset_ifclear'}{'contents'}[4];

Modified: trunk/tp/t/results/conditionals/nested_ignore.pl
===================================================================
--- trunk/tp/t/results/conditionals/nested_ignore.pl    2018-08-25 14:01:16 UTC 
(rev 8114)
+++ trunk/tp/t/results/conditionals/nested_ignore.pl    2018-08-25 14:29:53 UTC 
(rev 8115)
@@ -48,9 +48,6 @@
       'parent' => {}
     },
     {
-      'extra' => {
-        'command' => {}
-      },
       'parent' => {},
       'text' => '
 ',
@@ -103,9 +100,6 @@
       'parent' => {}
     },
     {
-      'extra' => {
-        'command' => {}
-      },
       'parent' => {},
       'text' => '
 ',
@@ -158,9 +152,6 @@
       'parent' => {}
     },
     {
-      'extra' => {
-        'command' => {}
-      },
       'parent' => {},
       'text' => '
 ',
@@ -176,7 +167,6 @@
 $result_trees{'nested_ignore'}{'contents'}[0]{'contents'}[3]{'parent'} = 
$result_trees{'nested_ignore'}{'contents'}[0];
 $result_trees{'nested_ignore'}{'contents'}[0]{'extra'}{'spaces_after_command'} 
= $result_trees{'nested_ignore'}{'contents'}[0]{'contents'}[0];
 $result_trees{'nested_ignore'}{'contents'}[0]{'parent'} = 
$result_trees{'nested_ignore'};
-$result_trees{'nested_ignore'}{'contents'}[1]{'extra'}{'command'} = 
$result_trees{'nested_ignore'}{'contents'}[0];
 $result_trees{'nested_ignore'}{'contents'}[1]{'parent'} = 
$result_trees{'nested_ignore'};
 $result_trees{'nested_ignore'}{'contents'}[2]{'parent'} = 
$result_trees{'nested_ignore'};
 
$result_trees{'nested_ignore'}{'contents'}[3]{'contents'}[0]{'extra'}{'command'}
 = $result_trees{'nested_ignore'}{'contents'}[3];
@@ -186,7 +176,6 @@
 $result_trees{'nested_ignore'}{'contents'}[3]{'contents'}[3]{'parent'} = 
$result_trees{'nested_ignore'}{'contents'}[3];
 $result_trees{'nested_ignore'}{'contents'}[3]{'extra'}{'spaces_after_command'} 
= $result_trees{'nested_ignore'}{'contents'}[3]{'contents'}[0];
 $result_trees{'nested_ignore'}{'contents'}[3]{'parent'} = 
$result_trees{'nested_ignore'};
-$result_trees{'nested_ignore'}{'contents'}[4]{'extra'}{'command'} = 
$result_trees{'nested_ignore'}{'contents'}[3];
 $result_trees{'nested_ignore'}{'contents'}[4]{'parent'} = 
$result_trees{'nested_ignore'};
 $result_trees{'nested_ignore'}{'contents'}[5]{'parent'} = 
$result_trees{'nested_ignore'};
 
$result_trees{'nested_ignore'}{'contents'}[6]{'contents'}[0]{'extra'}{'command'}
 = $result_trees{'nested_ignore'}{'contents'}[6];
@@ -196,7 +185,6 @@
 $result_trees{'nested_ignore'}{'contents'}[6]{'contents'}[3]{'parent'} = 
$result_trees{'nested_ignore'}{'contents'}[6];
 $result_trees{'nested_ignore'}{'contents'}[6]{'extra'}{'spaces_after_command'} 
= $result_trees{'nested_ignore'}{'contents'}[6]{'contents'}[0];
 $result_trees{'nested_ignore'}{'contents'}[6]{'parent'} = 
$result_trees{'nested_ignore'};
-$result_trees{'nested_ignore'}{'contents'}[7]{'extra'}{'command'} = 
$result_trees{'nested_ignore'}{'contents'}[6];
 $result_trees{'nested_ignore'}{'contents'}[7]{'parent'} = 
$result_trees{'nested_ignore'};
 
 $result_texis{'nested_ignore'} = '@ignore

Modified: trunk/tp/t/results/converters_tests/at_commands_in_raw.pl
===================================================================
--- trunk/tp/t/results/converters_tests/at_commands_in_raw.pl   2018-08-25 
14:01:16 UTC (rev 8114)
+++ trunk/tp/t/results/converters_tests/at_commands_in_raw.pl   2018-08-25 
14:29:53 UTC (rev 8115)
@@ -81,9 +81,7 @@
           'parent' => {}
         },
         {
-          'extra' => {
-            'command' => {}
-          },
+          'extra' => {},
           'parent' => {},
           'text' => '
 ',
@@ -891,7 +889,6 @@
 
$result_trees{'at_commands_in_raw'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'parent'}
 = $result_trees{'at_commands_in_raw'}{'contents'}[1]{'contents'}[1];
 
$result_trees{'at_commands_in_raw'}{'contents'}[1]{'contents'}[1]{'contents'}[1]{'parent'}
 = $result_trees{'at_commands_in_raw'}{'contents'}[1]{'contents'}[1];
 $result_trees{'at_commands_in_raw'}{'contents'}[1]{'contents'}[1]{'parent'} = 
$result_trees{'at_commands_in_raw'}{'contents'}[1];
-$result_trees{'at_commands_in_raw'}{'contents'}[1]{'contents'}[2]{'extra'}{'command'}
 = $result_trees{'at_commands_in_raw'}{'contents'}[1]{'contents'}[1];
 $result_trees{'at_commands_in_raw'}{'contents'}[1]{'contents'}[2]{'parent'} = 
$result_trees{'at_commands_in_raw'}{'contents'}[1];
 $result_trees{'at_commands_in_raw'}{'contents'}[1]{'contents'}[3]{'parent'} = 
$result_trees{'at_commands_in_raw'}{'contents'}[1];
 
$result_trees{'at_commands_in_raw'}{'contents'}[1]{'contents'}[4]{'contents'}[0]{'extra'}{'command'}
 = $result_trees{'at_commands_in_raw'}{'contents'}[1]{'contents'}[4];

Modified: trunk/tp/t/results/coverage_braces/test_image.pl
===================================================================
--- trunk/tp/t/results/coverage_braces/test_image.pl    2018-08-25 14:01:16 UTC 
(rev 8114)
+++ trunk/tp/t/results/coverage_braces/test_image.pl    2018-08-25 14:29:53 UTC 
(rev 8115)
@@ -55,9 +55,6 @@
           'parent' => {}
         },
         {
-          'extra' => {
-            'command' => {}
-          },
           'parent' => {},
           'text' => '
 ',
@@ -2955,7 +2952,6 @@
 
$result_trees{'test_image'}{'contents'}[0]{'contents'}[0]{'contents'}[2]{'parent'}
 = $result_trees{'test_image'}{'contents'}[0]{'contents'}[0];
 
$result_trees{'test_image'}{'contents'}[0]{'contents'}[0]{'contents'}[3]{'parent'}
 = $result_trees{'test_image'}{'contents'}[0]{'contents'}[0];
 $result_trees{'test_image'}{'contents'}[0]{'contents'}[0]{'parent'} = 
$result_trees{'test_image'}{'contents'}[0];
-$result_trees{'test_image'}{'contents'}[0]{'contents'}[1]{'extra'}{'command'} 
= $result_trees{'test_image'}{'contents'}[0]{'contents'}[0];
 $result_trees{'test_image'}{'contents'}[0]{'contents'}[1]{'parent'} = 
$result_trees{'test_image'}{'contents'}[0];
 $result_trees{'test_image'}{'contents'}[0]{'contents'}[2]{'parent'} = 
$result_trees{'test_image'}{'contents'}[0];
 
$result_trees{'test_image'}{'contents'}[0]{'contents'}[3]{'contents'}[0]{'extra'}{'command'}
 = $result_trees{'test_image'}{'contents'}[0]{'contents'}[3];

Modified: trunk/tp/t/results/html_tests/verbatim_in_multitable_in_example.pl
===================================================================
--- trunk/tp/t/results/html_tests/verbatim_in_multitable_in_example.pl  
2018-08-25 14:01:16 UTC (rev 8114)
+++ trunk/tp/t/results/html_tests/verbatim_in_multitable_in_example.pl  
2018-08-25 14:29:53 UTC (rev 8115)
@@ -203,9 +203,6 @@
                           'parent' => {}
                         },
                         {
-                          'extra' => {
-                            'command' => {}
-                          },
                           'parent' => {},
                           'text' => '
 ',
@@ -436,7 +433,6 @@
 
$result_trees{'verbatim_in_multitable_in_example'}{'contents'}[0]{'contents'}[1]{'contents'}[0]{'contents'}[1]{'contents'}[0]{'contents'}[1]{'contents'}[1]{'parent'}
 = 
$result_trees{'verbatim_in_multitable_in_example'}{'contents'}[0]{'contents'}[1]{'contents'}[0]{'contents'}[1]{'contents'}[0]{'contents'}[1];
 
$result_trees{'verbatim_in_multitable_in_example'}{'contents'}[0]{'contents'}[1]{'contents'}[0]{'contents'}[1]{'contents'}[0]{'contents'}[1]{'extra'}{'spaces_after_command'}
 = 
$result_trees{'verbatim_in_multitable_in_example'}{'contents'}[0]{'contents'}[1]{'contents'}[0]{'contents'}[1]{'contents'}[0]{'contents'}[1]{'contents'}[0];
 
$result_trees{'verbatim_in_multitable_in_example'}{'contents'}[0]{'contents'}[1]{'contents'}[0]{'contents'}[1]{'contents'}[0]{'contents'}[1]{'parent'}
 = 
$result_trees{'verbatim_in_multitable_in_example'}{'contents'}[0]{'contents'}[1]{'contents'}[0]{'contents'}[1]{'contents'}[0];
-$result_trees{'verbatim_in_multitable_in_example'}{'contents'}[0]{'contents'}[1]{'contents'}[0]{'contents'}[1]{'contents'}[0]{'contents'}[2]{'extra'}{'command'}
 = 
$result_trees{'verbatim_in_multitable_in_example'}{'contents'}[0]{'contents'}[1]{'contents'}[0]{'contents'}[1]{'contents'}[0]{'contents'}[1];
 
$result_trees{'verbatim_in_multitable_in_example'}{'contents'}[0]{'contents'}[1]{'contents'}[0]{'contents'}[1]{'contents'}[0]{'contents'}[2]{'parent'}
 = 
$result_trees{'verbatim_in_multitable_in_example'}{'contents'}[0]{'contents'}[1]{'contents'}[0]{'contents'}[1]{'contents'}[0];
 
$result_trees{'verbatim_in_multitable_in_example'}{'contents'}[0]{'contents'}[1]{'contents'}[0]{'contents'}[1]{'contents'}[0]{'extra'}{'spaces_after_command'}
 = 
$result_trees{'verbatim_in_multitable_in_example'}{'contents'}[0]{'contents'}[1]{'contents'}[0]{'contents'}[1]{'contents'}[0]{'contents'}[0];
 
$result_trees{'verbatim_in_multitable_in_example'}{'contents'}[0]{'contents'}[1]{'contents'}[0]{'contents'}[1]{'contents'}[0]{'parent'}
 = 
$result_trees{'verbatim_in_multitable_in_example'}{'contents'}[0]{'contents'}[1]{'contents'}[0]{'contents'}[1];

Modified: trunk/tp/t/results/html_tests/xml_protected_in_verb.pl
===================================================================
--- trunk/tp/t/results/html_tests/xml_protected_in_verb.pl      2018-08-25 
14:01:16 UTC (rev 8114)
+++ trunk/tp/t/results/html_tests/xml_protected_in_verb.pl      2018-08-25 
14:29:53 UTC (rev 8115)
@@ -37,9 +37,6 @@
       'parent' => {}
     },
     {
-      'extra' => {
-        'command' => {}
-      },
       'parent' => {},
       'text' => '
 ',
@@ -139,7 +136,6 @@
 $result_trees{'xml_protected_in_verb'}{'contents'}[0]{'contents'}[1]{'parent'} 
= $result_trees{'xml_protected_in_verb'}{'contents'}[0];
 
$result_trees{'xml_protected_in_verb'}{'contents'}[0]{'extra'}{'spaces_after_command'}
 = $result_trees{'xml_protected_in_verb'}{'contents'}[0]{'contents'}[0];
 $result_trees{'xml_protected_in_verb'}{'contents'}[0]{'parent'} = 
$result_trees{'xml_protected_in_verb'};
-$result_trees{'xml_protected_in_verb'}{'contents'}[1]{'extra'}{'command'} = 
$result_trees{'xml_protected_in_verb'}{'contents'}[0];
 $result_trees{'xml_protected_in_verb'}{'contents'}[1]{'parent'} = 
$result_trees{'xml_protected_in_verb'};
 $result_trees{'xml_protected_in_verb'}{'contents'}[2]{'parent'} = 
$result_trees{'xml_protected_in_verb'};
 
$result_trees{'xml_protected_in_verb'}{'contents'}[3]{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'xml_protected_in_verb'}{'contents'}[3]{'contents'}[0]{'args'}[0];

Modified: trunk/tp/t/results/include/cpp_lines.pl
===================================================================
--- trunk/tp/t/results/include/cpp_lines.pl     2018-08-25 14:01:16 UTC (rev 
8114)
+++ trunk/tp/t/results/include/cpp_lines.pl     2018-08-25 14:29:53 UTC (rev 
8115)
@@ -214,9 +214,6 @@
           'parent' => {}
         },
         {
-          'extra' => {
-            'command' => {}
-          },
           'parent' => {},
           'text' => '
 ',
@@ -262,9 +259,6 @@
           'parent' => {}
         },
         {
-          'extra' => {
-            'command' => {}
-          },
           'parent' => {},
           'text' => '
 ',
@@ -619,7 +613,6 @@
 
$result_trees{'cpp_lines'}{'contents'}[1]{'contents'}[3]{'contents'}[2]{'parent'}
 = $result_trees{'cpp_lines'}{'contents'}[1]{'contents'}[3];
 
$result_trees{'cpp_lines'}{'contents'}[1]{'contents'}[3]{'extra'}{'spaces_after_command'}
 = $result_trees{'cpp_lines'}{'contents'}[1]{'contents'}[3]{'contents'}[0];
 $result_trees{'cpp_lines'}{'contents'}[1]{'contents'}[3]{'parent'} = 
$result_trees{'cpp_lines'}{'contents'}[1];
-$result_trees{'cpp_lines'}{'contents'}[1]{'contents'}[4]{'extra'}{'command'} = 
$result_trees{'cpp_lines'}{'contents'}[1]{'contents'}[3];
 $result_trees{'cpp_lines'}{'contents'}[1]{'contents'}[4]{'parent'} = 
$result_trees{'cpp_lines'}{'contents'}[1];
 $result_trees{'cpp_lines'}{'contents'}[1]{'contents'}[5]{'parent'} = 
$result_trees{'cpp_lines'}{'contents'}[1];
 $result_trees{'cpp_lines'}{'contents'}[1]{'contents'}[6]{'args'}[0]{'parent'} 
= $result_trees{'cpp_lines'}{'contents'}[1]{'contents'}[6];
@@ -626,7 +619,6 @@
 
$result_trees{'cpp_lines'}{'contents'}[1]{'contents'}[6]{'contents'}[0]{'parent'}
 = $result_trees{'cpp_lines'}{'contents'}[1]{'contents'}[6];
 
$result_trees{'cpp_lines'}{'contents'}[1]{'contents'}[6]{'contents'}[1]{'parent'}
 = $result_trees{'cpp_lines'}{'contents'}[1]{'contents'}[6];
 $result_trees{'cpp_lines'}{'contents'}[1]{'contents'}[6]{'parent'} = 
$result_trees{'cpp_lines'}{'contents'}[1];
-$result_trees{'cpp_lines'}{'contents'}[1]{'contents'}[7]{'extra'}{'command'} = 
$result_trees{'cpp_lines'}{'contents'}[1]{'contents'}[6];
 $result_trees{'cpp_lines'}{'contents'}[1]{'contents'}[7]{'parent'} = 
$result_trees{'cpp_lines'}{'contents'}[1];
 $result_trees{'cpp_lines'}{'contents'}[1]{'contents'}[8]{'parent'} = 
$result_trees{'cpp_lines'}{'contents'}[1];
 
$result_trees{'cpp_lines'}{'contents'}[1]{'contents'}[9]{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'cpp_lines'}{'contents'}[1]{'contents'}[9]{'contents'}[0]{'args'}[0];

Modified: trunk/tp/t/results/include/macro_and_commands_in_early_commands.pl
===================================================================
--- trunk/tp/t/results/include/macro_and_commands_in_early_commands.pl  
2018-08-25 14:01:16 UTC (rev 8114)
+++ trunk/tp/t/results/include/macro_and_commands_in_early_commands.pl  
2018-08-25 14:29:53 UTC (rev 8115)
@@ -43,9 +43,6 @@
           'parent' => {}
         },
         {
-          'extra' => {
-            'command' => {}
-          },
           'parent' => {},
           'text' => '
 ',
@@ -144,9 +141,6 @@
           'parent' => {}
         },
         {
-          'extra' => {
-            'command' => {}
-          },
           'parent' => {},
           'text' => '
 ',
@@ -247,9 +241,6 @@
           'parent' => {}
         },
         {
-          'extra' => {
-            'command' => {}
-          },
           'parent' => {},
           'text' => '
 ',
@@ -383,9 +374,6 @@
           'parent' => {}
         },
         {
-          'extra' => {
-            'command' => {}
-          },
           'parent' => {},
           'text' => '
 ',
@@ -494,7 +482,6 @@
 
$result_trees{'macro_and_commands_in_early_commands'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'macro_and_commands_in_early_commands'}{'contents'}[0]{'contents'}[0];
 
$result_trees{'macro_and_commands_in_early_commands'}{'contents'}[0]{'contents'}[0]{'contents'}[1]{'parent'}
 = 
$result_trees{'macro_and_commands_in_early_commands'}{'contents'}[0]{'contents'}[0];
 
$result_trees{'macro_and_commands_in_early_commands'}{'contents'}[0]{'contents'}[0]{'parent'}
 = $result_trees{'macro_and_commands_in_early_commands'}{'contents'}[0];
-$result_trees{'macro_and_commands_in_early_commands'}{'contents'}[0]{'contents'}[1]{'extra'}{'command'}
 = 
$result_trees{'macro_and_commands_in_early_commands'}{'contents'}[0]{'contents'}[0];
 
$result_trees{'macro_and_commands_in_early_commands'}{'contents'}[0]{'contents'}[1]{'parent'}
 = $result_trees{'macro_and_commands_in_early_commands'}{'contents'}[0];
 
$result_trees{'macro_and_commands_in_early_commands'}{'contents'}[0]{'contents'}[2]{'parent'}
 = $result_trees{'macro_and_commands_in_early_commands'}{'contents'}[0];
 
$result_trees{'macro_and_commands_in_early_commands'}{'contents'}[0]{'contents'}[3]{'args'}[0]{'contents'}[0]{'extra'}{'command'}
 = 
$result_trees{'macro_and_commands_in_early_commands'}{'contents'}[0]{'contents'}[3];
@@ -511,7 +498,6 @@
 
$result_trees{'macro_and_commands_in_early_commands'}{'contents'}[0]{'contents'}[5]{'contents'}[0]{'parent'}
 = 
$result_trees{'macro_and_commands_in_early_commands'}{'contents'}[0]{'contents'}[5];
 
$result_trees{'macro_and_commands_in_early_commands'}{'contents'}[0]{'contents'}[5]{'contents'}[1]{'parent'}
 = 
$result_trees{'macro_and_commands_in_early_commands'}{'contents'}[0]{'contents'}[5];
 
$result_trees{'macro_and_commands_in_early_commands'}{'contents'}[0]{'contents'}[5]{'parent'}
 = $result_trees{'macro_and_commands_in_early_commands'}{'contents'}[0];
-$result_trees{'macro_and_commands_in_early_commands'}{'contents'}[0]{'contents'}[6]{'extra'}{'command'}
 = 
$result_trees{'macro_and_commands_in_early_commands'}{'contents'}[0]{'contents'}[5];
 
$result_trees{'macro_and_commands_in_early_commands'}{'contents'}[0]{'contents'}[6]{'parent'}
 = $result_trees{'macro_and_commands_in_early_commands'}{'contents'}[0];
 
$result_trees{'macro_and_commands_in_early_commands'}{'contents'}[0]{'contents'}[7]{'parent'}
 = $result_trees{'macro_and_commands_in_early_commands'}{'contents'}[0];
 
$result_trees{'macro_and_commands_in_early_commands'}{'contents'}[0]{'contents'}[8]{'args'}[0]{'contents'}[0]{'extra'}{'command'}
 = 
$result_trees{'macro_and_commands_in_early_commands'}{'contents'}[0]{'contents'}[8];
@@ -528,7 +514,6 @@
 
$result_trees{'macro_and_commands_in_early_commands'}{'contents'}[0]{'contents'}[10]{'contents'}[1]{'parent'}
 = 
$result_trees{'macro_and_commands_in_early_commands'}{'contents'}[0]{'contents'}[10];
 
$result_trees{'macro_and_commands_in_early_commands'}{'contents'}[0]{'contents'}[10]{'contents'}[2]{'parent'}
 = 
$result_trees{'macro_and_commands_in_early_commands'}{'contents'}[0]{'contents'}[10];
 
$result_trees{'macro_and_commands_in_early_commands'}{'contents'}[0]{'contents'}[10]{'parent'}
 = $result_trees{'macro_and_commands_in_early_commands'}{'contents'}[0];
-$result_trees{'macro_and_commands_in_early_commands'}{'contents'}[0]{'contents'}[11]{'extra'}{'command'}
 = 
$result_trees{'macro_and_commands_in_early_commands'}{'contents'}[0]{'contents'}[10];
 
$result_trees{'macro_and_commands_in_early_commands'}{'contents'}[0]{'contents'}[11]{'parent'}
 = $result_trees{'macro_and_commands_in_early_commands'}{'contents'}[0];
 
$result_trees{'macro_and_commands_in_early_commands'}{'contents'}[0]{'contents'}[12]{'parent'}
 = $result_trees{'macro_and_commands_in_early_commands'}{'contents'}[0];
 $result_trees{'macro_and_commands_in_early_commands'}{'contents'}[0]{'parent'} 
= $result_trees{'macro_and_commands_in_early_commands'};
@@ -551,7 +536,6 @@
 
$result_trees{'macro_and_commands_in_early_commands'}{'contents'}[2]{'contents'}[1]{'contents'}[0]{'parent'}
 = 
$result_trees{'macro_and_commands_in_early_commands'}{'contents'}[2]{'contents'}[1];
 
$result_trees{'macro_and_commands_in_early_commands'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'parent'}
 = 
$result_trees{'macro_and_commands_in_early_commands'}{'contents'}[2]{'contents'}[1];
 
$result_trees{'macro_and_commands_in_early_commands'}{'contents'}[2]{'contents'}[1]{'parent'}
 = $result_trees{'macro_and_commands_in_early_commands'}{'contents'}[2];
-$result_trees{'macro_and_commands_in_early_commands'}{'contents'}[2]{'contents'}[2]{'extra'}{'command'}
 = 
$result_trees{'macro_and_commands_in_early_commands'}{'contents'}[2]{'contents'}[1];
 
$result_trees{'macro_and_commands_in_early_commands'}{'contents'}[2]{'contents'}[2]{'parent'}
 = $result_trees{'macro_and_commands_in_early_commands'}{'contents'}[2];
 
$result_trees{'macro_and_commands_in_early_commands'}{'contents'}[2]{'contents'}[3]{'contents'}[0]{'parent'}
 = 
$result_trees{'macro_and_commands_in_early_commands'}{'contents'}[2]{'contents'}[3];
 
$result_trees{'macro_and_commands_in_early_commands'}{'contents'}[2]{'contents'}[3]{'parent'}
 = $result_trees{'macro_and_commands_in_early_commands'}{'contents'}[2];

Modified: trunk/tp/t/results/include/macro_definition_in_include.pl
===================================================================
--- trunk/tp/t/results/include/macro_definition_in_include.pl   2018-08-25 
14:01:16 UTC (rev 8114)
+++ trunk/tp/t/results/include/macro_definition_in_include.pl   2018-08-25 
14:29:53 UTC (rev 8115)
@@ -41,9 +41,6 @@
       'parent' => {}
     },
     {
-      'extra' => {
-        'command' => {}
-      },
       'parent' => {},
       'text' => '
 ',
@@ -78,7 +75,6 @@
 
$result_trees{'macro_definition_in_include'}{'contents'}[0]{'contents'}[0]{'parent'}
 = $result_trees{'macro_definition_in_include'}{'contents'}[0];
 
$result_trees{'macro_definition_in_include'}{'contents'}[0]{'contents'}[1]{'parent'}
 = $result_trees{'macro_definition_in_include'}{'contents'}[0];
 $result_trees{'macro_definition_in_include'}{'contents'}[0]{'parent'} = 
$result_trees{'macro_definition_in_include'};
-$result_trees{'macro_definition_in_include'}{'contents'}[1]{'extra'}{'command'}
 = $result_trees{'macro_definition_in_include'}{'contents'}[0];
 $result_trees{'macro_definition_in_include'}{'contents'}[1]{'parent'} = 
$result_trees{'macro_definition_in_include'};
 $result_trees{'macro_definition_in_include'}{'contents'}[2]{'parent'} = 
$result_trees{'macro_definition_in_include'};
 
$result_trees{'macro_definition_in_include'}{'contents'}[3]{'contents'}[0]{'parent'}
 = $result_trees{'macro_definition_in_include'}{'contents'}[3];

Modified: trunk/tp/t/results/include/macro_in_early_commands.pl
===================================================================
--- trunk/tp/t/results/include/macro_in_early_commands.pl       2018-08-25 
14:01:16 UTC (rev 8114)
+++ trunk/tp/t/results/include/macro_in_early_commands.pl       2018-08-25 
14:29:53 UTC (rev 8115)
@@ -43,9 +43,6 @@
           'parent' => {}
         },
         {
-          'extra' => {
-            'command' => {}
-          },
           'parent' => {},
           'text' => '
 ',
@@ -90,9 +87,6 @@
           'parent' => {}
         },
         {
-          'extra' => {
-            'command' => {}
-          },
           'parent' => {},
           'text' => '
 ',
@@ -183,9 +177,6 @@
           'parent' => {}
         },
         {
-          'extra' => {
-            'command' => {}
-          },
           'parent' => {},
           'text' => '
 ',
@@ -231,9 +222,6 @@
           'parent' => {}
         },
         {
-          'extra' => {
-            'command' => {}
-          },
           'parent' => {},
           'text' => '
 ',
@@ -332,9 +320,6 @@
           'parent' => {}
         },
         {
-          'extra' => {
-            'command' => {}
-          },
           'parent' => {},
           'text' => '
 ',
@@ -468,9 +453,6 @@
           'parent' => {}
         },
         {
-          'extra' => {
-            'command' => {}
-          },
           'parent' => {},
           'text' => '
 ',
@@ -564,7 +546,6 @@
 
$result_trees{'macro_in_early_commands'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'parent'}
 = $result_trees{'macro_in_early_commands'}{'contents'}[0]{'contents'}[0];
 
$result_trees{'macro_in_early_commands'}{'contents'}[0]{'contents'}[0]{'contents'}[1]{'parent'}
 = $result_trees{'macro_in_early_commands'}{'contents'}[0]{'contents'}[0];
 
$result_trees{'macro_in_early_commands'}{'contents'}[0]{'contents'}[0]{'parent'}
 = $result_trees{'macro_in_early_commands'}{'contents'}[0];
-$result_trees{'macro_in_early_commands'}{'contents'}[0]{'contents'}[1]{'extra'}{'command'}
 = $result_trees{'macro_in_early_commands'}{'contents'}[0]{'contents'}[0];
 
$result_trees{'macro_in_early_commands'}{'contents'}[0]{'contents'}[1]{'parent'}
 = $result_trees{'macro_in_early_commands'}{'contents'}[0];
 
$result_trees{'macro_in_early_commands'}{'contents'}[0]{'contents'}[2]{'args'}[0]{'parent'}
 = $result_trees{'macro_in_early_commands'}{'contents'}[0]{'contents'}[2];
 
$result_trees{'macro_in_early_commands'}{'contents'}[0]{'contents'}[2]{'args'}[1]{'parent'}
 = $result_trees{'macro_in_early_commands'}{'contents'}[0]{'contents'}[2];
@@ -571,7 +552,6 @@
 
$result_trees{'macro_in_early_commands'}{'contents'}[0]{'contents'}[2]{'contents'}[0]{'parent'}
 = $result_trees{'macro_in_early_commands'}{'contents'}[0]{'contents'}[2];
 
$result_trees{'macro_in_early_commands'}{'contents'}[0]{'contents'}[2]{'contents'}[1]{'parent'}
 = $result_trees{'macro_in_early_commands'}{'contents'}[0]{'contents'}[2];
 
$result_trees{'macro_in_early_commands'}{'contents'}[0]{'contents'}[2]{'parent'}
 = $result_trees{'macro_in_early_commands'}{'contents'}[0];
-$result_trees{'macro_in_early_commands'}{'contents'}[0]{'contents'}[3]{'extra'}{'command'}
 = $result_trees{'macro_in_early_commands'}{'contents'}[0]{'contents'}[2];
 
$result_trees{'macro_in_early_commands'}{'contents'}[0]{'contents'}[3]{'parent'}
 = $result_trees{'macro_in_early_commands'}{'contents'}[0];
 
$result_trees{'macro_in_early_commands'}{'contents'}[0]{'contents'}[4]{'parent'}
 = $result_trees{'macro_in_early_commands'}{'contents'}[0];
 
$result_trees{'macro_in_early_commands'}{'contents'}[0]{'contents'}[5]{'args'}[0]{'contents'}[0]{'extra'}{'command'}
 = $result_trees{'macro_in_early_commands'}{'contents'}[0]{'contents'}[5];
@@ -586,7 +566,6 @@
 
$result_trees{'macro_in_early_commands'}{'contents'}[0]{'contents'}[7]{'contents'}[0]{'parent'}
 = $result_trees{'macro_in_early_commands'}{'contents'}[0]{'contents'}[7];
 
$result_trees{'macro_in_early_commands'}{'contents'}[0]{'contents'}[7]{'contents'}[1]{'parent'}
 = $result_trees{'macro_in_early_commands'}{'contents'}[0]{'contents'}[7];
 
$result_trees{'macro_in_early_commands'}{'contents'}[0]{'contents'}[7]{'parent'}
 = $result_trees{'macro_in_early_commands'}{'contents'}[0];
-$result_trees{'macro_in_early_commands'}{'contents'}[0]{'contents'}[8]{'extra'}{'command'}
 = $result_trees{'macro_in_early_commands'}{'contents'}[0]{'contents'}[7];
 
$result_trees{'macro_in_early_commands'}{'contents'}[0]{'contents'}[8]{'parent'}
 = $result_trees{'macro_in_early_commands'}{'contents'}[0];
 
$result_trees{'macro_in_early_commands'}{'contents'}[0]{'contents'}[9]{'parent'}
 = $result_trees{'macro_in_early_commands'}{'contents'}[0];
 
$result_trees{'macro_in_early_commands'}{'contents'}[0]{'contents'}[10]{'args'}[0]{'parent'}
 = $result_trees{'macro_in_early_commands'}{'contents'}[0]{'contents'}[10];
@@ -593,7 +572,6 @@
 
$result_trees{'macro_in_early_commands'}{'contents'}[0]{'contents'}[10]{'contents'}[0]{'parent'}
 = $result_trees{'macro_in_early_commands'}{'contents'}[0]{'contents'}[10];
 
$result_trees{'macro_in_early_commands'}{'contents'}[0]{'contents'}[10]{'contents'}[1]{'parent'}
 = $result_trees{'macro_in_early_commands'}{'contents'}[0]{'contents'}[10];
 
$result_trees{'macro_in_early_commands'}{'contents'}[0]{'contents'}[10]{'parent'}
 = $result_trees{'macro_in_early_commands'}{'contents'}[0];
-$result_trees{'macro_in_early_commands'}{'contents'}[0]{'contents'}[11]{'extra'}{'command'}
 = $result_trees{'macro_in_early_commands'}{'contents'}[0]{'contents'}[10];
 
$result_trees{'macro_in_early_commands'}{'contents'}[0]{'contents'}[11]{'parent'}
 = $result_trees{'macro_in_early_commands'}{'contents'}[0];
 
$result_trees{'macro_in_early_commands'}{'contents'}[0]{'contents'}[12]{'parent'}
 = $result_trees{'macro_in_early_commands'}{'contents'}[0];
 
$result_trees{'macro_in_early_commands'}{'contents'}[0]{'contents'}[13]{'args'}[0]{'contents'}[0]{'extra'}{'command'}
 = $result_trees{'macro_in_early_commands'}{'contents'}[0]{'contents'}[13];
@@ -609,7 +587,6 @@
 
$result_trees{'macro_in_early_commands'}{'contents'}[0]{'contents'}[15]{'contents'}[1]{'parent'}
 = $result_trees{'macro_in_early_commands'}{'contents'}[0]{'contents'}[15];
 
$result_trees{'macro_in_early_commands'}{'contents'}[0]{'contents'}[15]{'contents'}[2]{'parent'}
 = $result_trees{'macro_in_early_commands'}{'contents'}[0]{'contents'}[15];
 
$result_trees{'macro_in_early_commands'}{'contents'}[0]{'contents'}[15]{'parent'}
 = $result_trees{'macro_in_early_commands'}{'contents'}[0];
-$result_trees{'macro_in_early_commands'}{'contents'}[0]{'contents'}[16]{'extra'}{'command'}
 = $result_trees{'macro_in_early_commands'}{'contents'}[0]{'contents'}[15];
 
$result_trees{'macro_in_early_commands'}{'contents'}[0]{'contents'}[16]{'parent'}
 = $result_trees{'macro_in_early_commands'}{'contents'}[0];
 
$result_trees{'macro_in_early_commands'}{'contents'}[0]{'contents'}[17]{'parent'}
 = $result_trees{'macro_in_early_commands'}{'contents'}[0];
 $result_trees{'macro_in_early_commands'}{'contents'}[0]{'parent'} = 
$result_trees{'macro_in_early_commands'};
@@ -632,7 +609,6 @@
 
$result_trees{'macro_in_early_commands'}{'contents'}[2]{'contents'}[1]{'contents'}[0]{'parent'}
 = $result_trees{'macro_in_early_commands'}{'contents'}[2]{'contents'}[1];
 
$result_trees{'macro_in_early_commands'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'parent'}
 = $result_trees{'macro_in_early_commands'}{'contents'}[2]{'contents'}[1];
 
$result_trees{'macro_in_early_commands'}{'contents'}[2]{'contents'}[1]{'parent'}
 = $result_trees{'macro_in_early_commands'}{'contents'}[2];
-$result_trees{'macro_in_early_commands'}{'contents'}[2]{'contents'}[2]{'extra'}{'command'}
 = $result_trees{'macro_in_early_commands'}{'contents'}[2]{'contents'}[1];
 
$result_trees{'macro_in_early_commands'}{'contents'}[2]{'contents'}[2]{'parent'}
 = $result_trees{'macro_in_early_commands'}{'contents'}[2];
 
$result_trees{'macro_in_early_commands'}{'contents'}[2]{'contents'}[3]{'contents'}[0]{'parent'}
 = $result_trees{'macro_in_early_commands'}{'contents'}[2]{'contents'}[3];
 
$result_trees{'macro_in_early_commands'}{'contents'}[2]{'contents'}[3]{'parent'}
 = $result_trees{'macro_in_early_commands'}{'contents'}[2];

Modified: trunk/tp/t/results/info_tests/def_in_copying.pl
===================================================================
--- trunk/tp/t/results/info_tests/def_in_copying.pl     2018-08-25 14:01:16 UTC 
(rev 8114)
+++ trunk/tp/t/results/info_tests/def_in_copying.pl     2018-08-25 14:29:53 UTC 
(rev 8115)
@@ -61,9 +61,6 @@
           'parent' => {}
         },
         {
-          'extra' => {
-            'command' => {}
-          },
           'parent' => {},
           'text' => '
 ',
@@ -890,7 +887,6 @@
 
$result_trees{'def_in_copying'}{'contents'}[0]{'contents'}[0]{'contents'}[3]{'parent'}
 = $result_trees{'def_in_copying'}{'contents'}[0]{'contents'}[0];
 
$result_trees{'def_in_copying'}{'contents'}[0]{'contents'}[0]{'contents'}[4]{'parent'}
 = $result_trees{'def_in_copying'}{'contents'}[0]{'contents'}[0];
 $result_trees{'def_in_copying'}{'contents'}[0]{'contents'}[0]{'parent'} = 
$result_trees{'def_in_copying'}{'contents'}[0];
-$result_trees{'def_in_copying'}{'contents'}[0]{'contents'}[1]{'extra'}{'command'}
 = $result_trees{'def_in_copying'}{'contents'}[0]{'contents'}[0];
 $result_trees{'def_in_copying'}{'contents'}[0]{'contents'}[1]{'parent'} = 
$result_trees{'def_in_copying'}{'contents'}[0];
 $result_trees{'def_in_copying'}{'contents'}[0]{'contents'}[2]{'parent'} = 
$result_trees{'def_in_copying'}{'contents'}[0];
 $result_trees{'def_in_copying'}{'contents'}[0]{'parent'} = 
$result_trees{'def_in_copying'};

Modified: trunk/tp/t/results/invalid_nestings/ignore_in_xref.pl
===================================================================
--- trunk/tp/t/results/invalid_nestings/ignore_in_xref.pl       2018-08-25 
14:01:16 UTC (rev 8114)
+++ trunk/tp/t/results/invalid_nestings/ignore_in_xref.pl       2018-08-25 
14:29:53 UTC (rev 8115)
@@ -99,9 +99,6 @@
                       'parent' => {}
                     },
                     {
-                      'extra' => {
-                        'command' => {}
-                      },
                       'parent' => {},
                       'text' => '
 ',
@@ -182,7 +179,6 @@
 
$result_trees{'ignore_in_xref'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'args'}[1]{'contents'}[0]{'contents'}[2]{'parent'}
 = 
$result_trees{'ignore_in_xref'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'args'}[1]{'contents'}[0];
 
$result_trees{'ignore_in_xref'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'args'}[1]{'contents'}[0]{'extra'}{'spaces_after_command'}
 = 
$result_trees{'ignore_in_xref'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'args'}[1]{'contents'}[0]{'contents'}[0];
 
$result_trees{'ignore_in_xref'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'args'}[1]{'contents'}[0]{'parent'}
 = 
$result_trees{'ignore_in_xref'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'args'}[1];
-$result_trees{'ignore_in_xref'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'args'}[1]{'contents'}[1]{'extra'}{'command'}
 = 
$result_trees{'ignore_in_xref'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'args'}[1]{'contents'}[0];
 
$result_trees{'ignore_in_xref'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'args'}[1]{'contents'}[1]{'parent'}
 = 
$result_trees{'ignore_in_xref'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'args'}[1];
 
$result_trees{'ignore_in_xref'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'args'}[1]{'parent'}
 = $result_trees{'ignore_in_xref'}{'contents'}[1]{'contents'}[1]{'contents'}[0];
 
$result_trees{'ignore_in_xref'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'extra'}{'label'}
 = $result_trees{'ignore_in_xref'}{'contents'}[1];

Modified: trunk/tp/t/results/invalid_nestings/verbatim_in_ref.pl
===================================================================
--- trunk/tp/t/results/invalid_nestings/verbatim_in_ref.pl      2018-08-25 
14:01:16 UTC (rev 8114)
+++ trunk/tp/t/results/invalid_nestings/verbatim_in_ref.pl      2018-08-25 
14:29:53 UTC (rev 8115)
@@ -115,9 +115,6 @@
           'parent' => {}
         },
         {
-          'extra' => {
-            'command' => {}
-          },
           'parent' => {},
           'text' => '
 ',
@@ -180,7 +177,6 @@
 
$result_trees{'verbatim_in_ref'}{'contents'}[1]{'contents'}[2]{'contents'}[1]{'parent'}
 = $result_trees{'verbatim_in_ref'}{'contents'}[1]{'contents'}[2];
 
$result_trees{'verbatim_in_ref'}{'contents'}[1]{'contents'}[2]{'extra'}{'spaces_after_command'}
 = 
$result_trees{'verbatim_in_ref'}{'contents'}[1]{'contents'}[2]{'contents'}[0];
 $result_trees{'verbatim_in_ref'}{'contents'}[1]{'contents'}[2]{'parent'} = 
$result_trees{'verbatim_in_ref'}{'contents'}[1];
-$result_trees{'verbatim_in_ref'}{'contents'}[1]{'contents'}[3]{'extra'}{'command'}
 = $result_trees{'verbatim_in_ref'}{'contents'}[1]{'contents'}[2];
 $result_trees{'verbatim_in_ref'}{'contents'}[1]{'contents'}[3]{'parent'} = 
$result_trees{'verbatim_in_ref'}{'contents'}[1];
 $result_trees{'verbatim_in_ref'}{'contents'}[1]{'contents'}[4]{'parent'} = 
$result_trees{'verbatim_in_ref'}{'contents'}[1];
 
$result_trees{'verbatim_in_ref'}{'contents'}[1]{'contents'}[5]{'contents'}[0]{'parent'}
 = $result_trees{'verbatim_in_ref'}{'contents'}[1]{'contents'}[5];

Modified: trunk/tp/t/results/macro/arg_body_expansion_order.pl
===================================================================
--- trunk/tp/t/results/macro/arg_body_expansion_order.pl        2018-08-25 
14:01:16 UTC (rev 8114)
+++ trunk/tp/t/results/macro/arg_body_expansion_order.pl        2018-08-25 
14:29:53 UTC (rev 8115)
@@ -47,9 +47,6 @@
       'parent' => {}
     },
     {
-      'extra' => {
-        'command' => {}
-      },
       'parent' => {},
       'text' => '
 ',
@@ -104,9 +101,6 @@
           'parent' => {}
         },
         {
-          'extra' => {
-            'command' => {}
-          },
           'parent' => {},
           'text' => '
 ',
@@ -136,9 +130,6 @@
       'parent' => {}
     },
     {
-      'extra' => {
-        'command' => {}
-      },
       'parent' => {},
       'text' => '
 ',
@@ -202,9 +193,6 @@
       'parent' => {}
     },
     {
-      'extra' => {
-        'command' => {}
-      },
       'parent' => {},
       'text' => '
 ',
@@ -229,7 +217,6 @@
 
$result_trees{'arg_body_expansion_order'}{'contents'}[1]{'contents'}[0]{'parent'}
 = $result_trees{'arg_body_expansion_order'}{'contents'}[1];
 
$result_trees{'arg_body_expansion_order'}{'contents'}[1]{'contents'}[1]{'parent'}
 = $result_trees{'arg_body_expansion_order'}{'contents'}[1];
 $result_trees{'arg_body_expansion_order'}{'contents'}[1]{'parent'} = 
$result_trees{'arg_body_expansion_order'};
-$result_trees{'arg_body_expansion_order'}{'contents'}[2]{'extra'}{'command'} = 
$result_trees{'arg_body_expansion_order'}{'contents'}[1];
 $result_trees{'arg_body_expansion_order'}{'contents'}[2]{'parent'} = 
$result_trees{'arg_body_expansion_order'};
 $result_trees{'arg_body_expansion_order'}{'contents'}[3]{'parent'} = 
$result_trees{'arg_body_expansion_order'};
 $result_trees{'arg_body_expansion_order'}{'contents'}[4]{'args'}[0]{'parent'} 
= $result_trees{'arg_body_expansion_order'}{'contents'}[4];
@@ -238,12 +225,10 @@
 
$result_trees{'arg_body_expansion_order'}{'contents'}[4]{'contents'}[1]{'contents'}[0]{'parent'}
 = $result_trees{'arg_body_expansion_order'}{'contents'}[4]{'contents'}[1];
 
$result_trees{'arg_body_expansion_order'}{'contents'}[4]{'contents'}[1]{'contents'}[1]{'parent'}
 = $result_trees{'arg_body_expansion_order'}{'contents'}[4]{'contents'}[1];
 
$result_trees{'arg_body_expansion_order'}{'contents'}[4]{'contents'}[1]{'parent'}
 = $result_trees{'arg_body_expansion_order'}{'contents'}[4];
-$result_trees{'arg_body_expansion_order'}{'contents'}[4]{'contents'}[2]{'extra'}{'command'}
 = $result_trees{'arg_body_expansion_order'}{'contents'}[4]{'contents'}[1];
 
$result_trees{'arg_body_expansion_order'}{'contents'}[4]{'contents'}[2]{'parent'}
 = $result_trees{'arg_body_expansion_order'}{'contents'}[4];
 
$result_trees{'arg_body_expansion_order'}{'contents'}[4]{'contents'}[3]{'parent'}
 = $result_trees{'arg_body_expansion_order'}{'contents'}[4];
 
$result_trees{'arg_body_expansion_order'}{'contents'}[4]{'contents'}[4]{'parent'}
 = $result_trees{'arg_body_expansion_order'}{'contents'}[4];
 $result_trees{'arg_body_expansion_order'}{'contents'}[4]{'parent'} = 
$result_trees{'arg_body_expansion_order'};
-$result_trees{'arg_body_expansion_order'}{'contents'}[5]{'extra'}{'command'} = 
$result_trees{'arg_body_expansion_order'}{'contents'}[4];
 $result_trees{'arg_body_expansion_order'}{'contents'}[5]{'parent'} = 
$result_trees{'arg_body_expansion_order'};
 $result_trees{'arg_body_expansion_order'}{'contents'}[6]{'parent'} = 
$result_trees{'arg_body_expansion_order'};
 $result_trees{'arg_body_expansion_order'}{'contents'}[7]{'args'}[0]{'parent'} 
= $result_trees{'arg_body_expansion_order'}{'contents'}[7];
@@ -252,7 +237,6 @@
 
$result_trees{'arg_body_expansion_order'}{'contents'}[8]{'contents'}[0]{'parent'}
 = $result_trees{'arg_body_expansion_order'}{'contents'}[8];
 
$result_trees{'arg_body_expansion_order'}{'contents'}[8]{'contents'}[1]{'parent'}
 = $result_trees{'arg_body_expansion_order'}{'contents'}[8];
 $result_trees{'arg_body_expansion_order'}{'contents'}[8]{'parent'} = 
$result_trees{'arg_body_expansion_order'};
-$result_trees{'arg_body_expansion_order'}{'contents'}[9]{'extra'}{'command'} = 
$result_trees{'arg_body_expansion_order'}{'contents'}[8];
 $result_trees{'arg_body_expansion_order'}{'contents'}[9]{'parent'} = 
$result_trees{'arg_body_expansion_order'};
 
$result_trees{'arg_body_expansion_order'}{'contents'}[10]{'contents'}[0]{'parent'}
 = $result_trees{'arg_body_expansion_order'}{'contents'}[10];
 $result_trees{'arg_body_expansion_order'}{'contents'}[10]{'parent'} = 
$result_trees{'arg_body_expansion_order'};

Modified: trunk/tp/t/results/macro/arg_not_closed.pl
===================================================================
--- trunk/tp/t/results/macro/arg_not_closed.pl  2018-08-25 14:01:16 UTC (rev 
8114)
+++ trunk/tp/t/results/macro/arg_not_closed.pl  2018-08-25 14:29:53 UTC (rev 
8115)
@@ -46,9 +46,6 @@
       'parent' => {}
     },
     {
-      'extra' => {
-        'command' => {}
-      },
       'parent' => {},
       'text' => '
 ',
@@ -79,7 +76,6 @@
 $result_trees{'arg_not_closed'}{'contents'}[0]{'contents'}[0]{'parent'} = 
$result_trees{'arg_not_closed'}{'contents'}[0];
 $result_trees{'arg_not_closed'}{'contents'}[0]{'contents'}[1]{'parent'} = 
$result_trees{'arg_not_closed'}{'contents'}[0];
 $result_trees{'arg_not_closed'}{'contents'}[0]{'parent'} = 
$result_trees{'arg_not_closed'};
-$result_trees{'arg_not_closed'}{'contents'}[1]{'extra'}{'command'} = 
$result_trees{'arg_not_closed'}{'contents'}[0];
 $result_trees{'arg_not_closed'}{'contents'}[1]{'parent'} = 
$result_trees{'arg_not_closed'};
 $result_trees{'arg_not_closed'}{'contents'}[2]{'parent'} = 
$result_trees{'arg_not_closed'};
 $result_trees{'arg_not_closed'}{'contents'}[3]{'contents'}[0]{'parent'} = 
$result_trees{'arg_not_closed'}{'contents'}[3];

Modified: trunk/tp/t/results/macro/backslash_in_arg.pl
===================================================================
--- trunk/tp/t/results/macro/backslash_in_arg.pl        2018-08-25 14:01:16 UTC 
(rev 8114)
+++ trunk/tp/t/results/macro/backslash_in_arg.pl        2018-08-25 14:29:53 UTC 
(rev 8115)
@@ -86,9 +86,6 @@
           'parent' => {}
         },
         {
-          'extra' => {
-            'command' => {}
-          },
           'parent' => {},
           'text' => '
 ',
@@ -393,7 +390,6 @@
 
$result_trees{'backslash_in_arg'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'parent'}
 = $result_trees{'backslash_in_arg'}{'contents'}[1]{'contents'}[1];
 
$result_trees{'backslash_in_arg'}{'contents'}[1]{'contents'}[1]{'contents'}[1]{'parent'}
 = $result_trees{'backslash_in_arg'}{'contents'}[1]{'contents'}[1];
 $result_trees{'backslash_in_arg'}{'contents'}[1]{'contents'}[1]{'parent'} = 
$result_trees{'backslash_in_arg'}{'contents'}[1];
-$result_trees{'backslash_in_arg'}{'contents'}[1]{'contents'}[2]{'extra'}{'command'}
 = $result_trees{'backslash_in_arg'}{'contents'}[1]{'contents'}[1];
 $result_trees{'backslash_in_arg'}{'contents'}[1]{'contents'}[2]{'parent'} = 
$result_trees{'backslash_in_arg'}{'contents'}[1];
 $result_trees{'backslash_in_arg'}{'contents'}[1]{'contents'}[3]{'parent'} = 
$result_trees{'backslash_in_arg'}{'contents'}[1];
 
$result_trees{'backslash_in_arg'}{'contents'}[1]{'contents'}[4]{'args'}[0]{'contents'}[0]{'extra'}{'command'}
 = $result_trees{'backslash_in_arg'}{'contents'}[1]{'contents'}[4];

Modified: trunk/tp/t/results/macro/bad_argument.pl
===================================================================
--- trunk/tp/t/results/macro/bad_argument.pl    2018-08-25 14:01:16 UTC (rev 
8114)
+++ trunk/tp/t/results/macro/bad_argument.pl    2018-08-25 14:29:53 UTC (rev 
8115)
@@ -35,9 +35,6 @@
       'parent' => {}
     },
     {
-      'extra' => {
-        'command' => {}
-      },
       'parent' => {},
       'text' => '
 ',
@@ -84,9 +81,6 @@
       'parent' => {}
     },
     {
-      'extra' => {
-        'command' => {}
-      },
       'parent' => {},
       'text' => '
 ',
@@ -138,9 +132,6 @@
       'parent' => {}
     },
     {
-      'extra' => {
-        'command' => {}
-      },
       'parent' => {},
       'text' => '
 ',
@@ -180,9 +171,6 @@
       'parent' => {}
     },
     {
-      'extra' => {
-        'command' => {}
-      },
       'parent' => {},
       'text' => '
 ',
@@ -194,7 +182,6 @@
 $result_trees{'bad_argument'}{'contents'}[0]{'contents'}[0]{'parent'} = 
$result_trees{'bad_argument'}{'contents'}[0];
 $result_trees{'bad_argument'}{'contents'}[0]{'contents'}[1]{'parent'} = 
$result_trees{'bad_argument'}{'contents'}[0];
 $result_trees{'bad_argument'}{'contents'}[0]{'parent'} = 
$result_trees{'bad_argument'};
-$result_trees{'bad_argument'}{'contents'}[1]{'extra'}{'command'} = 
$result_trees{'bad_argument'}{'contents'}[0];
 $result_trees{'bad_argument'}{'contents'}[1]{'parent'} = 
$result_trees{'bad_argument'};
 $result_trees{'bad_argument'}{'contents'}[2]{'parent'} = 
$result_trees{'bad_argument'};
 $result_trees{'bad_argument'}{'contents'}[3]{'args'}[0]{'parent'} = 
$result_trees{'bad_argument'}{'contents'}[3];
@@ -201,7 +188,6 @@
 $result_trees{'bad_argument'}{'contents'}[3]{'contents'}[0]{'parent'} = 
$result_trees{'bad_argument'}{'contents'}[3];
 $result_trees{'bad_argument'}{'contents'}[3]{'contents'}[1]{'parent'} = 
$result_trees{'bad_argument'}{'contents'}[3];
 $result_trees{'bad_argument'}{'contents'}[3]{'parent'} = 
$result_trees{'bad_argument'};
-$result_trees{'bad_argument'}{'contents'}[4]{'extra'}{'command'} = 
$result_trees{'bad_argument'}{'contents'}[3];
 $result_trees{'bad_argument'}{'contents'}[4]{'parent'} = 
$result_trees{'bad_argument'};
 $result_trees{'bad_argument'}{'contents'}[5]{'parent'} = 
$result_trees{'bad_argument'};
 $result_trees{'bad_argument'}{'contents'}[6]{'args'}[0]{'parent'} = 
$result_trees{'bad_argument'}{'contents'}[6];
@@ -209,13 +195,11 @@
 $result_trees{'bad_argument'}{'contents'}[6]{'contents'}[0]{'parent'} = 
$result_trees{'bad_argument'}{'contents'}[6];
 $result_trees{'bad_argument'}{'contents'}[6]{'contents'}[1]{'parent'} = 
$result_trees{'bad_argument'}{'contents'}[6];
 $result_trees{'bad_argument'}{'contents'}[6]{'parent'} = 
$result_trees{'bad_argument'};
-$result_trees{'bad_argument'}{'contents'}[7]{'extra'}{'command'} = 
$result_trees{'bad_argument'}{'contents'}[6];
 $result_trees{'bad_argument'}{'contents'}[7]{'parent'} = 
$result_trees{'bad_argument'};
 $result_trees{'bad_argument'}{'contents'}[8]{'parent'} = 
$result_trees{'bad_argument'};
 $result_trees{'bad_argument'}{'contents'}[9]{'contents'}[0]{'parent'} = 
$result_trees{'bad_argument'}{'contents'}[9];
 $result_trees{'bad_argument'}{'contents'}[9]{'contents'}[1]{'parent'} = 
$result_trees{'bad_argument'}{'contents'}[9];
 $result_trees{'bad_argument'}{'contents'}[9]{'parent'} = 
$result_trees{'bad_argument'};
-$result_trees{'bad_argument'}{'contents'}[10]{'extra'}{'command'} = 
$result_trees{'bad_argument'}{'contents'}[9];
 $result_trees{'bad_argument'}{'contents'}[10]{'parent'} = 
$result_trees{'bad_argument'};
 
 $result_texis{'bad_argument'} = '@macro

Modified: trunk/tp/t/results/macro/bad_formal_arg.pl
===================================================================
--- trunk/tp/t/results/macro/bad_formal_arg.pl  2018-08-25 14:01:16 UTC (rev 
8114)
+++ trunk/tp/t/results/macro/bad_formal_arg.pl  2018-08-25 14:29:53 UTC (rev 
8115)
@@ -58,9 +58,6 @@
       'parent' => {}
     },
     {
-      'extra' => {
-        'command' => {}
-      },
       'parent' => {},
       'text' => '
 ',
@@ -117,9 +114,6 @@
       'parent' => {}
     },
     {
-      'extra' => {
-        'command' => {}
-      },
       'parent' => {},
       'text' => '
 ',
@@ -174,9 +168,6 @@
           'parent' => {}
         },
         {
-          'extra' => {
-            'command' => {}
-          },
           'parent' => {},
           'text' => '
 ',
@@ -196,9 +187,6 @@
       'parent' => {}
     },
     {
-      'extra' => {
-        'command' => {}
-      },
       'parent' => {},
       'text' => '
 ',
@@ -214,7 +202,6 @@
 $result_trees{'bad_formal_arg'}{'contents'}[1]{'contents'}[0]{'parent'} = 
$result_trees{'bad_formal_arg'}{'contents'}[1];
 $result_trees{'bad_formal_arg'}{'contents'}[1]{'contents'}[1]{'parent'} = 
$result_trees{'bad_formal_arg'}{'contents'}[1];
 $result_trees{'bad_formal_arg'}{'contents'}[1]{'parent'} = 
$result_trees{'bad_formal_arg'};
-$result_trees{'bad_formal_arg'}{'contents'}[2]{'extra'}{'command'} = 
$result_trees{'bad_formal_arg'}{'contents'}[1];
 $result_trees{'bad_formal_arg'}{'contents'}[2]{'parent'} = 
$result_trees{'bad_formal_arg'};
 $result_trees{'bad_formal_arg'}{'contents'}[3]{'parent'} = 
$result_trees{'bad_formal_arg'};
 $result_trees{'bad_formal_arg'}{'contents'}[4]{'args'}[0]{'parent'} = 
$result_trees{'bad_formal_arg'}{'contents'}[4];
@@ -223,7 +210,6 @@
 $result_trees{'bad_formal_arg'}{'contents'}[4]{'contents'}[0]{'parent'} = 
$result_trees{'bad_formal_arg'}{'contents'}[4];
 $result_trees{'bad_formal_arg'}{'contents'}[4]{'contents'}[1]{'parent'} = 
$result_trees{'bad_formal_arg'}{'contents'}[4];
 $result_trees{'bad_formal_arg'}{'contents'}[4]{'parent'} = 
$result_trees{'bad_formal_arg'};
-$result_trees{'bad_formal_arg'}{'contents'}[5]{'extra'}{'command'} = 
$result_trees{'bad_formal_arg'}{'contents'}[4];
 $result_trees{'bad_formal_arg'}{'contents'}[5]{'parent'} = 
$result_trees{'bad_formal_arg'};
 $result_trees{'bad_formal_arg'}{'contents'}[6]{'parent'} = 
$result_trees{'bad_formal_arg'};
 $result_trees{'bad_formal_arg'}{'contents'}[7]{'args'}[0]{'parent'} = 
$result_trees{'bad_formal_arg'}{'contents'}[7];
@@ -232,10 +218,8 @@
 
$result_trees{'bad_formal_arg'}{'contents'}[7]{'contents'}[1]{'contents'}[0]{'parent'}
 = $result_trees{'bad_formal_arg'}{'contents'}[7]{'contents'}[1];
 
$result_trees{'bad_formal_arg'}{'contents'}[7]{'contents'}[1]{'contents'}[1]{'parent'}
 = $result_trees{'bad_formal_arg'}{'contents'}[7]{'contents'}[1];
 $result_trees{'bad_formal_arg'}{'contents'}[7]{'contents'}[1]{'parent'} = 
$result_trees{'bad_formal_arg'}{'contents'}[7];
-$result_trees{'bad_formal_arg'}{'contents'}[7]{'contents'}[2]{'extra'}{'command'}
 = $result_trees{'bad_formal_arg'}{'contents'}[7]{'contents'}[1];
 $result_trees{'bad_formal_arg'}{'contents'}[7]{'contents'}[2]{'parent'} = 
$result_trees{'bad_formal_arg'}{'contents'}[7];
 $result_trees{'bad_formal_arg'}{'contents'}[7]{'parent'} = 
$result_trees{'bad_formal_arg'};
-$result_trees{'bad_formal_arg'}{'contents'}[8]{'extra'}{'command'} = 
$result_trees{'bad_formal_arg'}{'contents'}[7];
 $result_trees{'bad_formal_arg'}{'contents'}[8]{'parent'} = 
$result_trees{'bad_formal_arg'};
 
 $result_texis{'bad_formal_arg'} = '

Modified: trunk/tp/t/results/macro/bad_macro_name_with_underscore.pl
===================================================================
--- trunk/tp/t/results/macro/bad_macro_name_with_underscore.pl  2018-08-25 
14:01:16 UTC (rev 8114)
+++ trunk/tp/t/results/macro/bad_macro_name_with_underscore.pl  2018-08-25 
14:29:53 UTC (rev 8115)
@@ -51,9 +51,6 @@
       'parent' => {}
     },
     {
-      'extra' => {
-        'command' => {}
-      },
       'parent' => {},
       'text' => '
 ',
@@ -68,7 +65,6 @@
 
$result_trees{'bad_macro_name_with_underscore'}{'contents'}[0]{'contents'}[0]{'parent'}
 = $result_trees{'bad_macro_name_with_underscore'}{'contents'}[0];
 
$result_trees{'bad_macro_name_with_underscore'}{'contents'}[0]{'contents'}[1]{'parent'}
 = $result_trees{'bad_macro_name_with_underscore'}{'contents'}[0];
 $result_trees{'bad_macro_name_with_underscore'}{'contents'}[0]{'parent'} = 
$result_trees{'bad_macro_name_with_underscore'};
-$result_trees{'bad_macro_name_with_underscore'}{'contents'}[1]{'extra'}{'command'}
 = $result_trees{'bad_macro_name_with_underscore'}{'contents'}[0];
 $result_trees{'bad_macro_name_with_underscore'}{'contents'}[1]{'parent'} = 
$result_trees{'bad_macro_name_with_underscore'};
 
 $result_texis{'bad_macro_name_with_underscore'} = '@macro the_macro {arg1, 
arg2}

Modified: trunk/tp/t/results/macro/complete_macro_for_end.pl
===================================================================
--- trunk/tp/t/results/macro/complete_macro_for_end.pl  2018-08-25 14:01:16 UTC 
(rev 8114)
+++ trunk/tp/t/results/macro/complete_macro_for_end.pl  2018-08-25 14:29:53 UTC 
(rev 8115)
@@ -41,9 +41,6 @@
       'parent' => {}
     },
     {
-      'extra' => {
-        'command' => {}
-      },
       'parent' => {},
       'text' => '
 ',
@@ -121,7 +118,6 @@
 
$result_trees{'complete_macro_for_end'}{'contents'}[0]{'contents'}[0]{'parent'} 
= $result_trees{'complete_macro_for_end'}{'contents'}[0];
 
$result_trees{'complete_macro_for_end'}{'contents'}[0]{'contents'}[1]{'parent'} 
= $result_trees{'complete_macro_for_end'}{'contents'}[0];
 $result_trees{'complete_macro_for_end'}{'contents'}[0]{'parent'} = 
$result_trees{'complete_macro_for_end'};
-$result_trees{'complete_macro_for_end'}{'contents'}[1]{'extra'}{'command'} = 
$result_trees{'complete_macro_for_end'}{'contents'}[0];
 $result_trees{'complete_macro_for_end'}{'contents'}[1]{'parent'} = 
$result_trees{'complete_macro_for_end'};
 $result_trees{'complete_macro_for_end'}{'contents'}[2]{'parent'} = 
$result_trees{'complete_macro_for_end'};
 
$result_trees{'complete_macro_for_end'}{'contents'}[3]{'contents'}[0]{'extra'}{'command'}
 = $result_trees{'complete_macro_for_end'}{'contents'}[3];

Modified: trunk/tp/t/results/macro/complex_argument.pl
===================================================================
--- trunk/tp/t/results/macro/complex_argument.pl        2018-08-25 14:01:16 UTC 
(rev 8114)
+++ trunk/tp/t/results/macro/complex_argument.pl        2018-08-25 14:29:53 UTC 
(rev 8115)
@@ -46,9 +46,6 @@
       'parent' => {}
     },
     {
-      'extra' => {
-        'command' => {}
-      },
       'parent' => {},
       'text' => '
 ',
@@ -112,9 +109,6 @@
       'parent' => {}
     },
     {
-      'extra' => {
-        'command' => {}
-      },
       'parent' => {},
       'text' => '
 ',
@@ -176,9 +170,6 @@
       'parent' => {}
     },
     {
-      'extra' => {
-        'command' => {}
-      },
       'parent' => {},
       'text' => '
 ',
@@ -382,9 +373,6 @@
       'parent' => {}
     },
     {
-      'extra' => {
-        'command' => {}
-      },
       'parent' => {},
       'text' => '
 ',
@@ -425,9 +413,6 @@
       'parent' => {}
     },
     {
-      'extra' => {
-        'command' => {}
-      },
       'parent' => {},
       'text' => '
 ',
@@ -472,9 +457,6 @@
       'parent' => {}
     },
     {
-      'extra' => {
-        'command' => {}
-      },
       'parent' => {},
       'text' => '
 ',
@@ -586,7 +568,6 @@
 $result_trees{'complex_argument'}{'contents'}[0]{'contents'}[0]{'parent'} = 
$result_trees{'complex_argument'}{'contents'}[0];
 $result_trees{'complex_argument'}{'contents'}[0]{'contents'}[1]{'parent'} = 
$result_trees{'complex_argument'}{'contents'}[0];
 $result_trees{'complex_argument'}{'contents'}[0]{'parent'} = 
$result_trees{'complex_argument'};
-$result_trees{'complex_argument'}{'contents'}[1]{'extra'}{'command'} = 
$result_trees{'complex_argument'}{'contents'}[0];
 $result_trees{'complex_argument'}{'contents'}[1]{'parent'} = 
$result_trees{'complex_argument'};
 $result_trees{'complex_argument'}{'contents'}[2]{'parent'} = 
$result_trees{'complex_argument'};
 $result_trees{'complex_argument'}{'contents'}[3]{'args'}[0]{'parent'} = 
$result_trees{'complex_argument'}{'contents'}[3];
@@ -596,7 +577,6 @@
 $result_trees{'complex_argument'}{'contents'}[3]{'contents'}[3]{'parent'} = 
$result_trees{'complex_argument'}{'contents'}[3];
 $result_trees{'complex_argument'}{'contents'}[3]{'contents'}[4]{'parent'} = 
$result_trees{'complex_argument'}{'contents'}[3];
 $result_trees{'complex_argument'}{'contents'}[3]{'parent'} = 
$result_trees{'complex_argument'};
-$result_trees{'complex_argument'}{'contents'}[4]{'extra'}{'command'} = 
$result_trees{'complex_argument'}{'contents'}[3];
 $result_trees{'complex_argument'}{'contents'}[4]{'parent'} = 
$result_trees{'complex_argument'};
 $result_trees{'complex_argument'}{'contents'}[5]{'parent'} = 
$result_trees{'complex_argument'};
 $result_trees{'complex_argument'}{'contents'}[6]{'args'}[0]{'parent'} = 
$result_trees{'complex_argument'}{'contents'}[6];
@@ -606,7 +586,6 @@
 $result_trees{'complex_argument'}{'contents'}[6]{'contents'}[1]{'parent'} = 
$result_trees{'complex_argument'}{'contents'}[6];
 $result_trees{'complex_argument'}{'contents'}[6]{'contents'}[2]{'parent'} = 
$result_trees{'complex_argument'}{'contents'}[6];
 $result_trees{'complex_argument'}{'contents'}[6]{'parent'} = 
$result_trees{'complex_argument'};
-$result_trees{'complex_argument'}{'contents'}[7]{'extra'}{'command'} = 
$result_trees{'complex_argument'}{'contents'}[6];
 $result_trees{'complex_argument'}{'contents'}[7]{'parent'} = 
$result_trees{'complex_argument'};
 $result_trees{'complex_argument'}{'contents'}[8]{'parent'} = 
$result_trees{'complex_argument'};
 
$result_trees{'complex_argument'}{'contents'}[9]{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'}
 = $result_trees{'complex_argument'}{'contents'}[9]{'contents'}[0]{'args'}[0];
@@ -642,7 +621,6 @@
 $result_trees{'complex_argument'}{'contents'}[10]{'contents'}[1]{'parent'} = 
$result_trees{'complex_argument'}{'contents'}[10];
 
$result_trees{'complex_argument'}{'contents'}[10]{'extra'}{'spaces_after_command'}
 = $result_trees{'complex_argument'}{'contents'}[10]{'contents'}[0];
 $result_trees{'complex_argument'}{'contents'}[10]{'parent'} = 
$result_trees{'complex_argument'};
-$result_trees{'complex_argument'}{'contents'}[11]{'extra'}{'command'} = 
$result_trees{'complex_argument'}{'contents'}[10];
 $result_trees{'complex_argument'}{'contents'}[11]{'parent'} = 
$result_trees{'complex_argument'};
 
$result_trees{'complex_argument'}{'contents'}[12]{'contents'}[0]{'extra'}{'command'}
 = $result_trees{'complex_argument'}{'contents'}[12];
 $result_trees{'complex_argument'}{'contents'}[12]{'contents'}[0]{'parent'} = 
$result_trees{'complex_argument'}{'contents'}[12];
@@ -650,7 +628,6 @@
 $result_trees{'complex_argument'}{'contents'}[12]{'contents'}[2]{'parent'} = 
$result_trees{'complex_argument'}{'contents'}[12];
 
$result_trees{'complex_argument'}{'contents'}[12]{'extra'}{'spaces_after_command'}
 = $result_trees{'complex_argument'}{'contents'}[12]{'contents'}[0];
 $result_trees{'complex_argument'}{'contents'}[12]{'parent'} = 
$result_trees{'complex_argument'};
-$result_trees{'complex_argument'}{'contents'}[13]{'extra'}{'command'} = 
$result_trees{'complex_argument'}{'contents'}[12];
 $result_trees{'complex_argument'}{'contents'}[13]{'parent'} = 
$result_trees{'complex_argument'};
 $result_trees{'complex_argument'}{'contents'}[14]{'args'}[0]{'parent'} = 
$result_trees{'complex_argument'}{'contents'}[14];
 $result_trees{'complex_argument'}{'contents'}[14]{'args'}[1]{'parent'} = 
$result_trees{'complex_argument'}{'contents'}[14];
@@ -657,7 +634,6 @@
 $result_trees{'complex_argument'}{'contents'}[14]{'contents'}[0]{'parent'} = 
$result_trees{'complex_argument'}{'contents'}[14];
 $result_trees{'complex_argument'}{'contents'}[14]{'contents'}[1]{'parent'} = 
$result_trees{'complex_argument'}{'contents'}[14];
 $result_trees{'complex_argument'}{'contents'}[14]{'parent'} = 
$result_trees{'complex_argument'};
-$result_trees{'complex_argument'}{'contents'}[15]{'extra'}{'command'} = 
$result_trees{'complex_argument'}{'contents'}[14];
 $result_trees{'complex_argument'}{'contents'}[15]{'parent'} = 
$result_trees{'complex_argument'};
 $result_trees{'complex_argument'}{'contents'}[16]{'contents'}[0]{'parent'} = 
$result_trees{'complex_argument'}{'contents'}[16];
 $result_trees{'complex_argument'}{'contents'}[16]{'contents'}[1]{'parent'} = 
$result_trees{'complex_argument'}{'contents'}[16];

Modified: trunk/tp/t/results/macro/double_macro_definition.pl
===================================================================
--- trunk/tp/t/results/macro/double_macro_definition.pl 2018-08-25 14:01:16 UTC 
(rev 8114)
+++ trunk/tp/t/results/macro/double_macro_definition.pl 2018-08-25 14:29:53 UTC 
(rev 8115)
@@ -29,9 +29,6 @@
       'parent' => {}
     },
     {
-      'extra' => {
-        'command' => {}
-      },
       'parent' => {},
       'text' => '
 ',
@@ -65,9 +62,6 @@
       'parent' => {}
     },
     {
-      'extra' => {
-        'command' => {}
-      },
       'parent' => {},
       'text' => '
 ',
@@ -78,12 +72,10 @@
 };
 $result_trees{'double_macro_definition'}{'contents'}[0]{'args'}[0]{'parent'} = 
$result_trees{'double_macro_definition'}{'contents'}[0];
 $result_trees{'double_macro_definition'}{'contents'}[0]{'parent'} = 
$result_trees{'double_macro_definition'};
-$result_trees{'double_macro_definition'}{'contents'}[1]{'extra'}{'command'} = 
$result_trees{'double_macro_definition'}{'contents'}[0];
 $result_trees{'double_macro_definition'}{'contents'}[1]{'parent'} = 
$result_trees{'double_macro_definition'};
 $result_trees{'double_macro_definition'}{'contents'}[2]{'parent'} = 
$result_trees{'double_macro_definition'};
 $result_trees{'double_macro_definition'}{'contents'}[3]{'args'}[0]{'parent'} = 
$result_trees{'double_macro_definition'}{'contents'}[3];
 $result_trees{'double_macro_definition'}{'contents'}[3]{'parent'} = 
$result_trees{'double_macro_definition'};
-$result_trees{'double_macro_definition'}{'contents'}[4]{'extra'}{'command'} = 
$result_trees{'double_macro_definition'}{'contents'}[3];
 $result_trees{'double_macro_definition'}{'contents'}[4]{'parent'} = 
$result_trees{'double_macro_definition'};
 
 $result_texis{'double_macro_definition'} = '@macro foo

Modified: trunk/tp/t/results/macro/double_recursive_macro_call.pl
===================================================================
--- trunk/tp/t/results/macro/double_recursive_macro_call.pl     2018-08-25 
14:01:16 UTC (rev 8114)
+++ trunk/tp/t/results/macro/double_recursive_macro_call.pl     2018-08-25 
14:29:53 UTC (rev 8115)
@@ -52,9 +52,6 @@
       'parent' => {}
     },
     {
-      'extra' => {
-        'command' => {}
-      },
       'parent' => {},
       'text' => '
 ',
@@ -105,9 +102,6 @@
       'parent' => {}
     },
     {
-      'extra' => {
-        'command' => {}
-      },
       'parent' => {},
       'text' => '
 ',
@@ -134,7 +128,6 @@
 
$result_trees{'double_recursive_macro_call'}{'contents'}[1]{'contents'}[0]{'parent'}
 = $result_trees{'double_recursive_macro_call'}{'contents'}[1];
 
$result_trees{'double_recursive_macro_call'}{'contents'}[1]{'contents'}[1]{'parent'}
 = $result_trees{'double_recursive_macro_call'}{'contents'}[1];
 $result_trees{'double_recursive_macro_call'}{'contents'}[1]{'parent'} = 
$result_trees{'double_recursive_macro_call'};
-$result_trees{'double_recursive_macro_call'}{'contents'}[2]{'extra'}{'command'}
 = $result_trees{'double_recursive_macro_call'}{'contents'}[1];
 $result_trees{'double_recursive_macro_call'}{'contents'}[2]{'parent'} = 
$result_trees{'double_recursive_macro_call'};
 $result_trees{'double_recursive_macro_call'}{'contents'}[3]{'parent'} = 
$result_trees{'double_recursive_macro_call'};
 
$result_trees{'double_recursive_macro_call'}{'contents'}[4]{'args'}[0]{'parent'}
 = $result_trees{'double_recursive_macro_call'}{'contents'}[4];
@@ -142,7 +135,6 @@
 
$result_trees{'double_recursive_macro_call'}{'contents'}[4]{'contents'}[0]{'parent'}
 = $result_trees{'double_recursive_macro_call'}{'contents'}[4];
 
$result_trees{'double_recursive_macro_call'}{'contents'}[4]{'contents'}[1]{'parent'}
 = $result_trees{'double_recursive_macro_call'}{'contents'}[4];
 $result_trees{'double_recursive_macro_call'}{'contents'}[4]{'parent'} = 
$result_trees{'double_recursive_macro_call'};
-$result_trees{'double_recursive_macro_call'}{'contents'}[5]{'extra'}{'command'}
 = $result_trees{'double_recursive_macro_call'}{'contents'}[4];
 $result_trees{'double_recursive_macro_call'}{'contents'}[5]{'parent'} = 
$result_trees{'double_recursive_macro_call'};
 $result_trees{'double_recursive_macro_call'}{'contents'}[6]{'parent'} = 
$result_trees{'double_recursive_macro_call'};
 $result_trees{'double_recursive_macro_call'}{'contents'}[7]{'parent'} = 
$result_trees{'double_recursive_macro_call'};

Modified: trunk/tp/t/results/macro/empty_end.pl
===================================================================
--- trunk/tp/t/results/macro/empty_end.pl       2018-08-25 14:01:16 UTC (rev 
8114)
+++ trunk/tp/t/results/macro/empty_end.pl       2018-08-25 14:29:53 UTC (rev 
8115)
@@ -46,9 +46,6 @@
       'parent' => {}
     },
     {
-      'extra' => {
-        'command' => {}
-      },
       'parent' => {},
       'text' => '',
       'type' => 'empty_line_after_command'
@@ -61,7 +58,6 @@
 $result_trees{'empty_end'}{'contents'}[0]{'contents'}[0]{'parent'} = 
$result_trees{'empty_end'}{'contents'}[0];
 $result_trees{'empty_end'}{'contents'}[0]{'contents'}[1]{'parent'} = 
$result_trees{'empty_end'}{'contents'}[0];
 $result_trees{'empty_end'}{'contents'}[0]{'parent'} = 
$result_trees{'empty_end'};
-$result_trees{'empty_end'}{'contents'}[1]{'extra'}{'command'} = 
$result_trees{'empty_end'}{'contents'}[0];
 $result_trees{'empty_end'}{'contents'}[1]{'parent'} = 
$result_trees{'empty_end'};
 
 $result_texis{'empty_end'} = '@macro foo {aaa, }

Modified: trunk/tp/t/results/macro/empty_macro_in_text_no_arg.pl
===================================================================
--- trunk/tp/t/results/macro/empty_macro_in_text_no_arg.pl      2018-08-25 
14:01:16 UTC (rev 8114)
+++ trunk/tp/t/results/macro/empty_macro_in_text_no_arg.pl      2018-08-25 
14:29:53 UTC (rev 8115)
@@ -29,9 +29,6 @@
       'parent' => {}
     },
     {
-      'extra' => {
-        'command' => {}
-      },
       'parent' => {},
       'text' => '
 ',
@@ -87,9 +84,6 @@
       'parent' => {}
     },
     {
-      'extra' => {
-        'command' => {}
-      },
       'parent' => {},
       'text' => '
 ',
@@ -117,7 +111,6 @@
 };
 
$result_trees{'empty_macro_in_text_no_arg'}{'contents'}[0]{'args'}[0]{'parent'} 
= $result_trees{'empty_macro_in_text_no_arg'}{'contents'}[0];
 $result_trees{'empty_macro_in_text_no_arg'}{'contents'}[0]{'parent'} = 
$result_trees{'empty_macro_in_text_no_arg'};
-$result_trees{'empty_macro_in_text_no_arg'}{'contents'}[1]{'extra'}{'command'} 
= $result_trees{'empty_macro_in_text_no_arg'}{'contents'}[0];
 $result_trees{'empty_macro_in_text_no_arg'}{'contents'}[1]{'parent'} = 
$result_trees{'empty_macro_in_text_no_arg'};
 $result_trees{'empty_macro_in_text_no_arg'}{'contents'}[2]{'parent'} = 
$result_trees{'empty_macro_in_text_no_arg'};
 $result_trees{'empty_macro_in_text_no_arg'}{'contents'}[3]{'parent'} = 
$result_trees{'empty_macro_in_text_no_arg'};
@@ -126,7 +119,6 @@
 $result_trees{'empty_macro_in_text_no_arg'}{'contents'}[5]{'parent'} = 
$result_trees{'empty_macro_in_text_no_arg'};
 
$result_trees{'empty_macro_in_text_no_arg'}{'contents'}[6]{'args'}[0]{'parent'} 
= $result_trees{'empty_macro_in_text_no_arg'}{'contents'}[6];
 $result_trees{'empty_macro_in_text_no_arg'}{'contents'}[6]{'parent'} = 
$result_trees{'empty_macro_in_text_no_arg'};
-$result_trees{'empty_macro_in_text_no_arg'}{'contents'}[7]{'extra'}{'command'} 
= $result_trees{'empty_macro_in_text_no_arg'}{'contents'}[6];
 $result_trees{'empty_macro_in_text_no_arg'}{'contents'}[7]{'parent'} = 
$result_trees{'empty_macro_in_text_no_arg'};
 $result_trees{'empty_macro_in_text_no_arg'}{'contents'}[8]{'parent'} = 
$result_trees{'empty_macro_in_text_no_arg'};
 
$result_trees{'empty_macro_in_text_no_arg'}{'contents'}[9]{'contents'}[0]{'parent'}
 = $result_trees{'empty_macro_in_text_no_arg'}{'contents'}[9];

Modified: trunk/tp/t/results/macro/empty_macro_no_arg.pl
===================================================================
--- trunk/tp/t/results/macro/empty_macro_no_arg.pl      2018-08-25 14:01:16 UTC 
(rev 8114)
+++ trunk/tp/t/results/macro/empty_macro_no_arg.pl      2018-08-25 14:29:53 UTC 
(rev 8115)
@@ -29,9 +29,6 @@
       'parent' => {}
     },
     {
-      'extra' => {
-        'command' => {}
-      },
       'parent' => {},
       'text' => '
 ',
@@ -66,7 +63,6 @@
 };
 $result_trees{'empty_macro_no_arg'}{'contents'}[0]{'args'}[0]{'parent'} = 
$result_trees{'empty_macro_no_arg'}{'contents'}[0];
 $result_trees{'empty_macro_no_arg'}{'contents'}[0]{'parent'} = 
$result_trees{'empty_macro_no_arg'};
-$result_trees{'empty_macro_no_arg'}{'contents'}[1]{'extra'}{'command'} = 
$result_trees{'empty_macro_no_arg'}{'contents'}[0];
 $result_trees{'empty_macro_no_arg'}{'contents'}[1]{'parent'} = 
$result_trees{'empty_macro_no_arg'};
 $result_trees{'empty_macro_no_arg'}{'contents'}[2]{'parent'} = 
$result_trees{'empty_macro_no_arg'};
 $result_trees{'empty_macro_no_arg'}{'contents'}[3]{'parent'} = 
$result_trees{'empty_macro_no_arg'};

Modified: trunk/tp/t/results/macro/expand_two_same.pl
===================================================================
--- trunk/tp/t/results/macro/expand_two_same.pl 2018-08-25 14:01:16 UTC (rev 
8114)
+++ trunk/tp/t/results/macro/expand_two_same.pl 2018-08-25 14:29:53 UTC (rev 
8115)
@@ -52,9 +52,6 @@
       'parent' => {}
     },
     {
-      'extra' => {
-        'command' => {}
-      },
       'parent' => {},
       'text' => '
 ',
@@ -186,7 +183,6 @@
 $result_trees{'expand_two_same'}{'contents'}[0]{'contents'}[1]{'parent'} = 
$result_trees{'expand_two_same'}{'contents'}[0];
 $result_trees{'expand_two_same'}{'contents'}[0]{'contents'}[2]{'parent'} = 
$result_trees{'expand_two_same'}{'contents'}[0];
 $result_trees{'expand_two_same'}{'contents'}[0]{'parent'} = 
$result_trees{'expand_two_same'};
-$result_trees{'expand_two_same'}{'contents'}[1]{'extra'}{'command'} = 
$result_trees{'expand_two_same'}{'contents'}[0];
 $result_trees{'expand_two_same'}{'contents'}[1]{'parent'} = 
$result_trees{'expand_two_same'};
 $result_trees{'expand_two_same'}{'contents'}[2]{'contents'}[0]{'parent'} = 
$result_trees{'expand_two_same'}{'contents'}[2];
 $result_trees{'expand_two_same'}{'contents'}[2]{'contents'}[1]{'parent'} = 
$result_trees{'expand_two_same'}{'contents'}[2];

Modified: trunk/tp/t/results/macro/expansion_order.pl
===================================================================
--- trunk/tp/t/results/macro/expansion_order.pl 2018-08-25 14:01:16 UTC (rev 
8114)
+++ trunk/tp/t/results/macro/expansion_order.pl 2018-08-25 14:29:53 UTC (rev 
8115)
@@ -46,9 +46,6 @@
       'parent' => {}
     },
     {
-      'extra' => {
-        'command' => {}
-      },
       'parent' => {},
       'text' => '
 ',
@@ -100,9 +97,6 @@
       'parent' => {}
     },
     {
-      'extra' => {
-        'command' => {}
-      },
       'parent' => {},
       'text' => '
 ',
@@ -139,7 +133,6 @@
 $result_trees{'expansion_order'}{'contents'}[0]{'contents'}[0]{'parent'} = 
$result_trees{'expansion_order'}{'contents'}[0];
 $result_trees{'expansion_order'}{'contents'}[0]{'contents'}[1]{'parent'} = 
$result_trees{'expansion_order'}{'contents'}[0];
 $result_trees{'expansion_order'}{'contents'}[0]{'parent'} = 
$result_trees{'expansion_order'};
-$result_trees{'expansion_order'}{'contents'}[1]{'extra'}{'command'} = 
$result_trees{'expansion_order'}{'contents'}[0];
 $result_trees{'expansion_order'}{'contents'}[1]{'parent'} = 
$result_trees{'expansion_order'};
 $result_trees{'expansion_order'}{'contents'}[2]{'parent'} = 
$result_trees{'expansion_order'};
 $result_trees{'expansion_order'}{'contents'}[3]{'args'}[0]{'parent'} = 
$result_trees{'expansion_order'}{'contents'}[3];
@@ -147,7 +140,6 @@
 $result_trees{'expansion_order'}{'contents'}[3]{'contents'}[1]{'parent'} = 
$result_trees{'expansion_order'}{'contents'}[3];
 $result_trees{'expansion_order'}{'contents'}[3]{'contents'}[2]{'parent'} = 
$result_trees{'expansion_order'}{'contents'}[3];
 $result_trees{'expansion_order'}{'contents'}[3]{'parent'} = 
$result_trees{'expansion_order'};
-$result_trees{'expansion_order'}{'contents'}[4]{'extra'}{'command'} = 
$result_trees{'expansion_order'}{'contents'}[3];
 $result_trees{'expansion_order'}{'contents'}[4]{'parent'} = 
$result_trees{'expansion_order'};
 $result_trees{'expansion_order'}{'contents'}[5]{'parent'} = 
$result_trees{'expansion_order'};
 $result_trees{'expansion_order'}{'contents'}[6]{'contents'}[0]{'parent'} = 
$result_trees{'expansion_order'}{'contents'}[6];

Modified: trunk/tp/t/results/macro/form_feeds.pl
===================================================================
--- trunk/tp/t/results/macro/form_feeds.pl      2018-08-25 14:01:16 UTC (rev 
8114)
+++ trunk/tp/t/results/macro/form_feeds.pl      2018-08-25 14:29:53 UTC (rev 
8115)
@@ -51,9 +51,6 @@
       'parent' => {}
     },
     {
-      'extra' => {
-        'command' => {}
-      },
       'parent' => {},
       'text' => '
 ',
@@ -104,9 +101,6 @@
       'parent' => {}
     },
     {
-      'extra' => {
-        'command' => {}
-      },
       'parent' => {},
       'text' => '
 ',
@@ -189,7 +183,6 @@
 $result_trees{'form_feeds'}{'contents'}[0]{'contents'}[0]{'parent'} = 
$result_trees{'form_feeds'}{'contents'}[0];
 $result_trees{'form_feeds'}{'contents'}[0]{'contents'}[1]{'parent'} = 
$result_trees{'form_feeds'}{'contents'}[0];
 $result_trees{'form_feeds'}{'contents'}[0]{'parent'} = 
$result_trees{'form_feeds'};
-$result_trees{'form_feeds'}{'contents'}[1]{'extra'}{'command'} = 
$result_trees{'form_feeds'}{'contents'}[0];
 $result_trees{'form_feeds'}{'contents'}[1]{'parent'} = 
$result_trees{'form_feeds'};
 $result_trees{'form_feeds'}{'contents'}[2]{'parent'} = 
$result_trees{'form_feeds'};
 $result_trees{'form_feeds'}{'contents'}[3]{'args'}[0]{'parent'} = 
$result_trees{'form_feeds'}{'contents'}[3];
@@ -197,7 +190,6 @@
 $result_trees{'form_feeds'}{'contents'}[3]{'contents'}[0]{'parent'} = 
$result_trees{'form_feeds'}{'contents'}[3];
 $result_trees{'form_feeds'}{'contents'}[3]{'contents'}[1]{'parent'} = 
$result_trees{'form_feeds'}{'contents'}[3];
 $result_trees{'form_feeds'}{'contents'}[3]{'parent'} = 
$result_trees{'form_feeds'};
-$result_trees{'form_feeds'}{'contents'}[4]{'extra'}{'command'} = 
$result_trees{'form_feeds'}{'contents'}[3];
 $result_trees{'form_feeds'}{'contents'}[4]{'parent'} = 
$result_trees{'form_feeds'};
 $result_trees{'form_feeds'}{'contents'}[5]{'parent'} = 
$result_trees{'form_feeds'};
 $result_trees{'form_feeds'}{'contents'}[6]{'contents'}[0]{'parent'} = 
$result_trees{'form_feeds'}{'contents'}[6];

Modified: trunk/tp/t/results/macro/ifclear_in_macro.pl
===================================================================
--- trunk/tp/t/results/macro/ifclear_in_macro.pl        2018-08-25 14:01:16 UTC 
(rev 8114)
+++ trunk/tp/t/results/macro/ifclear_in_macro.pl        2018-08-25 14:29:53 UTC 
(rev 8115)
@@ -58,9 +58,6 @@
       'parent' => {}
     },
     {
-      'extra' => {
-        'command' => {}
-      },
       'parent' => {},
       'text' => '
 ',
@@ -99,7 +96,6 @@
 $result_trees{'ifclear_in_macro'}{'contents'}[0]{'contents'}[2]{'parent'} = 
$result_trees{'ifclear_in_macro'}{'contents'}[0];
 $result_trees{'ifclear_in_macro'}{'contents'}[0]{'contents'}[3]{'parent'} = 
$result_trees{'ifclear_in_macro'}{'contents'}[0];
 $result_trees{'ifclear_in_macro'}{'contents'}[0]{'parent'} = 
$result_trees{'ifclear_in_macro'};
-$result_trees{'ifclear_in_macro'}{'contents'}[1]{'extra'}{'command'} = 
$result_trees{'ifclear_in_macro'}{'contents'}[0];
 $result_trees{'ifclear_in_macro'}{'contents'}[1]{'parent'} = 
$result_trees{'ifclear_in_macro'};
 $result_trees{'ifclear_in_macro'}{'contents'}[2]{'parent'} = 
$result_trees{'ifclear_in_macro'};
 $result_trees{'ifclear_in_macro'}{'contents'}[3]{'contents'}[0]{'parent'} = 
$result_trees{'ifclear_in_macro'}{'contents'}[3];

Modified: trunk/tp/t/results/macro/ifset_and_end_isef_in_macro.pl
===================================================================
--- trunk/tp/t/results/macro/ifset_and_end_isef_in_macro.pl     2018-08-25 
14:01:16 UTC (rev 8114)
+++ trunk/tp/t/results/macro/ifset_and_end_isef_in_macro.pl     2018-08-25 
14:29:53 UTC (rev 8115)
@@ -41,9 +41,6 @@
       'parent' => {}
     },
     {
-      'extra' => {
-        'command' => {}
-      },
       'parent' => {},
       'text' => '
 ',
@@ -89,9 +86,6 @@
       'parent' => {}
     },
     {
-      'extra' => {
-        'command' => {}
-      },
       'parent' => {},
       'text' => '
 ',
@@ -110,7 +104,6 @@
 
$result_trees{'ifset_and_end_isef_in_macro'}{'contents'}[0]{'contents'}[0]{'parent'}
 = $result_trees{'ifset_and_end_isef_in_macro'}{'contents'}[0];
 
$result_trees{'ifset_and_end_isef_in_macro'}{'contents'}[0]{'contents'}[1]{'parent'}
 = $result_trees{'ifset_and_end_isef_in_macro'}{'contents'}[0];
 $result_trees{'ifset_and_end_isef_in_macro'}{'contents'}[0]{'parent'} = 
$result_trees{'ifset_and_end_isef_in_macro'};
-$result_trees{'ifset_and_end_isef_in_macro'}{'contents'}[1]{'extra'}{'command'}
 = $result_trees{'ifset_and_end_isef_in_macro'}{'contents'}[0];
 $result_trees{'ifset_and_end_isef_in_macro'}{'contents'}[1]{'parent'} = 
$result_trees{'ifset_and_end_isef_in_macro'};
 $result_trees{'ifset_and_end_isef_in_macro'}{'contents'}[2]{'parent'} = 
$result_trees{'ifset_and_end_isef_in_macro'};
 
$result_trees{'ifset_and_end_isef_in_macro'}{'contents'}[3]{'args'}[0]{'parent'}
 = $result_trees{'ifset_and_end_isef_in_macro'}{'contents'}[3];
@@ -117,7 +110,6 @@
 
$result_trees{'ifset_and_end_isef_in_macro'}{'contents'}[3]{'contents'}[0]{'parent'}
 = $result_trees{'ifset_and_end_isef_in_macro'}{'contents'}[3];
 
$result_trees{'ifset_and_end_isef_in_macro'}{'contents'}[3]{'contents'}[1]{'parent'}
 = $result_trees{'ifset_and_end_isef_in_macro'}{'contents'}[3];
 $result_trees{'ifset_and_end_isef_in_macro'}{'contents'}[3]{'parent'} = 
$result_trees{'ifset_and_end_isef_in_macro'};
-$result_trees{'ifset_and_end_isef_in_macro'}{'contents'}[4]{'extra'}{'command'}
 = $result_trees{'ifset_and_end_isef_in_macro'}{'contents'}[3];
 $result_trees{'ifset_and_end_isef_in_macro'}{'contents'}[4]{'parent'} = 
$result_trees{'ifset_and_end_isef_in_macro'};
 $result_trees{'ifset_and_end_isef_in_macro'}{'contents'}[5]{'parent'} = 
$result_trees{'ifset_and_end_isef_in_macro'};
 

Modified: trunk/tp/t/results/macro/ifset_in_macro.pl
===================================================================
--- trunk/tp/t/results/macro/ifset_in_macro.pl  2018-08-25 14:01:16 UTC (rev 
8114)
+++ trunk/tp/t/results/macro/ifset_in_macro.pl  2018-08-25 14:29:53 UTC (rev 
8115)
@@ -58,9 +58,6 @@
       'parent' => {}
     },
     {
-      'extra' => {
-        'command' => {}
-      },
       'parent' => {},
       'text' => '
 ',
@@ -82,7 +79,6 @@
 $result_trees{'ifset_in_macro'}{'contents'}[0]{'contents'}[2]{'parent'} = 
$result_trees{'ifset_in_macro'}{'contents'}[0];
 $result_trees{'ifset_in_macro'}{'contents'}[0]{'contents'}[3]{'parent'} = 
$result_trees{'ifset_in_macro'}{'contents'}[0];
 $result_trees{'ifset_in_macro'}{'contents'}[0]{'parent'} = 
$result_trees{'ifset_in_macro'};
-$result_trees{'ifset_in_macro'}{'contents'}[1]{'extra'}{'command'} = 
$result_trees{'ifset_in_macro'}{'contents'}[0];
 $result_trees{'ifset_in_macro'}{'contents'}[1]{'parent'} = 
$result_trees{'ifset_in_macro'};
 $result_trees{'ifset_in_macro'}{'contents'}[2]{'parent'} = 
$result_trees{'ifset_in_macro'};
 

Modified: trunk/tp/t/results/macro/ifset_in_macro_set.pl
===================================================================
--- trunk/tp/t/results/macro/ifset_in_macro_set.pl      2018-08-25 14:01:16 UTC 
(rev 8114)
+++ trunk/tp/t/results/macro/ifset_in_macro_set.pl      2018-08-25 14:29:53 UTC 
(rev 8115)
@@ -58,9 +58,6 @@
       'parent' => {}
     },
     {
-      'extra' => {
-        'command' => {}
-      },
       'parent' => {},
       'text' => '
 ',
@@ -99,7 +96,6 @@
 $result_trees{'ifset_in_macro_set'}{'contents'}[0]{'contents'}[2]{'parent'} = 
$result_trees{'ifset_in_macro_set'}{'contents'}[0];
 $result_trees{'ifset_in_macro_set'}{'contents'}[0]{'contents'}[3]{'parent'} = 
$result_trees{'ifset_in_macro_set'}{'contents'}[0];
 $result_trees{'ifset_in_macro_set'}{'contents'}[0]{'parent'} = 
$result_trees{'ifset_in_macro_set'};
-$result_trees{'ifset_in_macro_set'}{'contents'}[1]{'extra'}{'command'} = 
$result_trees{'ifset_in_macro_set'}{'contents'}[0];
 $result_trees{'ifset_in_macro_set'}{'contents'}[1]{'parent'} = 
$result_trees{'ifset_in_macro_set'};
 $result_trees{'ifset_in_macro_set'}{'contents'}[2]{'parent'} = 
$result_trees{'ifset_in_macro_set'};
 $result_trees{'ifset_in_macro_set'}{'contents'}[3]{'contents'}[0]{'parent'} = 
$result_trees{'ifset_in_macro_set'}{'contents'}[3];

Modified: trunk/tp/t/results/macro/ignored_macro_definition.pl
===================================================================
--- trunk/tp/t/results/macro/ignored_macro_definition.pl        2018-08-25 
14:01:16 UTC (rev 8114)
+++ trunk/tp/t/results/macro/ignored_macro_definition.pl        2018-08-25 
14:29:53 UTC (rev 8115)
@@ -41,9 +41,6 @@
       'parent' => {}
     },
     {
-      'extra' => {
-        'command' => {}
-      },
       'parent' => {},
       'text' => '
 ',
@@ -126,7 +123,6 @@
 
$result_trees{'ignored_macro_definition'}{'contents'}[0]{'contents'}[0]{'parent'}
 = $result_trees{'ignored_macro_definition'}{'contents'}[0];
 
$result_trees{'ignored_macro_definition'}{'contents'}[0]{'contents'}[1]{'parent'}
 = $result_trees{'ignored_macro_definition'}{'contents'}[0];
 $result_trees{'ignored_macro_definition'}{'contents'}[0]{'parent'} = 
$result_trees{'ignored_macro_definition'};
-$result_trees{'ignored_macro_definition'}{'contents'}[1]{'extra'}{'command'} = 
$result_trees{'ignored_macro_definition'}{'contents'}[0];
 $result_trees{'ignored_macro_definition'}{'contents'}[1]{'parent'} = 
$result_trees{'ignored_macro_definition'};
 $result_trees{'ignored_macro_definition'}{'contents'}[2]{'parent'} = 
$result_trees{'ignored_macro_definition'};
 $result_trees{'ignored_macro_definition'}{'contents'}[3]{'parent'} = 
$result_trees{'ignored_macro_definition'};

Modified: trunk/tp/t/results/macro/implicit_quoting_one_arg.pl
===================================================================
--- trunk/tp/t/results/macro/implicit_quoting_one_arg.pl        2018-08-25 
14:01:16 UTC (rev 8114)
+++ trunk/tp/t/results/macro/implicit_quoting_one_arg.pl        2018-08-25 
14:29:53 UTC (rev 8115)
@@ -52,9 +52,6 @@
       'parent' => {}
     },
     {
-      'extra' => {
-        'command' => {}
-      },
       'parent' => {},
       'text' => '
 ',
@@ -108,7 +105,6 @@
 
$result_trees{'implicit_quoting_one_arg'}{'contents'}[1]{'contents'}[0]{'parent'}
 = $result_trees{'implicit_quoting_one_arg'}{'contents'}[1];
 
$result_trees{'implicit_quoting_one_arg'}{'contents'}[1]{'contents'}[1]{'parent'}
 = $result_trees{'implicit_quoting_one_arg'}{'contents'}[1];
 $result_trees{'implicit_quoting_one_arg'}{'contents'}[1]{'parent'} = 
$result_trees{'implicit_quoting_one_arg'};
-$result_trees{'implicit_quoting_one_arg'}{'contents'}[2]{'extra'}{'command'} = 
$result_trees{'implicit_quoting_one_arg'}{'contents'}[1];
 $result_trees{'implicit_quoting_one_arg'}{'contents'}[2]{'parent'} = 
$result_trees{'implicit_quoting_one_arg'};
 $result_trees{'implicit_quoting_one_arg'}{'contents'}[3]{'parent'} = 
$result_trees{'implicit_quoting_one_arg'};
 
$result_trees{'implicit_quoting_one_arg'}{'contents'}[4]{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'implicit_quoting_one_arg'}{'contents'}[4]{'contents'}[0]{'args'}[0];

Modified: trunk/tp/t/results/macro/implicit_quoting_recursion.pl
===================================================================
--- trunk/tp/t/results/macro/implicit_quoting_recursion.pl      2018-08-25 
14:01:16 UTC (rev 8114)
+++ trunk/tp/t/results/macro/implicit_quoting_recursion.pl      2018-08-25 
14:29:53 UTC (rev 8115)
@@ -51,9 +51,6 @@
       'parent' => {}
     },
     {
-      'extra' => {
-        'command' => {}
-      },
       'parent' => {},
       'text' => '
 ',
@@ -85,7 +82,6 @@
 
$result_trees{'implicit_quoting_recursion'}{'contents'}[0]{'contents'}[0]{'parent'}
 = $result_trees{'implicit_quoting_recursion'}{'contents'}[0];
 
$result_trees{'implicit_quoting_recursion'}{'contents'}[0]{'contents'}[1]{'parent'}
 = $result_trees{'implicit_quoting_recursion'}{'contents'}[0];
 $result_trees{'implicit_quoting_recursion'}{'contents'}[0]{'parent'} = 
$result_trees{'implicit_quoting_recursion'};
-$result_trees{'implicit_quoting_recursion'}{'contents'}[1]{'extra'}{'command'} 
= $result_trees{'implicit_quoting_recursion'}{'contents'}[0];
 $result_trees{'implicit_quoting_recursion'}{'contents'}[1]{'parent'} = 
$result_trees{'implicit_quoting_recursion'};
 $result_trees{'implicit_quoting_recursion'}{'contents'}[2]{'parent'} = 
$result_trees{'implicit_quoting_recursion'};
 
$result_trees{'implicit_quoting_recursion'}{'contents'}[3]{'contents'}[0]{'parent'}
 = $result_trees{'implicit_quoting_recursion'}{'contents'}[3];

Modified: trunk/tp/t/results/macro/leading_spaces_no_ignore.pl
===================================================================
--- trunk/tp/t/results/macro/leading_spaces_no_ignore.pl        2018-08-25 
14:01:16 UTC (rev 8114)
+++ trunk/tp/t/results/macro/leading_spaces_no_ignore.pl        2018-08-25 
14:29:53 UTC (rev 8115)
@@ -47,9 +47,6 @@
       'parent' => {}
     },
     {
-      'extra' => {
-        'command' => {}
-      },
       'parent' => {},
       'text' => '
 ',
@@ -90,7 +87,6 @@
 
$result_trees{'leading_spaces_no_ignore'}{'contents'}[0]{'contents'}[1]{'parent'}
 = $result_trees{'leading_spaces_no_ignore'}{'contents'}[0];
 
$result_trees{'leading_spaces_no_ignore'}{'contents'}[0]{'contents'}[2]{'parent'}
 = $result_trees{'leading_spaces_no_ignore'}{'contents'}[0];
 $result_trees{'leading_spaces_no_ignore'}{'contents'}[0]{'parent'} = 
$result_trees{'leading_spaces_no_ignore'};
-$result_trees{'leading_spaces_no_ignore'}{'contents'}[1]{'extra'}{'command'} = 
$result_trees{'leading_spaces_no_ignore'}{'contents'}[0];
 $result_trees{'leading_spaces_no_ignore'}{'contents'}[1]{'parent'} = 
$result_trees{'leading_spaces_no_ignore'};
 $result_trees{'leading_spaces_no_ignore'}{'contents'}[2]{'parent'} = 
$result_trees{'leading_spaces_no_ignore'};
 $result_trees{'leading_spaces_no_ignore'}{'contents'}[3]{'parent'} = 
$result_trees{'leading_spaces_no_ignore'};

Modified: trunk/tp/t/results/macro/line_after_recursive_call.pl
===================================================================
--- trunk/tp/t/results/macro/line_after_recursive_call.pl       2018-08-25 
14:01:16 UTC (rev 8114)
+++ trunk/tp/t/results/macro/line_after_recursive_call.pl       2018-08-25 
14:29:53 UTC (rev 8115)
@@ -53,9 +53,6 @@
       'parent' => {}
     },
     {
-      'extra' => {
-        'command' => {}
-      },
       'parent' => {},
       'text' => '
 ',
@@ -90,7 +87,6 @@
 
$result_trees{'line_after_recursive_call'}{'contents'}[0]{'contents'}[2]{'parent'}
 = $result_trees{'line_after_recursive_call'}{'contents'}[0];
 
$result_trees{'line_after_recursive_call'}{'contents'}[0]{'contents'}[3]{'parent'}
 = $result_trees{'line_after_recursive_call'}{'contents'}[0];
 $result_trees{'line_after_recursive_call'}{'contents'}[0]{'parent'} = 
$result_trees{'line_after_recursive_call'};
-$result_trees{'line_after_recursive_call'}{'contents'}[1]{'extra'}{'command'} 
= $result_trees{'line_after_recursive_call'}{'contents'}[0];
 $result_trees{'line_after_recursive_call'}{'contents'}[1]{'parent'} = 
$result_trees{'line_after_recursive_call'};
 
$result_trees{'line_after_recursive_call'}{'contents'}[2]{'contents'}[0]{'parent'}
 = $result_trees{'line_after_recursive_call'}{'contents'}[2];
 
$result_trees{'line_after_recursive_call'}{'contents'}[2]{'contents'}[1]{'parent'}
 = $result_trees{'line_after_recursive_call'}{'contents'}[2];

Modified: trunk/tp/t/results/macro/macro_expands_to_empty.pl
===================================================================
--- trunk/tp/t/results/macro/macro_expands_to_empty.pl  2018-08-25 14:01:16 UTC 
(rev 8114)
+++ trunk/tp/t/results/macro/macro_expands_to_empty.pl  2018-08-25 14:29:53 UTC 
(rev 8115)
@@ -46,9 +46,6 @@
       'parent' => {}
     },
     {
-      'extra' => {
-        'command' => {}
-      },
       'parent' => {},
       'text' => '
 ',
@@ -85,7 +82,6 @@
 
$result_trees{'macro_expands_to_empty'}{'contents'}[0]{'contents'}[0]{'parent'} 
= $result_trees{'macro_expands_to_empty'}{'contents'}[0];
 
$result_trees{'macro_expands_to_empty'}{'contents'}[0]{'contents'}[1]{'parent'} 
= $result_trees{'macro_expands_to_empty'}{'contents'}[0];
 $result_trees{'macro_expands_to_empty'}{'contents'}[0]{'parent'} = 
$result_trees{'macro_expands_to_empty'};
-$result_trees{'macro_expands_to_empty'}{'contents'}[1]{'extra'}{'command'} = 
$result_trees{'macro_expands_to_empty'}{'contents'}[0];
 $result_trees{'macro_expands_to_empty'}{'contents'}[1]{'parent'} = 
$result_trees{'macro_expands_to_empty'};
 $result_trees{'macro_expands_to_empty'}{'contents'}[2]{'parent'} = 
$result_trees{'macro_expands_to_empty'};
 $result_trees{'macro_expands_to_empty'}{'contents'}[3]{'parent'} = 
$result_trees{'macro_expands_to_empty'};

Modified: trunk/tp/t/results/macro/macro_expansion.pl
===================================================================
--- trunk/tp/t/results/macro/macro_expansion.pl 2018-08-25 14:01:16 UTC (rev 
8114)
+++ trunk/tp/t/results/macro/macro_expansion.pl 2018-08-25 14:29:53 UTC (rev 
8115)
@@ -75,9 +75,6 @@
       'parent' => {}
     },
     {
-      'extra' => {
-        'command' => {}
-      },
       'parent' => {},
       'text' => '
 ',
@@ -270,9 +267,6 @@
       'parent' => {}
     },
     {
-      'extra' => {
-        'command' => {}
-      },
       'parent' => {},
       'text' => ' ',
       'type' => 'empty_spaces_after_command'
@@ -500,7 +494,6 @@
 $result_trees{'macro_expansion'}{'contents'}[1]{'contents'}[3]{'parent'} = 
$result_trees{'macro_expansion'}{'contents'}[1];
 $result_trees{'macro_expansion'}{'contents'}[1]{'contents'}[4]{'parent'} = 
$result_trees{'macro_expansion'}{'contents'}[1];
 $result_trees{'macro_expansion'}{'contents'}[1]{'parent'} = 
$result_trees{'macro_expansion'};
-$result_trees{'macro_expansion'}{'contents'}[2]{'extra'}{'command'} = 
$result_trees{'macro_expansion'}{'contents'}[1];
 $result_trees{'macro_expansion'}{'contents'}[2]{'parent'} = 
$result_trees{'macro_expansion'};
 $result_trees{'macro_expansion'}{'contents'}[3]{'parent'} = 
$result_trees{'macro_expansion'};
 $result_trees{'macro_expansion'}{'contents'}[4]{'contents'}[0]{'parent'} = 
$result_trees{'macro_expansion'}{'contents'}[4];
@@ -534,7 +527,6 @@
 $result_trees{'macro_expansion'}{'contents'}[13]{'contents'}[1]{'parent'} = 
$result_trees{'macro_expansion'}{'contents'}[13];
 
$result_trees{'macro_expansion'}{'contents'}[13]{'extra'}{'spaces_after_command'}
 = $result_trees{'macro_expansion'}{'contents'}[13]{'contents'}[0];
 $result_trees{'macro_expansion'}{'contents'}[13]{'parent'} = 
$result_trees{'macro_expansion'};
-$result_trees{'macro_expansion'}{'contents'}[14]{'extra'}{'command'} = 
$result_trees{'macro_expansion'}{'contents'}[13];
 $result_trees{'macro_expansion'}{'contents'}[14]{'parent'} = 
$result_trees{'macro_expansion'};
 $result_trees{'macro_expansion'}{'contents'}[15]{'contents'}[0]{'parent'} = 
$result_trees{'macro_expansion'}{'contents'}[15];
 $result_trees{'macro_expansion'}{'contents'}[15]{'parent'} = 
$result_trees{'macro_expansion'};

Modified: trunk/tp/t/results/macro/macro_for_end.pl
===================================================================
--- trunk/tp/t/results/macro/macro_for_end.pl   2018-08-25 14:01:16 UTC (rev 
8114)
+++ trunk/tp/t/results/macro/macro_for_end.pl   2018-08-25 14:29:53 UTC (rev 
8115)
@@ -41,9 +41,6 @@
       'parent' => {}
     },
     {
-      'extra' => {
-        'command' => {}
-      },
       'parent' => {},
       'text' => '
 ',
@@ -127,7 +124,6 @@
 $result_trees{'macro_for_end'}{'contents'}[0]{'contents'}[0]{'parent'} = 
$result_trees{'macro_for_end'}{'contents'}[0];
 $result_trees{'macro_for_end'}{'contents'}[0]{'contents'}[1]{'parent'} = 
$result_trees{'macro_for_end'}{'contents'}[0];
 $result_trees{'macro_for_end'}{'contents'}[0]{'parent'} = 
$result_trees{'macro_for_end'};
-$result_trees{'macro_for_end'}{'contents'}[1]{'extra'}{'command'} = 
$result_trees{'macro_for_end'}{'contents'}[0];
 $result_trees{'macro_for_end'}{'contents'}[1]{'parent'} = 
$result_trees{'macro_for_end'};
 $result_trees{'macro_for_end'}{'contents'}[2]{'parent'} = 
$result_trees{'macro_for_end'};
 
$result_trees{'macro_for_end'}{'contents'}[3]{'contents'}[0]{'extra'}{'command'}
 = $result_trees{'macro_for_end'}{'contents'}[3];

Modified: trunk/tp/t/results/macro/macro_for_ignored_line_command.pl
===================================================================
--- trunk/tp/t/results/macro/macro_for_ignored_line_command.pl  2018-08-25 
14:01:16 UTC (rev 8114)
+++ trunk/tp/t/results/macro/macro_for_ignored_line_command.pl  2018-08-25 
14:29:53 UTC (rev 8115)
@@ -41,9 +41,6 @@
       'parent' => {}
     },
     {
-      'extra' => {
-        'command' => {}
-      },
       'parent' => {},
       'text' => '
 ',
@@ -74,7 +71,6 @@
 
$result_trees{'macro_for_ignored_line_command'}{'contents'}[0]{'contents'}[0]{'parent'}
 = $result_trees{'macro_for_ignored_line_command'}{'contents'}[0];
 
$result_trees{'macro_for_ignored_line_command'}{'contents'}[0]{'contents'}[1]{'parent'}
 = $result_trees{'macro_for_ignored_line_command'}{'contents'}[0];
 $result_trees{'macro_for_ignored_line_command'}{'contents'}[0]{'parent'} = 
$result_trees{'macro_for_ignored_line_command'};
-$result_trees{'macro_for_ignored_line_command'}{'contents'}[1]{'extra'}{'command'}
 = $result_trees{'macro_for_ignored_line_command'}{'contents'}[0];
 $result_trees{'macro_for_ignored_line_command'}{'contents'}[1]{'parent'} = 
$result_trees{'macro_for_ignored_line_command'};
 $result_trees{'macro_for_ignored_line_command'}{'contents'}[2]{'parent'} = 
$result_trees{'macro_for_ignored_line_command'};
 
$result_trees{'macro_for_ignored_line_command'}{'contents'}[3]{'args'}[0]{'parent'}
 = $result_trees{'macro_for_ignored_line_command'}{'contents'}[3];

Modified: trunk/tp/t/results/macro/macro_in_accent.pl
===================================================================
--- trunk/tp/t/results/macro/macro_in_accent.pl 2018-08-25 14:01:16 UTC (rev 
8114)
+++ trunk/tp/t/results/macro/macro_in_accent.pl 2018-08-25 14:29:53 UTC (rev 
8115)
@@ -41,9 +41,6 @@
       'parent' => {}
     },
     {
-      'extra' => {
-        'command' => {}
-      },
       'parent' => {},
       'text' => '
 ',
@@ -89,9 +86,6 @@
       'parent' => {}
     },
     {
-      'extra' => {
-        'command' => {}
-      },
       'parent' => {},
       'text' => '
 ',
@@ -269,7 +263,6 @@
 $result_trees{'macro_in_accent'}{'contents'}[0]{'contents'}[0]{'parent'} = 
$result_trees{'macro_in_accent'}{'contents'}[0];
 $result_trees{'macro_in_accent'}{'contents'}[0]{'contents'}[1]{'parent'} = 
$result_trees{'macro_in_accent'}{'contents'}[0];
 $result_trees{'macro_in_accent'}{'contents'}[0]{'parent'} = 
$result_trees{'macro_in_accent'};
-$result_trees{'macro_in_accent'}{'contents'}[1]{'extra'}{'command'} = 
$result_trees{'macro_in_accent'}{'contents'}[0];
 $result_trees{'macro_in_accent'}{'contents'}[1]{'parent'} = 
$result_trees{'macro_in_accent'};
 $result_trees{'macro_in_accent'}{'contents'}[2]{'parent'} = 
$result_trees{'macro_in_accent'};
 $result_trees{'macro_in_accent'}{'contents'}[3]{'args'}[0]{'parent'} = 
$result_trees{'macro_in_accent'}{'contents'}[3];
@@ -276,7 +269,6 @@
 $result_trees{'macro_in_accent'}{'contents'}[3]{'contents'}[0]{'parent'} = 
$result_trees{'macro_in_accent'}{'contents'}[3];
 $result_trees{'macro_in_accent'}{'contents'}[3]{'contents'}[1]{'parent'} = 
$result_trees{'macro_in_accent'}{'contents'}[3];
 $result_trees{'macro_in_accent'}{'contents'}[3]{'parent'} = 
$result_trees{'macro_in_accent'};
-$result_trees{'macro_in_accent'}{'contents'}[4]{'extra'}{'command'} = 
$result_trees{'macro_in_accent'}{'contents'}[3];
 $result_trees{'macro_in_accent'}{'contents'}[4]{'parent'} = 
$result_trees{'macro_in_accent'};
 $result_trees{'macro_in_accent'}{'contents'}[5]{'parent'} = 
$result_trees{'macro_in_accent'};
 
$result_trees{'macro_in_accent'}{'contents'}[6]{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'}
 = $result_trees{'macro_in_accent'}{'contents'}[6]{'contents'}[0]{'args'}[0];

Modified: trunk/tp/t/results/macro/macro_in_brace_command.pl
===================================================================
--- trunk/tp/t/results/macro/macro_in_brace_command.pl  2018-08-25 14:01:16 UTC 
(rev 8114)
+++ trunk/tp/t/results/macro/macro_in_brace_command.pl  2018-08-25 14:29:53 UTC 
(rev 8115)
@@ -41,9 +41,6 @@
       'parent' => {}
     },
     {
-      'extra' => {
-        'command' => {}
-      },
       'parent' => {},
       'text' => '
 ',
@@ -89,9 +86,6 @@
       'parent' => {}
     },
     {
-      'extra' => {
-        'command' => {}
-      },
       'parent' => {},
       'text' => '
 ',
@@ -266,7 +260,6 @@
 
$result_trees{'macro_in_brace_command'}{'contents'}[0]{'contents'}[0]{'parent'} 
= $result_trees{'macro_in_brace_command'}{'contents'}[0];
 
$result_trees{'macro_in_brace_command'}{'contents'}[0]{'contents'}[1]{'parent'} 
= $result_trees{'macro_in_brace_command'}{'contents'}[0];
 $result_trees{'macro_in_brace_command'}{'contents'}[0]{'parent'} = 
$result_trees{'macro_in_brace_command'};
-$result_trees{'macro_in_brace_command'}{'contents'}[1]{'extra'}{'command'} = 
$result_trees{'macro_in_brace_command'}{'contents'}[0];
 $result_trees{'macro_in_brace_command'}{'contents'}[1]{'parent'} = 
$result_trees{'macro_in_brace_command'};
 $result_trees{'macro_in_brace_command'}{'contents'}[2]{'parent'} = 
$result_trees{'macro_in_brace_command'};
 $result_trees{'macro_in_brace_command'}{'contents'}[3]{'args'}[0]{'parent'} = 
$result_trees{'macro_in_brace_command'}{'contents'}[3];
@@ -273,7 +266,6 @@
 
$result_trees{'macro_in_brace_command'}{'contents'}[3]{'contents'}[0]{'parent'} 
= $result_trees{'macro_in_brace_command'}{'contents'}[3];
 
$result_trees{'macro_in_brace_command'}{'contents'}[3]{'contents'}[1]{'parent'} 
= $result_trees{'macro_in_brace_command'}{'contents'}[3];
 $result_trees{'macro_in_brace_command'}{'contents'}[3]{'parent'} = 
$result_trees{'macro_in_brace_command'};
-$result_trees{'macro_in_brace_command'}{'contents'}[4]{'extra'}{'command'} = 
$result_trees{'macro_in_brace_command'}{'contents'}[3];
 $result_trees{'macro_in_brace_command'}{'contents'}[4]{'parent'} = 
$result_trees{'macro_in_brace_command'};
 $result_trees{'macro_in_brace_command'}{'contents'}[5]{'parent'} = 
$result_trees{'macro_in_brace_command'};
 
$result_trees{'macro_in_brace_command'}{'contents'}[6]{'args'}[0]{'contents'}[0]{'extra'}{'command'}
 = $result_trees{'macro_in_brace_command'}{'contents'}[6];

Modified: trunk/tp/t/results/macro/macro_in_end_argument.pl
===================================================================
--- trunk/tp/t/results/macro/macro_in_end_argument.pl   2018-08-25 14:01:16 UTC 
(rev 8114)
+++ trunk/tp/t/results/macro/macro_in_end_argument.pl   2018-08-25 14:29:53 UTC 
(rev 8115)
@@ -41,9 +41,6 @@
       'parent' => {}
     },
     {
-      'extra' => {
-        'command' => {}
-      },
       'parent' => {},
       'text' => '
 ',
@@ -127,7 +124,6 @@
 $result_trees{'macro_in_end_argument'}{'contents'}[0]{'contents'}[0]{'parent'} 
= $result_trees{'macro_in_end_argument'}{'contents'}[0];
 $result_trees{'macro_in_end_argument'}{'contents'}[0]{'contents'}[1]{'parent'} 
= $result_trees{'macro_in_end_argument'}{'contents'}[0];
 $result_trees{'macro_in_end_argument'}{'contents'}[0]{'parent'} = 
$result_trees{'macro_in_end_argument'};
-$result_trees{'macro_in_end_argument'}{'contents'}[1]{'extra'}{'command'} = 
$result_trees{'macro_in_end_argument'}{'contents'}[0];
 $result_trees{'macro_in_end_argument'}{'contents'}[1]{'parent'} = 
$result_trees{'macro_in_end_argument'};
 $result_trees{'macro_in_end_argument'}{'contents'}[2]{'parent'} = 
$result_trees{'macro_in_end_argument'};
 
$result_trees{'macro_in_end_argument'}{'contents'}[3]{'contents'}[0]{'extra'}{'command'}
 = $result_trees{'macro_in_end_argument'}{'contents'}[3];

Modified: trunk/tp/t/results/macro/macro_in_ifset.pl
===================================================================
--- trunk/tp/t/results/macro/macro_in_ifset.pl  2018-08-25 14:01:16 UTC (rev 
8114)
+++ trunk/tp/t/results/macro/macro_in_ifset.pl  2018-08-25 14:29:53 UTC (rev 
8115)
@@ -46,9 +46,6 @@
       'parent' => {}
     },
     {
-      'extra' => {
-        'command' => {}
-      },
       'parent' => {},
       'text' => '
 ',
@@ -68,7 +65,6 @@
 $result_trees{'macro_in_ifset'}{'contents'}[0]{'contents'}[0]{'parent'} = 
$result_trees{'macro_in_ifset'}{'contents'}[0];
 $result_trees{'macro_in_ifset'}{'contents'}[0]{'contents'}[1]{'parent'} = 
$result_trees{'macro_in_ifset'}{'contents'}[0];
 $result_trees{'macro_in_ifset'}{'contents'}[0]{'parent'} = 
$result_trees{'macro_in_ifset'};
-$result_trees{'macro_in_ifset'}{'contents'}[1]{'extra'}{'command'} = 
$result_trees{'macro_in_ifset'}{'contents'}[0];
 $result_trees{'macro_in_ifset'}{'contents'}[1]{'parent'} = 
$result_trees{'macro_in_ifset'};
 $result_trees{'macro_in_ifset'}{'contents'}[2]{'parent'} = 
$result_trees{'macro_in_ifset'};
 

Modified: trunk/tp/t/results/macro/macro_in_ifset_end_in_arg.pl
===================================================================
--- trunk/tp/t/results/macro/macro_in_ifset_end_in_arg.pl       2018-08-25 
14:01:16 UTC (rev 8114)
+++ trunk/tp/t/results/macro/macro_in_ifset_end_in_arg.pl       2018-08-25 
14:29:53 UTC (rev 8115)
@@ -46,9 +46,6 @@
       'parent' => {}
     },
     {
-      'extra' => {
-        'command' => {}
-      },
       'parent' => {},
       'text' => '
 ',
@@ -123,7 +120,6 @@
 
$result_trees{'macro_in_ifset_end_in_arg'}{'contents'}[0]{'contents'}[0]{'parent'}
 = $result_trees{'macro_in_ifset_end_in_arg'}{'contents'}[0];
 
$result_trees{'macro_in_ifset_end_in_arg'}{'contents'}[0]{'contents'}[1]{'parent'}
 = $result_trees{'macro_in_ifset_end_in_arg'}{'contents'}[0];
 $result_trees{'macro_in_ifset_end_in_arg'}{'contents'}[0]{'parent'} = 
$result_trees{'macro_in_ifset_end_in_arg'};
-$result_trees{'macro_in_ifset_end_in_arg'}{'contents'}[1]{'extra'}{'command'} 
= $result_trees{'macro_in_ifset_end_in_arg'}{'contents'}[0];
 $result_trees{'macro_in_ifset_end_in_arg'}{'contents'}[1]{'parent'} = 
$result_trees{'macro_in_ifset_end_in_arg'};
 $result_trees{'macro_in_ifset_end_in_arg'}{'contents'}[2]{'parent'} = 
$result_trees{'macro_in_ifset_end_in_arg'};
 $result_trees{'macro_in_ifset_end_in_arg'}{'contents'}[3]{'parent'} = 
$result_trees{'macro_in_ifset_end_in_arg'};

Modified: trunk/tp/t/results/macro/macro_in_index_commands.pl
===================================================================
--- trunk/tp/t/results/macro/macro_in_index_commands.pl 2018-08-25 14:01:16 UTC 
(rev 8114)
+++ trunk/tp/t/results/macro/macro_in_index_commands.pl 2018-08-25 14:29:53 UTC 
(rev 8115)
@@ -43,9 +43,6 @@
           'parent' => {}
         },
         {
-          'extra' => {
-            'command' => {}
-          },
           'parent' => {},
           'text' => '
 ',
@@ -85,9 +82,6 @@
           'parent' => {}
         },
         {
-          'extra' => {
-            'command' => {}
-          },
           'parent' => {},
           'text' => '
 ',
@@ -127,9 +121,6 @@
           'parent' => {}
         },
         {
-          'extra' => {
-            'command' => {}
-          },
           'parent' => {},
           'text' => '
 ',
@@ -265,9 +256,6 @@
           'parent' => {}
         },
         {
-          'extra' => {
-            'command' => {}
-          },
           'parent' => {},
           'text' => '
 ',
@@ -376,9 +364,6 @@
           'parent' => {}
         },
         {
-          'extra' => {
-            'command' => {}
-          },
           'parent' => {},
           'text' => '
 ',
@@ -424,9 +409,6 @@
           'parent' => {}
         },
         {
-          'extra' => {
-            'command' => {}
-          },
           'parent' => {},
           'text' => '
 ',
@@ -519,9 +501,6 @@
           'parent' => {}
         },
         {
-          'extra' => {
-            'command' => {}
-          },
           'parent' => {},
           'text' => '
 ',
@@ -1035,19 +1014,16 @@
 
$result_trees{'macro_in_index_commands'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'parent'}
 = $result_trees{'macro_in_index_commands'}{'contents'}[0]{'contents'}[0];
 
$result_trees{'macro_in_index_commands'}{'contents'}[0]{'contents'}[0]{'contents'}[1]{'parent'}
 = $result_trees{'macro_in_index_commands'}{'contents'}[0]{'contents'}[0];
 
$result_trees{'macro_in_index_commands'}{'contents'}[0]{'contents'}[0]{'parent'}
 = $result_trees{'macro_in_index_commands'}{'contents'}[0];
-$result_trees{'macro_in_index_commands'}{'contents'}[0]{'contents'}[1]{'extra'}{'command'}
 = $result_trees{'macro_in_index_commands'}{'contents'}[0]{'contents'}[0];
 
$result_trees{'macro_in_index_commands'}{'contents'}[0]{'contents'}[1]{'parent'}
 = $result_trees{'macro_in_index_commands'}{'contents'}[0];
 
$result_trees{'macro_in_index_commands'}{'contents'}[0]{'contents'}[2]{'args'}[0]{'parent'}
 = $result_trees{'macro_in_index_commands'}{'contents'}[0]{'contents'}[2];
 
$result_trees{'macro_in_index_commands'}{'contents'}[0]{'contents'}[2]{'contents'}[0]{'parent'}
 = $result_trees{'macro_in_index_commands'}{'contents'}[0]{'contents'}[2];
 
$result_trees{'macro_in_index_commands'}{'contents'}[0]{'contents'}[2]{'contents'}[1]{'parent'}
 = $result_trees{'macro_in_index_commands'}{'contents'}[0]{'contents'}[2];
 
$result_trees{'macro_in_index_commands'}{'contents'}[0]{'contents'}[2]{'parent'}
 = $result_trees{'macro_in_index_commands'}{'contents'}[0];
-$result_trees{'macro_in_index_commands'}{'contents'}[0]{'contents'}[3]{'extra'}{'command'}
 = $result_trees{'macro_in_index_commands'}{'contents'}[0]{'contents'}[2];
 
$result_trees{'macro_in_index_commands'}{'contents'}[0]{'contents'}[3]{'parent'}
 = $result_trees{'macro_in_index_commands'}{'contents'}[0];
 
$result_trees{'macro_in_index_commands'}{'contents'}[0]{'contents'}[4]{'args'}[0]{'parent'}
 = $result_trees{'macro_in_index_commands'}{'contents'}[0]{'contents'}[4];
 
$result_trees{'macro_in_index_commands'}{'contents'}[0]{'contents'}[4]{'contents'}[0]{'parent'}
 = $result_trees{'macro_in_index_commands'}{'contents'}[0]{'contents'}[4];
 
$result_trees{'macro_in_index_commands'}{'contents'}[0]{'contents'}[4]{'contents'}[1]{'parent'}
 = $result_trees{'macro_in_index_commands'}{'contents'}[0]{'contents'}[4];
 
$result_trees{'macro_in_index_commands'}{'contents'}[0]{'contents'}[4]{'parent'}
 = $result_trees{'macro_in_index_commands'}{'contents'}[0];
-$result_trees{'macro_in_index_commands'}{'contents'}[0]{'contents'}[5]{'extra'}{'command'}
 = $result_trees{'macro_in_index_commands'}{'contents'}[0]{'contents'}[4];
 
$result_trees{'macro_in_index_commands'}{'contents'}[0]{'contents'}[5]{'parent'}
 = $result_trees{'macro_in_index_commands'}{'contents'}[0];
 
$result_trees{'macro_in_index_commands'}{'contents'}[0]{'contents'}[6]{'parent'}
 = $result_trees{'macro_in_index_commands'}{'contents'}[0];
 
$result_trees{'macro_in_index_commands'}{'contents'}[0]{'contents'}[7]{'args'}[0]{'contents'}[0]{'extra'}{'command'}
 = $result_trees{'macro_in_index_commands'}{'contents'}[0]{'contents'}[7];
@@ -1069,7 +1045,6 @@
 
$result_trees{'macro_in_index_commands'}{'contents'}[0]{'contents'}[10]{'contents'}[0]{'parent'}
 = $result_trees{'macro_in_index_commands'}{'contents'}[0]{'contents'}[10];
 
$result_trees{'macro_in_index_commands'}{'contents'}[0]{'contents'}[10]{'contents'}[1]{'parent'}
 = $result_trees{'macro_in_index_commands'}{'contents'}[0]{'contents'}[10];
 
$result_trees{'macro_in_index_commands'}{'contents'}[0]{'contents'}[10]{'parent'}
 = $result_trees{'macro_in_index_commands'}{'contents'}[0];
-$result_trees{'macro_in_index_commands'}{'contents'}[0]{'contents'}[11]{'extra'}{'command'}
 = $result_trees{'macro_in_index_commands'}{'contents'}[0]{'contents'}[10];
 
$result_trees{'macro_in_index_commands'}{'contents'}[0]{'contents'}[11]{'parent'}
 = $result_trees{'macro_in_index_commands'}{'contents'}[0];
 
$result_trees{'macro_in_index_commands'}{'contents'}[0]{'contents'}[12]{'parent'}
 = $result_trees{'macro_in_index_commands'}{'contents'}[0];
 
$result_trees{'macro_in_index_commands'}{'contents'}[0]{'contents'}[13]{'contents'}[0]{'parent'}
 = $result_trees{'macro_in_index_commands'}{'contents'}[0]{'contents'}[13];
@@ -1087,7 +1062,6 @@
 
$result_trees{'macro_in_index_commands'}{'contents'}[0]{'contents'}[15]{'contents'}[0]{'parent'}
 = $result_trees{'macro_in_index_commands'}{'contents'}[0]{'contents'}[15];
 
$result_trees{'macro_in_index_commands'}{'contents'}[0]{'contents'}[15]{'contents'}[1]{'parent'}
 = $result_trees{'macro_in_index_commands'}{'contents'}[0]{'contents'}[15];
 
$result_trees{'macro_in_index_commands'}{'contents'}[0]{'contents'}[15]{'parent'}
 = $result_trees{'macro_in_index_commands'}{'contents'}[0];
-$result_trees{'macro_in_index_commands'}{'contents'}[0]{'contents'}[16]{'extra'}{'command'}
 = $result_trees{'macro_in_index_commands'}{'contents'}[0]{'contents'}[15];
 
$result_trees{'macro_in_index_commands'}{'contents'}[0]{'contents'}[16]{'parent'}
 = $result_trees{'macro_in_index_commands'}{'contents'}[0];
 
$result_trees{'macro_in_index_commands'}{'contents'}[0]{'contents'}[17]{'parent'}
 = $result_trees{'macro_in_index_commands'}{'contents'}[0];
 
$result_trees{'macro_in_index_commands'}{'contents'}[0]{'contents'}[18]{'args'}[0]{'parent'}
 = $result_trees{'macro_in_index_commands'}{'contents'}[0]{'contents'}[18];
@@ -1094,7 +1068,6 @@
 
$result_trees{'macro_in_index_commands'}{'contents'}[0]{'contents'}[18]{'contents'}[0]{'parent'}
 = $result_trees{'macro_in_index_commands'}{'contents'}[0]{'contents'}[18];
 
$result_trees{'macro_in_index_commands'}{'contents'}[0]{'contents'}[18]{'contents'}[1]{'parent'}
 = $result_trees{'macro_in_index_commands'}{'contents'}[0]{'contents'}[18];
 
$result_trees{'macro_in_index_commands'}{'contents'}[0]{'contents'}[18]{'parent'}
 = $result_trees{'macro_in_index_commands'}{'contents'}[0];
-$result_trees{'macro_in_index_commands'}{'contents'}[0]{'contents'}[19]{'extra'}{'command'}
 = $result_trees{'macro_in_index_commands'}{'contents'}[0]{'contents'}[18];
 
$result_trees{'macro_in_index_commands'}{'contents'}[0]{'contents'}[19]{'parent'}
 = $result_trees{'macro_in_index_commands'}{'contents'}[0];
 
$result_trees{'macro_in_index_commands'}{'contents'}[0]{'contents'}[20]{'parent'}
 = $result_trees{'macro_in_index_commands'}{'contents'}[0];
 
$result_trees{'macro_in_index_commands'}{'contents'}[0]{'contents'}[21]{'args'}[0]{'contents'}[0]{'extra'}{'command'}
 = $result_trees{'macro_in_index_commands'}{'contents'}[0]{'contents'}[21];
@@ -1109,7 +1082,6 @@
 
$result_trees{'macro_in_index_commands'}{'contents'}[0]{'contents'}[23]{'contents'}[0]{'parent'}
 = $result_trees{'macro_in_index_commands'}{'contents'}[0]{'contents'}[23];
 
$result_trees{'macro_in_index_commands'}{'contents'}[0]{'contents'}[23]{'contents'}[1]{'parent'}
 = $result_trees{'macro_in_index_commands'}{'contents'}[0]{'contents'}[23];
 
$result_trees{'macro_in_index_commands'}{'contents'}[0]{'contents'}[23]{'parent'}
 = $result_trees{'macro_in_index_commands'}{'contents'}[0];
-$result_trees{'macro_in_index_commands'}{'contents'}[0]{'contents'}[24]{'extra'}{'command'}
 = $result_trees{'macro_in_index_commands'}{'contents'}[0]{'contents'}[23];
 
$result_trees{'macro_in_index_commands'}{'contents'}[0]{'contents'}[24]{'parent'}
 = $result_trees{'macro_in_index_commands'}{'contents'}[0];
 
$result_trees{'macro_in_index_commands'}{'contents'}[0]{'contents'}[25]{'parent'}
 = $result_trees{'macro_in_index_commands'}{'contents'}[0];
 $result_trees{'macro_in_index_commands'}{'contents'}[0]{'parent'} = 
$result_trees{'macro_in_index_commands'};

Modified: trunk/tp/t/results/macro/macro_in_invalid_documentencoding.pl
===================================================================
--- trunk/tp/t/results/macro/macro_in_invalid_documentencoding.pl       
2018-08-25 14:01:16 UTC (rev 8114)
+++ trunk/tp/t/results/macro/macro_in_invalid_documentencoding.pl       
2018-08-25 14:29:53 UTC (rev 8115)
@@ -41,9 +41,6 @@
       'parent' => {}
     },
     {
-      'extra' => {
-        'command' => {}
-      },
       'parent' => {},
       'text' => '
 ',
@@ -95,7 +92,6 @@
 
$result_trees{'macro_in_invalid_documentencoding'}{'contents'}[0]{'contents'}[0]{'parent'}
 = $result_trees{'macro_in_invalid_documentencoding'}{'contents'}[0];
 
$result_trees{'macro_in_invalid_documentencoding'}{'contents'}[0]{'contents'}[1]{'parent'}
 = $result_trees{'macro_in_invalid_documentencoding'}{'contents'}[0];
 $result_trees{'macro_in_invalid_documentencoding'}{'contents'}[0]{'parent'} = 
$result_trees{'macro_in_invalid_documentencoding'};
-$result_trees{'macro_in_invalid_documentencoding'}{'contents'}[1]{'extra'}{'command'}
 = $result_trees{'macro_in_invalid_documentencoding'}{'contents'}[0];
 $result_trees{'macro_in_invalid_documentencoding'}{'contents'}[1]{'parent'} = 
$result_trees{'macro_in_invalid_documentencoding'};
 
$result_trees{'macro_in_invalid_documentencoding'}{'contents'}[2]{'args'}[0]{'contents'}[0]{'extra'}{'command'}
 = $result_trees{'macro_in_invalid_documentencoding'}{'contents'}[2];
 
$result_trees{'macro_in_invalid_documentencoding'}{'contents'}[2]{'args'}[0]{'contents'}[0]{'parent'}
 = $result_trees{'macro_in_invalid_documentencoding'}{'contents'}[2]{'args'}[0];

Modified: trunk/tp/t/results/macro/macro_in_macro_arg.pl
===================================================================
--- trunk/tp/t/results/macro/macro_in_macro_arg.pl      2018-08-25 14:01:16 UTC 
(rev 8114)
+++ trunk/tp/t/results/macro/macro_in_macro_arg.pl      2018-08-25 14:29:53 UTC 
(rev 8115)
@@ -47,9 +47,6 @@
       'parent' => {}
     },
     {
-      'extra' => {
-        'command' => {}
-      },
       'parent' => {},
       'text' => '
 ',
@@ -100,9 +97,6 @@
       'parent' => {}
     },
     {
-      'extra' => {
-        'command' => {}
-      },
       'parent' => {},
       'text' => '
 ',
@@ -164,9 +158,6 @@
       'parent' => {}
     },
     {
-      'extra' => {
-        'command' => {}
-      },
       'parent' => {},
       'text' => '
 ',
@@ -202,7 +193,6 @@
 $result_trees{'macro_in_macro_arg'}{'contents'}[1]{'contents'}[0]{'parent'} = 
$result_trees{'macro_in_macro_arg'}{'contents'}[1];
 $result_trees{'macro_in_macro_arg'}{'contents'}[1]{'contents'}[1]{'parent'} = 
$result_trees{'macro_in_macro_arg'}{'contents'}[1];
 $result_trees{'macro_in_macro_arg'}{'contents'}[1]{'parent'} = 
$result_trees{'macro_in_macro_arg'};
-$result_trees{'macro_in_macro_arg'}{'contents'}[2]{'extra'}{'command'} = 
$result_trees{'macro_in_macro_arg'}{'contents'}[1];
 $result_trees{'macro_in_macro_arg'}{'contents'}[2]{'parent'} = 
$result_trees{'macro_in_macro_arg'};
 $result_trees{'macro_in_macro_arg'}{'contents'}[3]{'parent'} = 
$result_trees{'macro_in_macro_arg'};
 $result_trees{'macro_in_macro_arg'}{'contents'}[4]{'args'}[0]{'parent'} = 
$result_trees{'macro_in_macro_arg'}{'contents'}[4];
@@ -210,7 +200,6 @@
 $result_trees{'macro_in_macro_arg'}{'contents'}[4]{'contents'}[0]{'parent'} = 
$result_trees{'macro_in_macro_arg'}{'contents'}[4];
 $result_trees{'macro_in_macro_arg'}{'contents'}[4]{'contents'}[1]{'parent'} = 
$result_trees{'macro_in_macro_arg'}{'contents'}[4];
 $result_trees{'macro_in_macro_arg'}{'contents'}[4]{'parent'} = 
$result_trees{'macro_in_macro_arg'};
-$result_trees{'macro_in_macro_arg'}{'contents'}[5]{'extra'}{'command'} = 
$result_trees{'macro_in_macro_arg'}{'contents'}[4];
 $result_trees{'macro_in_macro_arg'}{'contents'}[5]{'parent'} = 
$result_trees{'macro_in_macro_arg'};
 $result_trees{'macro_in_macro_arg'}{'contents'}[6]{'parent'} = 
$result_trees{'macro_in_macro_arg'};
 $result_trees{'macro_in_macro_arg'}{'contents'}[7]{'args'}[0]{'parent'} = 
$result_trees{'macro_in_macro_arg'}{'contents'}[7];
@@ -220,7 +209,6 @@
 $result_trees{'macro_in_macro_arg'}{'contents'}[7]{'contents'}[1]{'parent'} = 
$result_trees{'macro_in_macro_arg'}{'contents'}[7];
 $result_trees{'macro_in_macro_arg'}{'contents'}[7]{'contents'}[2]{'parent'} = 
$result_trees{'macro_in_macro_arg'}{'contents'}[7];
 $result_trees{'macro_in_macro_arg'}{'contents'}[7]{'parent'} = 
$result_trees{'macro_in_macro_arg'};
-$result_trees{'macro_in_macro_arg'}{'contents'}[8]{'extra'}{'command'} = 
$result_trees{'macro_in_macro_arg'}{'contents'}[7];
 $result_trees{'macro_in_macro_arg'}{'contents'}[8]{'parent'} = 
$result_trees{'macro_in_macro_arg'};
 $result_trees{'macro_in_macro_arg'}{'contents'}[9]{'parent'} = 
$result_trees{'macro_in_macro_arg'};
 $result_trees{'macro_in_macro_arg'}{'contents'}[10]{'contents'}[0]{'parent'} = 
$result_trees{'macro_in_macro_arg'}{'contents'}[10];

Modified: trunk/tp/t/results/macro/macro_in_macro_arg_simpler.pl
===================================================================
--- trunk/tp/t/results/macro/macro_in_macro_arg_simpler.pl      2018-08-25 
14:01:16 UTC (rev 8114)
+++ trunk/tp/t/results/macro/macro_in_macro_arg_simpler.pl      2018-08-25 
14:29:53 UTC (rev 8115)
@@ -41,9 +41,6 @@
       'parent' => {}
     },
     {
-      'extra' => {
-        'command' => {}
-      },
       'parent' => {},
       'text' => '
 ',
@@ -105,9 +102,6 @@
       'parent' => {}
     },
     {
-      'extra' => {
-        'command' => {}
-      },
       'parent' => {},
       'text' => '
 ',
@@ -142,7 +136,6 @@
 
$result_trees{'macro_in_macro_arg_simpler'}{'contents'}[0]{'contents'}[0]{'parent'}
 = $result_trees{'macro_in_macro_arg_simpler'}{'contents'}[0];
 
$result_trees{'macro_in_macro_arg_simpler'}{'contents'}[0]{'contents'}[1]{'parent'}
 = $result_trees{'macro_in_macro_arg_simpler'}{'contents'}[0];
 $result_trees{'macro_in_macro_arg_simpler'}{'contents'}[0]{'parent'} = 
$result_trees{'macro_in_macro_arg_simpler'};
-$result_trees{'macro_in_macro_arg_simpler'}{'contents'}[1]{'extra'}{'command'} 
= $result_trees{'macro_in_macro_arg_simpler'}{'contents'}[0];
 $result_trees{'macro_in_macro_arg_simpler'}{'contents'}[1]{'parent'} = 
$result_trees{'macro_in_macro_arg_simpler'};
 $result_trees{'macro_in_macro_arg_simpler'}{'contents'}[2]{'parent'} = 
$result_trees{'macro_in_macro_arg_simpler'};
 
$result_trees{'macro_in_macro_arg_simpler'}{'contents'}[3]{'args'}[0]{'parent'} 
= $result_trees{'macro_in_macro_arg_simpler'}{'contents'}[3];
@@ -152,7 +145,6 @@
 
$result_trees{'macro_in_macro_arg_simpler'}{'contents'}[3]{'contents'}[1]{'parent'}
 = $result_trees{'macro_in_macro_arg_simpler'}{'contents'}[3];
 
$result_trees{'macro_in_macro_arg_simpler'}{'contents'}[3]{'contents'}[2]{'parent'}
 = $result_trees{'macro_in_macro_arg_simpler'}{'contents'}[3];
 $result_trees{'macro_in_macro_arg_simpler'}{'contents'}[3]{'parent'} = 
$result_trees{'macro_in_macro_arg_simpler'};
-$result_trees{'macro_in_macro_arg_simpler'}{'contents'}[4]{'extra'}{'command'} 
= $result_trees{'macro_in_macro_arg_simpler'}{'contents'}[3];
 $result_trees{'macro_in_macro_arg_simpler'}{'contents'}[4]{'parent'} = 
$result_trees{'macro_in_macro_arg_simpler'};
 $result_trees{'macro_in_macro_arg_simpler'}{'contents'}[5]{'parent'} = 
$result_trees{'macro_in_macro_arg_simpler'};
 
$result_trees{'macro_in_macro_arg_simpler'}{'contents'}[6]{'contents'}[0]{'parent'}
 = $result_trees{'macro_in_macro_arg_simpler'}{'contents'}[6];

Modified: trunk/tp/t/results/macro/macro_in_menu.pl
===================================================================
--- trunk/tp/t/results/macro/macro_in_menu.pl   2018-08-25 14:01:16 UTC (rev 
8114)
+++ trunk/tp/t/results/macro/macro_in_menu.pl   2018-08-25 14:29:53 UTC (rev 
8115)
@@ -47,9 +47,6 @@
       'parent' => {}
     },
     {
-      'extra' => {
-        'command' => {}
-      },
       'parent' => {},
       'text' => '
 ',
@@ -95,9 +92,6 @@
       'parent' => {}
     },
     {
-      'extra' => {
-        'command' => {}
-      },
       'parent' => {},
       'text' => '
 ',
@@ -143,9 +137,6 @@
       'parent' => {}
     },
     {
-      'extra' => {
-        'command' => {}
-      },
       'parent' => {},
       'text' => '
 ',
@@ -191,9 +182,6 @@
       'parent' => {}
     },
     {
-      'extra' => {
-        'command' => {}
-      },
       'parent' => {},
       'text' => '
 ',
@@ -239,9 +227,6 @@
       'parent' => {}
     },
     {
-      'extra' => {
-        'command' => {}
-      },
       'parent' => {},
       'text' => '
 ',
@@ -287,9 +272,6 @@
       'parent' => {}
     },
     {
-      'extra' => {
-        'command' => {}
-      },
       'parent' => {},
       'text' => '
 ',
@@ -698,7 +680,6 @@
 $result_trees{'macro_in_menu'}{'contents'}[1]{'contents'}[0]{'parent'} = 
$result_trees{'macro_in_menu'}{'contents'}[1];
 $result_trees{'macro_in_menu'}{'contents'}[1]{'contents'}[1]{'parent'} = 
$result_trees{'macro_in_menu'}{'contents'}[1];
 $result_trees{'macro_in_menu'}{'contents'}[1]{'parent'} = 
$result_trees{'macro_in_menu'};
-$result_trees{'macro_in_menu'}{'contents'}[2]{'extra'}{'command'} = 
$result_trees{'macro_in_menu'}{'contents'}[1];
 $result_trees{'macro_in_menu'}{'contents'}[2]{'parent'} = 
$result_trees{'macro_in_menu'};
 $result_trees{'macro_in_menu'}{'contents'}[3]{'parent'} = 
$result_trees{'macro_in_menu'};
 $result_trees{'macro_in_menu'}{'contents'}[4]{'args'}[0]{'parent'} = 
$result_trees{'macro_in_menu'}{'contents'}[4];
@@ -705,7 +686,6 @@
 $result_trees{'macro_in_menu'}{'contents'}[4]{'contents'}[0]{'parent'} = 
$result_trees{'macro_in_menu'}{'contents'}[4];
 $result_trees{'macro_in_menu'}{'contents'}[4]{'contents'}[1]{'parent'} = 
$result_trees{'macro_in_menu'}{'contents'}[4];
 $result_trees{'macro_in_menu'}{'contents'}[4]{'parent'} = 
$result_trees{'macro_in_menu'};
-$result_trees{'macro_in_menu'}{'contents'}[5]{'extra'}{'command'} = 
$result_trees{'macro_in_menu'}{'contents'}[4];
 $result_trees{'macro_in_menu'}{'contents'}[5]{'parent'} = 
$result_trees{'macro_in_menu'};
 $result_trees{'macro_in_menu'}{'contents'}[6]{'parent'} = 
$result_trees{'macro_in_menu'};
 $result_trees{'macro_in_menu'}{'contents'}[7]{'args'}[0]{'parent'} = 
$result_trees{'macro_in_menu'}{'contents'}[7];
@@ -712,7 +692,6 @@
 $result_trees{'macro_in_menu'}{'contents'}[7]{'contents'}[0]{'parent'} = 
$result_trees{'macro_in_menu'}{'contents'}[7];
 $result_trees{'macro_in_menu'}{'contents'}[7]{'contents'}[1]{'parent'} = 
$result_trees{'macro_in_menu'}{'contents'}[7];
 $result_trees{'macro_in_menu'}{'contents'}[7]{'parent'} = 
$result_trees{'macro_in_menu'};
-$result_trees{'macro_in_menu'}{'contents'}[8]{'extra'}{'command'} = 
$result_trees{'macro_in_menu'}{'contents'}[7];
 $result_trees{'macro_in_menu'}{'contents'}[8]{'parent'} = 
$result_trees{'macro_in_menu'};
 $result_trees{'macro_in_menu'}{'contents'}[9]{'parent'} = 
$result_trees{'macro_in_menu'};
 $result_trees{'macro_in_menu'}{'contents'}[10]{'args'}[0]{'parent'} = 
$result_trees{'macro_in_menu'}{'contents'}[10];
@@ -719,7 +698,6 @@
 $result_trees{'macro_in_menu'}{'contents'}[10]{'contents'}[0]{'parent'} = 
$result_trees{'macro_in_menu'}{'contents'}[10];
 $result_trees{'macro_in_menu'}{'contents'}[10]{'contents'}[1]{'parent'} = 
$result_trees{'macro_in_menu'}{'contents'}[10];
 $result_trees{'macro_in_menu'}{'contents'}[10]{'parent'} = 
$result_trees{'macro_in_menu'};
-$result_trees{'macro_in_menu'}{'contents'}[11]{'extra'}{'command'} = 
$result_trees{'macro_in_menu'}{'contents'}[10];
 $result_trees{'macro_in_menu'}{'contents'}[11]{'parent'} = 
$result_trees{'macro_in_menu'};
 $result_trees{'macro_in_menu'}{'contents'}[12]{'parent'} = 
$result_trees{'macro_in_menu'};
 $result_trees{'macro_in_menu'}{'contents'}[13]{'args'}[0]{'parent'} = 
$result_trees{'macro_in_menu'}{'contents'}[13];
@@ -726,7 +704,6 @@
 $result_trees{'macro_in_menu'}{'contents'}[13]{'contents'}[0]{'parent'} = 
$result_trees{'macro_in_menu'}{'contents'}[13];
 $result_trees{'macro_in_menu'}{'contents'}[13]{'contents'}[1]{'parent'} = 
$result_trees{'macro_in_menu'}{'contents'}[13];
 $result_trees{'macro_in_menu'}{'contents'}[13]{'parent'} = 
$result_trees{'macro_in_menu'};
-$result_trees{'macro_in_menu'}{'contents'}[14]{'extra'}{'command'} = 
$result_trees{'macro_in_menu'}{'contents'}[13];
 $result_trees{'macro_in_menu'}{'contents'}[14]{'parent'} = 
$result_trees{'macro_in_menu'};
 $result_trees{'macro_in_menu'}{'contents'}[15]{'parent'} = 
$result_trees{'macro_in_menu'};
 $result_trees{'macro_in_menu'}{'contents'}[16]{'args'}[0]{'parent'} = 
$result_trees{'macro_in_menu'}{'contents'}[16];
@@ -733,7 +710,6 @@
 $result_trees{'macro_in_menu'}{'contents'}[16]{'contents'}[0]{'parent'} = 
$result_trees{'macro_in_menu'}{'contents'}[16];
 $result_trees{'macro_in_menu'}{'contents'}[16]{'contents'}[1]{'parent'} = 
$result_trees{'macro_in_menu'}{'contents'}[16];
 $result_trees{'macro_in_menu'}{'contents'}[16]{'parent'} = 
$result_trees{'macro_in_menu'};
-$result_trees{'macro_in_menu'}{'contents'}[17]{'extra'}{'command'} = 
$result_trees{'macro_in_menu'}{'contents'}[16];
 $result_trees{'macro_in_menu'}{'contents'}[17]{'parent'} = 
$result_trees{'macro_in_menu'};
 $result_trees{'macro_in_menu'}{'contents'}[18]{'parent'} = 
$result_trees{'macro_in_menu'};
 
$result_trees{'macro_in_menu'}{'contents'}[19]{'contents'}[0]{'extra'}{'command'}
 = $result_trees{'macro_in_menu'}{'contents'}[19];

Modified: trunk/tp/t/results/macro/macro_in_misc_commands.pl
===================================================================
--- trunk/tp/t/results/macro/macro_in_misc_commands.pl  2018-08-25 14:01:16 UTC 
(rev 8114)
+++ trunk/tp/t/results/macro/macro_in_misc_commands.pl  2018-08-25 14:29:53 UTC 
(rev 8115)
@@ -43,9 +43,6 @@
           'parent' => {}
         },
         {
-          'extra' => {
-            'command' => {}
-          },
           'parent' => {},
           'text' => '
 ',
@@ -91,9 +88,6 @@
           'parent' => {}
         },
         {
-          'extra' => {
-            'command' => {}
-          },
           'parent' => {},
           'text' => '
 ',
@@ -321,9 +315,6 @@
           'parent' => {}
         },
         {
-          'extra' => {
-            'command' => {}
-          },
           'parent' => {},
           'text' => '
 ',
@@ -363,9 +354,6 @@
           'parent' => {}
         },
         {
-          'extra' => {
-            'command' => {}
-          },
           'parent' => {},
           'text' => '
 ',
@@ -527,9 +515,6 @@
           'parent' => {}
         },
         {
-          'extra' => {
-            'command' => {}
-          },
           'parent' => {},
           'text' => '
 ',
@@ -575,9 +560,6 @@
           'parent' => {}
         },
         {
-          'extra' => {
-            'command' => {}
-          },
           'parent' => {},
           'text' => '
 ',
@@ -766,9 +748,6 @@
           'parent' => {}
         },
         {
-          'extra' => {
-            'command' => {}
-          },
           'parent' => {},
           'text' => '
 ',
@@ -861,9 +840,6 @@
           'parent' => {}
         },
         {
-          'extra' => {
-            'command' => {}
-          },
           'parent' => {},
           'text' => '
 ',
@@ -915,9 +891,6 @@
           'parent' => {}
         },
         {
-          'extra' => {
-            'command' => {}
-          },
           'parent' => {},
           'text' => '
 ',
@@ -1077,9 +1050,6 @@
           'parent' => {}
         },
         {
-          'extra' => {
-            'command' => {}
-          },
           'parent' => {},
           'text' => '
 ',
@@ -1207,9 +1177,6 @@
           'parent' => {}
         },
         {
-          'extra' => {
-            'command' => {}
-          },
           'parent' => {},
           'text' => '
 ',
@@ -1249,9 +1216,6 @@
           'parent' => {}
         },
         {
-          'extra' => {
-            'command' => {}
-          },
           'parent' => {},
           'text' => '
 ',
@@ -1463,9 +1427,6 @@
           'parent' => {}
         },
         {
-          'extra' => {
-            'command' => {}
-          },
           'parent' => {},
           'text' => '
 ',
@@ -1701,9 +1662,6 @@
           'parent' => {}
         },
         {
-          'extra' => {
-            'command' => {}
-          },
           'parent' => {},
           'text' => '
 ',
@@ -1743,9 +1701,6 @@
           'parent' => {}
         },
         {
-          'extra' => {
-            'command' => {}
-          },
           'parent' => {},
           'text' => '
 ',
@@ -1785,9 +1740,6 @@
           'parent' => {}
         },
         {
-          'extra' => {
-            'command' => {}
-          },
           'parent' => {},
           'text' => '
 ',
@@ -1827,9 +1779,6 @@
           'parent' => {}
         },
         {
-          'extra' => {
-            'command' => {}
-          },
           'parent' => {},
           'text' => '
 ',
@@ -1869,9 +1818,6 @@
           'parent' => {}
         },
         {
-          'extra' => {
-            'command' => {}
-          },
           'parent' => {},
           'text' => '
 ',
@@ -2169,9 +2115,6 @@
           'parent' => {}
         },
         {
-          'extra' => {
-            'command' => {}
-          },
           'parent' => {},
           'text' => '
 ',
@@ -2211,9 +2154,6 @@
           'parent' => {}
         },
         {
-          'extra' => {
-            'command' => {}
-          },
           'parent' => {},
           'text' => '
 ',
@@ -2341,9 +2281,6 @@
           'parent' => {}
         },
         {
-          'extra' => {
-            'command' => {}
-          },
           'parent' => {},
           'text' => '
 ',
@@ -2383,9 +2320,6 @@
           'parent' => {}
         },
         {
-          'extra' => {
-            'command' => {}
-          },
           'parent' => {},
           'text' => '
 ',
@@ -2531,9 +2465,6 @@
           'parent' => {}
         },
         {
-          'extra' => {
-            'command' => {}
-          },
           'parent' => {},
           'text' => '
 ',
@@ -2632,9 +2563,6 @@
           'parent' => {}
         },
         {
-          'extra' => {
-            'command' => {}
-          },
           'parent' => {},
           'text' => '
 ',
@@ -2674,9 +2602,6 @@
           'parent' => {}
         },
         {
-          'extra' => {
-            'command' => {}
-          },
           'parent' => {},
           'text' => '
 ',
@@ -2810,9 +2735,6 @@
           'parent' => {}
         },
         {
-          'extra' => {
-            'command' => {}
-          },
           'parent' => {},
           'text' => '
 ',
@@ -2852,9 +2774,6 @@
           'parent' => {}
         },
         {
-          'extra' => {
-            'command' => {}
-          },
           'parent' => {},
           'text' => '
 ',
@@ -2894,9 +2813,6 @@
           'parent' => {}
         },
         {
-          'extra' => {
-            'command' => {}
-          },
           'parent' => {},
           'text' => '
 ',
@@ -3242,9 +3158,6 @@
           'parent' => {}
         },
         {
-          'extra' => {
-            'command' => {}
-          },
           'parent' => {},
           'text' => '
 ',
@@ -3331,9 +3244,6 @@
           'parent' => {}
         },
         {
-          'extra' => {
-            'command' => {}
-          },
           'parent' => {},
           'text' => '
 ',
@@ -3391,9 +3301,6 @@
           'parent' => {}
         },
         {
-          'extra' => {
-            'command' => {}
-          },
           'parent' => {},
           'text' => '
 ',
@@ -3480,9 +3387,6 @@
           'parent' => {}
         },
         {
-          'extra' => {
-            'command' => {}
-          },
           'parent' => {},
           'text' => '
 ',
@@ -3569,9 +3473,6 @@
           'parent' => {}
         },
         {
-          'extra' => {
-            'command' => {}
-          },
           'parent' => {},
           'text' => '
 ',
@@ -3896,9 +3797,6 @@
           'parent' => {}
         },
         {
-          'extra' => {
-            'command' => {}
-          },
           'parent' => {},
           'text' => '
 ',
@@ -3961,9 +3859,6 @@
           'parent' => {}
         },
         {
-          'extra' => {
-            'command' => {}
-          },
           'parent' => {},
           'text' => '
 ',
@@ -4010,7 +3905,6 @@
 
$result_trees{'macro_in_misc_commands'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'parent'}
 = $result_trees{'macro_in_misc_commands'}{'contents'}[0]{'contents'}[0];
 
$result_trees{'macro_in_misc_commands'}{'contents'}[0]{'contents'}[0]{'contents'}[1]{'parent'}
 = $result_trees{'macro_in_misc_commands'}{'contents'}[0]{'contents'}[0];
 
$result_trees{'macro_in_misc_commands'}{'contents'}[0]{'contents'}[0]{'parent'} 
= $result_trees{'macro_in_misc_commands'}{'contents'}[0];
-$result_trees{'macro_in_misc_commands'}{'contents'}[0]{'contents'}[1]{'extra'}{'command'}
 = $result_trees{'macro_in_misc_commands'}{'contents'}[0]{'contents'}[0];
 
$result_trees{'macro_in_misc_commands'}{'contents'}[0]{'contents'}[1]{'parent'} 
= $result_trees{'macro_in_misc_commands'}{'contents'}[0];
 
$result_trees{'macro_in_misc_commands'}{'contents'}[0]{'contents'}[2]{'parent'} 
= $result_trees{'macro_in_misc_commands'}{'contents'}[0];
 
$result_trees{'macro_in_misc_commands'}{'contents'}[0]{'contents'}[3]{'args'}[0]{'parent'}
 = $result_trees{'macro_in_misc_commands'}{'contents'}[0]{'contents'}[3];
@@ -4017,7 +3911,6 @@
 
$result_trees{'macro_in_misc_commands'}{'contents'}[0]{'contents'}[3]{'contents'}[0]{'parent'}
 = $result_trees{'macro_in_misc_commands'}{'contents'}[0]{'contents'}[3];
 
$result_trees{'macro_in_misc_commands'}{'contents'}[0]{'contents'}[3]{'contents'}[1]{'parent'}
 = $result_trees{'macro_in_misc_commands'}{'contents'}[0]{'contents'}[3];
 
$result_trees{'macro_in_misc_commands'}{'contents'}[0]{'contents'}[3]{'parent'} 
= $result_trees{'macro_in_misc_commands'}{'contents'}[0];
-$result_trees{'macro_in_misc_commands'}{'contents'}[0]{'contents'}[4]{'extra'}{'command'}
 = $result_trees{'macro_in_misc_commands'}{'contents'}[0]{'contents'}[3];
 
$result_trees{'macro_in_misc_commands'}{'contents'}[0]{'contents'}[4]{'parent'} 
= $result_trees{'macro_in_misc_commands'}{'contents'}[0];
 
$result_trees{'macro_in_misc_commands'}{'contents'}[0]{'contents'}[5]{'parent'} 
= $result_trees{'macro_in_misc_commands'}{'contents'}[0];
 $result_trees{'macro_in_misc_commands'}{'contents'}[0]{'parent'} = 
$result_trees{'macro_in_misc_commands'};
@@ -4055,13 +3948,11 @@
 
$result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[4]{'contents'}[0]{'parent'}
 = $result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[4];
 
$result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[4]{'contents'}[1]{'parent'}
 = $result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[4];
 
$result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[4]{'parent'} 
= $result_trees{'macro_in_misc_commands'}{'contents'}[2];
-$result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[5]{'extra'}{'command'}
 = $result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[4];
 
$result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[5]{'parent'} 
= $result_trees{'macro_in_misc_commands'}{'contents'}[2];
 
$result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[6]{'args'}[0]{'parent'}
 = $result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[6];
 
$result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[6]{'contents'}[0]{'parent'}
 = $result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[6];
 
$result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[6]{'contents'}[1]{'parent'}
 = $result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[6];
 
$result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[6]{'parent'} 
= $result_trees{'macro_in_misc_commands'}{'contents'}[2];
-$result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[7]{'extra'}{'command'}
 = $result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[6];
 
$result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[7]{'parent'} 
= $result_trees{'macro_in_misc_commands'}{'contents'}[2];
 
$result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[8]{'parent'} 
= $result_trees{'macro_in_misc_commands'}{'contents'}[2];
 
$result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[9]{'contents'}[0]{'parent'}
 = $result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[9];
@@ -4089,7 +3980,6 @@
 
$result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[13]{'contents'}[0]{'parent'}
 = $result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[13];
 
$result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[13]{'contents'}[1]{'parent'}
 = $result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[13];
 
$result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[13]{'parent'}
 = $result_trees{'macro_in_misc_commands'}{'contents'}[2];
-$result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[14]{'extra'}{'command'}
 = $result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[13];
 
$result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[14]{'parent'}
 = $result_trees{'macro_in_misc_commands'}{'contents'}[2];
 
$result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[15]{'parent'}
 = $result_trees{'macro_in_misc_commands'}{'contents'}[2];
 
$result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[16]{'args'}[0]{'parent'}
 = $result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[16];
@@ -4096,7 +3986,6 @@
 
$result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[16]{'contents'}[0]{'parent'}
 = $result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[16];
 
$result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[16]{'contents'}[1]{'parent'}
 = $result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[16];
 
$result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[16]{'parent'}
 = $result_trees{'macro_in_misc_commands'}{'contents'}[2];
-$result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[17]{'extra'}{'command'}
 = $result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[16];
 
$result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[17]{'parent'}
 = $result_trees{'macro_in_misc_commands'}{'contents'}[2];
 
$result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[18]{'parent'}
 = $result_trees{'macro_in_misc_commands'}{'contents'}[2];
 
$result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[19]{'args'}[0]{'contents'}[0]{'extra'}{'command'}
 = $result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[19];
@@ -4125,7 +4014,6 @@
 
$result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[25]{'contents'}[0]{'parent'}
 = $result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[25];
 
$result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[25]{'contents'}[1]{'parent'}
 = $result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[25];
 
$result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[25]{'parent'}
 = $result_trees{'macro_in_misc_commands'}{'contents'}[2];
-$result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[26]{'extra'}{'command'}
 = $result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[25];
 
$result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[26]{'parent'}
 = $result_trees{'macro_in_misc_commands'}{'contents'}[2];
 
$result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[27]{'parent'}
 = $result_trees{'macro_in_misc_commands'}{'contents'}[2];
 
$result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[28]{'args'}[0]{'contents'}[0]{'extra'}{'command'}
 = $result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[28];
@@ -4140,7 +4028,6 @@
 
$result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[30]{'contents'}[0]{'parent'}
 = $result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[30];
 
$result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[30]{'contents'}[1]{'parent'}
 = $result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[30];
 
$result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[30]{'parent'}
 = $result_trees{'macro_in_misc_commands'}{'contents'}[2];
-$result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[31]{'extra'}{'command'}
 = $result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[30];
 
$result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[31]{'parent'}
 = $result_trees{'macro_in_misc_commands'}{'contents'}[2];
 
$result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[32]{'args'}[0]{'parent'}
 = $result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[32];
 
$result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[32]{'parent'}
 = $result_trees{'macro_in_misc_commands'}{'contents'}[2];
@@ -4148,7 +4035,6 @@
 
$result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[33]{'contents'}[0]{'parent'}
 = $result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[33];
 
$result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[33]{'contents'}[1]{'parent'}
 = $result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[33];
 
$result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[33]{'parent'}
 = $result_trees{'macro_in_misc_commands'}{'contents'}[2];
-$result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[34]{'extra'}{'command'}
 = $result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[33];
 
$result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[34]{'parent'}
 = $result_trees{'macro_in_misc_commands'}{'contents'}[2];
 
$result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[35]{'args'}[0]{'parent'}
 = $result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[35];
 
$result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[35]{'parent'}
 = $result_trees{'macro_in_misc_commands'}{'contents'}[2];
@@ -4174,7 +4060,6 @@
 
$result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[41]{'contents'}[0]{'parent'}
 = $result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[41];
 
$result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[41]{'contents'}[1]{'parent'}
 = $result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[41];
 
$result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[41]{'parent'}
 = $result_trees{'macro_in_misc_commands'}{'contents'}[2];
-$result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[42]{'extra'}{'command'}
 = $result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[41];
 
$result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[42]{'parent'}
 = $result_trees{'macro_in_misc_commands'}{'contents'}[2];
 
$result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[43]{'args'}[0]{'contents'}[0]{'extra'}{'command'}
 = $result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[43];
 
$result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[43]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[43]{'args'}[0];
@@ -4194,13 +4079,11 @@
 
$result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[47]{'contents'}[0]{'parent'}
 = $result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[47];
 
$result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[47]{'contents'}[1]{'parent'}
 = $result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[47];
 
$result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[47]{'parent'}
 = $result_trees{'macro_in_misc_commands'}{'contents'}[2];
-$result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[48]{'extra'}{'command'}
 = $result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[47];
 
$result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[48]{'parent'}
 = $result_trees{'macro_in_misc_commands'}{'contents'}[2];
 
$result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[49]{'args'}[0]{'parent'}
 = $result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[49];
 
$result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[49]{'contents'}[0]{'parent'}
 = $result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[49];
 
$result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[49]{'contents'}[1]{'parent'}
 = $result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[49];
 
$result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[49]{'parent'}
 = $result_trees{'macro_in_misc_commands'}{'contents'}[2];
-$result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[50]{'extra'}{'command'}
 = $result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[49];
 
$result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[50]{'parent'}
 = $result_trees{'macro_in_misc_commands'}{'contents'}[2];
 
$result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[51]{'parent'}
 = $result_trees{'macro_in_misc_commands'}{'contents'}[2];
 
$result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[52]{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[52]{'contents'}[0]{'args'}[0];
@@ -4233,7 +4116,6 @@
 
$result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[60]{'contents'}[0]{'parent'}
 = $result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[60];
 
$result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[60]{'contents'}[1]{'parent'}
 = $result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[60];
 
$result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[60]{'parent'}
 = $result_trees{'macro_in_misc_commands'}{'contents'}[2];
-$result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[61]{'extra'}{'command'}
 = $result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[60];
 
$result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[61]{'parent'}
 = $result_trees{'macro_in_misc_commands'}{'contents'}[2];
 
$result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[62]{'args'}[0]{'contents'}[0]{'extra'}{'command'}
 = $result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[62];
 
$result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[62]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[62]{'args'}[0];
@@ -4272,31 +4154,26 @@
 
$result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[68]{'contents'}[0]{'parent'}
 = $result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[68];
 
$result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[68]{'contents'}[1]{'parent'}
 = $result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[68];
 
$result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[68]{'parent'}
 = $result_trees{'macro_in_misc_commands'}{'contents'}[2];
-$result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[69]{'extra'}{'command'}
 = $result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[68];
 
$result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[69]{'parent'}
 = $result_trees{'macro_in_misc_commands'}{'contents'}[2];
 
$result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[70]{'args'}[0]{'parent'}
 = $result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[70];
 
$result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[70]{'contents'}[0]{'parent'}
 = $result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[70];
 
$result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[70]{'contents'}[1]{'parent'}
 = $result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[70];
 
$result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[70]{'parent'}
 = $result_trees{'macro_in_misc_commands'}{'contents'}[2];
-$result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[71]{'extra'}{'command'}
 = $result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[70];
 
$result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[71]{'parent'}
 = $result_trees{'macro_in_misc_commands'}{'contents'}[2];
 
$result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[72]{'args'}[0]{'parent'}
 = $result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[72];
 
$result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[72]{'contents'}[0]{'parent'}
 = $result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[72];
 
$result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[72]{'contents'}[1]{'parent'}
 = $result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[72];
 
$result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[72]{'parent'}
 = $result_trees{'macro_in_misc_commands'}{'contents'}[2];
-$result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[73]{'extra'}{'command'}
 = $result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[72];
 
$result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[73]{'parent'}
 = $result_trees{'macro_in_misc_commands'}{'contents'}[2];
 
$result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[74]{'args'}[0]{'parent'}
 = $result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[74];
 
$result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[74]{'contents'}[0]{'parent'}
 = $result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[74];
 
$result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[74]{'contents'}[1]{'parent'}
 = $result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[74];
 
$result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[74]{'parent'}
 = $result_trees{'macro_in_misc_commands'}{'contents'}[2];
-$result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[75]{'extra'}{'command'}
 = $result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[74];
 
$result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[75]{'parent'}
 = $result_trees{'macro_in_misc_commands'}{'contents'}[2];
 
$result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[76]{'args'}[0]{'parent'}
 = $result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[76];
 
$result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[76]{'contents'}[0]{'parent'}
 = $result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[76];
 
$result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[76]{'contents'}[1]{'parent'}
 = $result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[76];
 
$result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[76]{'parent'}
 = $result_trees{'macro_in_misc_commands'}{'contents'}[2];
-$result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[77]{'extra'}{'command'}
 = $result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[76];
 
$result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[77]{'parent'}
 = $result_trees{'macro_in_misc_commands'}{'contents'}[2];
 
$result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[78]{'parent'}
 = $result_trees{'macro_in_misc_commands'}{'contents'}[2];
 
$result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[79]{'args'}[0]{'contents'}[0]{'extra'}{'command'}
 = $result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[79];
@@ -4346,13 +4223,11 @@
 
$result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[86]{'contents'}[0]{'parent'}
 = $result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[86];
 
$result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[86]{'contents'}[1]{'parent'}
 = $result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[86];
 
$result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[86]{'parent'}
 = $result_trees{'macro_in_misc_commands'}{'contents'}[2];
-$result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[87]{'extra'}{'command'}
 = $result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[86];
 
$result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[87]{'parent'}
 = $result_trees{'macro_in_misc_commands'}{'contents'}[2];
 
$result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[88]{'args'}[0]{'parent'}
 = $result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[88];
 
$result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[88]{'contents'}[0]{'parent'}
 = $result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[88];
 
$result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[88]{'contents'}[1]{'parent'}
 = $result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[88];
 
$result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[88]{'parent'}
 = $result_trees{'macro_in_misc_commands'}{'contents'}[2];
-$result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[89]{'extra'}{'command'}
 = $result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[88];
 
$result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[89]{'parent'}
 = $result_trees{'macro_in_misc_commands'}{'contents'}[2];
 
$result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[90]{'args'}[0]{'contents'}[0]{'extra'}{'command'}
 = $result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[90];
 
$result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[90]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[90]{'args'}[0];
@@ -4373,13 +4248,11 @@
 
$result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[93]{'contents'}[0]{'parent'}
 = $result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[93];
 
$result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[93]{'contents'}[1]{'parent'}
 = $result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[93];
 
$result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[93]{'parent'}
 = $result_trees{'macro_in_misc_commands'}{'contents'}[2];
-$result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[94]{'extra'}{'command'}
 = $result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[93];
 
$result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[94]{'parent'}
 = $result_trees{'macro_in_misc_commands'}{'contents'}[2];
 
$result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[95]{'args'}[0]{'parent'}
 = $result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[95];
 
$result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[95]{'contents'}[0]{'parent'}
 = $result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[95];
 
$result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[95]{'contents'}[1]{'parent'}
 = $result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[95];
 
$result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[95]{'parent'}
 = $result_trees{'macro_in_misc_commands'}{'contents'}[2];
-$result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[96]{'extra'}{'command'}
 = $result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[95];
 
$result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[96]{'parent'}
 = $result_trees{'macro_in_misc_commands'}{'contents'}[2];
 
$result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[97]{'args'}[0]{'contents'}[0]{'extra'}{'command'}
 = $result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[97];
 
$result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[97]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[97]{'args'}[0];
@@ -4402,7 +4275,6 @@
 
$result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[101]{'contents'}[0]{'parent'}
 = $result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[101];
 
$result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[101]{'contents'}[1]{'parent'}
 = $result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[101];
 
$result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[101]{'parent'}
 = $result_trees{'macro_in_misc_commands'}{'contents'}[2];
-$result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[102]{'extra'}{'command'}
 = $result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[101];
 
$result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[102]{'parent'}
 = $result_trees{'macro_in_misc_commands'}{'contents'}[2];
 
$result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[103]{'args'}[0]{'contents'}[0]{'extra'}{'command'}
 = $result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[103];
 
$result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[103]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[103]{'args'}[0];
@@ -4417,13 +4289,11 @@
 
$result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[105]{'contents'}[0]{'parent'}
 = $result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[105];
 
$result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[105]{'contents'}[1]{'parent'}
 = $result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[105];
 
$result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[105]{'parent'}
 = $result_trees{'macro_in_misc_commands'}{'contents'}[2];
-$result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[106]{'extra'}{'command'}
 = $result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[105];
 
$result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[106]{'parent'}
 = $result_trees{'macro_in_misc_commands'}{'contents'}[2];
 
$result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[107]{'args'}[0]{'parent'}
 = $result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[107];
 
$result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[107]{'contents'}[0]{'parent'}
 = $result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[107];
 
$result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[107]{'contents'}[1]{'parent'}
 = $result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[107];
 
$result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[107]{'parent'}
 = $result_trees{'macro_in_misc_commands'}{'contents'}[2];
-$result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[108]{'extra'}{'command'}
 = $result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[107];
 
$result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[108]{'parent'}
 = $result_trees{'macro_in_misc_commands'}{'contents'}[2];
 
$result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[109]{'args'}[0]{'contents'}[0]{'extra'}{'command'}
 = $result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[109];
 
$result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[109]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[109]{'args'}[0];
@@ -4445,19 +4315,16 @@
 
$result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[113]{'contents'}[0]{'parent'}
 = $result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[113];
 
$result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[113]{'contents'}[1]{'parent'}
 = $result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[113];
 
$result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[113]{'parent'}
 = $result_trees{'macro_in_misc_commands'}{'contents'}[2];
-$result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[114]{'extra'}{'command'}
 = $result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[113];
 
$result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[114]{'parent'}
 = $result_trees{'macro_in_misc_commands'}{'contents'}[2];
 
$result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[115]{'args'}[0]{'parent'}
 = $result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[115];
 
$result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[115]{'contents'}[0]{'parent'}
 = $result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[115];
 
$result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[115]{'contents'}[1]{'parent'}
 = $result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[115];
 
$result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[115]{'parent'}
 = $result_trees{'macro_in_misc_commands'}{'contents'}[2];
-$result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[116]{'extra'}{'command'}
 = $result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[115];
 
$result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[116]{'parent'}
 = $result_trees{'macro_in_misc_commands'}{'contents'}[2];
 
$result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[117]{'args'}[0]{'parent'}
 = $result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[117];
 
$result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[117]{'contents'}[0]{'parent'}
 = $result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[117];
 
$result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[117]{'contents'}[1]{'parent'}
 = $result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[117];
 
$result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[117]{'parent'}
 = $result_trees{'macro_in_misc_commands'}{'contents'}[2];
-$result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[118]{'extra'}{'command'}
 = $result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[117];
 
$result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[118]{'parent'}
 = $result_trees{'macro_in_misc_commands'}{'contents'}[2];
 
$result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[119]{'parent'}
 = $result_trees{'macro_in_misc_commands'}{'contents'}[2];
 
$result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[120]{'contents'}[0]{'parent'}
 = $result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[120];
@@ -4523,7 +4390,6 @@
 
$result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[135]{'contents'}[0]{'parent'}
 = $result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[135];
 
$result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[135]{'contents'}[1]{'parent'}
 = $result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[135];
 
$result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[135]{'parent'}
 = $result_trees{'macro_in_misc_commands'}{'contents'}[2];
-$result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[136]{'extra'}{'command'}
 = $result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[135];
 
$result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[136]{'parent'}
 = $result_trees{'macro_in_misc_commands'}{'contents'}[2];
 
$result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[137]{'args'}[0]{'parent'}
 = $result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[137];
 
$result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[137]{'parent'}
 = $result_trees{'macro_in_misc_commands'}{'contents'}[2];
@@ -4535,7 +4401,6 @@
 
$result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[141]{'contents'}[0]{'parent'}
 = $result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[141];
 
$result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[141]{'contents'}[1]{'parent'}
 = $result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[141];
 
$result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[141]{'parent'}
 = $result_trees{'macro_in_misc_commands'}{'contents'}[2];
-$result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[142]{'extra'}{'command'}
 = $result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[141];
 
$result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[142]{'parent'}
 = $result_trees{'macro_in_misc_commands'}{'contents'}[2];
 
$result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[143]{'args'}[0]{'parent'}
 = $result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[143];
 
$result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[143]{'parent'}
 = $result_trees{'macro_in_misc_commands'}{'contents'}[2];
@@ -4544,7 +4409,6 @@
 
$result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[145]{'contents'}[0]{'parent'}
 = $result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[145];
 
$result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[145]{'contents'}[1]{'parent'}
 = $result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[145];
 
$result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[145]{'parent'}
 = $result_trees{'macro_in_misc_commands'}{'contents'}[2];
-$result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[146]{'extra'}{'command'}
 = $result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[145];
 
$result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[146]{'parent'}
 = $result_trees{'macro_in_misc_commands'}{'contents'}[2];
 
$result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[147]{'args'}[0]{'contents'}[0]{'extra'}{'command'}
 = $result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[147];
 
$result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[147]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[147]{'args'}[0];
@@ -4559,7 +4423,6 @@
 
$result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[149]{'contents'}[0]{'parent'}
 = $result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[149];
 
$result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[149]{'contents'}[1]{'parent'}
 = $result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[149];
 
$result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[149]{'parent'}
 = $result_trees{'macro_in_misc_commands'}{'contents'}[2];
-$result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[150]{'extra'}{'command'}
 = $result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[149];
 
$result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[150]{'parent'}
 = $result_trees{'macro_in_misc_commands'}{'contents'}[2];
 
$result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[151]{'args'}[0]{'contents'}[0]{'extra'}{'command'}
 = $result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[151];
 
$result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[151]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[151]{'args'}[0];
@@ -4573,7 +4436,6 @@
 
$result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[153]{'contents'}[0]{'parent'}
 = $result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[153];
 
$result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[153]{'contents'}[1]{'parent'}
 = $result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[153];
 
$result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[153]{'parent'}
 = $result_trees{'macro_in_misc_commands'}{'contents'}[2];
-$result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[154]{'extra'}{'command'}
 = $result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[153];
 
$result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[154]{'parent'}
 = $result_trees{'macro_in_misc_commands'}{'contents'}[2];
 
$result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[155]{'parent'}
 = $result_trees{'macro_in_misc_commands'}{'contents'}[2];
 
$result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[156]{'args'}[0]{'parent'}
 = $result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[156];
@@ -4628,7 +4490,6 @@
 
$result_trees{'macro_in_misc_commands'}{'contents'}[4]{'contents'}[3]{'contents'}[0]{'parent'}
 = $result_trees{'macro_in_misc_commands'}{'contents'}[4]{'contents'}[3];
 
$result_trees{'macro_in_misc_commands'}{'contents'}[4]{'contents'}[3]{'contents'}[1]{'parent'}
 = $result_trees{'macro_in_misc_commands'}{'contents'}[4]{'contents'}[3];
 
$result_trees{'macro_in_misc_commands'}{'contents'}[4]{'contents'}[3]{'parent'} 
= $result_trees{'macro_in_misc_commands'}{'contents'}[4];
-$result_trees{'macro_in_misc_commands'}{'contents'}[4]{'contents'}[4]{'extra'}{'command'}
 = $result_trees{'macro_in_misc_commands'}{'contents'}[4]{'contents'}[3];
 
$result_trees{'macro_in_misc_commands'}{'contents'}[4]{'contents'}[4]{'parent'} 
= $result_trees{'macro_in_misc_commands'}{'contents'}[4];
 
$result_trees{'macro_in_misc_commands'}{'contents'}[4]{'contents'}[5]{'args'}[0]{'parent'}
 = $result_trees{'macro_in_misc_commands'}{'contents'}[4]{'contents'}[5];
 
$result_trees{'macro_in_misc_commands'}{'contents'}[4]{'contents'}[5]{'parent'} 
= $result_trees{'macro_in_misc_commands'}{'contents'}[4];
@@ -4637,7 +4498,6 @@
 
$result_trees{'macro_in_misc_commands'}{'contents'}[4]{'contents'}[7]{'contents'}[0]{'parent'}
 = $result_trees{'macro_in_misc_commands'}{'contents'}[4]{'contents'}[7];
 
$result_trees{'macro_in_misc_commands'}{'contents'}[4]{'contents'}[7]{'contents'}[1]{'parent'}
 = $result_trees{'macro_in_misc_commands'}{'contents'}[4]{'contents'}[7];
 
$result_trees{'macro_in_misc_commands'}{'contents'}[4]{'contents'}[7]{'parent'} 
= $result_trees{'macro_in_misc_commands'}{'contents'}[4];
-$result_trees{'macro_in_misc_commands'}{'contents'}[4]{'contents'}[8]{'extra'}{'command'}
 = $result_trees{'macro_in_misc_commands'}{'contents'}[4]{'contents'}[7];
 
$result_trees{'macro_in_misc_commands'}{'contents'}[4]{'contents'}[8]{'parent'} 
= $result_trees{'macro_in_misc_commands'}{'contents'}[4];
 
$result_trees{'macro_in_misc_commands'}{'contents'}[4]{'contents'}[9]{'parent'} 
= $result_trees{'macro_in_misc_commands'}{'contents'}[4];
 
$result_trees{'macro_in_misc_commands'}{'contents'}[4]{'extra'}{'misc_content'}[0]
 = 
$result_trees{'macro_in_misc_commands'}{'contents'}[4]{'args'}[0]{'contents'}[1];

Modified: trunk/tp/t/results/macro/macro_name_with_digit.pl
===================================================================
--- trunk/tp/t/results/macro/macro_name_with_digit.pl   2018-08-25 14:01:16 UTC 
(rev 8114)
+++ trunk/tp/t/results/macro/macro_name_with_digit.pl   2018-08-25 14:29:53 UTC 
(rev 8115)
@@ -41,9 +41,6 @@
       'parent' => {}
     },
     {
-      'extra' => {
-        'command' => {}
-      },
       'parent' => {},
       'text' => '
 ',
@@ -94,9 +91,6 @@
       'parent' => {}
     },
     {
-      'extra' => {
-        'command' => {}
-      },
       'parent' => {},
       'text' => '
 ',
@@ -126,7 +120,6 @@
 $result_trees{'macro_name_with_digit'}{'contents'}[0]{'contents'}[0]{'parent'} 
= $result_trees{'macro_name_with_digit'}{'contents'}[0];
 $result_trees{'macro_name_with_digit'}{'contents'}[0]{'contents'}[1]{'parent'} 
= $result_trees{'macro_name_with_digit'}{'contents'}[0];
 $result_trees{'macro_name_with_digit'}{'contents'}[0]{'parent'} = 
$result_trees{'macro_name_with_digit'};
-$result_trees{'macro_name_with_digit'}{'contents'}[1]{'extra'}{'command'} = 
$result_trees{'macro_name_with_digit'}{'contents'}[0];
 $result_trees{'macro_name_with_digit'}{'contents'}[1]{'parent'} = 
$result_trees{'macro_name_with_digit'};
 $result_trees{'macro_name_with_digit'}{'contents'}[2]{'parent'} = 
$result_trees{'macro_name_with_digit'};
 $result_trees{'macro_name_with_digit'}{'contents'}[3]{'args'}[0]{'parent'} = 
$result_trees{'macro_name_with_digit'}{'contents'}[3];
@@ -134,7 +127,6 @@
 $result_trees{'macro_name_with_digit'}{'contents'}[3]{'contents'}[0]{'parent'} 
= $result_trees{'macro_name_with_digit'}{'contents'}[3];
 $result_trees{'macro_name_with_digit'}{'contents'}[3]{'contents'}[1]{'parent'} 
= $result_trees{'macro_name_with_digit'}{'contents'}[3];
 $result_trees{'macro_name_with_digit'}{'contents'}[3]{'parent'} = 
$result_trees{'macro_name_with_digit'};
-$result_trees{'macro_name_with_digit'}{'contents'}[4]{'extra'}{'command'} = 
$result_trees{'macro_name_with_digit'}{'contents'}[3];
 $result_trees{'macro_name_with_digit'}{'contents'}[4]{'parent'} = 
$result_trees{'macro_name_with_digit'};
 $result_trees{'macro_name_with_digit'}{'contents'}[5]{'parent'} = 
$result_trees{'macro_name_with_digit'};
 $result_trees{'macro_name_with_digit'}{'contents'}[6]{'contents'}[0]{'parent'} 
= $result_trees{'macro_name_with_digit'}{'contents'}[6];

Modified: trunk/tp/t/results/macro/macro_name_with_hyphen.pl
===================================================================
--- trunk/tp/t/results/macro/macro_name_with_hyphen.pl  2018-08-25 14:01:16 UTC 
(rev 8114)
+++ trunk/tp/t/results/macro/macro_name_with_hyphen.pl  2018-08-25 14:29:53 UTC 
(rev 8115)
@@ -51,9 +51,6 @@
       'parent' => {}
     },
     {
-      'extra' => {
-        'command' => {}
-      },
       'parent' => {},
       'text' => '
 ',
@@ -111,7 +108,6 @@
 
$result_trees{'macro_name_with_hyphen'}{'contents'}[0]{'contents'}[0]{'parent'} 
= $result_trees{'macro_name_with_hyphen'}{'contents'}[0];
 
$result_trees{'macro_name_with_hyphen'}{'contents'}[0]{'contents'}[1]{'parent'} 
= $result_trees{'macro_name_with_hyphen'}{'contents'}[0];
 $result_trees{'macro_name_with_hyphen'}{'contents'}[0]{'parent'} = 
$result_trees{'macro_name_with_hyphen'};
-$result_trees{'macro_name_with_hyphen'}{'contents'}[1]{'extra'}{'command'} = 
$result_trees{'macro_name_with_hyphen'}{'contents'}[0];
 $result_trees{'macro_name_with_hyphen'}{'contents'}[1]{'parent'} = 
$result_trees{'macro_name_with_hyphen'};
 $result_trees{'macro_name_with_hyphen'}{'contents'}[2]{'parent'} = 
$result_trees{'macro_name_with_hyphen'};
 
$result_trees{'macro_name_with_hyphen'}{'contents'}[3]{'contents'}[0]{'parent'} 
= $result_trees{'macro_name_with_hyphen'}{'contents'}[3];

Modified: trunk/tp/t/results/macro/macro_no_arg_bad_expansion.pl
===================================================================
--- trunk/tp/t/results/macro/macro_no_arg_bad_expansion.pl      2018-08-25 
14:01:16 UTC (rev 8114)
+++ trunk/tp/t/results/macro/macro_no_arg_bad_expansion.pl      2018-08-25 
14:29:53 UTC (rev 8115)
@@ -41,9 +41,6 @@
       'parent' => {}
     },
     {
-      'extra' => {
-        'command' => {}
-      },
       'parent' => {},
       'text' => '
 ',
@@ -73,7 +70,6 @@
 
$result_trees{'macro_no_arg_bad_expansion'}{'contents'}[0]{'contents'}[0]{'parent'}
 = $result_trees{'macro_no_arg_bad_expansion'}{'contents'}[0];
 
$result_trees{'macro_no_arg_bad_expansion'}{'contents'}[0]{'contents'}[1]{'parent'}
 = $result_trees{'macro_no_arg_bad_expansion'}{'contents'}[0];
 $result_trees{'macro_no_arg_bad_expansion'}{'contents'}[0]{'parent'} = 
$result_trees{'macro_no_arg_bad_expansion'};
-$result_trees{'macro_no_arg_bad_expansion'}{'contents'}[1]{'extra'}{'command'} 
= $result_trees{'macro_no_arg_bad_expansion'}{'contents'}[0];
 $result_trees{'macro_no_arg_bad_expansion'}{'contents'}[1]{'parent'} = 
$result_trees{'macro_no_arg_bad_expansion'};
 $result_trees{'macro_no_arg_bad_expansion'}{'contents'}[2]{'parent'} = 
$result_trees{'macro_no_arg_bad_expansion'};
 
$result_trees{'macro_no_arg_bad_expansion'}{'contents'}[3]{'contents'}[0]{'parent'}
 = $result_trees{'macro_no_arg_bad_expansion'}{'contents'}[3];

Modified: trunk/tp/t/results/macro/macro_no_arg_expansion.pl
===================================================================
--- trunk/tp/t/results/macro/macro_no_arg_expansion.pl  2018-08-25 14:01:16 UTC 
(rev 8114)
+++ trunk/tp/t/results/macro/macro_no_arg_expansion.pl  2018-08-25 14:29:53 UTC 
(rev 8115)
@@ -41,9 +41,6 @@
       'parent' => {}
     },
     {
-      'extra' => {
-        'command' => {}
-      },
       'parent' => {},
       'text' => '
 ',
@@ -73,7 +70,6 @@
 
$result_trees{'macro_no_arg_expansion'}{'contents'}[0]{'contents'}[0]{'parent'} 
= $result_trees{'macro_no_arg_expansion'}{'contents'}[0];
 
$result_trees{'macro_no_arg_expansion'}{'contents'}[0]{'contents'}[1]{'parent'} 
= $result_trees{'macro_no_arg_expansion'}{'contents'}[0];
 $result_trees{'macro_no_arg_expansion'}{'contents'}[0]{'parent'} = 
$result_trees{'macro_no_arg_expansion'};
-$result_trees{'macro_no_arg_expansion'}{'contents'}[1]{'extra'}{'command'} = 
$result_trees{'macro_no_arg_expansion'}{'contents'}[0];
 $result_trees{'macro_no_arg_expansion'}{'contents'}[1]{'parent'} = 
$result_trees{'macro_no_arg_expansion'};
 $result_trees{'macro_no_arg_expansion'}{'contents'}[2]{'parent'} = 
$result_trees{'macro_no_arg_expansion'};
 
$result_trees{'macro_no_arg_expansion'}{'contents'}[3]{'contents'}[0]{'parent'} 
= $result_trees{'macro_no_arg_expansion'}{'contents'}[3];

Modified: trunk/tp/t/results/macro/macro_one_arg_end_of_file.pl
===================================================================
--- trunk/tp/t/results/macro/macro_one_arg_end_of_file.pl       2018-08-25 
14:01:16 UTC (rev 8114)
+++ trunk/tp/t/results/macro/macro_one_arg_end_of_file.pl       2018-08-25 
14:29:53 UTC (rev 8115)
@@ -46,9 +46,6 @@
       'parent' => {}
     },
     {
-      'extra' => {
-        'command' => {}
-      },
       'parent' => {},
       'text' => '
 ',
@@ -78,7 +75,6 @@
 
$result_trees{'macro_one_arg_end_of_file'}{'contents'}[0]{'contents'}[0]{'parent'}
 = $result_trees{'macro_one_arg_end_of_file'}{'contents'}[0];
 
$result_trees{'macro_one_arg_end_of_file'}{'contents'}[0]{'contents'}[1]{'parent'}
 = $result_trees{'macro_one_arg_end_of_file'}{'contents'}[0];
 $result_trees{'macro_one_arg_end_of_file'}{'contents'}[0]{'parent'} = 
$result_trees{'macro_one_arg_end_of_file'};
-$result_trees{'macro_one_arg_end_of_file'}{'contents'}[1]{'extra'}{'command'} 
= $result_trees{'macro_one_arg_end_of_file'}{'contents'}[0];
 $result_trees{'macro_one_arg_end_of_file'}{'contents'}[1]{'parent'} = 
$result_trees{'macro_one_arg_end_of_file'};
 $result_trees{'macro_one_arg_end_of_file'}{'contents'}[2]{'parent'} = 
$result_trees{'macro_one_arg_end_of_file'};
 
$result_trees{'macro_one_arg_end_of_file'}{'contents'}[3]{'contents'}[0]{'parent'}
 = $result_trees{'macro_one_arg_end_of_file'}{'contents'}[3];

Modified: trunk/tp/t/results/macro/macro_with_error_at_end_line_after_macro.pl
===================================================================
--- trunk/tp/t/results/macro/macro_with_error_at_end_line_after_macro.pl        
2018-08-25 14:01:16 UTC (rev 8114)
+++ trunk/tp/t/results/macro/macro_with_error_at_end_line_after_macro.pl        
2018-08-25 14:29:53 UTC (rev 8115)
@@ -46,9 +46,6 @@
       'parent' => {}
     },
     {
-      'extra' => {
-        'command' => {}
-      },
       'parent' => {},
       'text' => '
 ',
@@ -98,7 +95,6 @@
 
$result_trees{'macro_with_error_at_end_line_after_macro'}{'contents'}[0]{'contents'}[0]{'parent'}
 = $result_trees{'macro_with_error_at_end_line_after_macro'}{'contents'}[0];
 
$result_trees{'macro_with_error_at_end_line_after_macro'}{'contents'}[0]{'contents'}[1]{'parent'}
 = $result_trees{'macro_with_error_at_end_line_after_macro'}{'contents'}[0];
 
$result_trees{'macro_with_error_at_end_line_after_macro'}{'contents'}[0]{'parent'}
 = $result_trees{'macro_with_error_at_end_line_after_macro'};
-$result_trees{'macro_with_error_at_end_line_after_macro'}{'contents'}[1]{'extra'}{'command'}
 = $result_trees{'macro_with_error_at_end_line_after_macro'}{'contents'}[0];
 
$result_trees{'macro_with_error_at_end_line_after_macro'}{'contents'}[1]{'parent'}
 = $result_trees{'macro_with_error_at_end_line_after_macro'};
 
$result_trees{'macro_with_error_at_end_line_after_macro'}{'contents'}[2]{'parent'}
 = $result_trees{'macro_with_error_at_end_line_after_macro'};
 
$result_trees{'macro_with_error_at_end_line_after_macro'}{'contents'}[3]{'args'}[0]{'contents'}[0]{'extra'}{'command'}
 = $result_trees{'macro_with_error_at_end_line_after_macro'}{'contents'}[3];

Modified: trunk/tp/t/results/macro/macro_zero.pl
===================================================================
--- trunk/tp/t/results/macro/macro_zero.pl      2018-08-25 14:01:16 UTC (rev 
8114)
+++ trunk/tp/t/results/macro/macro_zero.pl      2018-08-25 14:29:53 UTC (rev 
8115)
@@ -41,9 +41,6 @@
       'parent' => {}
     },
     {
-      'extra' => {
-        'command' => {}
-      },
       'parent' => {},
       'text' => '
 ',
@@ -78,7 +75,6 @@
 $result_trees{'macro_zero'}{'contents'}[0]{'contents'}[0]{'parent'} = 
$result_trees{'macro_zero'}{'contents'}[0];
 $result_trees{'macro_zero'}{'contents'}[0]{'contents'}[1]{'parent'} = 
$result_trees{'macro_zero'}{'contents'}[0];
 $result_trees{'macro_zero'}{'contents'}[0]{'parent'} = 
$result_trees{'macro_zero'};
-$result_trees{'macro_zero'}{'contents'}[1]{'extra'}{'command'} = 
$result_trees{'macro_zero'}{'contents'}[0];
 $result_trees{'macro_zero'}{'contents'}[1]{'parent'} = 
$result_trees{'macro_zero'};
 $result_trees{'macro_zero'}{'contents'}[2]{'parent'} = 
$result_trees{'macro_zero'};
 $result_trees{'macro_zero'}{'contents'}[3]{'contents'}[0]{'parent'} = 
$result_trees{'macro_zero'}{'contents'}[3];

Modified: trunk/tp/t/results/macro/nested_macro_call.pl
===================================================================
--- trunk/tp/t/results/macro/nested_macro_call.pl       2018-08-25 14:01:16 UTC 
(rev 8114)
+++ trunk/tp/t/results/macro/nested_macro_call.pl       2018-08-25 14:29:53 UTC 
(rev 8115)
@@ -41,9 +41,6 @@
       'parent' => {}
     },
     {
-      'extra' => {
-        'command' => {}
-      },
       'parent' => {},
       'text' => '
 ',
@@ -95,9 +92,6 @@
       'parent' => {}
     },
     {
-      'extra' => {
-        'command' => {}
-      },
       'parent' => {},
       'text' => '
 ',
@@ -132,7 +126,6 @@
 $result_trees{'nested_macro_call'}{'contents'}[0]{'contents'}[0]{'parent'} = 
$result_trees{'nested_macro_call'}{'contents'}[0];
 $result_trees{'nested_macro_call'}{'contents'}[0]{'contents'}[1]{'parent'} = 
$result_trees{'nested_macro_call'}{'contents'}[0];
 $result_trees{'nested_macro_call'}{'contents'}[0]{'parent'} = 
$result_trees{'nested_macro_call'};
-$result_trees{'nested_macro_call'}{'contents'}[1]{'extra'}{'command'} = 
$result_trees{'nested_macro_call'}{'contents'}[0];
 $result_trees{'nested_macro_call'}{'contents'}[1]{'parent'} = 
$result_trees{'nested_macro_call'};
 $result_trees{'nested_macro_call'}{'contents'}[2]{'parent'} = 
$result_trees{'nested_macro_call'};
 $result_trees{'nested_macro_call'}{'contents'}[3]{'args'}[0]{'parent'} = 
$result_trees{'nested_macro_call'}{'contents'}[3];
@@ -140,7 +133,6 @@
 $result_trees{'nested_macro_call'}{'contents'}[3]{'contents'}[1]{'parent'} = 
$result_trees{'nested_macro_call'}{'contents'}[3];
 $result_trees{'nested_macro_call'}{'contents'}[3]{'contents'}[2]{'parent'} = 
$result_trees{'nested_macro_call'}{'contents'}[3];
 $result_trees{'nested_macro_call'}{'contents'}[3]{'parent'} = 
$result_trees{'nested_macro_call'};
-$result_trees{'nested_macro_call'}{'contents'}[4]{'extra'}{'command'} = 
$result_trees{'nested_macro_call'}{'contents'}[3];
 $result_trees{'nested_macro_call'}{'contents'}[4]{'parent'} = 
$result_trees{'nested_macro_call'};
 $result_trees{'nested_macro_call'}{'contents'}[5]{'parent'} = 
$result_trees{'nested_macro_call'};
 $result_trees{'nested_macro_call'}{'contents'}[6]{'contents'}[0]{'parent'} = 
$result_trees{'nested_macro_call'}{'contents'}[6];

Modified: trunk/tp/t/results/macro/no_macrobody.pl
===================================================================
--- trunk/tp/t/results/macro/no_macrobody.pl    2018-08-25 14:01:16 UTC (rev 
8114)
+++ trunk/tp/t/results/macro/no_macrobody.pl    2018-08-25 14:29:53 UTC (rev 
8115)
@@ -34,9 +34,6 @@
       'parent' => {}
     },
     {
-      'extra' => {
-        'command' => {}
-      },
       'parent' => {},
       'text' => '
 ',
@@ -77,7 +74,6 @@
 $result_trees{'no_macrobody'}{'contents'}[0]{'args'}[0]{'parent'} = 
$result_trees{'no_macrobody'}{'contents'}[0];
 $result_trees{'no_macrobody'}{'contents'}[0]{'args'}[1]{'parent'} = 
$result_trees{'no_macrobody'}{'contents'}[0];
 $result_trees{'no_macrobody'}{'contents'}[0]{'parent'} = 
$result_trees{'no_macrobody'};
-$result_trees{'no_macrobody'}{'contents'}[1]{'extra'}{'command'} = 
$result_trees{'no_macrobody'}{'contents'}[0];
 $result_trees{'no_macrobody'}{'contents'}[1]{'parent'} = 
$result_trees{'no_macrobody'};
 $result_trees{'no_macrobody'}{'contents'}[2]{'parent'} = 
$result_trees{'no_macrobody'};
 $result_trees{'no_macrobody'}{'contents'}[3]{'parent'} = 
$result_trees{'no_macrobody'};

Modified: trunk/tp/t/results/macro/paragraph_and_macro.pl
===================================================================
--- trunk/tp/t/results/macro/paragraph_and_macro.pl     2018-08-25 14:01:16 UTC 
(rev 8114)
+++ trunk/tp/t/results/macro/paragraph_and_macro.pl     2018-08-25 14:29:53 UTC 
(rev 8115)
@@ -29,9 +29,6 @@
       'parent' => {}
     },
     {
-      'extra' => {
-        'command' => {}
-      },
       'parent' => {},
       'text' => '
 ',
@@ -77,9 +74,6 @@
       'parent' => {}
     },
     {
-      'extra' => {
-        'command' => {}
-      },
       'parent' => {},
       'text' => '
 ',
@@ -125,9 +119,6 @@
       'parent' => {}
     },
     {
-      'extra' => {
-        'command' => {}
-      },
       'parent' => {},
       'text' => '
 ',
@@ -230,7 +221,6 @@
 };
 $result_trees{'paragraph_and_macro'}{'contents'}[0]{'args'}[0]{'parent'} = 
$result_trees{'paragraph_and_macro'}{'contents'}[0];
 $result_trees{'paragraph_and_macro'}{'contents'}[0]{'parent'} = 
$result_trees{'paragraph_and_macro'};
-$result_trees{'paragraph_and_macro'}{'contents'}[1]{'extra'}{'command'} = 
$result_trees{'paragraph_and_macro'}{'contents'}[0];
 $result_trees{'paragraph_and_macro'}{'contents'}[1]{'parent'} = 
$result_trees{'paragraph_and_macro'};
 $result_trees{'paragraph_and_macro'}{'contents'}[2]{'parent'} = 
$result_trees{'paragraph_and_macro'};
 $result_trees{'paragraph_and_macro'}{'contents'}[3]{'args'}[0]{'parent'} = 
$result_trees{'paragraph_and_macro'}{'contents'}[3];
@@ -237,7 +227,6 @@
 $result_trees{'paragraph_and_macro'}{'contents'}[3]{'contents'}[0]{'parent'} = 
$result_trees{'paragraph_and_macro'}{'contents'}[3];
 $result_trees{'paragraph_and_macro'}{'contents'}[3]{'contents'}[1]{'parent'} = 
$result_trees{'paragraph_and_macro'}{'contents'}[3];
 $result_trees{'paragraph_and_macro'}{'contents'}[3]{'parent'} = 
$result_trees{'paragraph_and_macro'};
-$result_trees{'paragraph_and_macro'}{'contents'}[4]{'extra'}{'command'} = 
$result_trees{'paragraph_and_macro'}{'contents'}[3];
 $result_trees{'paragraph_and_macro'}{'contents'}[4]{'parent'} = 
$result_trees{'paragraph_and_macro'};
 $result_trees{'paragraph_and_macro'}{'contents'}[5]{'parent'} = 
$result_trees{'paragraph_and_macro'};
 $result_trees{'paragraph_and_macro'}{'contents'}[6]{'args'}[0]{'parent'} = 
$result_trees{'paragraph_and_macro'}{'contents'}[6];
@@ -244,7 +233,6 @@
 $result_trees{'paragraph_and_macro'}{'contents'}[6]{'contents'}[0]{'parent'} = 
$result_trees{'paragraph_and_macro'}{'contents'}[6];
 $result_trees{'paragraph_and_macro'}{'contents'}[6]{'contents'}[1]{'parent'} = 
$result_trees{'paragraph_and_macro'}{'contents'}[6];
 $result_trees{'paragraph_and_macro'}{'contents'}[6]{'parent'} = 
$result_trees{'paragraph_and_macro'};
-$result_trees{'paragraph_and_macro'}{'contents'}[7]{'extra'}{'command'} = 
$result_trees{'paragraph_and_macro'}{'contents'}[6];
 $result_trees{'paragraph_and_macro'}{'contents'}[7]{'parent'} = 
$result_trees{'paragraph_and_macro'};
 $result_trees{'paragraph_and_macro'}{'contents'}[8]{'parent'} = 
$result_trees{'paragraph_and_macro'};
 $result_trees{'paragraph_and_macro'}{'contents'}[9]{'parent'} = 
$result_trees{'paragraph_and_macro'};

Modified: trunk/tp/t/results/macro/protect_comma_macro_line.pl
===================================================================
--- trunk/tp/t/results/macro/protect_comma_macro_line.pl        2018-08-25 
14:01:16 UTC (rev 8114)
+++ trunk/tp/t/results/macro/protect_comma_macro_line.pl        2018-08-25 
14:29:53 UTC (rev 8115)
@@ -64,9 +64,6 @@
       'parent' => {}
     },
     {
-      'extra' => {
-        'command' => {}
-      },
       'parent' => {},
       'text' => '
 ',
@@ -122,7 +119,6 @@
 
$result_trees{'protect_comma_macro_line'}{'contents'}[0]{'contents'}[3]{'parent'}
 = $result_trees{'protect_comma_macro_line'}{'contents'}[0];
 
$result_trees{'protect_comma_macro_line'}{'contents'}[0]{'contents'}[4]{'parent'}
 = $result_trees{'protect_comma_macro_line'}{'contents'}[0];
 $result_trees{'protect_comma_macro_line'}{'contents'}[0]{'parent'} = 
$result_trees{'protect_comma_macro_line'};
-$result_trees{'protect_comma_macro_line'}{'contents'}[1]{'extra'}{'command'} = 
$result_trees{'protect_comma_macro_line'}{'contents'}[0];
 $result_trees{'protect_comma_macro_line'}{'contents'}[1]{'parent'} = 
$result_trees{'protect_comma_macro_line'};
 $result_trees{'protect_comma_macro_line'}{'contents'}[2]{'parent'} = 
$result_trees{'protect_comma_macro_line'};
 
$result_trees{'protect_comma_macro_line'}{'contents'}[3]{'contents'}[0]{'parent'}
 = $result_trees{'protect_comma_macro_line'}{'contents'}[3];

Modified: trunk/tp/t/results/macro/protect_in_body.pl
===================================================================
--- trunk/tp/t/results/macro/protect_in_body.pl 2018-08-25 14:01:16 UTC (rev 
8114)
+++ trunk/tp/t/results/macro/protect_in_body.pl 2018-08-25 14:29:53 UTC (rev 
8115)
@@ -51,9 +51,6 @@
       'parent' => {}
     },
     {
-      'extra' => {
-        'command' => {}
-      },
       'parent' => {},
       'text' => '
 ',
@@ -147,7 +144,6 @@
 $result_trees{'protect_in_body'}{'contents'}[0]{'contents'}[0]{'parent'} = 
$result_trees{'protect_in_body'}{'contents'}[0];
 $result_trees{'protect_in_body'}{'contents'}[0]{'contents'}[1]{'parent'} = 
$result_trees{'protect_in_body'}{'contents'}[0];
 $result_trees{'protect_in_body'}{'contents'}[0]{'parent'} = 
$result_trees{'protect_in_body'};
-$result_trees{'protect_in_body'}{'contents'}[1]{'extra'}{'command'} = 
$result_trees{'protect_in_body'}{'contents'}[0];
 $result_trees{'protect_in_body'}{'contents'}[1]{'parent'} = 
$result_trees{'protect_in_body'};
 $result_trees{'protect_in_body'}{'contents'}[2]{'parent'} = 
$result_trees{'protect_in_body'};
 $result_trees{'protect_in_body'}{'contents'}[3]{'contents'}[0]{'parent'} = 
$result_trees{'protect_in_body'}{'contents'}[3];

Modified: trunk/tp/t/results/macro/protect_in_body_line_arg.pl
===================================================================
--- trunk/tp/t/results/macro/protect_in_body_line_arg.pl        2018-08-25 
14:01:16 UTC (rev 8114)
+++ trunk/tp/t/results/macro/protect_in_body_line_arg.pl        2018-08-25 
14:29:53 UTC (rev 8115)
@@ -51,9 +51,6 @@
       'parent' => {}
     },
     {
-      'extra' => {
-        'command' => {}
-      },
       'parent' => {},
       'text' => '
 ',
@@ -149,7 +146,6 @@
 
$result_trees{'protect_in_body_line_arg'}{'contents'}[0]{'contents'}[0]{'parent'}
 = $result_trees{'protect_in_body_line_arg'}{'contents'}[0];
 
$result_trees{'protect_in_body_line_arg'}{'contents'}[0]{'contents'}[1]{'parent'}
 = $result_trees{'protect_in_body_line_arg'}{'contents'}[0];
 $result_trees{'protect_in_body_line_arg'}{'contents'}[0]{'parent'} = 
$result_trees{'protect_in_body_line_arg'};
-$result_trees{'protect_in_body_line_arg'}{'contents'}[1]{'extra'}{'command'} = 
$result_trees{'protect_in_body_line_arg'}{'contents'}[0];
 $result_trees{'protect_in_body_line_arg'}{'contents'}[1]{'parent'} = 
$result_trees{'protect_in_body_line_arg'};
 $result_trees{'protect_in_body_line_arg'}{'contents'}[2]{'parent'} = 
$result_trees{'protect_in_body_line_arg'};
 
$result_trees{'protect_in_body_line_arg'}{'contents'}[3]{'contents'}[0]{'parent'}
 = $result_trees{'protect_in_body_line_arg'}{'contents'}[3];

Modified: trunk/tp/t/results/macro/protect_in_body_one_arg.pl
===================================================================
--- trunk/tp/t/results/macro/protect_in_body_one_arg.pl 2018-08-25 14:01:16 UTC 
(rev 8114)
+++ trunk/tp/t/results/macro/protect_in_body_one_arg.pl 2018-08-25 14:29:53 UTC 
(rev 8115)
@@ -51,9 +51,6 @@
       'parent' => {}
     },
     {
-      'extra' => {
-        'command' => {}
-      },
       'parent' => {},
       'text' => '
 ',
@@ -142,7 +139,6 @@
 
$result_trees{'protect_in_body_one_arg'}{'contents'}[0]{'contents'}[0]{'parent'}
 = $result_trees{'protect_in_body_one_arg'}{'contents'}[0];
 
$result_trees{'protect_in_body_one_arg'}{'contents'}[0]{'contents'}[1]{'parent'}
 = $result_trees{'protect_in_body_one_arg'}{'contents'}[0];
 $result_trees{'protect_in_body_one_arg'}{'contents'}[0]{'parent'} = 
$result_trees{'protect_in_body_one_arg'};
-$result_trees{'protect_in_body_one_arg'}{'contents'}[1]{'extra'}{'command'} = 
$result_trees{'protect_in_body_one_arg'}{'contents'}[0];
 $result_trees{'protect_in_body_one_arg'}{'contents'}[1]{'parent'} = 
$result_trees{'protect_in_body_one_arg'};
 $result_trees{'protect_in_body_one_arg'}{'contents'}[2]{'parent'} = 
$result_trees{'protect_in_body_one_arg'};
 
$result_trees{'protect_in_body_one_arg'}{'contents'}[3]{'contents'}[0]{'parent'}
 = $result_trees{'protect_in_body_one_arg'}{'contents'}[3];

Modified: trunk/tp/t/results/macro/recursive_call_in_argument.pl
===================================================================
--- trunk/tp/t/results/macro/recursive_call_in_argument.pl      2018-08-25 
14:01:16 UTC (rev 8114)
+++ trunk/tp/t/results/macro/recursive_call_in_argument.pl      2018-08-25 
14:29:53 UTC (rev 8115)
@@ -46,9 +46,6 @@
       'parent' => {}
     },
     {
-      'extra' => {
-        'command' => {}
-      },
       'parent' => {},
       'text' => '
 ',
@@ -79,7 +76,6 @@
 
$result_trees{'recursive_call_in_argument'}{'contents'}[0]{'contents'}[0]{'parent'}
 = $result_trees{'recursive_call_in_argument'}{'contents'}[0];
 
$result_trees{'recursive_call_in_argument'}{'contents'}[0]{'contents'}[1]{'parent'}
 = $result_trees{'recursive_call_in_argument'}{'contents'}[0];
 $result_trees{'recursive_call_in_argument'}{'contents'}[0]{'parent'} = 
$result_trees{'recursive_call_in_argument'};
-$result_trees{'recursive_call_in_argument'}{'contents'}[1]{'extra'}{'command'} 
= $result_trees{'recursive_call_in_argument'}{'contents'}[0];
 $result_trees{'recursive_call_in_argument'}{'contents'}[1]{'parent'} = 
$result_trees{'recursive_call_in_argument'};
 $result_trees{'recursive_call_in_argument'}{'contents'}[2]{'parent'} = 
$result_trees{'recursive_call_in_argument'};
 
$result_trees{'recursive_call_in_argument'}{'contents'}[3]{'contents'}[0]{'parent'}
 = $result_trees{'recursive_call_in_argument'}{'contents'}[3];

Modified: trunk/tp/t/results/macro/recursive_call_in_macro.pl
===================================================================
--- trunk/tp/t/results/macro/recursive_call_in_macro.pl 2018-08-25 14:01:16 UTC 
(rev 8114)
+++ trunk/tp/t/results/macro/recursive_call_in_macro.pl 2018-08-25 14:29:53 UTC 
(rev 8115)
@@ -46,9 +46,6 @@
       'parent' => {}
     },
     {
-      'extra' => {
-        'command' => {}
-      },
       'parent' => {},
       'text' => '
 ',
@@ -74,7 +71,6 @@
 
$result_trees{'recursive_call_in_macro'}{'contents'}[0]{'contents'}[0]{'parent'}
 = $result_trees{'recursive_call_in_macro'}{'contents'}[0];
 
$result_trees{'recursive_call_in_macro'}{'contents'}[0]{'contents'}[1]{'parent'}
 = $result_trees{'recursive_call_in_macro'}{'contents'}[0];
 $result_trees{'recursive_call_in_macro'}{'contents'}[0]{'parent'} = 
$result_trees{'recursive_call_in_macro'};
-$result_trees{'recursive_call_in_macro'}{'contents'}[1]{'extra'}{'command'} = 
$result_trees{'recursive_call_in_macro'}{'contents'}[0];
 $result_trees{'recursive_call_in_macro'}{'contents'}[1]{'parent'} = 
$result_trees{'recursive_call_in_macro'};
 $result_trees{'recursive_call_in_macro'}{'contents'}[2]{'parent'} = 
$result_trees{'recursive_call_in_macro'};
 $result_trees{'recursive_call_in_macro'}{'contents'}[3]{'parent'} = 
$result_trees{'recursive_call_in_macro'};

Modified: trunk/tp/t/results/macro/redefine_texinfo_macro.pl
===================================================================
--- trunk/tp/t/results/macro/redefine_texinfo_macro.pl  2018-08-25 14:01:16 UTC 
(rev 8114)
+++ trunk/tp/t/results/macro/redefine_texinfo_macro.pl  2018-08-25 14:29:53 UTC 
(rev 8115)
@@ -46,9 +46,6 @@
       'parent' => {}
     },
     {
-      'extra' => {
-        'command' => {}
-      },
       'parent' => {},
       'text' => '
 ',
@@ -101,7 +98,6 @@
 
$result_trees{'redefine_texinfo_macro'}{'contents'}[0]{'contents'}[0]{'parent'} 
= $result_trees{'redefine_texinfo_macro'}{'contents'}[0];
 
$result_trees{'redefine_texinfo_macro'}{'contents'}[0]{'contents'}[1]{'parent'} 
= $result_trees{'redefine_texinfo_macro'}{'contents'}[0];
 $result_trees{'redefine_texinfo_macro'}{'contents'}[0]{'parent'} = 
$result_trees{'redefine_texinfo_macro'};
-$result_trees{'redefine_texinfo_macro'}{'contents'}[1]{'extra'}{'command'} = 
$result_trees{'redefine_texinfo_macro'}{'contents'}[0];
 $result_trees{'redefine_texinfo_macro'}{'contents'}[1]{'parent'} = 
$result_trees{'redefine_texinfo_macro'};
 $result_trees{'redefine_texinfo_macro'}{'contents'}[2]{'parent'} = 
$result_trees{'redefine_texinfo_macro'};
 
$result_trees{'redefine_texinfo_macro'}{'contents'}[3]{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'redefine_texinfo_macro'}{'contents'}[3]{'contents'}[0]{'args'}[0];

Modified: trunk/tp/t/results/macro/simple_imbricated_macro.pl
===================================================================
--- trunk/tp/t/results/macro/simple_imbricated_macro.pl 2018-08-25 14:01:16 UTC 
(rev 8114)
+++ trunk/tp/t/results/macro/simple_imbricated_macro.pl 2018-08-25 14:29:53 UTC 
(rev 8115)
@@ -45,9 +45,6 @@
           'parent' => {}
         },
         {
-          'extra' => {
-            'command' => {}
-          },
           'parent' => {},
           'text' => '
 ',
@@ -66,9 +63,6 @@
       'parent' => {}
     },
     {
-      'extra' => {
-        'command' => {}
-      },
       'parent' => {},
       'text' => '
 ',
@@ -121,9 +115,6 @@
           'parent' => {}
         },
         {
-          'extra' => {
-            'command' => {}
-          },
           'parent' => {},
           'text' => '
 ',
@@ -158,10 +149,8 @@
 
$result_trees{'simple_imbricated_macro'}{'contents'}[0]{'contents'}[1]{'contents'}[0]{'parent'}
 = $result_trees{'simple_imbricated_macro'}{'contents'}[0]{'contents'}[1];
 
$result_trees{'simple_imbricated_macro'}{'contents'}[0]{'contents'}[1]{'contents'}[1]{'parent'}
 = $result_trees{'simple_imbricated_macro'}{'contents'}[0]{'contents'}[1];
 
$result_trees{'simple_imbricated_macro'}{'contents'}[0]{'contents'}[1]{'parent'}
 = $result_trees{'simple_imbricated_macro'}{'contents'}[0];
-$result_trees{'simple_imbricated_macro'}{'contents'}[0]{'contents'}[2]{'extra'}{'command'}
 = $result_trees{'simple_imbricated_macro'}{'contents'}[0]{'contents'}[1];
 
$result_trees{'simple_imbricated_macro'}{'contents'}[0]{'contents'}[2]{'parent'}
 = $result_trees{'simple_imbricated_macro'}{'contents'}[0];
 $result_trees{'simple_imbricated_macro'}{'contents'}[0]{'parent'} = 
$result_trees{'simple_imbricated_macro'};
-$result_trees{'simple_imbricated_macro'}{'contents'}[1]{'extra'}{'command'} = 
$result_trees{'simple_imbricated_macro'}{'contents'}[0];
 $result_trees{'simple_imbricated_macro'}{'contents'}[1]{'parent'} = 
$result_trees{'simple_imbricated_macro'};
 $result_trees{'simple_imbricated_macro'}{'contents'}[2]{'parent'} = 
$result_trees{'simple_imbricated_macro'};
 
$result_trees{'simple_imbricated_macro'}{'contents'}[3]{'contents'}[0]{'parent'}
 = $result_trees{'simple_imbricated_macro'}{'contents'}[3];
@@ -169,7 +158,6 @@
 
$result_trees{'simple_imbricated_macro'}{'contents'}[3]{'contents'}[1]{'contents'}[0]{'parent'}
 = $result_trees{'simple_imbricated_macro'}{'contents'}[3]{'contents'}[1];
 
$result_trees{'simple_imbricated_macro'}{'contents'}[3]{'contents'}[1]{'contents'}[1]{'parent'}
 = $result_trees{'simple_imbricated_macro'}{'contents'}[3]{'contents'}[1];
 
$result_trees{'simple_imbricated_macro'}{'contents'}[3]{'contents'}[1]{'parent'}
 = $result_trees{'simple_imbricated_macro'}{'contents'}[3];
-$result_trees{'simple_imbricated_macro'}{'contents'}[3]{'contents'}[2]{'extra'}{'command'}
 = $result_trees{'simple_imbricated_macro'}{'contents'}[3]{'contents'}[1];
 
$result_trees{'simple_imbricated_macro'}{'contents'}[3]{'contents'}[2]{'parent'}
 = $result_trees{'simple_imbricated_macro'}{'contents'}[3];
 $result_trees{'simple_imbricated_macro'}{'contents'}[3]{'parent'} = 
$result_trees{'simple_imbricated_macro'};
 $result_trees{'simple_imbricated_macro'}{'contents'}[4]{'parent'} = 
$result_trees{'simple_imbricated_macro'};

Modified: trunk/tp/t/results/macro/space_macro_after_end.pl
===================================================================
--- trunk/tp/t/results/macro/space_macro_after_end.pl   2018-08-25 14:01:16 UTC 
(rev 8114)
+++ trunk/tp/t/results/macro/space_macro_after_end.pl   2018-08-25 14:29:53 UTC 
(rev 8115)
@@ -41,9 +41,6 @@
       'parent' => {}
     },
     {
-      'extra' => {
-        'command' => {}
-      },
       'parent' => {},
       'text' => '
 ',
@@ -137,7 +134,6 @@
 $result_trees{'space_macro_after_end'}{'contents'}[0]{'contents'}[0]{'parent'} 
= $result_trees{'space_macro_after_end'}{'contents'}[0];
 $result_trees{'space_macro_after_end'}{'contents'}[0]{'contents'}[1]{'parent'} 
= $result_trees{'space_macro_after_end'}{'contents'}[0];
 $result_trees{'space_macro_after_end'}{'contents'}[0]{'parent'} = 
$result_trees{'space_macro_after_end'};
-$result_trees{'space_macro_after_end'}{'contents'}[1]{'extra'}{'command'} = 
$result_trees{'space_macro_after_end'}{'contents'}[0];
 $result_trees{'space_macro_after_end'}{'contents'}[1]{'parent'} = 
$result_trees{'space_macro_after_end'};
 $result_trees{'space_macro_after_end'}{'contents'}[2]{'parent'} = 
$result_trees{'space_macro_after_end'};
 
$result_trees{'space_macro_after_end'}{'contents'}[3]{'contents'}[0]{'extra'}{'command'}
 = $result_trees{'space_macro_after_end'}{'contents'}[3];

Modified: trunk/tp/t/results/macro/space_macro_after_end_verbatim.pl
===================================================================
--- trunk/tp/t/results/macro/space_macro_after_end_verbatim.pl  2018-08-25 
14:01:16 UTC (rev 8114)
+++ trunk/tp/t/results/macro/space_macro_after_end_verbatim.pl  2018-08-25 
14:29:53 UTC (rev 8115)
@@ -41,9 +41,6 @@
       'parent' => {}
     },
     {
-      'extra' => {
-        'command' => {}
-      },
       'parent' => {},
       'text' => '
 ',
@@ -85,9 +82,6 @@
       'parent' => {}
     },
     {
-      'extra' => {
-        'command' => {}
-      },
       'parent' => {},
       'text' => ' ',
       'type' => 'empty_line_after_command'
@@ -99,7 +93,6 @@
 
$result_trees{'space_macro_after_end_verbatim'}{'contents'}[0]{'contents'}[0]{'parent'}
 = $result_trees{'space_macro_after_end_verbatim'}{'contents'}[0];
 
$result_trees{'space_macro_after_end_verbatim'}{'contents'}[0]{'contents'}[1]{'parent'}
 = $result_trees{'space_macro_after_end_verbatim'}{'contents'}[0];
 $result_trees{'space_macro_after_end_verbatim'}{'contents'}[0]{'parent'} = 
$result_trees{'space_macro_after_end_verbatim'};
-$result_trees{'space_macro_after_end_verbatim'}{'contents'}[1]{'extra'}{'command'}
 = $result_trees{'space_macro_after_end_verbatim'}{'contents'}[0];
 $result_trees{'space_macro_after_end_verbatim'}{'contents'}[1]{'parent'} = 
$result_trees{'space_macro_after_end_verbatim'};
 $result_trees{'space_macro_after_end_verbatim'}{'contents'}[2]{'parent'} = 
$result_trees{'space_macro_after_end_verbatim'};
 
$result_trees{'space_macro_after_end_verbatim'}{'contents'}[3]{'contents'}[0]{'extra'}{'command'}
 = $result_trees{'space_macro_after_end_verbatim'}{'contents'}[3];
@@ -107,7 +100,6 @@
 
$result_trees{'space_macro_after_end_verbatim'}{'contents'}[3]{'contents'}[1]{'parent'}
 = $result_trees{'space_macro_after_end_verbatim'}{'contents'}[3];
 
$result_trees{'space_macro_after_end_verbatim'}{'contents'}[3]{'extra'}{'spaces_after_command'}
 = 
$result_trees{'space_macro_after_end_verbatim'}{'contents'}[3]{'contents'}[0];
 $result_trees{'space_macro_after_end_verbatim'}{'contents'}[3]{'parent'} = 
$result_trees{'space_macro_after_end_verbatim'};
-$result_trees{'space_macro_after_end_verbatim'}{'contents'}[4]{'extra'}{'command'}
 = $result_trees{'space_macro_after_end_verbatim'}{'contents'}[3];
 $result_trees{'space_macro_after_end_verbatim'}{'contents'}[4]{'parent'} = 
$result_trees{'space_macro_after_end_verbatim'};
 
 $result_texis{'space_macro_after_end_verbatim'} = '@macro spaces

Modified: trunk/tp/t/results/macro/text_before_after.pl
===================================================================
--- trunk/tp/t/results/macro/text_before_after.pl       2018-08-25 14:01:16 UTC 
(rev 8114)
+++ trunk/tp/t/results/macro/text_before_after.pl       2018-08-25 14:29:53 UTC 
(rev 8115)
@@ -47,9 +47,6 @@
           'parent' => {}
         },
         {
-          'extra' => {
-            'command' => {}
-          },
           'parent' => {},
           'text' => ' ',
           'type' => 'empty_spaces_after_command'
@@ -71,7 +68,6 @@
 
$result_trees{'text_before_after'}{'contents'}[0]{'contents'}[1]{'contents'}[0]{'parent'}
 = $result_trees{'text_before_after'}{'contents'}[0]{'contents'}[1];
 
$result_trees{'text_before_after'}{'contents'}[0]{'contents'}[1]{'contents'}[1]{'parent'}
 = $result_trees{'text_before_after'}{'contents'}[0]{'contents'}[1];
 $result_trees{'text_before_after'}{'contents'}[0]{'contents'}[1]{'parent'} = 
$result_trees{'text_before_after'}{'contents'}[0];
-$result_trees{'text_before_after'}{'contents'}[0]{'contents'}[2]{'extra'}{'command'}
 = $result_trees{'text_before_after'}{'contents'}[0]{'contents'}[1];
 $result_trees{'text_before_after'}{'contents'}[0]{'contents'}[2]{'parent'} = 
$result_trees{'text_before_after'}{'contents'}[0];
 $result_trees{'text_before_after'}{'contents'}[0]{'contents'}[3]{'parent'} = 
$result_trees{'text_before_after'}{'contents'}[0];
 $result_trees{'text_before_after'}{'contents'}[0]{'parent'} = 
$result_trees{'text_before_after'};

Modified: trunk/tp/t/results/macro/too_much_args.pl
===================================================================
--- trunk/tp/t/results/macro/too_much_args.pl   2018-08-25 14:01:16 UTC (rev 
8114)
+++ trunk/tp/t/results/macro/too_much_args.pl   2018-08-25 14:29:53 UTC (rev 
8115)
@@ -57,9 +57,6 @@
       'parent' => {}
     },
     {
-      'extra' => {
-        'command' => {}
-      },
       'parent' => {},
       'text' => '
 ',
@@ -97,7 +94,6 @@
 $result_trees{'too_much_args'}{'contents'}[0]{'contents'}[1]{'parent'} = 
$result_trees{'too_much_args'}{'contents'}[0];
 $result_trees{'too_much_args'}{'contents'}[0]{'contents'}[2]{'parent'} = 
$result_trees{'too_much_args'}{'contents'}[0];
 $result_trees{'too_much_args'}{'contents'}[0]{'parent'} = 
$result_trees{'too_much_args'};
-$result_trees{'too_much_args'}{'contents'}[1]{'extra'}{'command'} = 
$result_trees{'too_much_args'}{'contents'}[0];
 $result_trees{'too_much_args'}{'contents'}[1]{'parent'} = 
$result_trees{'too_much_args'};
 $result_trees{'too_much_args'}{'contents'}[2]{'parent'} = 
$result_trees{'too_much_args'};
 $result_trees{'too_much_args'}{'contents'}[3]{'contents'}[0]{'parent'} = 
$result_trees{'too_much_args'}{'contents'}[3];

Modified: trunk/tp/t/results/macro/two_macros_on_a_line.pl
===================================================================
--- trunk/tp/t/results/macro/two_macros_on_a_line.pl    2018-08-25 14:01:16 UTC 
(rev 8114)
+++ trunk/tp/t/results/macro/two_macros_on_a_line.pl    2018-08-25 14:29:53 UTC 
(rev 8115)
@@ -41,9 +41,6 @@
       'parent' => {}
     },
     {
-      'extra' => {
-        'command' => {}
-      },
       'parent' => {},
       'text' => '
 ',
@@ -106,9 +103,6 @@
       'parent' => {}
     },
     {
-      'extra' => {
-        'command' => {}
-      },
       'parent' => {},
       'text' => '
 ',
@@ -331,7 +325,6 @@
 $result_trees{'two_macros_on_a_line'}{'contents'}[0]{'contents'}[0]{'parent'} 
= $result_trees{'two_macros_on_a_line'}{'contents'}[0];
 $result_trees{'two_macros_on_a_line'}{'contents'}[0]{'contents'}[1]{'parent'} 
= $result_trees{'two_macros_on_a_line'}{'contents'}[0];
 $result_trees{'two_macros_on_a_line'}{'contents'}[0]{'parent'} = 
$result_trees{'two_macros_on_a_line'};
-$result_trees{'two_macros_on_a_line'}{'contents'}[1]{'extra'}{'command'} = 
$result_trees{'two_macros_on_a_line'}{'contents'}[0];
 $result_trees{'two_macros_on_a_line'}{'contents'}[1]{'parent'} = 
$result_trees{'two_macros_on_a_line'};
 $result_trees{'two_macros_on_a_line'}{'contents'}[2]{'parent'} = 
$result_trees{'two_macros_on_a_line'};
 $result_trees{'two_macros_on_a_line'}{'contents'}[3]{'args'}[0]{'parent'} = 
$result_trees{'two_macros_on_a_line'}{'contents'}[3];
@@ -341,7 +334,6 @@
 $result_trees{'two_macros_on_a_line'}{'contents'}[3]{'contents'}[2]{'parent'} 
= $result_trees{'two_macros_on_a_line'}{'contents'}[3];
 $result_trees{'two_macros_on_a_line'}{'contents'}[3]{'contents'}[3]{'parent'} 
= $result_trees{'two_macros_on_a_line'}{'contents'}[3];
 $result_trees{'two_macros_on_a_line'}{'contents'}[3]{'parent'} = 
$result_trees{'two_macros_on_a_line'};
-$result_trees{'two_macros_on_a_line'}{'contents'}[4]{'extra'}{'command'} = 
$result_trees{'two_macros_on_a_line'}{'contents'}[3];
 $result_trees{'two_macros_on_a_line'}{'contents'}[4]{'parent'} = 
$result_trees{'two_macros_on_a_line'};
 $result_trees{'two_macros_on_a_line'}{'contents'}[5]{'parent'} = 
$result_trees{'two_macros_on_a_line'};
 $result_trees{'two_macros_on_a_line'}{'contents'}[6]{'parent'} = 
$result_trees{'two_macros_on_a_line'};

Modified: trunk/tp/t/results/macro/zero_argument.pl
===================================================================
--- trunk/tp/t/results/macro/zero_argument.pl   2018-08-25 14:01:16 UTC (rev 
8114)
+++ trunk/tp/t/results/macro/zero_argument.pl   2018-08-25 14:29:53 UTC (rev 
8115)
@@ -41,9 +41,6 @@
       'parent' => {}
     },
     {
-      'extra' => {
-        'command' => {}
-      },
       'parent' => {},
       'text' => '
 ',
@@ -89,9 +86,6 @@
       'parent' => {}
     },
     {
-      'extra' => {
-        'command' => {}
-      },
       'parent' => {},
       'text' => '',
       'type' => 'empty_line_after_command'
@@ -103,7 +97,6 @@
 $result_trees{'zero_argument'}{'contents'}[0]{'contents'}[0]{'parent'} = 
$result_trees{'zero_argument'}{'contents'}[0];
 $result_trees{'zero_argument'}{'contents'}[0]{'contents'}[1]{'parent'} = 
$result_trees{'zero_argument'}{'contents'}[0];
 $result_trees{'zero_argument'}{'contents'}[0]{'parent'} = 
$result_trees{'zero_argument'};
-$result_trees{'zero_argument'}{'contents'}[1]{'extra'}{'command'} = 
$result_trees{'zero_argument'}{'contents'}[0];
 $result_trees{'zero_argument'}{'contents'}[1]{'parent'} = 
$result_trees{'zero_argument'};
 $result_trees{'zero_argument'}{'contents'}[2]{'parent'} = 
$result_trees{'zero_argument'};
 $result_trees{'zero_argument'}{'contents'}[3]{'args'}[0]{'parent'} = 
$result_trees{'zero_argument'}{'contents'}[3];
@@ -110,7 +103,6 @@
 $result_trees{'zero_argument'}{'contents'}[3]{'contents'}[0]{'parent'} = 
$result_trees{'zero_argument'}{'contents'}[3];
 $result_trees{'zero_argument'}{'contents'}[3]{'contents'}[1]{'parent'} = 
$result_trees{'zero_argument'}{'contents'}[3];
 $result_trees{'zero_argument'}{'contents'}[3]{'parent'} = 
$result_trees{'zero_argument'};
-$result_trees{'zero_argument'}{'contents'}[4]{'extra'}{'command'} = 
$result_trees{'zero_argument'}{'contents'}[3];
 $result_trees{'zero_argument'}{'contents'}[4]{'parent'} = 
$result_trees{'zero_argument'};
 
 $result_texis{'zero_argument'} = '@macro foo {}

Modified: trunk/tp/t/results/menu/block_commands_in_menu_description.pl
===================================================================
--- trunk/tp/t/results/menu/block_commands_in_menu_description.pl       
2018-08-25 14:01:16 UTC (rev 8114)
+++ trunk/tp/t/results/menu/block_commands_in_menu_description.pl       
2018-08-25 14:29:53 UTC (rev 8115)
@@ -592,9 +592,7 @@
                       'parent' => {}
                     },
                     {
-                      'extra' => {
-                        'command' => {}
-                      },
+                      'extra' => {},
                       'parent' => {},
                       'text' => '
 ',
@@ -804,7 +802,6 @@
 
$result_trees{'block_commands_in_menu_description'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'args'}[3]{'contents'}[4]{'contents'}[1]{'parent'}
 = 
$result_trees{'block_commands_in_menu_description'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'args'}[3]{'contents'}[4];
 
$result_trees{'block_commands_in_menu_description'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'args'}[3]{'contents'}[4]{'extra'}{'spaces_after_command'}
 = 
$result_trees{'block_commands_in_menu_description'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'args'}[3]{'contents'}[4]{'contents'}[0];
 
$result_trees{'block_commands_in_menu_description'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'args'}[3]{'contents'}[4]{'parent'}
 = 
$result_trees{'block_commands_in_menu_description'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'args'}[3];
-$result_trees{'block_commands_in_menu_description'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'args'}[3]{'contents'}[5]{'extra'}{'command'}
 = 
$result_trees{'block_commands_in_menu_description'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'args'}[3]{'contents'}[4];
 
$result_trees{'block_commands_in_menu_description'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'args'}[3]{'contents'}[5]{'parent'}
 = 
$result_trees{'block_commands_in_menu_description'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'args'}[3];
 
$result_trees{'block_commands_in_menu_description'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'args'}[3]{'parent'}
 = 
$result_trees{'block_commands_in_menu_description'}{'contents'}[2]{'contents'}[1]{'contents'}[1];
 
$result_trees{'block_commands_in_menu_description'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'extra'}{'menu_entry_description'}
 = 
$result_trees{'block_commands_in_menu_description'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'args'}[3];

Modified: trunk/tp/t/results/menu/formats_in_menu.pl
===================================================================
--- trunk/tp/t/results/menu/formats_in_menu.pl  2018-08-25 14:01:16 UTC (rev 
8114)
+++ trunk/tp/t/results/menu/formats_in_menu.pl  2018-08-25 14:29:53 UTC (rev 
8115)
@@ -368,9 +368,7 @@
                       'parent' => {}
                     },
                     {
-                      'extra' => {
-                        'command' => {}
-                      },
+                      'extra' => {},
                       'parent' => {},
                       'text' => '
 ',
@@ -890,7 +888,6 @@
 
$result_trees{'formats_in_menu'}{'contents'}[1]{'contents'}[1]{'contents'}[3]{'args'}[3]{'contents'}[1]{'contents'}[2]{'parent'}
 = 
$result_trees{'formats_in_menu'}{'contents'}[1]{'contents'}[1]{'contents'}[3]{'args'}[3]{'contents'}[1];
 
$result_trees{'formats_in_menu'}{'contents'}[1]{'contents'}[1]{'contents'}[3]{'args'}[3]{'contents'}[1]{'extra'}{'spaces_after_command'}
 = 
$result_trees{'formats_in_menu'}{'contents'}[1]{'contents'}[1]{'contents'}[3]{'args'}[3]{'contents'}[1]{'contents'}[0];
 
$result_trees{'formats_in_menu'}{'contents'}[1]{'contents'}[1]{'contents'}[3]{'args'}[3]{'contents'}[1]{'parent'}
 = 
$result_trees{'formats_in_menu'}{'contents'}[1]{'contents'}[1]{'contents'}[3]{'args'}[3];
-$result_trees{'formats_in_menu'}{'contents'}[1]{'contents'}[1]{'contents'}[3]{'args'}[3]{'contents'}[2]{'extra'}{'command'}
 = 
$result_trees{'formats_in_menu'}{'contents'}[1]{'contents'}[1]{'contents'}[3]{'args'}[3]{'contents'}[1];
 
$result_trees{'formats_in_menu'}{'contents'}[1]{'contents'}[1]{'contents'}[3]{'args'}[3]{'contents'}[2]{'parent'}
 = 
$result_trees{'formats_in_menu'}{'contents'}[1]{'contents'}[1]{'contents'}[3]{'args'}[3];
 
$result_trees{'formats_in_menu'}{'contents'}[1]{'contents'}[1]{'contents'}[3]{'args'}[3]{'contents'}[3]{'parent'}
 = 
$result_trees{'formats_in_menu'}{'contents'}[1]{'contents'}[1]{'contents'}[3]{'args'}[3];
 
$result_trees{'formats_in_menu'}{'contents'}[1]{'contents'}[1]{'contents'}[3]{'args'}[3]{'parent'}
 = 
$result_trees{'formats_in_menu'}{'contents'}[1]{'contents'}[1]{'contents'}[3];

Modified: 
trunk/tp/t/results/misc_commands/codequoteundirected_codequotebacktick.pl
===================================================================
--- trunk/tp/t/results/misc_commands/codequoteundirected_codequotebacktick.pl   
2018-08-25 14:01:16 UTC (rev 8114)
+++ trunk/tp/t/results/misc_commands/codequoteundirected_codequotebacktick.pl   
2018-08-25 14:29:53 UTC (rev 8115)
@@ -73,9 +73,6 @@
           'parent' => {}
         },
         {
-          'extra' => {
-            'command' => {}
-          },
           'parent' => {},
           'text' => '
 ',
@@ -217,9 +214,6 @@
           'parent' => {}
         },
         {
-          'extra' => {
-            'command' => {}
-          },
           'parent' => {},
           'text' => '
 ',
@@ -4286,7 +4280,6 @@
 
$result_trees{'codequoteundirected_codequotebacktick'}{'contents'}[0]{'contents'}[0]{'contents'}[5]{'parent'}
 = 
$result_trees{'codequoteundirected_codequotebacktick'}{'contents'}[0]{'contents'}[0];
 
$result_trees{'codequoteundirected_codequotebacktick'}{'contents'}[0]{'contents'}[0]{'contents'}[6]{'parent'}
 = 
$result_trees{'codequoteundirected_codequotebacktick'}{'contents'}[0]{'contents'}[0];
 
$result_trees{'codequoteundirected_codequotebacktick'}{'contents'}[0]{'contents'}[0]{'parent'}
 = $result_trees{'codequoteundirected_codequotebacktick'}{'contents'}[0];
-$result_trees{'codequoteundirected_codequotebacktick'}{'contents'}[0]{'contents'}[1]{'extra'}{'command'}
 = 
$result_trees{'codequoteundirected_codequotebacktick'}{'contents'}[0]{'contents'}[0];
 
$result_trees{'codequoteundirected_codequotebacktick'}{'contents'}[0]{'contents'}[1]{'parent'}
 = $result_trees{'codequoteundirected_codequotebacktick'}{'contents'}[0];
 
$result_trees{'codequoteundirected_codequotebacktick'}{'contents'}[0]{'contents'}[2]{'parent'}
 = $result_trees{'codequoteundirected_codequotebacktick'}{'contents'}[0];
 
$result_trees{'codequoteundirected_codequotebacktick'}{'contents'}[0]{'contents'}[3]{'args'}[0]{'parent'}
 = 
$result_trees{'codequoteundirected_codequotebacktick'}{'contents'}[0]{'contents'}[3];
@@ -4309,7 +4302,6 @@
 
$result_trees{'codequoteundirected_codequotebacktick'}{'contents'}[0]{'contents'}[3]{'contents'}[16]{'parent'}
 = 
$result_trees{'codequoteundirected_codequotebacktick'}{'contents'}[0]{'contents'}[3];
 
$result_trees{'codequoteundirected_codequotebacktick'}{'contents'}[0]{'contents'}[3]{'contents'}[17]{'parent'}
 = 
$result_trees{'codequoteundirected_codequotebacktick'}{'contents'}[0]{'contents'}[3];
 
$result_trees{'codequoteundirected_codequotebacktick'}{'contents'}[0]{'contents'}[3]{'parent'}
 = $result_trees{'codequoteundirected_codequotebacktick'}{'contents'}[0];
-$result_trees{'codequoteundirected_codequotebacktick'}{'contents'}[0]{'contents'}[4]{'extra'}{'command'}
 = 
$result_trees{'codequoteundirected_codequotebacktick'}{'contents'}[0]{'contents'}[3];
 
$result_trees{'codequoteundirected_codequotebacktick'}{'contents'}[0]{'contents'}[4]{'parent'}
 = $result_trees{'codequoteundirected_codequotebacktick'}{'contents'}[0];
 
$result_trees{'codequoteundirected_codequotebacktick'}{'contents'}[0]{'contents'}[5]{'parent'}
 = $result_trees{'codequoteundirected_codequotebacktick'}{'contents'}[0];
 
$result_trees{'codequoteundirected_codequotebacktick'}{'contents'}[0]{'contents'}[6]{'contents'}[0]{'extra'}{'command'}
 = 
$result_trees{'codequoteundirected_codequotebacktick'}{'contents'}[0]{'contents'}[6];

Modified: trunk/tp/t/results/misc_commands/kbdinputstyle.pl
===================================================================
--- trunk/tp/t/results/misc_commands/kbdinputstyle.pl   2018-08-25 14:01:16 UTC 
(rev 8114)
+++ trunk/tp/t/results/misc_commands/kbdinputstyle.pl   2018-08-25 14:29:53 UTC 
(rev 8115)
@@ -95,9 +95,6 @@
       'parent' => {}
     },
     {
-      'extra' => {
-        'command' => {}
-      },
       'parent' => {},
       'text' => '
 ',
@@ -1358,7 +1355,6 @@
 $result_trees{'kbdinputstyle'}{'contents'}[0]{'contents'}[9]{'parent'} = 
$result_trees{'kbdinputstyle'}{'contents'}[0];
 $result_trees{'kbdinputstyle'}{'contents'}[0]{'contents'}[10]{'parent'} = 
$result_trees{'kbdinputstyle'}{'contents'}[0];
 $result_trees{'kbdinputstyle'}{'contents'}[0]{'parent'} = 
$result_trees{'kbdinputstyle'};
-$result_trees{'kbdinputstyle'}{'contents'}[1]{'extra'}{'command'} = 
$result_trees{'kbdinputstyle'}{'contents'}[0];
 $result_trees{'kbdinputstyle'}{'contents'}[1]{'parent'} = 
$result_trees{'kbdinputstyle'};
 $result_trees{'kbdinputstyle'}{'contents'}[2]{'parent'} = 
$result_trees{'kbdinputstyle'};
 $result_trees{'kbdinputstyle'}{'contents'}[3]{'contents'}[0]{'parent'} = 
$result_trees{'kbdinputstyle'}{'contents'}[3];

Modified: trunk/tp/t/results/misc_commands/test_allowcodebreaks.pl
===================================================================
--- trunk/tp/t/results/misc_commands/test_allowcodebreaks.pl    2018-08-25 
14:01:16 UTC (rev 8114)
+++ trunk/tp/t/results/misc_commands/test_allowcodebreaks.pl    2018-08-25 
14:29:53 UTC (rev 8115)
@@ -116,9 +116,6 @@
           'parent' => {}
         },
         {
-          'extra' => {
-            'command' => {}
-          },
           'parent' => {},
           'text' => '
 ',
@@ -182,9 +179,6 @@
           'parent' => {}
         },
         {
-          'extra' => {
-            'command' => {}
-          },
           'parent' => {},
           'text' => '
 ',
@@ -2190,7 +2184,6 @@
 
$result_trees{'test_allowcodebreaks'}{'contents'}[1]{'contents'}[1]{'contents'}[5]{'parent'}
 = $result_trees{'test_allowcodebreaks'}{'contents'}[1]{'contents'}[1];
 
$result_trees{'test_allowcodebreaks'}{'contents'}[1]{'contents'}[1]{'contents'}[6]{'parent'}
 = $result_trees{'test_allowcodebreaks'}{'contents'}[1]{'contents'}[1];
 $result_trees{'test_allowcodebreaks'}{'contents'}[1]{'contents'}[1]{'parent'} 
= $result_trees{'test_allowcodebreaks'}{'contents'}[1];
-$result_trees{'test_allowcodebreaks'}{'contents'}[1]{'contents'}[2]{'extra'}{'command'}
 = $result_trees{'test_allowcodebreaks'}{'contents'}[1]{'contents'}[1];
 $result_trees{'test_allowcodebreaks'}{'contents'}[1]{'contents'}[2]{'parent'} 
= $result_trees{'test_allowcodebreaks'}{'contents'}[1];
 $result_trees{'test_allowcodebreaks'}{'contents'}[1]{'contents'}[3]{'parent'} 
= $result_trees{'test_allowcodebreaks'}{'contents'}[1];
 
$result_trees{'test_allowcodebreaks'}{'contents'}[1]{'contents'}[4]{'args'}[0]{'parent'}
 = $result_trees{'test_allowcodebreaks'}{'contents'}[1]{'contents'}[4];
@@ -2200,7 +2193,6 @@
 
$result_trees{'test_allowcodebreaks'}{'contents'}[1]{'contents'}[4]{'contents'}[3]{'parent'}
 = $result_trees{'test_allowcodebreaks'}{'contents'}[1]{'contents'}[4];
 
$result_trees{'test_allowcodebreaks'}{'contents'}[1]{'contents'}[4]{'contents'}[4]{'parent'}
 = $result_trees{'test_allowcodebreaks'}{'contents'}[1]{'contents'}[4];
 $result_trees{'test_allowcodebreaks'}{'contents'}[1]{'contents'}[4]{'parent'} 
= $result_trees{'test_allowcodebreaks'}{'contents'}[1];
-$result_trees{'test_allowcodebreaks'}{'contents'}[1]{'contents'}[5]{'extra'}{'command'}
 = $result_trees{'test_allowcodebreaks'}{'contents'}[1]{'contents'}[4];
 $result_trees{'test_allowcodebreaks'}{'contents'}[1]{'contents'}[5]{'parent'} 
= $result_trees{'test_allowcodebreaks'}{'contents'}[1];
 $result_trees{'test_allowcodebreaks'}{'contents'}[1]{'contents'}[6]{'parent'} 
= $result_trees{'test_allowcodebreaks'}{'contents'}[1];
 
$result_trees{'test_allowcodebreaks'}{'contents'}[1]{'contents'}[7]{'contents'}[0]{'parent'}
 = $result_trees{'test_allowcodebreaks'}{'contents'}[1]{'contents'}[7];

Modified: trunk/tp/t/results/plaintext_tests/star_at_command_formatting.pl
===================================================================
--- trunk/tp/t/results/plaintext_tests/star_at_command_formatting.pl    
2018-08-25 14:01:16 UTC (rev 8114)
+++ trunk/tp/t/results/plaintext_tests/star_at_command_formatting.pl    
2018-08-25 14:29:53 UTC (rev 8115)
@@ -107,9 +107,6 @@
       'parent' => {}
     },
     {
-      'extra' => {
-        'command' => {}
-      },
       'parent' => {},
       'text' => '
 ',
@@ -1140,7 +1137,6 @@
 
$result_trees{'star_at_command_formatting'}{'contents'}[0]{'contents'}[11]{'parent'}
 = $result_trees{'star_at_command_formatting'}{'contents'}[0];
 
$result_trees{'star_at_command_formatting'}{'contents'}[0]{'contents'}[12]{'parent'}
 = $result_trees{'star_at_command_formatting'}{'contents'}[0];
 $result_trees{'star_at_command_formatting'}{'contents'}[0]{'parent'} = 
$result_trees{'star_at_command_formatting'};
-$result_trees{'star_at_command_formatting'}{'contents'}[1]{'extra'}{'command'} 
= $result_trees{'star_at_command_formatting'}{'contents'}[0];
 $result_trees{'star_at_command_formatting'}{'contents'}[1]{'parent'} = 
$result_trees{'star_at_command_formatting'};
 $result_trees{'star_at_command_formatting'}{'contents'}[2]{'parent'} = 
$result_trees{'star_at_command_formatting'};
 
$result_trees{'star_at_command_formatting'}{'contents'}[3]{'contents'}[0]{'parent'}
 = $result_trees{'star_at_command_formatting'}{'contents'}[3];

Modified: trunk/tp/t/results/raw/misc_raw.pl
===================================================================
--- trunk/tp/t/results/raw/misc_raw.pl  2018-08-25 14:01:16 UTC (rev 8114)
+++ trunk/tp/t/results/raw/misc_raw.pl  2018-08-25 14:29:53 UTC (rev 8115)
@@ -223,9 +223,6 @@
       'parent' => {}
     },
     {
-      'extra' => {
-        'command' => {}
-      },
       'parent' => {},
       'text' => '
 ',
@@ -275,7 +272,6 @@
 $result_trees{'misc_raw'}{'contents'}[5]{'contents'}[2]{'parent'} = 
$result_trees{'misc_raw'}{'contents'}[5];
 $result_trees{'misc_raw'}{'contents'}[5]{'extra'}{'spaces_after_command'} = 
$result_trees{'misc_raw'}{'contents'}[5]{'contents'}[0];
 $result_trees{'misc_raw'}{'contents'}[5]{'parent'} = $result_trees{'misc_raw'};
-$result_trees{'misc_raw'}{'contents'}[6]{'extra'}{'command'} = 
$result_trees{'misc_raw'}{'contents'}[5];
 $result_trees{'misc_raw'}{'contents'}[6]{'parent'} = $result_trees{'misc_raw'};
 
 $result_texis{'misc_raw'} = '

Modified: trunk/tp/t/results/raw/misc_raw_comments.pl
===================================================================
--- trunk/tp/t/results/raw/misc_raw_comments.pl 2018-08-25 14:01:16 UTC (rev 
8114)
+++ trunk/tp/t/results/raw/misc_raw_comments.pl 2018-08-25 14:29:53 UTC (rev 
8115)
@@ -277,9 +277,6 @@
       'parent' => {}
     },
     {
-      'extra' => {
-        'command' => {}
-      },
       'parent' => {},
       'text' => '
 ',
@@ -335,7 +332,6 @@
 $result_trees{'misc_raw_comments'}{'contents'}[5]{'contents'}[2]{'parent'} = 
$result_trees{'misc_raw_comments'}{'contents'}[5];
 
$result_trees{'misc_raw_comments'}{'contents'}[5]{'extra'}{'spaces_after_command'}
 = $result_trees{'misc_raw_comments'}{'contents'}[5]{'contents'}[0];
 $result_trees{'misc_raw_comments'}{'contents'}[5]{'parent'} = 
$result_trees{'misc_raw_comments'};
-$result_trees{'misc_raw_comments'}{'contents'}[6]{'extra'}{'command'} = 
$result_trees{'misc_raw_comments'}{'contents'}[5];
 $result_trees{'misc_raw_comments'}{'contents'}[6]{'parent'} = 
$result_trees{'misc_raw_comments'};
 
 $result_texis{'misc_raw_comments'} = '

Modified: trunk/tp/t/results/raw/nested_macros.pl
===================================================================
--- trunk/tp/t/results/raw/nested_macros.pl     2018-08-25 14:01:16 UTC (rev 
8114)
+++ trunk/tp/t/results/raw/nested_macros.pl     2018-08-25 14:29:53 UTC (rev 
8115)
@@ -55,9 +55,6 @@
           'parent' => {}
         },
         {
-          'extra' => {
-            'command' => {}
-          },
           'parent' => {},
           'text' => '
 ',
@@ -73,9 +70,6 @@
           'parent' => {}
         },
         {
-          'extra' => {
-            'command' => {}
-          },
           'parent' => {},
           'text' => '
 ',
@@ -94,9 +88,6 @@
       'parent' => {}
     },
     {
-      'extra' => {
-        'command' => {}
-      },
       'parent' => {},
       'text' => '
 ',
@@ -112,13 +103,10 @@
 
$result_trees{'nested_macros'}{'contents'}[0]{'contents'}[1]{'contents'}[0]{'parent'}
 = $result_trees{'nested_macros'}{'contents'}[0]{'contents'}[1];
 
$result_trees{'nested_macros'}{'contents'}[0]{'contents'}[1]{'contents'}[1]{'parent'}
 = $result_trees{'nested_macros'}{'contents'}[0]{'contents'}[1];
 $result_trees{'nested_macros'}{'contents'}[0]{'contents'}[1]{'parent'} = 
$result_trees{'nested_macros'}{'contents'}[0];
-$result_trees{'nested_macros'}{'contents'}[0]{'contents'}[2]{'extra'}{'command'}
 = $result_trees{'nested_macros'}{'contents'}[0]{'contents'}[1];
 $result_trees{'nested_macros'}{'contents'}[0]{'contents'}[2]{'parent'} = 
$result_trees{'nested_macros'}{'contents'}[0];
 $result_trees{'nested_macros'}{'contents'}[0]{'contents'}[3]{'parent'} = 
$result_trees{'nested_macros'}{'contents'}[0];
-$result_trees{'nested_macros'}{'contents'}[0]{'contents'}[4]{'extra'}{'command'}
 = $result_trees{'nested_macros'}{'contents'}[0]{'contents'}[3];
 $result_trees{'nested_macros'}{'contents'}[0]{'contents'}[4]{'parent'} = 
$result_trees{'nested_macros'}{'contents'}[0];
 $result_trees{'nested_macros'}{'contents'}[0]{'parent'} = 
$result_trees{'nested_macros'};
-$result_trees{'nested_macros'}{'contents'}[1]{'extra'}{'command'} = 
$result_trees{'nested_macros'}{'contents'}[0];
 $result_trees{'nested_macros'}{'contents'}[1]{'parent'} = 
$result_trees{'nested_macros'};
 
 $result_texis{'nested_macros'} = '@macro truc   { arg,  ex}

Modified: trunk/tp/t/results/raw/raw_commands_and_end_of_lines.pl
===================================================================
--- trunk/tp/t/results/raw/raw_commands_and_end_of_lines.pl     2018-08-25 
14:01:16 UTC (rev 8114)
+++ trunk/tp/t/results/raw/raw_commands_and_end_of_lines.pl     2018-08-25 
14:29:53 UTC (rev 8115)
@@ -1164,9 +1164,6 @@
       'parent' => {}
     },
     {
-      'extra' => {
-        'command' => {}
-      },
       'parent' => {},
       'text' => '
 ',
@@ -1219,9 +1216,6 @@
       'parent' => {}
     },
     {
-      'extra' => {
-        'command' => {}
-      },
       'parent' => {},
       'text' => '
 ',
@@ -1284,9 +1278,6 @@
       'parent' => {}
     },
     {
-      'extra' => {
-        'command' => {}
-      },
       'parent' => {},
       'text' => '
 ',
@@ -1349,9 +1340,6 @@
       'parent' => {}
     },
     {
-      'extra' => {
-        'command' => {}
-      },
       'parent' => {},
       'text' => ' ',
       'type' => 'empty_spaces_after_command'
@@ -1413,9 +1401,6 @@
       'parent' => {}
     },
     {
-      'extra' => {
-        'command' => {}
-      },
       'parent' => {},
       'text' => '
 ',
@@ -1716,7 +1701,6 @@
 
$result_trees{'raw_commands_and_end_of_lines'}{'contents'}[25]{'contents'}[1]{'parent'}
 = $result_trees{'raw_commands_and_end_of_lines'}{'contents'}[25];
 
$result_trees{'raw_commands_and_end_of_lines'}{'contents'}[25]{'extra'}{'spaces_after_command'}
 = 
$result_trees{'raw_commands_and_end_of_lines'}{'contents'}[25]{'contents'}[0];
 $result_trees{'raw_commands_and_end_of_lines'}{'contents'}[25]{'parent'} = 
$result_trees{'raw_commands_and_end_of_lines'};
-$result_trees{'raw_commands_and_end_of_lines'}{'contents'}[26]{'extra'}{'command'}
 = $result_trees{'raw_commands_and_end_of_lines'}{'contents'}[25];
 $result_trees{'raw_commands_and_end_of_lines'}{'contents'}[26]{'parent'} = 
$result_trees{'raw_commands_and_end_of_lines'};
 $result_trees{'raw_commands_and_end_of_lines'}{'contents'}[27]{'parent'} = 
$result_trees{'raw_commands_and_end_of_lines'};
 
$result_trees{'raw_commands_and_end_of_lines'}{'contents'}[28]{'contents'}[0]{'parent'}
 = $result_trees{'raw_commands_and_end_of_lines'}{'contents'}[28];
@@ -1726,7 +1710,6 @@
 
$result_trees{'raw_commands_and_end_of_lines'}{'contents'}[29]{'contents'}[1]{'parent'}
 = $result_trees{'raw_commands_and_end_of_lines'}{'contents'}[29];
 
$result_trees{'raw_commands_and_end_of_lines'}{'contents'}[29]{'extra'}{'spaces_after_command'}
 = 
$result_trees{'raw_commands_and_end_of_lines'}{'contents'}[29]{'contents'}[0];
 $result_trees{'raw_commands_and_end_of_lines'}{'contents'}[29]{'parent'} = 
$result_trees{'raw_commands_and_end_of_lines'};
-$result_trees{'raw_commands_and_end_of_lines'}{'contents'}[30]{'extra'}{'command'}
 = $result_trees{'raw_commands_and_end_of_lines'}{'contents'}[29];
 $result_trees{'raw_commands_and_end_of_lines'}{'contents'}[30]{'parent'} = 
$result_trees{'raw_commands_and_end_of_lines'};
 
$result_trees{'raw_commands_and_end_of_lines'}{'contents'}[31]{'contents'}[0]{'parent'}
 = $result_trees{'raw_commands_and_end_of_lines'}{'contents'}[31];
 $result_trees{'raw_commands_and_end_of_lines'}{'contents'}[31]{'parent'} = 
$result_trees{'raw_commands_and_end_of_lines'};
@@ -1738,7 +1721,6 @@
 
$result_trees{'raw_commands_and_end_of_lines'}{'contents'}[34]{'contents'}[1]{'parent'}
 = $result_trees{'raw_commands_and_end_of_lines'}{'contents'}[34];
 
$result_trees{'raw_commands_and_end_of_lines'}{'contents'}[34]{'extra'}{'spaces_after_command'}
 = 
$result_trees{'raw_commands_and_end_of_lines'}{'contents'}[34]{'contents'}[0];
 $result_trees{'raw_commands_and_end_of_lines'}{'contents'}[34]{'parent'} = 
$result_trees{'raw_commands_and_end_of_lines'};
-$result_trees{'raw_commands_and_end_of_lines'}{'contents'}[35]{'extra'}{'command'}
 = $result_trees{'raw_commands_and_end_of_lines'}{'contents'}[34];
 $result_trees{'raw_commands_and_end_of_lines'}{'contents'}[35]{'parent'} = 
$result_trees{'raw_commands_and_end_of_lines'};
 
$result_trees{'raw_commands_and_end_of_lines'}{'contents'}[36]{'contents'}[0]{'parent'}
 = $result_trees{'raw_commands_and_end_of_lines'}{'contents'}[36];
 $result_trees{'raw_commands_and_end_of_lines'}{'contents'}[36]{'parent'} = 
$result_trees{'raw_commands_and_end_of_lines'};
@@ -1750,7 +1732,6 @@
 
$result_trees{'raw_commands_and_end_of_lines'}{'contents'}[39]{'contents'}[1]{'parent'}
 = $result_trees{'raw_commands_and_end_of_lines'}{'contents'}[39];
 
$result_trees{'raw_commands_and_end_of_lines'}{'contents'}[39]{'extra'}{'spaces_after_command'}
 = 
$result_trees{'raw_commands_and_end_of_lines'}{'contents'}[39]{'contents'}[0];
 $result_trees{'raw_commands_and_end_of_lines'}{'contents'}[39]{'parent'} = 
$result_trees{'raw_commands_and_end_of_lines'};
-$result_trees{'raw_commands_and_end_of_lines'}{'contents'}[40]{'extra'}{'command'}
 = $result_trees{'raw_commands_and_end_of_lines'}{'contents'}[39];
 $result_trees{'raw_commands_and_end_of_lines'}{'contents'}[40]{'parent'} = 
$result_trees{'raw_commands_and_end_of_lines'};
 
$result_trees{'raw_commands_and_end_of_lines'}{'contents'}[41]{'contents'}[0]{'parent'}
 = $result_trees{'raw_commands_and_end_of_lines'}{'contents'}[41];
 $result_trees{'raw_commands_and_end_of_lines'}{'contents'}[41]{'parent'} = 
$result_trees{'raw_commands_and_end_of_lines'};
@@ -1762,7 +1743,6 @@
 
$result_trees{'raw_commands_and_end_of_lines'}{'contents'}[44]{'contents'}[1]{'parent'}
 = $result_trees{'raw_commands_and_end_of_lines'}{'contents'}[44];
 
$result_trees{'raw_commands_and_end_of_lines'}{'contents'}[44]{'extra'}{'spaces_after_command'}
 = 
$result_trees{'raw_commands_and_end_of_lines'}{'contents'}[44]{'contents'}[0];
 $result_trees{'raw_commands_and_end_of_lines'}{'contents'}[44]{'parent'} = 
$result_trees{'raw_commands_and_end_of_lines'};
-$result_trees{'raw_commands_and_end_of_lines'}{'contents'}[45]{'extra'}{'command'}
 = $result_trees{'raw_commands_and_end_of_lines'}{'contents'}[44];
 $result_trees{'raw_commands_and_end_of_lines'}{'contents'}[45]{'parent'} = 
$result_trees{'raw_commands_and_end_of_lines'};
 
$result_trees{'raw_commands_and_end_of_lines'}{'contents'}[46]{'contents'}[0]{'parent'}
 = $result_trees{'raw_commands_and_end_of_lines'}{'contents'}[46];
 $result_trees{'raw_commands_and_end_of_lines'}{'contents'}[46]{'parent'} = 
$result_trees{'raw_commands_and_end_of_lines'};

Modified: trunk/tp/t/results/raw/raw_in_para.pl
===================================================================
--- trunk/tp/t/results/raw/raw_in_para.pl       2018-08-25 14:01:16 UTC (rev 
8114)
+++ trunk/tp/t/results/raw/raw_in_para.pl       2018-08-25 14:29:53 UTC (rev 
8115)
@@ -48,9 +48,6 @@
       'parent' => {}
     },
     {
-      'extra' => {
-        'command' => {}
-      },
       'parent' => {},
       'text' => '
 ',
@@ -285,7 +282,6 @@
 $result_trees{'raw_in_para'}{'contents'}[1]{'contents'}[1]{'parent'} = 
$result_trees{'raw_in_para'}{'contents'}[1];
 $result_trees{'raw_in_para'}{'contents'}[1]{'extra'}{'spaces_after_command'} = 
$result_trees{'raw_in_para'}{'contents'}[1]{'contents'}[0];
 $result_trees{'raw_in_para'}{'contents'}[1]{'parent'} = 
$result_trees{'raw_in_para'};
-$result_trees{'raw_in_para'}{'contents'}[2]{'extra'}{'command'} = 
$result_trees{'raw_in_para'}{'contents'}[1];
 $result_trees{'raw_in_para'}{'contents'}[2]{'parent'} = 
$result_trees{'raw_in_para'};
 $result_trees{'raw_in_para'}{'contents'}[3]{'parent'} = 
$result_trees{'raw_in_para'};
 $result_trees{'raw_in_para'}{'contents'}[4]{'contents'}[0]{'parent'} = 
$result_trees{'raw_in_para'}{'contents'}[4];

Modified: trunk/tp/t/results/raw/verbatim_and_verbatiminclude.pl
===================================================================
--- trunk/tp/t/results/raw/verbatim_and_verbatiminclude.pl      2018-08-25 
14:01:16 UTC (rev 8114)
+++ trunk/tp/t/results/raw/verbatim_and_verbatiminclude.pl      2018-08-25 
14:29:53 UTC (rev 8115)
@@ -37,9 +37,6 @@
       'parent' => {}
     },
     {
-      'extra' => {
-        'command' => {}
-      },
       'parent' => {},
       'text' => '
 ',
@@ -92,9 +89,6 @@
       'parent' => {}
     },
     {
-      'extra' => {
-        'command' => {}
-      },
       'parent' => {},
       'text' => '
 ',
@@ -176,9 +170,6 @@
           'parent' => {}
         },
         {
-          'extra' => {
-            'command' => {}
-          },
           'parent' => {},
           'text' => '
 ',
@@ -284,9 +275,6 @@
       'parent' => {}
     },
     {
-      'extra' => {
-        'command' => {}
-      },
       'parent' => {},
       'text' => '
 ',
@@ -607,9 +595,6 @@
           'parent' => {}
         },
         {
-          'extra' => {
-            'command' => {}
-          },
           'parent' => {},
           'text' => '
 ',
@@ -751,9 +736,6 @@
           'parent' => {}
         },
         {
-          'extra' => {
-            'command' => {}
-          },
           'parent' => {},
           'text' => '
 ',
@@ -883,9 +865,6 @@
           'parent' => {}
         },
         {
-          'extra' => {
-            'command' => {}
-          },
           'parent' => {},
           'text' => '
 ',
@@ -963,7 +942,6 @@
 
$result_trees{'verbatim_and_verbatiminclude'}{'contents'}[0]{'contents'}[1]{'parent'}
 = $result_trees{'verbatim_and_verbatiminclude'}{'contents'}[0];
 
$result_trees{'verbatim_and_verbatiminclude'}{'contents'}[0]{'extra'}{'spaces_after_command'}
 = $result_trees{'verbatim_and_verbatiminclude'}{'contents'}[0]{'contents'}[0];
 $result_trees{'verbatim_and_verbatiminclude'}{'contents'}[0]{'parent'} = 
$result_trees{'verbatim_and_verbatiminclude'};
-$result_trees{'verbatim_and_verbatiminclude'}{'contents'}[1]{'extra'}{'command'}
 = $result_trees{'verbatim_and_verbatiminclude'}{'contents'}[0];
 $result_trees{'verbatim_and_verbatiminclude'}{'contents'}[1]{'parent'} = 
$result_trees{'verbatim_and_verbatiminclude'};
 $result_trees{'verbatim_and_verbatiminclude'}{'contents'}[2]{'parent'} = 
$result_trees{'verbatim_and_verbatiminclude'};
 
$result_trees{'verbatim_and_verbatiminclude'}{'contents'}[3]{'contents'}[0]{'parent'}
 = $result_trees{'verbatim_and_verbatiminclude'}{'contents'}[3];
@@ -973,7 +951,6 @@
 
$result_trees{'verbatim_and_verbatiminclude'}{'contents'}[4]{'contents'}[1]{'parent'}
 = $result_trees{'verbatim_and_verbatiminclude'}{'contents'}[4];
 
$result_trees{'verbatim_and_verbatiminclude'}{'contents'}[4]{'extra'}{'spaces_after_command'}
 = $result_trees{'verbatim_and_verbatiminclude'}{'contents'}[4]{'contents'}[0];
 $result_trees{'verbatim_and_verbatiminclude'}{'contents'}[4]{'parent'} = 
$result_trees{'verbatim_and_verbatiminclude'};
-$result_trees{'verbatim_and_verbatiminclude'}{'contents'}[5]{'extra'}{'command'}
 = $result_trees{'verbatim_and_verbatiminclude'}{'contents'}[4];
 $result_trees{'verbatim_and_verbatiminclude'}{'contents'}[5]{'parent'} = 
$result_trees{'verbatim_and_verbatiminclude'};
 
$result_trees{'verbatim_and_verbatiminclude'}{'contents'}[6]{'contents'}[0]{'parent'}
 = $result_trees{'verbatim_and_verbatiminclude'}{'contents'}[6];
 $result_trees{'verbatim_and_verbatiminclude'}{'contents'}[6]{'parent'} = 
$result_trees{'verbatim_and_verbatiminclude'};
@@ -988,7 +965,6 @@
 
$result_trees{'verbatim_and_verbatiminclude'}{'contents'}[8]{'contents'}[2]{'contents'}[2]{'parent'}
 = $result_trees{'verbatim_and_verbatiminclude'}{'contents'}[8]{'contents'}[2];
 
$result_trees{'verbatim_and_verbatiminclude'}{'contents'}[8]{'contents'}[2]{'extra'}{'spaces_after_command'}
 = 
$result_trees{'verbatim_and_verbatiminclude'}{'contents'}[8]{'contents'}[2]{'contents'}[0];
 
$result_trees{'verbatim_and_verbatiminclude'}{'contents'}[8]{'contents'}[2]{'parent'}
 = $result_trees{'verbatim_and_verbatiminclude'}{'contents'}[8];
-$result_trees{'verbatim_and_verbatiminclude'}{'contents'}[8]{'contents'}[3]{'extra'}{'command'}
 = $result_trees{'verbatim_and_verbatiminclude'}{'contents'}[8]{'contents'}[2];
 
$result_trees{'verbatim_and_verbatiminclude'}{'contents'}[8]{'contents'}[3]{'parent'}
 = $result_trees{'verbatim_and_verbatiminclude'}{'contents'}[8];
 
$result_trees{'verbatim_and_verbatiminclude'}{'contents'}[8]{'contents'}[4]{'args'}[0]{'contents'}[0]{'extra'}{'command'}
 = $result_trees{'verbatim_and_verbatiminclude'}{'contents'}[8]{'contents'}[4];
 
$result_trees{'verbatim_and_verbatiminclude'}{'contents'}[8]{'contents'}[4]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'verbatim_and_verbatiminclude'}{'contents'}[8]{'contents'}[4]{'args'}[0];
@@ -1009,7 +985,6 @@
 
$result_trees{'verbatim_and_verbatiminclude'}{'contents'}[11]{'contents'}[1]{'parent'}
 = $result_trees{'verbatim_and_verbatiminclude'}{'contents'}[11];
 
$result_trees{'verbatim_and_verbatiminclude'}{'contents'}[11]{'extra'}{'spaces_after_command'}
 = $result_trees{'verbatim_and_verbatiminclude'}{'contents'}[11]{'contents'}[0];
 $result_trees{'verbatim_and_verbatiminclude'}{'contents'}[11]{'parent'} = 
$result_trees{'verbatim_and_verbatiminclude'};
-$result_trees{'verbatim_and_verbatiminclude'}{'contents'}[12]{'extra'}{'command'}
 = $result_trees{'verbatim_and_verbatiminclude'}{'contents'}[11];
 $result_trees{'verbatim_and_verbatiminclude'}{'contents'}[12]{'parent'} = 
$result_trees{'verbatim_and_verbatiminclude'};
 
$result_trees{'verbatim_and_verbatiminclude'}{'contents'}[13]{'contents'}[0]{'parent'}
 = $result_trees{'verbatim_and_verbatiminclude'}{'contents'}[13];
 $result_trees{'verbatim_and_verbatiminclude'}{'contents'}[13]{'parent'} = 
$result_trees{'verbatim_and_verbatiminclude'};
@@ -1068,7 +1043,6 @@
 
$result_trees{'verbatim_and_verbatiminclude'}{'contents'}[23]{'contents'}[2]{'contents'}[2]{'parent'}
 = $result_trees{'verbatim_and_verbatiminclude'}{'contents'}[23]{'contents'}[2];
 
$result_trees{'verbatim_and_verbatiminclude'}{'contents'}[23]{'contents'}[2]{'extra'}{'spaces_after_command'}
 = 
$result_trees{'verbatim_and_verbatiminclude'}{'contents'}[23]{'contents'}[2]{'contents'}[0];
 
$result_trees{'verbatim_and_verbatiminclude'}{'contents'}[23]{'contents'}[2]{'parent'}
 = $result_trees{'verbatim_and_verbatiminclude'}{'contents'}[23];
-$result_trees{'verbatim_and_verbatiminclude'}{'contents'}[23]{'contents'}[3]{'extra'}{'command'}
 = $result_trees{'verbatim_and_verbatiminclude'}{'contents'}[23]{'contents'}[2];
 
$result_trees{'verbatim_and_verbatiminclude'}{'contents'}[23]{'contents'}[3]{'parent'}
 = $result_trees{'verbatim_and_verbatiminclude'}{'contents'}[23];
 
$result_trees{'verbatim_and_verbatiminclude'}{'contents'}[23]{'contents'}[4]{'contents'}[0]{'parent'}
 = $result_trees{'verbatim_and_verbatiminclude'}{'contents'}[23]{'contents'}[4];
 
$result_trees{'verbatim_and_verbatiminclude'}{'contents'}[23]{'contents'}[4]{'parent'}
 = $result_trees{'verbatim_and_verbatiminclude'}{'contents'}[23];
@@ -1095,7 +1069,6 @@
 
$result_trees{'verbatim_and_verbatiminclude'}{'contents'}[25]{'contents'}[3]{'contents'}[2]{'parent'}
 = $result_trees{'verbatim_and_verbatiminclude'}{'contents'}[25]{'contents'}[3];
 
$result_trees{'verbatim_and_verbatiminclude'}{'contents'}[25]{'contents'}[3]{'extra'}{'spaces_after_command'}
 = 
$result_trees{'verbatim_and_verbatiminclude'}{'contents'}[25]{'contents'}[3]{'contents'}[0];
 
$result_trees{'verbatim_and_verbatiminclude'}{'contents'}[25]{'contents'}[3]{'parent'}
 = $result_trees{'verbatim_and_verbatiminclude'}{'contents'}[25];
-$result_trees{'verbatim_and_verbatiminclude'}{'contents'}[25]{'contents'}[4]{'extra'}{'command'}
 = $result_trees{'verbatim_and_verbatiminclude'}{'contents'}[25]{'contents'}[3];
 
$result_trees{'verbatim_and_verbatiminclude'}{'contents'}[25]{'contents'}[4]{'parent'}
 = $result_trees{'verbatim_and_verbatiminclude'}{'contents'}[25];
 
$result_trees{'verbatim_and_verbatiminclude'}{'contents'}[25]{'contents'}[5]{'parent'}
 = $result_trees{'verbatim_and_verbatiminclude'}{'contents'}[25];
 
$result_trees{'verbatim_and_verbatiminclude'}{'contents'}[25]{'contents'}[6]{'args'}[0]{'contents'}[0]{'extra'}{'command'}
 = $result_trees{'verbatim_and_verbatiminclude'}{'contents'}[25]{'contents'}[6];
@@ -1120,7 +1093,6 @@
 
$result_trees{'verbatim_and_verbatiminclude'}{'contents'}[27]{'contents'}[3]{'contents'}[1]{'parent'}
 = $result_trees{'verbatim_and_verbatiminclude'}{'contents'}[27]{'contents'}[3];
 
$result_trees{'verbatim_and_verbatiminclude'}{'contents'}[27]{'contents'}[3]{'extra'}{'spaces_after_command'}
 = 
$result_trees{'verbatim_and_verbatiminclude'}{'contents'}[27]{'contents'}[3]{'contents'}[0];
 
$result_trees{'verbatim_and_verbatiminclude'}{'contents'}[27]{'contents'}[3]{'parent'}
 = $result_trees{'verbatim_and_verbatiminclude'}{'contents'}[27];
-$result_trees{'verbatim_and_verbatiminclude'}{'contents'}[27]{'contents'}[4]{'extra'}{'command'}
 = $result_trees{'verbatim_and_verbatiminclude'}{'contents'}[27]{'contents'}[3];
 
$result_trees{'verbatim_and_verbatiminclude'}{'contents'}[27]{'contents'}[4]{'parent'}
 = $result_trees{'verbatim_and_verbatiminclude'}{'contents'}[27];
 
$result_trees{'verbatim_and_verbatiminclude'}{'contents'}[27]{'contents'}[5]{'contents'}[0]{'parent'}
 = $result_trees{'verbatim_and_verbatiminclude'}{'contents'}[27]{'contents'}[5];
 
$result_trees{'verbatim_and_verbatiminclude'}{'contents'}[27]{'contents'}[5]{'parent'}
 = $result_trees{'verbatim_and_verbatiminclude'}{'contents'}[27];

Modified: trunk/tp/t/results/raw/verbatim_in_brace_command.pl
===================================================================
--- trunk/tp/t/results/raw/verbatim_in_brace_command.pl 2018-08-25 14:01:16 UTC 
(rev 8114)
+++ trunk/tp/t/results/raw/verbatim_in_brace_command.pl 2018-08-25 14:29:53 UTC 
(rev 8115)
@@ -67,9 +67,6 @@
       'parent' => {}
     },
     {
-      'extra' => {
-        'command' => {}
-      },
       'parent' => {},
       'text' => '
 ',
@@ -92,7 +89,6 @@
 
$result_trees{'verbatim_in_brace_command'}{'contents'}[1]{'contents'}[1]{'parent'}
 = $result_trees{'verbatim_in_brace_command'}{'contents'}[1];
 
$result_trees{'verbatim_in_brace_command'}{'contents'}[1]{'extra'}{'spaces_after_command'}
 = $result_trees{'verbatim_in_brace_command'}{'contents'}[1]{'contents'}[0];
 $result_trees{'verbatim_in_brace_command'}{'contents'}[1]{'parent'} = 
$result_trees{'verbatim_in_brace_command'};
-$result_trees{'verbatim_in_brace_command'}{'contents'}[2]{'extra'}{'command'} 
= $result_trees{'verbatim_in_brace_command'}{'contents'}[1];
 $result_trees{'verbatim_in_brace_command'}{'contents'}[2]{'parent'} = 
$result_trees{'verbatim_in_brace_command'};
 $result_trees{'verbatim_in_brace_command'}{'contents'}[3]{'parent'} = 
$result_trees{'verbatim_in_brace_command'};
 

Modified: trunk/tp/t/results/value_and_macro/comma_value_in_macro_arg.pl
===================================================================
--- trunk/tp/t/results/value_and_macro/comma_value_in_macro_arg.pl      
2018-08-25 14:01:16 UTC (rev 8114)
+++ trunk/tp/t/results/value_and_macro/comma_value_in_macro_arg.pl      
2018-08-25 14:29:53 UTC (rev 8115)
@@ -81,9 +81,6 @@
       'parent' => {}
     },
     {
-      'extra' => {
-        'command' => {}
-      },
       'parent' => {},
       'text' => '
 ',
@@ -162,7 +159,6 @@
 
$result_trees{'comma_value_in_macro_arg'}{'contents'}[2]{'contents'}[0]{'parent'}
 = $result_trees{'comma_value_in_macro_arg'}{'contents'}[2];
 
$result_trees{'comma_value_in_macro_arg'}{'contents'}[2]{'contents'}[1]{'parent'}
 = $result_trees{'comma_value_in_macro_arg'}{'contents'}[2];
 $result_trees{'comma_value_in_macro_arg'}{'contents'}[2]{'parent'} = 
$result_trees{'comma_value_in_macro_arg'};
-$result_trees{'comma_value_in_macro_arg'}{'contents'}[3]{'extra'}{'command'} = 
$result_trees{'comma_value_in_macro_arg'}{'contents'}[2];
 $result_trees{'comma_value_in_macro_arg'}{'contents'}[3]{'parent'} = 
$result_trees{'comma_value_in_macro_arg'};
 $result_trees{'comma_value_in_macro_arg'}{'contents'}[4]{'parent'} = 
$result_trees{'comma_value_in_macro_arg'};
 
$result_trees{'comma_value_in_macro_arg'}{'contents'}[5]{'contents'}[0]{'parent'}
 = $result_trees{'comma_value_in_macro_arg'}{'contents'}[5];

Modified: trunk/tp/t/results/value_and_macro/macro_in_value.pl
===================================================================
--- trunk/tp/t/results/value_and_macro/macro_in_value.pl        2018-08-25 
14:01:16 UTC (rev 8114)
+++ trunk/tp/t/results/value_and_macro/macro_in_value.pl        2018-08-25 
14:29:53 UTC (rev 8115)
@@ -53,9 +53,6 @@
       'parent' => {}
     },
     {
-      'extra' => {
-        'command' => {}
-      },
       'parent' => {},
       'text' => '
 ',
@@ -134,7 +131,6 @@
 $result_trees{'macro_in_value'}{'contents'}[0]{'contents'}[2]{'parent'} = 
$result_trees{'macro_in_value'}{'contents'}[0];
 $result_trees{'macro_in_value'}{'contents'}[0]{'contents'}[3]{'parent'} = 
$result_trees{'macro_in_value'}{'contents'}[0];
 $result_trees{'macro_in_value'}{'contents'}[0]{'parent'} = 
$result_trees{'macro_in_value'};
-$result_trees{'macro_in_value'}{'contents'}[1]{'extra'}{'command'} = 
$result_trees{'macro_in_value'}{'contents'}[0];
 $result_trees{'macro_in_value'}{'contents'}[1]{'parent'} = 
$result_trees{'macro_in_value'};
 $result_trees{'macro_in_value'}{'contents'}[2]{'parent'} = 
$result_trees{'macro_in_value'};
 $result_trees{'macro_in_value'}{'contents'}[3]{'args'}[0]{'parent'} = 
$result_trees{'macro_in_value'}{'contents'}[3];

Modified: trunk/tp/t/results/value_and_macro/value_in_macro_body.pl
===================================================================
--- trunk/tp/t/results/value_and_macro/value_in_macro_body.pl   2018-08-25 
14:01:16 UTC (rev 8114)
+++ trunk/tp/t/results/value_and_macro/value_in_macro_body.pl   2018-08-25 
14:29:53 UTC (rev 8115)
@@ -76,9 +76,6 @@
       'parent' => {}
     },
     {
-      'extra' => {
-        'command' => {}
-      },
       'parent' => {},
       'text' => '
 ',
@@ -139,7 +136,6 @@
 $result_trees{'value_in_macro_body'}{'contents'}[2]{'contents'}[0]{'parent'} = 
$result_trees{'value_in_macro_body'}{'contents'}[2];
 $result_trees{'value_in_macro_body'}{'contents'}[2]{'contents'}[1]{'parent'} = 
$result_trees{'value_in_macro_body'}{'contents'}[2];
 $result_trees{'value_in_macro_body'}{'contents'}[2]{'parent'} = 
$result_trees{'value_in_macro_body'};
-$result_trees{'value_in_macro_body'}{'contents'}[3]{'extra'}{'command'} = 
$result_trees{'value_in_macro_body'}{'contents'}[2];
 $result_trees{'value_in_macro_body'}{'contents'}[3]{'parent'} = 
$result_trees{'value_in_macro_body'};
 $result_trees{'value_in_macro_body'}{'contents'}[4]{'parent'} = 
$result_trees{'value_in_macro_body'};
 $result_trees{'value_in_macro_body'}{'contents'}[5]{'contents'}[0]{'parent'} = 
$result_trees{'value_in_macro_body'}{'contents'}[5];

Modified: trunk/tp/t/results/value_and_macro/value_in_macro_formal_arg.pl
===================================================================
--- trunk/tp/t/results/value_and_macro/value_in_macro_formal_arg.pl     
2018-08-25 14:01:16 UTC (rev 8114)
+++ trunk/tp/t/results/value_and_macro/value_in_macro_formal_arg.pl     
2018-08-25 14:29:53 UTC (rev 8115)
@@ -82,9 +82,6 @@
       'parent' => {}
     },
     {
-      'extra' => {
-        'command' => {}
-      },
       'parent' => {},
       'text' => '
 ',
@@ -120,7 +117,6 @@
 
$result_trees{'value_in_macro_formal_arg'}{'contents'}[2]{'contents'}[0]{'parent'}
 = $result_trees{'value_in_macro_formal_arg'}{'contents'}[2];
 
$result_trees{'value_in_macro_formal_arg'}{'contents'}[2]{'contents'}[1]{'parent'}
 = $result_trees{'value_in_macro_formal_arg'}{'contents'}[2];
 $result_trees{'value_in_macro_formal_arg'}{'contents'}[2]{'parent'} = 
$result_trees{'value_in_macro_formal_arg'};
-$result_trees{'value_in_macro_formal_arg'}{'contents'}[3]{'extra'}{'command'} 
= $result_trees{'value_in_macro_formal_arg'}{'contents'}[2];
 $result_trees{'value_in_macro_formal_arg'}{'contents'}[3]{'parent'} = 
$result_trees{'value_in_macro_formal_arg'};
 $result_trees{'value_in_macro_formal_arg'}{'contents'}[4]{'parent'} = 
$result_trees{'value_in_macro_formal_arg'};
 
$result_trees{'value_in_macro_formal_arg'}{'contents'}[5]{'contents'}[0]{'parent'}
 = $result_trees{'value_in_macro_formal_arg'}{'contents'}[5];

Modified: trunk/tp/t/results/xml_tests/commands_and_spaces.pl
===================================================================
--- trunk/tp/t/results/xml_tests/commands_and_spaces.pl 2018-08-25 14:01:16 UTC 
(rev 8114)
+++ trunk/tp/t/results/xml_tests/commands_and_spaces.pl 2018-08-25 14:29:53 UTC 
(rev 8115)
@@ -1255,9 +1255,7 @@
           'parent' => {}
         },
         {
-          'extra' => {
-            'command' => {}
-          },
+          'extra' => {},
           'parent' => {},
           'text' => ' 
 ',
@@ -2292,7 +2290,6 @@
 
$result_trees{'commands_and_spaces'}{'contents'}[1]{'contents'}[29]{'contents'}[1]{'parent'}
 = $result_trees{'commands_and_spaces'}{'contents'}[1]{'contents'}[29];
 
$result_trees{'commands_and_spaces'}{'contents'}[1]{'contents'}[29]{'extra'}{'spaces_after_command'}
 = 
$result_trees{'commands_and_spaces'}{'contents'}[1]{'contents'}[29]{'contents'}[0];
 $result_trees{'commands_and_spaces'}{'contents'}[1]{'contents'}[29]{'parent'} 
= $result_trees{'commands_and_spaces'}{'contents'}[1];
-$result_trees{'commands_and_spaces'}{'contents'}[1]{'contents'}[30]{'extra'}{'command'}
 = $result_trees{'commands_and_spaces'}{'contents'}[1]{'contents'}[29];
 $result_trees{'commands_and_spaces'}{'contents'}[1]{'contents'}[30]{'parent'} 
= $result_trees{'commands_and_spaces'}{'contents'}[1];
 $result_trees{'commands_and_spaces'}{'contents'}[1]{'contents'}[31]{'parent'} 
= $result_trees{'commands_and_spaces'}{'contents'}[1];
 
$result_trees{'commands_and_spaces'}{'contents'}[1]{'contents'}[32]{'contents'}[0]{'extra'}{'command'}
 = $result_trees{'commands_and_spaces'}{'contents'}[1]{'contents'}[32];

Modified: trunk/tp/t/results/xml_tests/macro_and_args.pl
===================================================================
--- trunk/tp/t/results/xml_tests/macro_and_args.pl      2018-08-25 14:01:16 UTC 
(rev 8114)
+++ trunk/tp/t/results/xml_tests/macro_and_args.pl      2018-08-25 14:29:53 UTC 
(rev 8115)
@@ -39,9 +39,7 @@
       'parent' => {}
     },
     {
-      'extra' => {
-        'command' => {}
-      },
+      'extra' => {},
       'parent' => {},
       'text' => '
 ',
@@ -91,9 +89,7 @@
       'parent' => {}
     },
     {
-      'extra' => {
-        'command' => {}
-      },
+      'extra' => {},
       'parent' => {},
       'text' => '
 ',
@@ -106,7 +102,6 @@
 $result_trees{'macro_and_args'}{'contents'}[0]{'args'}[1]{'parent'} = 
$result_trees{'macro_and_args'}{'contents'}[0];
 $result_trees{'macro_and_args'}{'contents'}[0]{'args'}[2]{'parent'} = 
$result_trees{'macro_and_args'}{'contents'}[0];
 $result_trees{'macro_and_args'}{'contents'}[0]{'parent'} = 
$result_trees{'macro_and_args'};
-$result_trees{'macro_and_args'}{'contents'}[1]{'extra'}{'command'} = 
$result_trees{'macro_and_args'}{'contents'}[0];
 $result_trees{'macro_and_args'}{'contents'}[1]{'parent'} = 
$result_trees{'macro_and_args'};
 $result_trees{'macro_and_args'}{'contents'}[2]{'parent'} = 
$result_trees{'macro_and_args'};
 $result_trees{'macro_and_args'}{'contents'}[3]{'args'}[0]{'parent'} = 
$result_trees{'macro_and_args'}{'contents'}[3];
@@ -114,7 +109,6 @@
 $result_trees{'macro_and_args'}{'contents'}[3]{'args'}[2]{'parent'} = 
$result_trees{'macro_and_args'}{'contents'}[3];
 $result_trees{'macro_and_args'}{'contents'}[3]{'args'}[3]{'parent'} = 
$result_trees{'macro_and_args'}{'contents'}[3];
 $result_trees{'macro_and_args'}{'contents'}[3]{'parent'} = 
$result_trees{'macro_and_args'};
-$result_trees{'macro_and_args'}{'contents'}[4]{'extra'}{'command'} = 
$result_trees{'macro_and_args'}{'contents'}[3];
 $result_trees{'macro_and_args'}{'contents'}[4]{'parent'} = 
$result_trees{'macro_and_args'};
 
 $result_texis{'macro_and_args'} = '@macro good { aaa, 2b-bb}

Modified: trunk/tp/t/results/xml_tests/spaces_info_lost.pl
===================================================================
--- trunk/tp/t/results/xml_tests/spaces_info_lost.pl    2018-08-25 14:01:16 UTC 
(rev 8114)
+++ trunk/tp/t/results/xml_tests/spaces_info_lost.pl    2018-08-25 14:29:53 UTC 
(rev 8115)
@@ -141,9 +141,7 @@
       'parent' => {}
     },
     {
-      'extra' => {
-        'command' => {}
-      },
+      'extra' => {},
       'parent' => {},
       'text' => ' 
 ',
@@ -177,7 +175,6 @@
 $result_trees{'spaces_info_lost'}{'contents'}[2]{'contents'}[1]{'parent'} = 
$result_trees{'spaces_info_lost'}{'contents'}[2];
 
$result_trees{'spaces_info_lost'}{'contents'}[2]{'extra'}{'spaces_after_command'}
 = $result_trees{'spaces_info_lost'}{'contents'}[2]{'contents'}[0];
 $result_trees{'spaces_info_lost'}{'contents'}[2]{'parent'} = 
$result_trees{'spaces_info_lost'};
-$result_trees{'spaces_info_lost'}{'contents'}[3]{'extra'}{'command'} = 
$result_trees{'spaces_info_lost'}{'contents'}[2];
 $result_trees{'spaces_info_lost'}{'contents'}[3]{'parent'} = 
$result_trees{'spaces_info_lost'};
 
 $result_texis{'spaces_info_lost'} = '@example  text on example line 

Modified: trunk/tp/t/results/xtable/table_nested.pl
===================================================================
--- trunk/tp/t/results/xtable/table_nested.pl   2018-08-25 14:01:16 UTC (rev 
8114)
+++ trunk/tp/t/results/xtable/table_nested.pl   2018-08-25 14:29:53 UTC (rev 
8115)
@@ -161,9 +161,7 @@
       'parent' => {}
     },
     {
-      'extra' => {
-        'command' => {}
-      },
+      'extra' => {},
       'parent' => {},
       'text' => '
 ',
@@ -2463,7 +2461,6 @@
 $result_trees{'table_nested'}{'contents'}[0]{'contents'}[20]{'parent'} = 
$result_trees{'table_nested'}{'contents'}[0];
 $result_trees{'table_nested'}{'contents'}[0]{'contents'}[21]{'parent'} = 
$result_trees{'table_nested'}{'contents'}[0];
 $result_trees{'table_nested'}{'contents'}[0]{'parent'} = 
$result_trees{'table_nested'};
-$result_trees{'table_nested'}{'contents'}[1]{'extra'}{'command'} = 
$result_trees{'table_nested'}{'contents'}[0];
 $result_trees{'table_nested'}{'contents'}[1]{'parent'} = 
$result_trees{'table_nested'};
 $result_trees{'table_nested'}{'contents'}[2]{'parent'} = 
$result_trees{'table_nested'};
 $result_trees{'table_nested'}{'contents'}[3]{'contents'}[0]{'parent'} = 
$result_trees{'table_nested'}{'contents'}[3];