branch master updated: Remove last_raw_newline

[Patrice Dumas]

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

pertusus pushed a commit to branch master
in repository texinfo.

The following commit(s) were added to refs/heads/master by this push:
     new f98a54bd03 Remove last_raw_newline
f98a54bd03 is described below

commit f98a54bd03992ea2d8e74fcf45a0717500e5f7ad
Author: Patrice Dumas <pertusus@free.fr>
AuthorDate: Sat Sep 10 12:16:00 2022 +0200

    Remove last_raw_newline
    
    * tp/Texinfo/ParserNonXS.pm (_parse_texi),
    tp/Texinfo/XS/parsetexi/element_types.txt,
    tp/Texinfo/XS/parsetexi/parser.c (process_remaining_on_line)
    tp/Texinfo/Convert/Plaintext.pm (_convert): do not set
    last_raw_newline type.  It could probably have been removed earlier,
    when rawpreformatted was introduced.
---
 ChangeLog                                          |  13 +-
 tp/Texinfo/Convert/Plaintext.pm                    |   3 +-
 tp/Texinfo/ParserNonXS.pm                          |  15 -
 tp/Texinfo/XS/parsetexi/element_types.c            |   1 -
 tp/Texinfo/XS/parsetexi/element_types.h            |   1 -
 tp/Texinfo/XS/parsetexi/element_types.txt          |   1 -
 tp/Texinfo/XS/parsetexi/parser.c                   |  18 -
 .../command_conditionals_user_defined.pl           |  14 +-
 tp/t/results/conditionals/end_ifset_in_format.pl   |  14 +-
 tp/t/results/conditionals/macro_in_ifset.pl        |  14 +-
 tp/t/results/conditionals/macro_in_ifset_set.pl    |  28 +-
 tp/t/results/conditionals/nested_ifset_ifclear.pl  |  14 +-
 tp/t/results/conditionals/nested_ignore.pl         |  40 +-
 .../conditionals/user_defined_txiinternalvalue.pl  |  14 +-
 .../results/converters_tests/at_commands_in_raw.pl |  14 +-
 tp/t/results/coverage_braces/test_image.pl         |  14 +-
 tp/t/results/formatting/texi_bib_example.pl        |  94 ++--
 tp/t/results/formatting/texi_glossary.pl           | 108 ++---
 tp/t/results/include/cpp_lines.pl                  |  28 +-
 .../macro_and_commands_in_early_commands.pl        |  56 +--
 .../results/include/macro_definition_in_include.pl |  14 +-
 tp/t/results/include/macro_in_early_commands.pl    |  84 ++--
 tp/t/results/info_tests/def_in_copying.pl          |  14 +-
 tp/t/results/invalid_nestings/ignore_in_xref.pl    |  14 +-
 tp/t/results/macro/arg_body_expansion_order.pl     |  56 +--
 tp/t/results/macro/arg_not_closed.pl               |  14 +-
 tp/t/results/macro/backslash_in_arg.pl             |  14 +-
 tp/t/results/macro/bad_argument.pl                 |  56 +--
 tp/t/results/macro/bad_formal_arg.pl               |  42 +-
 .../macro/bad_macro_name_with_underscore.pl        |  14 +-
 tp/t/results/macro/complete_macro_for_end.pl       |  14 +-
 tp/t/results/macro/complex_argument.pl             |  70 +--
 tp/t/results/macro/double_recursive_macro_call.pl  |  28 +-
 tp/t/results/macro/empty_end.pl                    |  14 +-
 tp/t/results/macro/empty_macro_argument.pl         |  28 +-
 tp/t/results/macro/expand_two_same.pl              |  12 +-
 tp/t/results/macro/expansion_order.pl              |  26 +-
 tp/t/results/macro/form_feeds.pl                   |  28 +-
 tp/t/results/macro/ifclear_in_macro.pl             |  14 +-
 tp/t/results/macro/ifset_and_end_isef_in_macro.pl  |  28 +-
 tp/t/results/macro/ifset_in_macro.pl               |  14 +-
 tp/t/results/macro/ifset_in_macro_set.pl           |  14 +-
 tp/t/results/macro/ignored_macro_definition.pl     |  14 +-
 tp/t/results/macro/implicit_quoting_one_arg.pl     |  14 +-
 tp/t/results/macro/implicit_quoting_recursion.pl   |  14 +-
 tp/t/results/macro/include_after_empty_line_arg.pl |  14 +-
 tp/t/results/macro/leading_spaces_no_ignore.pl     |  14 +-
 tp/t/results/macro/line_after_recursive_call.pl    |  14 +-
 tp/t/results/macro/macro_expands_to_empty.pl       |  14 +-
 tp/t/results/macro/macro_expansion.pl              |  14 +-
 tp/t/results/macro/macro_for_end.pl                |  14 +-
 .../macro/macro_for_ignored_line_command.pl        |  14 +-
 tp/t/results/macro/macro_in_accent.pl              |  28 +-
 tp/t/results/macro/macro_in_brace_command.pl       |  28 +-
 tp/t/results/macro/macro_in_end_argument.pl        |  14 +-
 tp/t/results/macro/macro_in_ifset.pl               |  14 +-
 tp/t/results/macro/macro_in_ifset_end_in_arg.pl    |  14 +-
 tp/t/results/macro/macro_in_index_commands.pl      |  98 ++---
 .../macro/macro_in_invalid_documentencoding.pl     |  14 +-
 tp/t/results/macro/macro_in_macro_arg.pl           |  42 +-
 tp/t/results/macro/macro_in_macro_arg_simpler.pl   |  28 +-
 tp/t/results/macro/macro_in_menu.pl                |  84 ++--
 tp/t/results/macro/macro_in_misc_commands.pl       | 476 ++++++---------------
 tp/t/results/macro/macro_name_with_digit.pl        |  28 +-
 tp/t/results/macro/macro_name_with_hyphen.pl       |  14 +-
 tp/t/results/macro/macro_no_arg_bad_expansion.pl   |  14 +-
 tp/t/results/macro/macro_no_arg_expansion.pl       |  14 +-
 tp/t/results/macro/macro_one_arg_end_of_file.pl    |  14 +-
 .../macro_with_error_at_end_line_after_macro.pl    |  14 +-
 tp/t/results/macro/macro_zero.pl                   |  14 +-
 tp/t/results/macro/nested_macro_call.pl            |  26 +-
 tp/t/results/macro/paragraph_and_macro.pl          |  28 +-
 tp/t/results/macro/protect_comma_macro_line.pl     |  14 +-
 tp/t/results/macro/protect_in_body.pl              |  14 +-
 tp/t/results/macro/protect_in_body_line_arg.pl     |  14 +-
 tp/t/results/macro/protect_in_body_one_arg.pl      |  14 +-
 tp/t/results/macro/recursive_call_in_argument.pl   |  14 +-
 tp/t/results/macro/recursive_call_in_macro.pl      |  14 +-
 tp/t/results/macro/redefine_texinfo_macro.pl       |  14 +-
 tp/t/results/macro/simple_imbricated_macro.pl      |  28 +-
 tp/t/results/macro/space_macro_after_end.pl        |  14 +-
 .../macro/space_macro_after_end_verbatim.pl        |  12 +-
 tp/t/results/macro/text_before_after.pl            |  14 +-
 tp/t/results/macro/too_much_args.pl                |  14 +-
 tp/t/results/macro/two_macros_on_a_line.pl         |  28 +-
 tp/t/results/macro/zero_argument.pl                |  28 +-
 .../codequoteundirected_codequotebacktick.pl       |  28 +-
 tp/t/results/misc_commands/kbdinputstyle.pl        |  14 +-
 .../misc_commands/kbdinputstyle_in_table.pl        |  14 +-
 tp/t/results/misc_commands/test_allowcodebreaks.pl |  28 +-
 .../plaintext_tests/star_at_command_formatting.pl  |  14 +-
 tp/t/results/raw/nested_macros.pl                  |  14 +-
 .../value_and_macro/comma_value_in_macro_arg.pl    |  14 +-
 tp/t/results/value_and_macro/macro_in_value.pl     |  14 +-
 .../results/value_and_macro/value_in_macro_body.pl |  14 +-
 .../value_and_macro/value_in_macro_formal_arg.pl   |  14 +-
 tp/t/results/xtable/table_nested.pl                |  14 +-
 97 files changed, 760 insertions(+), 1920 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 3ccc930d0f..ed2c824e34 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,7 +1,18 @@
+2022-09-10  Patrice Dumas  <pertusus@free.fr>
+
+       Remove last_raw_newline
+
+       * tp/Texinfo/ParserNonXS.pm (_parse_texi),
+       tp/Texinfo/XS/parsetexi/element_types.txt,
+       tp/Texinfo/XS/parsetexi/parser.c (process_remaining_on_line)
+       tp/Texinfo/Convert/Plaintext.pm (_convert): do not set
+       last_raw_newline type.  It could probably have been removed earlier,
+       when rawpreformatted was introduced.
+
 2022-09-10  Patrice Dumas  <pertusus@free.fr>
 
        * tp/Texinfo/Convert/TexinfoXML.pm (_convert): no 
empty_line_after_command
-       nor last_raw_newline in raw format comand/rawpreformatted anymore.
+       nor last_raw_newline in raw format command/rawpreformatted anymore.
 
 2022-09-10  Patrice Dumas  <pertusus@free.fr>
 
diff --git a/tp/Texinfo/Convert/Plaintext.pm b/tp/Texinfo/Convert/Plaintext.pm
index 09ee48c231..ee088cb3b8 100644
--- a/tp/Texinfo/Convert/Plaintext.pm
+++ b/tp/Texinfo/Convert/Plaintext.pm
@@ -1616,8 +1616,7 @@ sub _convert($$)
   if (defined($element->{'text'})) {
     if (!$type or $type ne 'untranslated') {
       if (!$formatter->{'_top_formatter'}) {
-        if ($type and ($type eq 'raw' 
-                                 or $type eq 'last_raw_newline')) {
+        if ($type and $type eq 'raw') {
           $result = _count_added($self, $formatter->{'container'},
                       add_next($formatter->{'container'}, $element->{'text'}));
         } else {
diff --git a/tp/Texinfo/ParserNonXS.pm b/tp/Texinfo/ParserNonXS.pm
index ed68d2e7eb..170d2ee230 100644
--- a/tp/Texinfo/ParserNonXS.pm
+++ b/tp/Texinfo/ParserNonXS.pm
@@ -3987,17 +3987,6 @@ sub _parse_texi($$$)
             $self->_line_warn(sprintf(
                   __("\@end %s should only appear at the beginning of a line"),
                                      $current->{'cmdname'}), $source_info);
-          } else {
-            # FIXME exclude other formats, like @macro, @ifset, @ignore?
-            if ($current->{'cmdname'} ne 'verbatim'
-                and @{$current->{'contents'}}
-                and $current->{'contents'}->[-1]->{'type'}
-                and $current->{'contents'}->[-1]->{'type'} eq 'raw') {
-              if ($current->{'contents'}->[-1]->{'text'} =~ s/(\n)//) {
-                push @{$current->{'contents'}}, {'type' => 'last_raw_newline',
-                             'text' => $1, 'parent' => $current};
-              }
-            }
           }
           # store toplevel macro specification
           if (($current->{'cmdname'} eq 'macro' or $current->{'cmdname'} eq 
'rmacro')
@@ -7022,10 +7011,6 @@ this space should be ignorable (like C<@caption> or 
C<@sortas>).
 
 Space appearing before a paragraph beginning.
 
-=item last_raw_newline
-
-The last end of line in a raw block (except for C<@verbatim>).
-
 =item misc_arg
 
 Used for the arguments to some special line commands whose arguments
diff --git a/tp/Texinfo/XS/parsetexi/element_types.c 
b/tp/Texinfo/XS/parsetexi/element_types.c
index e521bcce42..6c9e85469e 100644
--- a/tp/Texinfo/XS/parsetexi/element_types.c
+++ b/tp/Texinfo/XS/parsetexi/element_types.c
@@ -8,7 +8,6 @@ char *element_type_names[] = {
 "definfoenclose_command",
 "empty_line",
 "raw",
-"last_raw_newline",
 "empty_line_after_command",
 "empty_spaces_after_command",
 "spaces_at_end",
diff --git a/tp/Texinfo/XS/parsetexi/element_types.h 
b/tp/Texinfo/XS/parsetexi/element_types.h
index 85209970a2..f0e543df65 100644
--- a/tp/Texinfo/XS/parsetexi/element_types.h
+++ b/tp/Texinfo/XS/parsetexi/element_types.h
@@ -11,7 +11,6 @@ ET_space_command_arg,
 ET_definfoenclose_command,
 ET_empty_line,
 ET_raw,
-ET_last_raw_newline,
 ET_empty_line_after_command,
 ET_empty_spaces_after_command,
 ET_spaces_at_end,
diff --git a/tp/Texinfo/XS/parsetexi/element_types.txt 
b/tp/Texinfo/XS/parsetexi/element_types.txt
index b33e8359ce..cd4cf16685 100644
--- a/tp/Texinfo/XS/parsetexi/element_types.txt
+++ b/tp/Texinfo/XS/parsetexi/element_types.txt
@@ -26,7 +26,6 @@ definfoenclose_command
 # For text elements
 empty_line
 raw
-last_raw_newline
 empty_line_after_command
 empty_spaces_after_command
 spaces_at_end
diff --git a/tp/Texinfo/XS/parsetexi/parser.c b/tp/Texinfo/XS/parsetexi/parser.c
index e15d1f43ef..a30758ba6f 100644
--- a/tp/Texinfo/XS/parsetexi/parser.c
+++ b/tp/Texinfo/XS/parsetexi/parser.c
@@ -1132,24 +1132,6 @@ process_remaining_on_line (ELEMENT **current_inout, char 
**line_inout)
               line_warn ("@end %s should only appear at the "
                          "beginning of a line", command_name(end_cmd));
             }
-          else
-            {
-              ELEMENT *last_child = last_contents_child (current);
-              if (last_child
-                   && last_child->type == ET_raw
-                   && current->cmd != CM_verbatim)
-                {
-                  if (last_child->text.end > 0
-                      && last_child->text.text[last_child->text.end - 1] == 
'\n')
-                    {
-                      ELEMENT *lrn;
-                      last_child->text.text[--last_child->text.end] = '\0';
-                      lrn = new_element (ET_last_raw_newline);
-                      text_append (&lrn->text, "\n");
-                      add_to_element_contents (current, lrn);
-                    }
-                }
-            }
 
           /* For macros, define a new macro (unless we are in a nested
              macro definition). */
diff --git a/tp/t/results/conditionals/command_conditionals_user_defined.pl 
b/tp/t/results/conditionals/command_conditionals_user_defined.pl
index 6b0839c1a5..bb9c36950d 100644
--- a/tp/t/results/conditionals/command_conditionals_user_defined.pl
+++ b/tp/t/results/conditionals/command_conditionals_user_defined.pl
@@ -21,14 +21,9 @@ $result_trees{'command_conditionals_user_defined'} = {
           'contents' => [
             {
               'parent' => {},
-              'text' => 'machin',
-              'type' => 'raw'
-            },
-            {
-              'parent' => {},
-              'text' => '
+              'text' => 'machin
 ',
-              'type' => 'last_raw_newline'
+              'type' => 'raw'
             },
             {
               'args' => [
@@ -290,10 +285,9 @@ $result_trees{'command_conditionals_user_defined'} = {
 };
 
$result_trees{'command_conditionals_user_defined'}{'contents'}[0]{'contents'}[0]{'args'}[0]{'parent'}
 = 
$result_trees{'command_conditionals_user_defined'}{'contents'}[0]{'contents'}[0];
 
$result_trees{'command_conditionals_user_defined'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'command_conditionals_user_defined'}{'contents'}[0]{'contents'}[0];
+$result_trees{'command_conditionals_user_defined'}{'contents'}[0]{'contents'}[0]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'command_conditionals_user_defined'}{'contents'}[0]{'contents'}[0]{'contents'}[1]{'args'}[0];
+$result_trees{'command_conditionals_user_defined'}{'contents'}[0]{'contents'}[0]{'contents'}[1]{'args'}[0]{'parent'}
 = 
$result_trees{'command_conditionals_user_defined'}{'contents'}[0]{'contents'}[0]{'contents'}[1];
 
$result_trees{'command_conditionals_user_defined'}{'contents'}[0]{'contents'}[0]{'contents'}[1]{'parent'}
 = 
$result_trees{'command_conditionals_user_defined'}{'contents'}[0]{'contents'}[0];
-$result_trees{'command_conditionals_user_defined'}{'contents'}[0]{'contents'}[0]{'contents'}[2]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'command_conditionals_user_defined'}{'contents'}[0]{'contents'}[0]{'contents'}[2]{'args'}[0];
-$result_trees{'command_conditionals_user_defined'}{'contents'}[0]{'contents'}[0]{'contents'}[2]{'args'}[0]{'parent'}
 = 
$result_trees{'command_conditionals_user_defined'}{'contents'}[0]{'contents'}[0]{'contents'}[2];
-$result_trees{'command_conditionals_user_defined'}{'contents'}[0]{'contents'}[0]{'contents'}[2]{'parent'}
 = 
$result_trees{'command_conditionals_user_defined'}{'contents'}[0]{'contents'}[0];
 
$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]{'contents'}[2]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'command_conditionals_user_defined'}{'contents'}[0]{'contents'}[2]{'args'}[0];
diff --git a/tp/t/results/conditionals/end_ifset_in_format.pl 
b/tp/t/results/conditionals/end_ifset_in_format.pl
index e061fb157f..bf8ba0ce4a 100644
--- a/tp/t/results/conditionals/end_ifset_in_format.pl
+++ b/tp/t/results/conditionals/end_ifset_in_format.pl
@@ -61,14 +61,9 @@ $result_trees{'end_ifset_in_format'} = {
           'contents' => [
             {
               'parent' => {},
-              'text' => '@end ifset',
-              'type' => 'raw'
-            },
-            {
-              'parent' => {},
-              'text' => '
+              'text' => '@end ifset
 ',
-              'type' => 'last_raw_newline'
+              'type' => 'raw'
             },
             {
               'args' => [
@@ -245,10 +240,9 @@ 
$result_trees{'end_ifset_in_format'}{'contents'}[0]{'contents'}[1]{'parent'} = $
 $result_trees{'end_ifset_in_format'}{'contents'}[0]{'contents'}[2]{'parent'} = 
$result_trees{'end_ifset_in_format'}{'contents'}[0];
 
$result_trees{'end_ifset_in_format'}{'contents'}[0]{'contents'}[3]{'args'}[0]{'parent'}
 = $result_trees{'end_ifset_in_format'}{'contents'}[0]{'contents'}[3];
 
$result_trees{'end_ifset_in_format'}{'contents'}[0]{'contents'}[3]{'contents'}[0]{'parent'}
 = $result_trees{'end_ifset_in_format'}{'contents'}[0]{'contents'}[3];
+$result_trees{'end_ifset_in_format'}{'contents'}[0]{'contents'}[3]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'end_ifset_in_format'}{'contents'}[0]{'contents'}[3]{'contents'}[1]{'args'}[0];
+$result_trees{'end_ifset_in_format'}{'contents'}[0]{'contents'}[3]{'contents'}[1]{'args'}[0]{'parent'}
 = 
$result_trees{'end_ifset_in_format'}{'contents'}[0]{'contents'}[3]{'contents'}[1];
 
$result_trees{'end_ifset_in_format'}{'contents'}[0]{'contents'}[3]{'contents'}[1]{'parent'}
 = $result_trees{'end_ifset_in_format'}{'contents'}[0]{'contents'}[3];
-$result_trees{'end_ifset_in_format'}{'contents'}[0]{'contents'}[3]{'contents'}[2]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'end_ifset_in_format'}{'contents'}[0]{'contents'}[3]{'contents'}[2]{'args'}[0];
-$result_trees{'end_ifset_in_format'}{'contents'}[0]{'contents'}[3]{'contents'}[2]{'args'}[0]{'parent'}
 = 
$result_trees{'end_ifset_in_format'}{'contents'}[0]{'contents'}[3]{'contents'}[2];
-$result_trees{'end_ifset_in_format'}{'contents'}[0]{'contents'}[3]{'contents'}[2]{'parent'}
 = $result_trees{'end_ifset_in_format'}{'contents'}[0]{'contents'}[3];
 $result_trees{'end_ifset_in_format'}{'contents'}[0]{'contents'}[3]{'parent'} = 
$result_trees{'end_ifset_in_format'}{'contents'}[0];
 
$result_trees{'end_ifset_in_format'}{'contents'}[0]{'contents'}[4]{'contents'}[0]{'parent'}
 = $result_trees{'end_ifset_in_format'}{'contents'}[0]{'contents'}[4];
 $result_trees{'end_ifset_in_format'}{'contents'}[0]{'contents'}[4]{'parent'} = 
$result_trees{'end_ifset_in_format'}{'contents'}[0];
diff --git a/tp/t/results/conditionals/macro_in_ifset.pl 
b/tp/t/results/conditionals/macro_in_ifset.pl
index f4ec39e099..c8ea3475a4 100644
--- a/tp/t/results/conditionals/macro_in_ifset.pl
+++ b/tp/t/results/conditionals/macro_in_ifset.pl
@@ -27,14 +27,9 @@ $result_trees{'macro_in_ifset'} = {
           'contents' => [
             {
               'parent' => {},
-              'text' => 'truc',
-              'type' => 'raw'
-            },
-            {
-              'parent' => {},
-              'text' => '
+              'text' => 'truc
 ',
-              'type' => 'last_raw_newline'
+              'type' => 'raw'
             },
             {
               'args' => [
@@ -110,10 +105,9 @@ $result_trees{'macro_in_ifset'} = {
 $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]{'args'}[0]{'parent'}
 = $result_trees{'macro_in_ifset'}{'contents'}[0]{'contents'}[1];
 
$result_trees{'macro_in_ifset'}{'contents'}[0]{'contents'}[1]{'contents'}[0]{'parent'}
 = $result_trees{'macro_in_ifset'}{'contents'}[0]{'contents'}[1];
+$result_trees{'macro_in_ifset'}{'contents'}[0]{'contents'}[1]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'macro_in_ifset'}{'contents'}[0]{'contents'}[1]{'contents'}[1]{'args'}[0];
+$result_trees{'macro_in_ifset'}{'contents'}[0]{'contents'}[1]{'contents'}[1]{'args'}[0]{'parent'}
 = $result_trees{'macro_in_ifset'}{'contents'}[0]{'contents'}[1]{'contents'}[1];
 
$result_trees{'macro_in_ifset'}{'contents'}[0]{'contents'}[1]{'contents'}[1]{'parent'}
 = $result_trees{'macro_in_ifset'}{'contents'}[0]{'contents'}[1];
-$result_trees{'macro_in_ifset'}{'contents'}[0]{'contents'}[1]{'contents'}[2]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'macro_in_ifset'}{'contents'}[0]{'contents'}[1]{'contents'}[2]{'args'}[0];
-$result_trees{'macro_in_ifset'}{'contents'}[0]{'contents'}[1]{'contents'}[2]{'args'}[0]{'parent'}
 = $result_trees{'macro_in_ifset'}{'contents'}[0]{'contents'}[1]{'contents'}[2];
-$result_trees{'macro_in_ifset'}{'contents'}[0]{'contents'}[1]{'contents'}[2]{'parent'}
 = $result_trees{'macro_in_ifset'}{'contents'}[0]{'contents'}[1];
 $result_trees{'macro_in_ifset'}{'contents'}[0]{'contents'}[1]{'parent'} = 
$result_trees{'macro_in_ifset'}{'contents'}[0];
 $result_trees{'macro_in_ifset'}{'contents'}[0]{'contents'}[2]{'parent'} = 
$result_trees{'macro_in_ifset'}{'contents'}[0];
 $result_trees{'macro_in_ifset'}{'contents'}[0]{'contents'}[3]{'parent'} = 
$result_trees{'macro_in_ifset'}{'contents'}[0];
diff --git a/tp/t/results/conditionals/macro_in_ifset_set.pl 
b/tp/t/results/conditionals/macro_in_ifset_set.pl
index da731fa856..1ce12d03ca 100644
--- a/tp/t/results/conditionals/macro_in_ifset_set.pl
+++ b/tp/t/results/conditionals/macro_in_ifset_set.pl
@@ -57,14 +57,9 @@ $result_trees{'macro_in_ifset_set'} = {
           'contents' => [
             {
               'parent' => {},
-              'text' => 'truc',
-              'type' => 'raw'
-            },
-            {
-              'parent' => {},
-              'text' => '
+              'text' => 'truc
 ',
-              'type' => 'last_raw_newline'
+              'type' => 'raw'
             },
             {
               'args' => [
@@ -143,14 +138,9 @@ $result_trees{'macro_in_ifset_set'} = {
           'contents' => [
             {
               'parent' => {},
-              'text' => 'in ifset',
-              'type' => 'raw'
-            },
-            {
-              'parent' => {},
-              'text' => '
+              'text' => 'in ifset
 ',
-              'type' => 'last_raw_newline'
+              'type' => 'raw'
             },
             {
               'args' => [
@@ -224,20 +214,18 @@ 
$result_trees{'macro_in_ifset_set'}{'contents'}[0]{'contents'}[1]{'parent'} = $r
 $result_trees{'macro_in_ifset_set'}{'contents'}[0]{'contents'}[2]{'parent'} = 
$result_trees{'macro_in_ifset_set'}{'contents'}[0];
 
$result_trees{'macro_in_ifset_set'}{'contents'}[0]{'contents'}[3]{'args'}[0]{'parent'}
 = $result_trees{'macro_in_ifset_set'}{'contents'}[0]{'contents'}[3];
 
$result_trees{'macro_in_ifset_set'}{'contents'}[0]{'contents'}[3]{'contents'}[0]{'parent'}
 = $result_trees{'macro_in_ifset_set'}{'contents'}[0]{'contents'}[3];
+$result_trees{'macro_in_ifset_set'}{'contents'}[0]{'contents'}[3]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'macro_in_ifset_set'}{'contents'}[0]{'contents'}[3]{'contents'}[1]{'args'}[0];
+$result_trees{'macro_in_ifset_set'}{'contents'}[0]{'contents'}[3]{'contents'}[1]{'args'}[0]{'parent'}
 = 
$result_trees{'macro_in_ifset_set'}{'contents'}[0]{'contents'}[3]{'contents'}[1];
 
$result_trees{'macro_in_ifset_set'}{'contents'}[0]{'contents'}[3]{'contents'}[1]{'parent'}
 = $result_trees{'macro_in_ifset_set'}{'contents'}[0]{'contents'}[3];
-$result_trees{'macro_in_ifset_set'}{'contents'}[0]{'contents'}[3]{'contents'}[2]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'macro_in_ifset_set'}{'contents'}[0]{'contents'}[3]{'contents'}[2]{'args'}[0];
-$result_trees{'macro_in_ifset_set'}{'contents'}[0]{'contents'}[3]{'contents'}[2]{'args'}[0]{'parent'}
 = 
$result_trees{'macro_in_ifset_set'}{'contents'}[0]{'contents'}[3]{'contents'}[2];
-$result_trees{'macro_in_ifset_set'}{'contents'}[0]{'contents'}[3]{'contents'}[2]{'parent'}
 = $result_trees{'macro_in_ifset_set'}{'contents'}[0]{'contents'}[3];
 $result_trees{'macro_in_ifset_set'}{'contents'}[0]{'contents'}[3]{'parent'} = 
$result_trees{'macro_in_ifset_set'}{'contents'}[0];
 $result_trees{'macro_in_ifset_set'}{'contents'}[0]{'contents'}[4]{'parent'} = 
$result_trees{'macro_in_ifset_set'}{'contents'}[0];
 
$result_trees{'macro_in_ifset_set'}{'contents'}[0]{'contents'}[5]{'args'}[0]{'parent'}
 = $result_trees{'macro_in_ifset_set'}{'contents'}[0]{'contents'}[5];
 $result_trees{'macro_in_ifset_set'}{'contents'}[0]{'contents'}[5]{'parent'} = 
$result_trees{'macro_in_ifset_set'}{'contents'}[0];
 
$result_trees{'macro_in_ifset_set'}{'contents'}[0]{'contents'}[6]{'args'}[0]{'parent'}
 = $result_trees{'macro_in_ifset_set'}{'contents'}[0]{'contents'}[6];
 
$result_trees{'macro_in_ifset_set'}{'contents'}[0]{'contents'}[6]{'contents'}[0]{'parent'}
 = $result_trees{'macro_in_ifset_set'}{'contents'}[0]{'contents'}[6];
+$result_trees{'macro_in_ifset_set'}{'contents'}[0]{'contents'}[6]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'macro_in_ifset_set'}{'contents'}[0]{'contents'}[6]{'contents'}[1]{'args'}[0];
+$result_trees{'macro_in_ifset_set'}{'contents'}[0]{'contents'}[6]{'contents'}[1]{'args'}[0]{'parent'}
 = 
$result_trees{'macro_in_ifset_set'}{'contents'}[0]{'contents'}[6]{'contents'}[1];
 
$result_trees{'macro_in_ifset_set'}{'contents'}[0]{'contents'}[6]{'contents'}[1]{'parent'}
 = $result_trees{'macro_in_ifset_set'}{'contents'}[0]{'contents'}[6];
-$result_trees{'macro_in_ifset_set'}{'contents'}[0]{'contents'}[6]{'contents'}[2]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'macro_in_ifset_set'}{'contents'}[0]{'contents'}[6]{'contents'}[2]{'args'}[0];
-$result_trees{'macro_in_ifset_set'}{'contents'}[0]{'contents'}[6]{'contents'}[2]{'args'}[0]{'parent'}
 = 
$result_trees{'macro_in_ifset_set'}{'contents'}[0]{'contents'}[6]{'contents'}[2];
-$result_trees{'macro_in_ifset_set'}{'contents'}[0]{'contents'}[6]{'contents'}[2]{'parent'}
 = $result_trees{'macro_in_ifset_set'}{'contents'}[0]{'contents'}[6];
 $result_trees{'macro_in_ifset_set'}{'contents'}[0]{'contents'}[6]{'parent'} = 
$result_trees{'macro_in_ifset_set'}{'contents'}[0];
 $result_trees{'macro_in_ifset_set'}{'contents'}[0]{'contents'}[7]{'parent'} = 
$result_trees{'macro_in_ifset_set'}{'contents'}[0];
 
$result_trees{'macro_in_ifset_set'}{'contents'}[0]{'contents'}[8]{'contents'}[0]{'parent'}
 = $result_trees{'macro_in_ifset_set'}{'contents'}[0]{'contents'}[8];
diff --git a/tp/t/results/conditionals/nested_ifset_ifclear.pl 
b/tp/t/results/conditionals/nested_ifset_ifclear.pl
index 15a6723c32..d311a0cd7e 100644
--- a/tp/t/results/conditionals/nested_ifset_ifclear.pl
+++ b/tp/t/results/conditionals/nested_ifset_ifclear.pl
@@ -69,14 +69,9 @@ $result_trees{'nested_ifset_ifclear'} = {
             },
             {
               'parent' => {},
-              'text' => '@end ifset',
-              'type' => 'raw'
-            },
-            {
-              'parent' => {},
-              'text' => '
+              'text' => '@end ifset
 ',
-              'type' => 'last_raw_newline'
+              'type' => 'raw'
             },
             {
               'args' => [
@@ -350,10 +345,9 @@ 
$result_trees{'nested_ifset_ifclear'}{'contents'}[0]{'contents'}[1]{'contents'}[
 
$result_trees{'nested_ifset_ifclear'}{'contents'}[0]{'contents'}[1]{'contents'}[5]{'parent'}
 = $result_trees{'nested_ifset_ifclear'}{'contents'}[0]{'contents'}[1];
 
$result_trees{'nested_ifset_ifclear'}{'contents'}[0]{'contents'}[1]{'contents'}[6]{'parent'}
 = $result_trees{'nested_ifset_ifclear'}{'contents'}[0]{'contents'}[1];
 
$result_trees{'nested_ifset_ifclear'}{'contents'}[0]{'contents'}[1]{'contents'}[7]{'parent'}
 = $result_trees{'nested_ifset_ifclear'}{'contents'}[0]{'contents'}[1];
+$result_trees{'nested_ifset_ifclear'}{'contents'}[0]{'contents'}[1]{'contents'}[8]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'nested_ifset_ifclear'}{'contents'}[0]{'contents'}[1]{'contents'}[8]{'args'}[0];
+$result_trees{'nested_ifset_ifclear'}{'contents'}[0]{'contents'}[1]{'contents'}[8]{'args'}[0]{'parent'}
 = 
$result_trees{'nested_ifset_ifclear'}{'contents'}[0]{'contents'}[1]{'contents'}[8];
 
$result_trees{'nested_ifset_ifclear'}{'contents'}[0]{'contents'}[1]{'contents'}[8]{'parent'}
 = $result_trees{'nested_ifset_ifclear'}{'contents'}[0]{'contents'}[1];
-$result_trees{'nested_ifset_ifclear'}{'contents'}[0]{'contents'}[1]{'contents'}[9]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'nested_ifset_ifclear'}{'contents'}[0]{'contents'}[1]{'contents'}[9]{'args'}[0];
-$result_trees{'nested_ifset_ifclear'}{'contents'}[0]{'contents'}[1]{'contents'}[9]{'args'}[0]{'parent'}
 = 
$result_trees{'nested_ifset_ifclear'}{'contents'}[0]{'contents'}[1]{'contents'}[9];
-$result_trees{'nested_ifset_ifclear'}{'contents'}[0]{'contents'}[1]{'contents'}[9]{'parent'}
 = $result_trees{'nested_ifset_ifclear'}{'contents'}[0]{'contents'}[1];
 $result_trees{'nested_ifset_ifclear'}{'contents'}[0]{'contents'}[1]{'parent'} 
= $result_trees{'nested_ifset_ifclear'}{'contents'}[0];
 $result_trees{'nested_ifset_ifclear'}{'contents'}[0]{'contents'}[2]{'parent'} 
= $result_trees{'nested_ifset_ifclear'}{'contents'}[0];
 
$result_trees{'nested_ifset_ifclear'}{'contents'}[0]{'contents'}[3]{'args'}[0]{'parent'}
 = $result_trees{'nested_ifset_ifclear'}{'contents'}[0]{'contents'}[3];
diff --git a/tp/t/results/conditionals/nested_ignore.pl 
b/tp/t/results/conditionals/nested_ignore.pl
index 7ea078c35b..a6be3715c3 100644
--- a/tp/t/results/conditionals/nested_ignore.pl
+++ b/tp/t/results/conditionals/nested_ignore.pl
@@ -29,16 +29,11 @@ $result_trees{'nested_ignore'} = {
 ',
               'type' => 'raw'
             },
-            {
-              'parent' => {},
-              'text' => '',
-              'type' => 'raw'
-            },
             {
               'parent' => {},
               'text' => '
 ',
-              'type' => 'last_raw_newline'
+              'type' => 'raw'
             },
             {
               'args' => [
@@ -105,14 +100,9 @@ $result_trees{'nested_ignore'} = {
             },
             {
               'parent' => {},
-              'text' => '@ifinfo',
-              'type' => 'raw'
-            },
-            {
-              'parent' => {},
-              'text' => '
+              'text' => '@ifinfo
 ',
-              'type' => 'last_raw_newline'
+              'type' => 'raw'
             },
             {
               'args' => [
@@ -179,14 +169,9 @@ $result_trees{'nested_ignore'} = {
             },
             {
               'parent' => {},
-              'text' => '@ifclear',
-              'type' => 'raw'
-            },
-            {
-              'parent' => {},
-              'text' => '
+              'text' => '@ifclear
 ',
-              'type' => 'last_raw_newline'
+              'type' => 'raw'
             },
             {
               'args' => [
@@ -235,28 +220,25 @@ $result_trees{'nested_ignore'} = {
 
$result_trees{'nested_ignore'}{'contents'}[0]{'contents'}[0]{'args'}[0]{'parent'}
 = $result_trees{'nested_ignore'}{'contents'}[0]{'contents'}[0];
 
$result_trees{'nested_ignore'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'parent'}
 = $result_trees{'nested_ignore'}{'contents'}[0]{'contents'}[0];
 
$result_trees{'nested_ignore'}{'contents'}[0]{'contents'}[0]{'contents'}[1]{'parent'}
 = $result_trees{'nested_ignore'}{'contents'}[0]{'contents'}[0];
+$result_trees{'nested_ignore'}{'contents'}[0]{'contents'}[0]{'contents'}[2]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'nested_ignore'}{'contents'}[0]{'contents'}[0]{'contents'}[2]{'args'}[0];
+$result_trees{'nested_ignore'}{'contents'}[0]{'contents'}[0]{'contents'}[2]{'args'}[0]{'parent'}
 = $result_trees{'nested_ignore'}{'contents'}[0]{'contents'}[0]{'contents'}[2];
 
$result_trees{'nested_ignore'}{'contents'}[0]{'contents'}[0]{'contents'}[2]{'parent'}
 = $result_trees{'nested_ignore'}{'contents'}[0]{'contents'}[0];
-$result_trees{'nested_ignore'}{'contents'}[0]{'contents'}[0]{'contents'}[3]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'nested_ignore'}{'contents'}[0]{'contents'}[0]{'contents'}[3]{'args'}[0];
-$result_trees{'nested_ignore'}{'contents'}[0]{'contents'}[0]{'contents'}[3]{'args'}[0]{'parent'}
 = $result_trees{'nested_ignore'}{'contents'}[0]{'contents'}[0]{'contents'}[3];
-$result_trees{'nested_ignore'}{'contents'}[0]{'contents'}[0]{'contents'}[3]{'parent'}
 = $result_trees{'nested_ignore'}{'contents'}[0]{'contents'}[0];
 $result_trees{'nested_ignore'}{'contents'}[0]{'contents'}[0]{'parent'} = 
$result_trees{'nested_ignore'}{'contents'}[0];
 $result_trees{'nested_ignore'}{'contents'}[0]{'contents'}[1]{'parent'} = 
$result_trees{'nested_ignore'}{'contents'}[0];
 
$result_trees{'nested_ignore'}{'contents'}[0]{'contents'}[2]{'args'}[0]{'parent'}
 = $result_trees{'nested_ignore'}{'contents'}[0]{'contents'}[2];
 
$result_trees{'nested_ignore'}{'contents'}[0]{'contents'}[2]{'contents'}[0]{'parent'}
 = $result_trees{'nested_ignore'}{'contents'}[0]{'contents'}[2];
 
$result_trees{'nested_ignore'}{'contents'}[0]{'contents'}[2]{'contents'}[1]{'parent'}
 = $result_trees{'nested_ignore'}{'contents'}[0]{'contents'}[2];
+$result_trees{'nested_ignore'}{'contents'}[0]{'contents'}[2]{'contents'}[2]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'nested_ignore'}{'contents'}[0]{'contents'}[2]{'contents'}[2]{'args'}[0];
+$result_trees{'nested_ignore'}{'contents'}[0]{'contents'}[2]{'contents'}[2]{'args'}[0]{'parent'}
 = $result_trees{'nested_ignore'}{'contents'}[0]{'contents'}[2]{'contents'}[2];
 
$result_trees{'nested_ignore'}{'contents'}[0]{'contents'}[2]{'contents'}[2]{'parent'}
 = $result_trees{'nested_ignore'}{'contents'}[0]{'contents'}[2];
-$result_trees{'nested_ignore'}{'contents'}[0]{'contents'}[2]{'contents'}[3]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'nested_ignore'}{'contents'}[0]{'contents'}[2]{'contents'}[3]{'args'}[0];
-$result_trees{'nested_ignore'}{'contents'}[0]{'contents'}[2]{'contents'}[3]{'args'}[0]{'parent'}
 = $result_trees{'nested_ignore'}{'contents'}[0]{'contents'}[2]{'contents'}[3];
-$result_trees{'nested_ignore'}{'contents'}[0]{'contents'}[2]{'contents'}[3]{'parent'}
 = $result_trees{'nested_ignore'}{'contents'}[0]{'contents'}[2];
 $result_trees{'nested_ignore'}{'contents'}[0]{'contents'}[2]{'parent'} = 
$result_trees{'nested_ignore'}{'contents'}[0];
 $result_trees{'nested_ignore'}{'contents'}[0]{'contents'}[3]{'parent'} = 
$result_trees{'nested_ignore'}{'contents'}[0];
 
$result_trees{'nested_ignore'}{'contents'}[0]{'contents'}[4]{'args'}[0]{'parent'}
 = $result_trees{'nested_ignore'}{'contents'}[0]{'contents'}[4];
 
$result_trees{'nested_ignore'}{'contents'}[0]{'contents'}[4]{'contents'}[0]{'parent'}
 = $result_trees{'nested_ignore'}{'contents'}[0]{'contents'}[4];
 
$result_trees{'nested_ignore'}{'contents'}[0]{'contents'}[4]{'contents'}[1]{'parent'}
 = $result_trees{'nested_ignore'}{'contents'}[0]{'contents'}[4];
+$result_trees{'nested_ignore'}{'contents'}[0]{'contents'}[4]{'contents'}[2]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'nested_ignore'}{'contents'}[0]{'contents'}[4]{'contents'}[2]{'args'}[0];
+$result_trees{'nested_ignore'}{'contents'}[0]{'contents'}[4]{'contents'}[2]{'args'}[0]{'parent'}
 = $result_trees{'nested_ignore'}{'contents'}[0]{'contents'}[4]{'contents'}[2];
 
$result_trees{'nested_ignore'}{'contents'}[0]{'contents'}[4]{'contents'}[2]{'parent'}
 = $result_trees{'nested_ignore'}{'contents'}[0]{'contents'}[4];
-$result_trees{'nested_ignore'}{'contents'}[0]{'contents'}[4]{'contents'}[3]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'nested_ignore'}{'contents'}[0]{'contents'}[4]{'contents'}[3]{'args'}[0];
-$result_trees{'nested_ignore'}{'contents'}[0]{'contents'}[4]{'contents'}[3]{'args'}[0]{'parent'}
 = $result_trees{'nested_ignore'}{'contents'}[0]{'contents'}[4]{'contents'}[3];
-$result_trees{'nested_ignore'}{'contents'}[0]{'contents'}[4]{'contents'}[3]{'parent'}
 = $result_trees{'nested_ignore'}{'contents'}[0]{'contents'}[4];
 $result_trees{'nested_ignore'}{'contents'}[0]{'contents'}[4]{'parent'} = 
$result_trees{'nested_ignore'}{'contents'}[0];
 $result_trees{'nested_ignore'}{'contents'}[0]{'parent'} = 
$result_trees{'nested_ignore'};
 
diff --git a/tp/t/results/conditionals/user_defined_txiinternalvalue.pl 
b/tp/t/results/conditionals/user_defined_txiinternalvalue.pl
index 3a9b926378..4d10f6385b 100644
--- a/tp/t/results/conditionals/user_defined_txiinternalvalue.pl
+++ b/tp/t/results/conditionals/user_defined_txiinternalvalue.pl
@@ -21,14 +21,9 @@ $result_trees{'user_defined_txiinternalvalue'} = {
           'contents' => [
             {
               'parent' => {},
-              'text' => 'user internalvalue',
-              'type' => 'raw'
-            },
-            {
-              'parent' => {},
-              'text' => '
+              'text' => 'user internalvalue
 ',
-              'type' => 'last_raw_newline'
+              'type' => 'raw'
             },
             {
               'args' => [
@@ -97,10 +92,9 @@ $result_trees{'user_defined_txiinternalvalue'} = {
 };
 
$result_trees{'user_defined_txiinternalvalue'}{'contents'}[0]{'contents'}[0]{'args'}[0]{'parent'}
 = $result_trees{'user_defined_txiinternalvalue'}{'contents'}[0]{'contents'}[0];
 
$result_trees{'user_defined_txiinternalvalue'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'parent'}
 = $result_trees{'user_defined_txiinternalvalue'}{'contents'}[0]{'contents'}[0];
+$result_trees{'user_defined_txiinternalvalue'}{'contents'}[0]{'contents'}[0]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'user_defined_txiinternalvalue'}{'contents'}[0]{'contents'}[0]{'contents'}[1]{'args'}[0];
+$result_trees{'user_defined_txiinternalvalue'}{'contents'}[0]{'contents'}[0]{'contents'}[1]{'args'}[0]{'parent'}
 = 
$result_trees{'user_defined_txiinternalvalue'}{'contents'}[0]{'contents'}[0]{'contents'}[1];
 
$result_trees{'user_defined_txiinternalvalue'}{'contents'}[0]{'contents'}[0]{'contents'}[1]{'parent'}
 = $result_trees{'user_defined_txiinternalvalue'}{'contents'}[0]{'contents'}[0];
-$result_trees{'user_defined_txiinternalvalue'}{'contents'}[0]{'contents'}[0]{'contents'}[2]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'user_defined_txiinternalvalue'}{'contents'}[0]{'contents'}[0]{'contents'}[2]{'args'}[0];
-$result_trees{'user_defined_txiinternalvalue'}{'contents'}[0]{'contents'}[0]{'contents'}[2]{'args'}[0]{'parent'}
 = 
$result_trees{'user_defined_txiinternalvalue'}{'contents'}[0]{'contents'}[0]{'contents'}[2];
-$result_trees{'user_defined_txiinternalvalue'}{'contents'}[0]{'contents'}[0]{'contents'}[2]{'parent'}
 = $result_trees{'user_defined_txiinternalvalue'}{'contents'}[0]{'contents'}[0];
 
$result_trees{'user_defined_txiinternalvalue'}{'contents'}[0]{'contents'}[0]{'parent'}
 = $result_trees{'user_defined_txiinternalvalue'}{'contents'}[0];
 
$result_trees{'user_defined_txiinternalvalue'}{'contents'}[0]{'contents'}[1]{'parent'}
 = $result_trees{'user_defined_txiinternalvalue'}{'contents'}[0];
 
$result_trees{'user_defined_txiinternalvalue'}{'contents'}[0]{'contents'}[2]{'contents'}[0]{'parent'}
 = $result_trees{'user_defined_txiinternalvalue'}{'contents'}[0]{'contents'}[2];
diff --git a/tp/t/results/converters_tests/at_commands_in_raw.pl 
b/tp/t/results/converters_tests/at_commands_in_raw.pl
index 0f2ffc9ac6..700840938c 100644
--- a/tp/t/results/converters_tests/at_commands_in_raw.pl
+++ b/tp/t/results/converters_tests/at_commands_in_raw.pl
@@ -90,14 +90,9 @@ $result_trees{'at_commands_in_raw'} = {
           'contents' => [
             {
               'parent' => {},
-              'text' => 'Other macro',
-              'type' => 'raw'
-            },
-            {
-              'parent' => {},
-              'text' => '
+              'text' => 'Other macro
 ',
-              'type' => 'last_raw_newline'
+              'type' => 'raw'
             },
             {
               'args' => [
@@ -948,10 +943,9 @@ 
$result_trees{'at_commands_in_raw'}{'contents'}[2]{'args'}[0]{'parent'} = $resul
 $result_trees{'at_commands_in_raw'}{'contents'}[2]{'contents'}[0]{'parent'} = 
$result_trees{'at_commands_in_raw'}{'contents'}[2];
 
$result_trees{'at_commands_in_raw'}{'contents'}[2]{'contents'}[1]{'args'}[0]{'parent'}
 = $result_trees{'at_commands_in_raw'}{'contents'}[2]{'contents'}[1];
 
$result_trees{'at_commands_in_raw'}{'contents'}[2]{'contents'}[1]{'contents'}[0]{'parent'}
 = $result_trees{'at_commands_in_raw'}{'contents'}[2]{'contents'}[1];
+$result_trees{'at_commands_in_raw'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'at_commands_in_raw'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'args'}[0];
+$result_trees{'at_commands_in_raw'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'args'}[0]{'parent'}
 = 
$result_trees{'at_commands_in_raw'}{'contents'}[2]{'contents'}[1]{'contents'}[1];
 
$result_trees{'at_commands_in_raw'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'parent'}
 = $result_trees{'at_commands_in_raw'}{'contents'}[2]{'contents'}[1];
-$result_trees{'at_commands_in_raw'}{'contents'}[2]{'contents'}[1]{'contents'}[2]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'at_commands_in_raw'}{'contents'}[2]{'contents'}[1]{'contents'}[2]{'args'}[0];
-$result_trees{'at_commands_in_raw'}{'contents'}[2]{'contents'}[1]{'contents'}[2]{'args'}[0]{'parent'}
 = 
$result_trees{'at_commands_in_raw'}{'contents'}[2]{'contents'}[1]{'contents'}[2];
-$result_trees{'at_commands_in_raw'}{'contents'}[2]{'contents'}[1]{'contents'}[2]{'parent'}
 = $result_trees{'at_commands_in_raw'}{'contents'}[2]{'contents'}[1];
 $result_trees{'at_commands_in_raw'}{'contents'}[2]{'contents'}[1]{'parent'} = 
$result_trees{'at_commands_in_raw'}{'contents'}[2];
 $result_trees{'at_commands_in_raw'}{'contents'}[2]{'contents'}[2]{'parent'} = 
$result_trees{'at_commands_in_raw'}{'contents'}[2];
 $result_trees{'at_commands_in_raw'}{'contents'}[2]{'parent'} = 
$result_trees{'at_commands_in_raw'};
diff --git a/tp/t/results/coverage_braces/test_image.pl 
b/tp/t/results/coverage_braces/test_image.pl
index b17831939b..36b94776e9 100644
--- a/tp/t/results/coverage_braces/test_image.pl
+++ b/tp/t/results/coverage_braces/test_image.pl
@@ -33,14 +33,9 @@ $result_trees{'test_image'} = {
             },
             {
               'parent' => {},
-              'text' => 'In text @image{f@@i--le@/.@.  a@@<"%@@@verb{:  < & @ 
% " :} ,1in, 1cm, alt @b{@^{@dotless{i}}--le@/.@.}  a@*<"%@@@verb{:  < & @ % " 
:}  ,.ext@@i--le@/.@.  a@@<"%@@@verb{:  < & @ % " :}}.',
-              'type' => 'raw'
-            },
-            {
-              'parent' => {},
-              'text' => '
+              'text' => 'In text @image{f@@i--le@/.@.  a@@<"%@@@verb{:  < & @ 
% " :} ,1in, 1cm, alt @b{@^{@dotless{i}}--le@/.@.}  a@*<"%@@@verb{:  < & @ % " 
:}  ,.ext@@i--le@/.@.  a@@<"%@@@verb{:  < & @ % " :}}.
 ',
-              'type' => 'last_raw_newline'
+              'type' => 'raw'
             },
             {
               'args' => [
@@ -3061,10 +3056,9 @@ 
$result_trees{'test_image'}{'contents'}[0]{'contents'}[0]{'args'}[0]{'parent'} =
 
$result_trees{'test_image'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'parent'}
 = $result_trees{'test_image'}{'contents'}[0]{'contents'}[0];
 
$result_trees{'test_image'}{'contents'}[0]{'contents'}[0]{'contents'}[1]{'parent'}
 = $result_trees{'test_image'}{'contents'}[0]{'contents'}[0];
 
$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]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'test_image'}{'contents'}[0]{'contents'}[0]{'contents'}[3]{'args'}[0];
+$result_trees{'test_image'}{'contents'}[0]{'contents'}[0]{'contents'}[3]{'args'}[0]{'parent'}
 = $result_trees{'test_image'}{'contents'}[0]{'contents'}[0]{'contents'}[3];
 
$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]{'contents'}[4]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'test_image'}{'contents'}[0]{'contents'}[0]{'contents'}[4]{'args'}[0];
-$result_trees{'test_image'}{'contents'}[0]{'contents'}[0]{'contents'}[4]{'args'}[0]{'parent'}
 = $result_trees{'test_image'}{'contents'}[0]{'contents'}[0]{'contents'}[4];
-$result_trees{'test_image'}{'contents'}[0]{'contents'}[0]{'contents'}[4]{'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]{'parent'} = 
$result_trees{'test_image'}{'contents'}[0];
 $result_trees{'test_image'}{'contents'}[0]{'contents'}[2]{'args'}[0]{'parent'} 
= $result_trees{'test_image'}{'contents'}[0]{'contents'}[2];
diff --git a/tp/t/results/formatting/texi_bib_example.pl 
b/tp/t/results/formatting/texi_bib_example.pl
index 26f914d233..e380400dd3 100644
--- a/tp/t/results/formatting/texi_bib_example.pl
+++ b/tp/t/results/formatting/texi_bib_example.pl
@@ -2965,14 +2965,9 @@ $result_trees{'texi_bib_example'} = {
               'contents' => [
                 {
                   'parent' => {},
-                  'text' => '@set mybibrefnode \\node\\',
-                  'type' => 'raw'
-                },
-                {
-                  'parent' => {},
-                  'text' => '
+                  'text' => '@set mybibrefnode \\node\\
 ',
-                  'type' => 'last_raw_newline'
+                  'type' => 'raw'
                 },
                 {
                   'args' => [
@@ -3075,14 +3070,9 @@ $result_trees{'texi_bib_example'} = {
               'contents' => [
                 {
                   'parent' => {},
-                  'text' => '@value{mybibrefnode}',
-                  'type' => 'raw'
-                },
-                {
-                  'parent' => {},
-                  'text' => '
+                  'text' => '@value{mybibrefnode}
 ',
-                  'type' => 'last_raw_newline'
+                  'type' => 'raw'
                 },
                 {
                   'args' => [
@@ -3214,14 +3204,9 @@ $result_trees{'texi_bib_example'} = {
                 },
                 {
                   'parent' => {},
-                  'text' => '@mybibsetrefnode{\\node\\}',
-                  'type' => 'raw'
-                },
-                {
-                  'parent' => {},
-                  'text' => '
+                  'text' => '@mybibsetrefnode{\\node\\}
 ',
-                  'type' => 'last_raw_newline'
+                  'type' => 'raw'
                 },
                 {
                   'args' => [
@@ -3353,14 +3338,9 @@ $result_trees{'texi_bib_example'} = {
                 },
                 {
                   'parent' => {},
-                  'text' => '@mybibsetrefnode{\\node\\}',
-                  'type' => 'raw'
-                },
-                {
-                  'parent' => {},
-                  'text' => '
+                  'text' => '@mybibsetrefnode{\\node\\}
 ',
-                  'type' => 'last_raw_newline'
+                  'type' => 'raw'
                 },
                 {
                   'args' => [
@@ -3496,16 +3476,11 @@ $result_trees{'texi_bib_example'} = {
 ',
                   'type' => 'raw'
                 },
-                {
-                  'parent' => {},
-                  'text' => '',
-                  'type' => 'raw'
-                },
                 {
                   'parent' => {},
                   'text' => '
 ',
-                  'type' => 'last_raw_newline'
+                  'type' => 'raw'
                 },
                 {
                   'args' => [
@@ -3576,14 +3551,9 @@ $result_trees{'texi_bib_example'} = {
               'contents' => [
                 {
                   'parent' => {},
-                  'text' => '(See item [\\ref\\] in @ref{\\node\\, \\ref\\}.)',
-                  'type' => 'raw'
-                },
-                {
-                  'parent' => {},
-                  'text' => '
+                  'text' => '(See item [\\ref\\] in @ref{\\node\\, \\ref\\}.)
 ',
-                  'type' => 'last_raw_newline'
+                  'type' => 'raw'
                 },
                 {
                   'args' => [
@@ -3749,16 +3719,11 @@ $result_trees{'texi_bib_example'} = {
 ',
                   'type' => 'raw'
                 },
-                {
-                  'parent' => {},
-                  'text' => '',
-                  'type' => 'raw'
-                },
                 {
                   'parent' => {},
                   'text' => '
 ',
-                  'type' => 'last_raw_newline'
+                  'type' => 'raw'
                 },
                 {
                   'args' => [
@@ -4976,10 +4941,9 @@ 
$result_trees{'texi_bib_example'}{'contents'}[0]{'contents'}[1]{'contents'}[163]
 
$result_trees{'texi_bib_example'}{'contents'}[0]{'contents'}[1]{'contents'}[164]{'args'}[0]{'parent'}
 = 
$result_trees{'texi_bib_example'}{'contents'}[0]{'contents'}[1]{'contents'}[164];
 
$result_trees{'texi_bib_example'}{'contents'}[0]{'contents'}[1]{'contents'}[164]{'args'}[1]{'parent'}
 = 
$result_trees{'texi_bib_example'}{'contents'}[0]{'contents'}[1]{'contents'}[164];
 
$result_trees{'texi_bib_example'}{'contents'}[0]{'contents'}[1]{'contents'}[164]{'contents'}[0]{'parent'}
 = 
$result_trees{'texi_bib_example'}{'contents'}[0]{'contents'}[1]{'contents'}[164];
+$result_trees{'texi_bib_example'}{'contents'}[0]{'contents'}[1]{'contents'}[164]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'texi_bib_example'}{'contents'}[0]{'contents'}[1]{'contents'}[164]{'contents'}[1]{'args'}[0];
+$result_trees{'texi_bib_example'}{'contents'}[0]{'contents'}[1]{'contents'}[164]{'contents'}[1]{'args'}[0]{'parent'}
 = 
$result_trees{'texi_bib_example'}{'contents'}[0]{'contents'}[1]{'contents'}[164]{'contents'}[1];
 
$result_trees{'texi_bib_example'}{'contents'}[0]{'contents'}[1]{'contents'}[164]{'contents'}[1]{'parent'}
 = 
$result_trees{'texi_bib_example'}{'contents'}[0]{'contents'}[1]{'contents'}[164];
-$result_trees{'texi_bib_example'}{'contents'}[0]{'contents'}[1]{'contents'}[164]{'contents'}[2]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'texi_bib_example'}{'contents'}[0]{'contents'}[1]{'contents'}[164]{'contents'}[2]{'args'}[0];
-$result_trees{'texi_bib_example'}{'contents'}[0]{'contents'}[1]{'contents'}[164]{'contents'}[2]{'args'}[0]{'parent'}
 = 
$result_trees{'texi_bib_example'}{'contents'}[0]{'contents'}[1]{'contents'}[164]{'contents'}[2];
-$result_trees{'texi_bib_example'}{'contents'}[0]{'contents'}[1]{'contents'}[164]{'contents'}[2]{'parent'}
 = 
$result_trees{'texi_bib_example'}{'contents'}[0]{'contents'}[1]{'contents'}[164];
 
$result_trees{'texi_bib_example'}{'contents'}[0]{'contents'}[1]{'contents'}[164]{'parent'}
 = $result_trees{'texi_bib_example'}{'contents'}[0]{'contents'}[1];
 
$result_trees{'texi_bib_example'}{'contents'}[0]{'contents'}[1]{'contents'}[165]{'parent'}
 = $result_trees{'texi_bib_example'}{'contents'}[0]{'contents'}[1];
 
$result_trees{'texi_bib_example'}{'contents'}[0]{'contents'}[1]{'contents'}[166]{'args'}[0]{'parent'}
 = 
$result_trees{'texi_bib_example'}{'contents'}[0]{'contents'}[1]{'contents'}[166];
@@ -4989,10 +4953,9 @@ 
$result_trees{'texi_bib_example'}{'contents'}[0]{'contents'}[1]{'contents'}[167]
 
$result_trees{'texi_bib_example'}{'contents'}[0]{'contents'}[1]{'contents'}[168]{'parent'}
 = $result_trees{'texi_bib_example'}{'contents'}[0]{'contents'}[1];
 
$result_trees{'texi_bib_example'}{'contents'}[0]{'contents'}[1]{'contents'}[169]{'args'}[0]{'parent'}
 = 
$result_trees{'texi_bib_example'}{'contents'}[0]{'contents'}[1]{'contents'}[169];
 
$result_trees{'texi_bib_example'}{'contents'}[0]{'contents'}[1]{'contents'}[169]{'contents'}[0]{'parent'}
 = 
$result_trees{'texi_bib_example'}{'contents'}[0]{'contents'}[1]{'contents'}[169];
+$result_trees{'texi_bib_example'}{'contents'}[0]{'contents'}[1]{'contents'}[169]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'texi_bib_example'}{'contents'}[0]{'contents'}[1]{'contents'}[169]{'contents'}[1]{'args'}[0];
+$result_trees{'texi_bib_example'}{'contents'}[0]{'contents'}[1]{'contents'}[169]{'contents'}[1]{'args'}[0]{'parent'}
 = 
$result_trees{'texi_bib_example'}{'contents'}[0]{'contents'}[1]{'contents'}[169]{'contents'}[1];
 
$result_trees{'texi_bib_example'}{'contents'}[0]{'contents'}[1]{'contents'}[169]{'contents'}[1]{'parent'}
 = 
$result_trees{'texi_bib_example'}{'contents'}[0]{'contents'}[1]{'contents'}[169];
-$result_trees{'texi_bib_example'}{'contents'}[0]{'contents'}[1]{'contents'}[169]{'contents'}[2]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'texi_bib_example'}{'contents'}[0]{'contents'}[1]{'contents'}[169]{'contents'}[2]{'args'}[0];
-$result_trees{'texi_bib_example'}{'contents'}[0]{'contents'}[1]{'contents'}[169]{'contents'}[2]{'args'}[0]{'parent'}
 = 
$result_trees{'texi_bib_example'}{'contents'}[0]{'contents'}[1]{'contents'}[169]{'contents'}[2];
-$result_trees{'texi_bib_example'}{'contents'}[0]{'contents'}[1]{'contents'}[169]{'contents'}[2]{'parent'}
 = 
$result_trees{'texi_bib_example'}{'contents'}[0]{'contents'}[1]{'contents'}[169];
 
$result_trees{'texi_bib_example'}{'contents'}[0]{'contents'}[1]{'contents'}[169]{'parent'}
 = $result_trees{'texi_bib_example'}{'contents'}[0]{'contents'}[1];
 
$result_trees{'texi_bib_example'}{'contents'}[0]{'contents'}[1]{'contents'}[170]{'parent'}
 = $result_trees{'texi_bib_example'}{'contents'}[0]{'contents'}[1];
 
$result_trees{'texi_bib_example'}{'contents'}[0]{'contents'}[1]{'contents'}[171]{'args'}[0]{'parent'}
 = 
$result_trees{'texi_bib_example'}{'contents'}[0]{'contents'}[1]{'contents'}[171];
@@ -5007,10 +4970,9 @@ 
$result_trees{'texi_bib_example'}{'contents'}[0]{'contents'}[1]{'contents'}[174]
 
$result_trees{'texi_bib_example'}{'contents'}[0]{'contents'}[1]{'contents'}[174]{'contents'}[2]{'parent'}
 = 
$result_trees{'texi_bib_example'}{'contents'}[0]{'contents'}[1]{'contents'}[174];
 
$result_trees{'texi_bib_example'}{'contents'}[0]{'contents'}[1]{'contents'}[174]{'contents'}[3]{'parent'}
 = 
$result_trees{'texi_bib_example'}{'contents'}[0]{'contents'}[1]{'contents'}[174];
 
$result_trees{'texi_bib_example'}{'contents'}[0]{'contents'}[1]{'contents'}[174]{'contents'}[4]{'parent'}
 = 
$result_trees{'texi_bib_example'}{'contents'}[0]{'contents'}[1]{'contents'}[174];
+$result_trees{'texi_bib_example'}{'contents'}[0]{'contents'}[1]{'contents'}[174]{'contents'}[5]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'texi_bib_example'}{'contents'}[0]{'contents'}[1]{'contents'}[174]{'contents'}[5]{'args'}[0];
+$result_trees{'texi_bib_example'}{'contents'}[0]{'contents'}[1]{'contents'}[174]{'contents'}[5]{'args'}[0]{'parent'}
 = 
$result_trees{'texi_bib_example'}{'contents'}[0]{'contents'}[1]{'contents'}[174]{'contents'}[5];
 
$result_trees{'texi_bib_example'}{'contents'}[0]{'contents'}[1]{'contents'}[174]{'contents'}[5]{'parent'}
 = 
$result_trees{'texi_bib_example'}{'contents'}[0]{'contents'}[1]{'contents'}[174];
-$result_trees{'texi_bib_example'}{'contents'}[0]{'contents'}[1]{'contents'}[174]{'contents'}[6]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'texi_bib_example'}{'contents'}[0]{'contents'}[1]{'contents'}[174]{'contents'}[6]{'args'}[0];
-$result_trees{'texi_bib_example'}{'contents'}[0]{'contents'}[1]{'contents'}[174]{'contents'}[6]{'args'}[0]{'parent'}
 = 
$result_trees{'texi_bib_example'}{'contents'}[0]{'contents'}[1]{'contents'}[174]{'contents'}[6];
-$result_trees{'texi_bib_example'}{'contents'}[0]{'contents'}[1]{'contents'}[174]{'contents'}[6]{'parent'}
 = 
$result_trees{'texi_bib_example'}{'contents'}[0]{'contents'}[1]{'contents'}[174];
 
$result_trees{'texi_bib_example'}{'contents'}[0]{'contents'}[1]{'contents'}[174]{'parent'}
 = $result_trees{'texi_bib_example'}{'contents'}[0]{'contents'}[1];
 
$result_trees{'texi_bib_example'}{'contents'}[0]{'contents'}[1]{'contents'}[175]{'parent'}
 = $result_trees{'texi_bib_example'}{'contents'}[0]{'contents'}[1];
 
$result_trees{'texi_bib_example'}{'contents'}[0]{'contents'}[1]{'contents'}[176]{'args'}[0]{'parent'}
 = 
$result_trees{'texi_bib_example'}{'contents'}[0]{'contents'}[1]{'contents'}[176];
@@ -5025,10 +4987,9 @@ 
$result_trees{'texi_bib_example'}{'contents'}[0]{'contents'}[1]{'contents'}[179]
 
$result_trees{'texi_bib_example'}{'contents'}[0]{'contents'}[1]{'contents'}[179]{'contents'}[2]{'parent'}
 = 
$result_trees{'texi_bib_example'}{'contents'}[0]{'contents'}[1]{'contents'}[179];
 
$result_trees{'texi_bib_example'}{'contents'}[0]{'contents'}[1]{'contents'}[179]{'contents'}[3]{'parent'}
 = 
$result_trees{'texi_bib_example'}{'contents'}[0]{'contents'}[1]{'contents'}[179];
 
$result_trees{'texi_bib_example'}{'contents'}[0]{'contents'}[1]{'contents'}[179]{'contents'}[4]{'parent'}
 = 
$result_trees{'texi_bib_example'}{'contents'}[0]{'contents'}[1]{'contents'}[179];
+$result_trees{'texi_bib_example'}{'contents'}[0]{'contents'}[1]{'contents'}[179]{'contents'}[5]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'texi_bib_example'}{'contents'}[0]{'contents'}[1]{'contents'}[179]{'contents'}[5]{'args'}[0];
+$result_trees{'texi_bib_example'}{'contents'}[0]{'contents'}[1]{'contents'}[179]{'contents'}[5]{'args'}[0]{'parent'}
 = 
$result_trees{'texi_bib_example'}{'contents'}[0]{'contents'}[1]{'contents'}[179]{'contents'}[5];
 
$result_trees{'texi_bib_example'}{'contents'}[0]{'contents'}[1]{'contents'}[179]{'contents'}[5]{'parent'}
 = 
$result_trees{'texi_bib_example'}{'contents'}[0]{'contents'}[1]{'contents'}[179];
-$result_trees{'texi_bib_example'}{'contents'}[0]{'contents'}[1]{'contents'}[179]{'contents'}[6]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'texi_bib_example'}{'contents'}[0]{'contents'}[1]{'contents'}[179]{'contents'}[6]{'args'}[0];
-$result_trees{'texi_bib_example'}{'contents'}[0]{'contents'}[1]{'contents'}[179]{'contents'}[6]{'args'}[0]{'parent'}
 = 
$result_trees{'texi_bib_example'}{'contents'}[0]{'contents'}[1]{'contents'}[179]{'contents'}[6];
-$result_trees{'texi_bib_example'}{'contents'}[0]{'contents'}[1]{'contents'}[179]{'contents'}[6]{'parent'}
 = 
$result_trees{'texi_bib_example'}{'contents'}[0]{'contents'}[1]{'contents'}[179];
 
$result_trees{'texi_bib_example'}{'contents'}[0]{'contents'}[1]{'contents'}[179]{'parent'}
 = $result_trees{'texi_bib_example'}{'contents'}[0]{'contents'}[1];
 
$result_trees{'texi_bib_example'}{'contents'}[0]{'contents'}[1]{'contents'}[180]{'parent'}
 = $result_trees{'texi_bib_example'}{'contents'}[0]{'contents'}[1];
 
$result_trees{'texi_bib_example'}{'contents'}[0]{'contents'}[1]{'contents'}[181]{'parent'}
 = $result_trees{'texi_bib_example'}{'contents'}[0]{'contents'}[1];
@@ -5045,20 +5006,18 @@ 
$result_trees{'texi_bib_example'}{'contents'}[0]{'contents'}[1]{'contents'}[184]
 
$result_trees{'texi_bib_example'}{'contents'}[0]{'contents'}[1]{'contents'}[184]{'contents'}[5]{'parent'}
 = 
$result_trees{'texi_bib_example'}{'contents'}[0]{'contents'}[1]{'contents'}[184];
 
$result_trees{'texi_bib_example'}{'contents'}[0]{'contents'}[1]{'contents'}[184]{'contents'}[6]{'parent'}
 = 
$result_trees{'texi_bib_example'}{'contents'}[0]{'contents'}[1]{'contents'}[184];
 
$result_trees{'texi_bib_example'}{'contents'}[0]{'contents'}[1]{'contents'}[184]{'contents'}[7]{'parent'}
 = 
$result_trees{'texi_bib_example'}{'contents'}[0]{'contents'}[1]{'contents'}[184];
+$result_trees{'texi_bib_example'}{'contents'}[0]{'contents'}[1]{'contents'}[184]{'contents'}[8]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'texi_bib_example'}{'contents'}[0]{'contents'}[1]{'contents'}[184]{'contents'}[8]{'args'}[0];
+$result_trees{'texi_bib_example'}{'contents'}[0]{'contents'}[1]{'contents'}[184]{'contents'}[8]{'args'}[0]{'parent'}
 = 
$result_trees{'texi_bib_example'}{'contents'}[0]{'contents'}[1]{'contents'}[184]{'contents'}[8];
 
$result_trees{'texi_bib_example'}{'contents'}[0]{'contents'}[1]{'contents'}[184]{'contents'}[8]{'parent'}
 = 
$result_trees{'texi_bib_example'}{'contents'}[0]{'contents'}[1]{'contents'}[184];
-$result_trees{'texi_bib_example'}{'contents'}[0]{'contents'}[1]{'contents'}[184]{'contents'}[9]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'texi_bib_example'}{'contents'}[0]{'contents'}[1]{'contents'}[184]{'contents'}[9]{'args'}[0];
-$result_trees{'texi_bib_example'}{'contents'}[0]{'contents'}[1]{'contents'}[184]{'contents'}[9]{'args'}[0]{'parent'}
 = 
$result_trees{'texi_bib_example'}{'contents'}[0]{'contents'}[1]{'contents'}[184]{'contents'}[9];
-$result_trees{'texi_bib_example'}{'contents'}[0]{'contents'}[1]{'contents'}[184]{'contents'}[9]{'parent'}
 = 
$result_trees{'texi_bib_example'}{'contents'}[0]{'contents'}[1]{'contents'}[184];
 
$result_trees{'texi_bib_example'}{'contents'}[0]{'contents'}[1]{'contents'}[184]{'parent'}
 = $result_trees{'texi_bib_example'}{'contents'}[0]{'contents'}[1];
 
$result_trees{'texi_bib_example'}{'contents'}[0]{'contents'}[1]{'contents'}[185]{'parent'}
 = $result_trees{'texi_bib_example'}{'contents'}[0]{'contents'}[1];
 
$result_trees{'texi_bib_example'}{'contents'}[0]{'contents'}[1]{'contents'}[186]{'args'}[0]{'parent'}
 = 
$result_trees{'texi_bib_example'}{'contents'}[0]{'contents'}[1]{'contents'}[186];
 
$result_trees{'texi_bib_example'}{'contents'}[0]{'contents'}[1]{'contents'}[186]{'args'}[1]{'parent'}
 = 
$result_trees{'texi_bib_example'}{'contents'}[0]{'contents'}[1]{'contents'}[186];
 
$result_trees{'texi_bib_example'}{'contents'}[0]{'contents'}[1]{'contents'}[186]{'args'}[2]{'parent'}
 = 
$result_trees{'texi_bib_example'}{'contents'}[0]{'contents'}[1]{'contents'}[186];
 
$result_trees{'texi_bib_example'}{'contents'}[0]{'contents'}[1]{'contents'}[186]{'contents'}[0]{'parent'}
 = 
$result_trees{'texi_bib_example'}{'contents'}[0]{'contents'}[1]{'contents'}[186];
+$result_trees{'texi_bib_example'}{'contents'}[0]{'contents'}[1]{'contents'}[186]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'texi_bib_example'}{'contents'}[0]{'contents'}[1]{'contents'}[186]{'contents'}[1]{'args'}[0];
+$result_trees{'texi_bib_example'}{'contents'}[0]{'contents'}[1]{'contents'}[186]{'contents'}[1]{'args'}[0]{'parent'}
 = 
$result_trees{'texi_bib_example'}{'contents'}[0]{'contents'}[1]{'contents'}[186]{'contents'}[1];
 
$result_trees{'texi_bib_example'}{'contents'}[0]{'contents'}[1]{'contents'}[186]{'contents'}[1]{'parent'}
 = 
$result_trees{'texi_bib_example'}{'contents'}[0]{'contents'}[1]{'contents'}[186];
-$result_trees{'texi_bib_example'}{'contents'}[0]{'contents'}[1]{'contents'}[186]{'contents'}[2]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'texi_bib_example'}{'contents'}[0]{'contents'}[1]{'contents'}[186]{'contents'}[2]{'args'}[0];
-$result_trees{'texi_bib_example'}{'contents'}[0]{'contents'}[1]{'contents'}[186]{'contents'}[2]{'args'}[0]{'parent'}
 = 
$result_trees{'texi_bib_example'}{'contents'}[0]{'contents'}[1]{'contents'}[186]{'contents'}[2];
-$result_trees{'texi_bib_example'}{'contents'}[0]{'contents'}[1]{'contents'}[186]{'contents'}[2]{'parent'}
 = 
$result_trees{'texi_bib_example'}{'contents'}[0]{'contents'}[1]{'contents'}[186];
 
$result_trees{'texi_bib_example'}{'contents'}[0]{'contents'}[1]{'contents'}[186]{'parent'}
 = $result_trees{'texi_bib_example'}{'contents'}[0]{'contents'}[1];
 
$result_trees{'texi_bib_example'}{'contents'}[0]{'contents'}[1]{'contents'}[187]{'parent'}
 = $result_trees{'texi_bib_example'}{'contents'}[0]{'contents'}[1];
 
$result_trees{'texi_bib_example'}{'contents'}[0]{'contents'}[1]{'contents'}[188]{'args'}[0]{'parent'}
 = 
$result_trees{'texi_bib_example'}{'contents'}[0]{'contents'}[1]{'contents'}[188];
@@ -5080,10 +5039,9 @@ 
$result_trees{'texi_bib_example'}{'contents'}[0]{'contents'}[1]{'contents'}[190]
 
$result_trees{'texi_bib_example'}{'contents'}[0]{'contents'}[1]{'contents'}[190]{'contents'}[11]{'parent'}
 = 
$result_trees{'texi_bib_example'}{'contents'}[0]{'contents'}[1]{'contents'}[190];
 
$result_trees{'texi_bib_example'}{'contents'}[0]{'contents'}[1]{'contents'}[190]{'contents'}[12]{'parent'}
 = 
$result_trees{'texi_bib_example'}{'contents'}[0]{'contents'}[1]{'contents'}[190];
 
$result_trees{'texi_bib_example'}{'contents'}[0]{'contents'}[1]{'contents'}[190]{'contents'}[13]{'parent'}
 = 
$result_trees{'texi_bib_example'}{'contents'}[0]{'contents'}[1]{'contents'}[190];
+$result_trees{'texi_bib_example'}{'contents'}[0]{'contents'}[1]{'contents'}[190]{'contents'}[14]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'texi_bib_example'}{'contents'}[0]{'contents'}[1]{'contents'}[190]{'contents'}[14]{'args'}[0];
+$result_trees{'texi_bib_example'}{'contents'}[0]{'contents'}[1]{'contents'}[190]{'contents'}[14]{'args'}[0]{'parent'}
 = 
$result_trees{'texi_bib_example'}{'contents'}[0]{'contents'}[1]{'contents'}[190]{'contents'}[14];
 
$result_trees{'texi_bib_example'}{'contents'}[0]{'contents'}[1]{'contents'}[190]{'contents'}[14]{'parent'}
 = 
$result_trees{'texi_bib_example'}{'contents'}[0]{'contents'}[1]{'contents'}[190];
-$result_trees{'texi_bib_example'}{'contents'}[0]{'contents'}[1]{'contents'}[190]{'contents'}[15]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'texi_bib_example'}{'contents'}[0]{'contents'}[1]{'contents'}[190]{'contents'}[15]{'args'}[0];
-$result_trees{'texi_bib_example'}{'contents'}[0]{'contents'}[1]{'contents'}[190]{'contents'}[15]{'args'}[0]{'parent'}
 = 
$result_trees{'texi_bib_example'}{'contents'}[0]{'contents'}[1]{'contents'}[190]{'contents'}[15];
-$result_trees{'texi_bib_example'}{'contents'}[0]{'contents'}[1]{'contents'}[190]{'contents'}[15]{'parent'}
 = 
$result_trees{'texi_bib_example'}{'contents'}[0]{'contents'}[1]{'contents'}[190];
 
$result_trees{'texi_bib_example'}{'contents'}[0]{'contents'}[1]{'contents'}[190]{'parent'}
 = $result_trees{'texi_bib_example'}{'contents'}[0]{'contents'}[1];
 
$result_trees{'texi_bib_example'}{'contents'}[0]{'contents'}[1]{'contents'}[191]{'parent'}
 = $result_trees{'texi_bib_example'}{'contents'}[0]{'contents'}[1];
 
$result_trees{'texi_bib_example'}{'contents'}[0]{'contents'}[1]{'contents'}[192]{'args'}[0]{'parent'}
 = 
$result_trees{'texi_bib_example'}{'contents'}[0]{'contents'}[1]{'contents'}[192];
diff --git a/tp/t/results/formatting/texi_glossary.pl 
b/tp/t/results/formatting/texi_glossary.pl
index 20becea712..1ed773ffa7 100644
--- a/tp/t/results/formatting/texi_glossary.pl
+++ b/tp/t/results/formatting/texi_glossary.pl
@@ -82,14 +82,9 @@ $result_trees{'texi_glossary'} = {
               'contents' => [
                 {
                   'parent' => {},
-                  'text' => '@table @asis',
-                  'type' => 'raw'
-                },
-                {
-                  'parent' => {},
-                  'text' => '
+                  'text' => '@table @asis
 ',
-                  'type' => 'last_raw_newline'
+                  'type' => 'raw'
                 },
                 {
                   'args' => [
@@ -160,16 +155,11 @@ $result_trees{'texi_glossary'} = {
 ',
                   'type' => 'raw'
                 },
-                {
-                  'parent' => {},
-                  'text' => '',
-                  'type' => 'raw'
-                },
                 {
                   'parent' => {},
                   'text' => '
 ',
-                  'type' => 'last_raw_newline'
+                  'type' => 'raw'
                 },
                 {
                   'args' => [
@@ -311,14 +301,9 @@ $result_trees{'texi_glossary'} = {
                         },
                         {
                           'parent' => {},
-                          'text' => '\\text\\',
-                          'type' => 'raw'
-                        },
-                        {
-                          'parent' => {},
-                          'text' => '
+                          'text' => '\\text\\
 ',
-                          'type' => 'last_raw_newline'
+                          'type' => 'raw'
                         },
                         {
                           'args' => [
@@ -398,16 +383,11 @@ $result_trees{'texi_glossary'} = {
 ',
                   'type' => 'raw'
                 },
-                {
-                  'parent' => {},
-                  'text' => '',
-                  'type' => 'raw'
-                },
                 {
                   'parent' => {},
                   'text' => '
 ',
-                  'type' => 'last_raw_newline'
+                  'type' => 'raw'
                 },
                 {
                   'args' => [
@@ -751,14 +731,9 @@ $result_trees{'texi_glossary'} = {
                     },
                     {
                       'parent' => {},
-                      'text' => 'text1, arg1 ',
-                      'type' => 'raw'
-                    },
-                    {
-                      'parent' => {},
-                      'text' => '
+                      'text' => 'text1, arg1 
 ',
-                      'type' => 'last_raw_newline'
+                      'type' => 'raw'
                     },
                     {
                       'args' => [
@@ -879,14 +854,9 @@ $result_trees{'texi_glossary'} = {
                 },
                 {
                   'parent' => {},
-                  'text' => 'text1, arg1 ',
-                  'type' => 'raw'
-                },
-                {
-                  'parent' => {},
-                  'text' => '
+                  'text' => 'text1, arg1 
 ',
-                  'type' => 'last_raw_newline'
+                  'type' => 'raw'
                 },
                 {
                   'args' => [
@@ -1140,14 +1110,9 @@ $result_trees{'texi_glossary'} = {
                     },
                     {
                       'parent' => {},
-                      'text' => 'text2',
-                      'type' => 'raw'
-                    },
-                    {
-                      'parent' => {},
-                      'text' => '
+                      'text' => 'text2
 ',
-                      'type' => 'last_raw_newline'
+                      'type' => 'raw'
                     },
                     {
                       'args' => [
@@ -1268,14 +1233,9 @@ $result_trees{'texi_glossary'} = {
                 },
                 {
                   'parent' => {},
-                  'text' => 'text2',
-                  'type' => 'raw'
-                },
-                {
-                  'parent' => {},
-                  'text' => '
+                  'text' => 'text2
 ',
-                  'type' => 'last_raw_newline'
+                  'type' => 'raw'
                 },
                 {
                   'args' => [
@@ -1399,20 +1359,18 @@ 
$result_trees{'texi_glossary'}{'contents'}[0]{'contents'}[1]{'contents'}[0]{'par
 
$result_trees{'texi_glossary'}{'contents'}[0]{'contents'}[1]{'contents'}[1]{'parent'}
 = $result_trees{'texi_glossary'}{'contents'}[0]{'contents'}[1];
 
$result_trees{'texi_glossary'}{'contents'}[0]{'contents'}[1]{'contents'}[2]{'args'}[0]{'parent'}
 = $result_trees{'texi_glossary'}{'contents'}[0]{'contents'}[1]{'contents'}[2];
 
$result_trees{'texi_glossary'}{'contents'}[0]{'contents'}[1]{'contents'}[2]{'contents'}[0]{'parent'}
 = $result_trees{'texi_glossary'}{'contents'}[0]{'contents'}[1]{'contents'}[2];
+$result_trees{'texi_glossary'}{'contents'}[0]{'contents'}[1]{'contents'}[2]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'texi_glossary'}{'contents'}[0]{'contents'}[1]{'contents'}[2]{'contents'}[1]{'args'}[0];
+$result_trees{'texi_glossary'}{'contents'}[0]{'contents'}[1]{'contents'}[2]{'contents'}[1]{'args'}[0]{'parent'}
 = 
$result_trees{'texi_glossary'}{'contents'}[0]{'contents'}[1]{'contents'}[2]{'contents'}[1];
 
$result_trees{'texi_glossary'}{'contents'}[0]{'contents'}[1]{'contents'}[2]{'contents'}[1]{'parent'}
 = $result_trees{'texi_glossary'}{'contents'}[0]{'contents'}[1]{'contents'}[2];
-$result_trees{'texi_glossary'}{'contents'}[0]{'contents'}[1]{'contents'}[2]{'contents'}[2]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'texi_glossary'}{'contents'}[0]{'contents'}[1]{'contents'}[2]{'contents'}[2]{'args'}[0];
-$result_trees{'texi_glossary'}{'contents'}[0]{'contents'}[1]{'contents'}[2]{'contents'}[2]{'args'}[0]{'parent'}
 = 
$result_trees{'texi_glossary'}{'contents'}[0]{'contents'}[1]{'contents'}[2]{'contents'}[2];
-$result_trees{'texi_glossary'}{'contents'}[0]{'contents'}[1]{'contents'}[2]{'contents'}[2]{'parent'}
 = $result_trees{'texi_glossary'}{'contents'}[0]{'contents'}[1]{'contents'}[2];
 
$result_trees{'texi_glossary'}{'contents'}[0]{'contents'}[1]{'contents'}[2]{'parent'}
 = $result_trees{'texi_glossary'}{'contents'}[0]{'contents'}[1];
 
$result_trees{'texi_glossary'}{'contents'}[0]{'contents'}[1]{'contents'}[3]{'parent'}
 = $result_trees{'texi_glossary'}{'contents'}[0]{'contents'}[1];
 
$result_trees{'texi_glossary'}{'contents'}[0]{'contents'}[1]{'contents'}[4]{'args'}[0]{'parent'}
 = $result_trees{'texi_glossary'}{'contents'}[0]{'contents'}[1]{'contents'}[4];
 
$result_trees{'texi_glossary'}{'contents'}[0]{'contents'}[1]{'contents'}[4]{'contents'}[0]{'parent'}
 = $result_trees{'texi_glossary'}{'contents'}[0]{'contents'}[1]{'contents'}[4];
 
$result_trees{'texi_glossary'}{'contents'}[0]{'contents'}[1]{'contents'}[4]{'contents'}[1]{'parent'}
 = $result_trees{'texi_glossary'}{'contents'}[0]{'contents'}[1]{'contents'}[4];
 
$result_trees{'texi_glossary'}{'contents'}[0]{'contents'}[1]{'contents'}[4]{'contents'}[2]{'parent'}
 = $result_trees{'texi_glossary'}{'contents'}[0]{'contents'}[1]{'contents'}[4];
+$result_trees{'texi_glossary'}{'contents'}[0]{'contents'}[1]{'contents'}[4]{'contents'}[3]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'texi_glossary'}{'contents'}[0]{'contents'}[1]{'contents'}[4]{'contents'}[3]{'args'}[0];
+$result_trees{'texi_glossary'}{'contents'}[0]{'contents'}[1]{'contents'}[4]{'contents'}[3]{'args'}[0]{'parent'}
 = 
$result_trees{'texi_glossary'}{'contents'}[0]{'contents'}[1]{'contents'}[4]{'contents'}[3];
 
$result_trees{'texi_glossary'}{'contents'}[0]{'contents'}[1]{'contents'}[4]{'contents'}[3]{'parent'}
 = $result_trees{'texi_glossary'}{'contents'}[0]{'contents'}[1]{'contents'}[4];
-$result_trees{'texi_glossary'}{'contents'}[0]{'contents'}[1]{'contents'}[4]{'contents'}[4]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'texi_glossary'}{'contents'}[0]{'contents'}[1]{'contents'}[4]{'contents'}[4]{'args'}[0];
-$result_trees{'texi_glossary'}{'contents'}[0]{'contents'}[1]{'contents'}[4]{'contents'}[4]{'args'}[0]{'parent'}
 = 
$result_trees{'texi_glossary'}{'contents'}[0]{'contents'}[1]{'contents'}[4]{'contents'}[4];
-$result_trees{'texi_glossary'}{'contents'}[0]{'contents'}[1]{'contents'}[4]{'contents'}[4]{'parent'}
 = $result_trees{'texi_glossary'}{'contents'}[0]{'contents'}[1]{'contents'}[4];
 
$result_trees{'texi_glossary'}{'contents'}[0]{'contents'}[1]{'contents'}[4]{'parent'}
 = $result_trees{'texi_glossary'}{'contents'}[0]{'contents'}[1];
 
$result_trees{'texi_glossary'}{'contents'}[0]{'contents'}[1]{'contents'}[5]{'parent'}
 = $result_trees{'texi_glossary'}{'contents'}[0]{'contents'}[1];
 
$result_trees{'texi_glossary'}{'contents'}[0]{'contents'}[1]{'contents'}[6]{'args'}[0]{'parent'}
 = $result_trees{'texi_glossary'}{'contents'}[0]{'contents'}[1]{'contents'}[6];
@@ -1430,10 +1388,9 @@ 
$result_trees{'texi_glossary'}{'contents'}[0]{'contents'}[1]{'contents'}[6]{'con
 
$result_trees{'texi_glossary'}{'contents'}[0]{'contents'}[1]{'contents'}[6]{'contents'}[7]{'contents'}[1]{'contents'}[0]{'parent'}
 = 
$result_trees{'texi_glossary'}{'contents'}[0]{'contents'}[1]{'contents'}[6]{'contents'}[7]{'contents'}[1];
 
$result_trees{'texi_glossary'}{'contents'}[0]{'contents'}[1]{'contents'}[6]{'contents'}[7]{'contents'}[1]{'contents'}[1]{'parent'}
 = 
$result_trees{'texi_glossary'}{'contents'}[0]{'contents'}[1]{'contents'}[6]{'contents'}[7]{'contents'}[1];
 
$result_trees{'texi_glossary'}{'contents'}[0]{'contents'}[1]{'contents'}[6]{'contents'}[7]{'contents'}[1]{'contents'}[2]{'parent'}
 = 
$result_trees{'texi_glossary'}{'contents'}[0]{'contents'}[1]{'contents'}[6]{'contents'}[7]{'contents'}[1];
+$result_trees{'texi_glossary'}{'contents'}[0]{'contents'}[1]{'contents'}[6]{'contents'}[7]{'contents'}[1]{'contents'}[3]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'texi_glossary'}{'contents'}[0]{'contents'}[1]{'contents'}[6]{'contents'}[7]{'contents'}[1]{'contents'}[3]{'args'}[0];
+$result_trees{'texi_glossary'}{'contents'}[0]{'contents'}[1]{'contents'}[6]{'contents'}[7]{'contents'}[1]{'contents'}[3]{'args'}[0]{'parent'}
 = 
$result_trees{'texi_glossary'}{'contents'}[0]{'contents'}[1]{'contents'}[6]{'contents'}[7]{'contents'}[1]{'contents'}[3];
 
$result_trees{'texi_glossary'}{'contents'}[0]{'contents'}[1]{'contents'}[6]{'contents'}[7]{'contents'}[1]{'contents'}[3]{'parent'}
 = 
$result_trees{'texi_glossary'}{'contents'}[0]{'contents'}[1]{'contents'}[6]{'contents'}[7]{'contents'}[1];
-$result_trees{'texi_glossary'}{'contents'}[0]{'contents'}[1]{'contents'}[6]{'contents'}[7]{'contents'}[1]{'contents'}[4]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'texi_glossary'}{'contents'}[0]{'contents'}[1]{'contents'}[6]{'contents'}[7]{'contents'}[1]{'contents'}[4]{'args'}[0];
-$result_trees{'texi_glossary'}{'contents'}[0]{'contents'}[1]{'contents'}[6]{'contents'}[7]{'contents'}[1]{'contents'}[4]{'args'}[0]{'parent'}
 = 
$result_trees{'texi_glossary'}{'contents'}[0]{'contents'}[1]{'contents'}[6]{'contents'}[7]{'contents'}[1]{'contents'}[4];
-$result_trees{'texi_glossary'}{'contents'}[0]{'contents'}[1]{'contents'}[6]{'contents'}[7]{'contents'}[1]{'contents'}[4]{'parent'}
 = 
$result_trees{'texi_glossary'}{'contents'}[0]{'contents'}[1]{'contents'}[6]{'contents'}[7]{'contents'}[1];
 
$result_trees{'texi_glossary'}{'contents'}[0]{'contents'}[1]{'contents'}[6]{'contents'}[7]{'contents'}[1]{'parent'}
 = 
$result_trees{'texi_glossary'}{'contents'}[0]{'contents'}[1]{'contents'}[6]{'contents'}[7];
 
$result_trees{'texi_glossary'}{'contents'}[0]{'contents'}[1]{'contents'}[6]{'contents'}[7]{'contents'}[2]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'texi_glossary'}{'contents'}[0]{'contents'}[1]{'contents'}[6]{'contents'}[7]{'contents'}[2]{'args'}[0];
 
$result_trees{'texi_glossary'}{'contents'}[0]{'contents'}[1]{'contents'}[6]{'contents'}[7]{'contents'}[2]{'args'}[0]{'parent'}
 = 
$result_trees{'texi_glossary'}{'contents'}[0]{'contents'}[1]{'contents'}[6]{'contents'}[7]{'contents'}[2];
@@ -1441,10 +1398,9 @@ 
$result_trees{'texi_glossary'}{'contents'}[0]{'contents'}[1]{'contents'}[6]{'con
 
$result_trees{'texi_glossary'}{'contents'}[0]{'contents'}[1]{'contents'}[6]{'contents'}[7]{'parent'}
 = $result_trees{'texi_glossary'}{'contents'}[0]{'contents'}[1]{'contents'}[6];
 
$result_trees{'texi_glossary'}{'contents'}[0]{'contents'}[1]{'contents'}[6]{'contents'}[8]{'parent'}
 = $result_trees{'texi_glossary'}{'contents'}[0]{'contents'}[1]{'contents'}[6];
 
$result_trees{'texi_glossary'}{'contents'}[0]{'contents'}[1]{'contents'}[6]{'contents'}[9]{'parent'}
 = $result_trees{'texi_glossary'}{'contents'}[0]{'contents'}[1]{'contents'}[6];
+$result_trees{'texi_glossary'}{'contents'}[0]{'contents'}[1]{'contents'}[6]{'contents'}[10]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'texi_glossary'}{'contents'}[0]{'contents'}[1]{'contents'}[6]{'contents'}[10]{'args'}[0];
+$result_trees{'texi_glossary'}{'contents'}[0]{'contents'}[1]{'contents'}[6]{'contents'}[10]{'args'}[0]{'parent'}
 = 
$result_trees{'texi_glossary'}{'contents'}[0]{'contents'}[1]{'contents'}[6]{'contents'}[10];
 
$result_trees{'texi_glossary'}{'contents'}[0]{'contents'}[1]{'contents'}[6]{'contents'}[10]{'parent'}
 = $result_trees{'texi_glossary'}{'contents'}[0]{'contents'}[1]{'contents'}[6];
-$result_trees{'texi_glossary'}{'contents'}[0]{'contents'}[1]{'contents'}[6]{'contents'}[11]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'texi_glossary'}{'contents'}[0]{'contents'}[1]{'contents'}[6]{'contents'}[11]{'args'}[0];
-$result_trees{'texi_glossary'}{'contents'}[0]{'contents'}[1]{'contents'}[6]{'contents'}[11]{'args'}[0]{'parent'}
 = 
$result_trees{'texi_glossary'}{'contents'}[0]{'contents'}[1]{'contents'}[6]{'contents'}[11];
-$result_trees{'texi_glossary'}{'contents'}[0]{'contents'}[1]{'contents'}[6]{'contents'}[11]{'parent'}
 = $result_trees{'texi_glossary'}{'contents'}[0]{'contents'}[1]{'contents'}[6];
 
$result_trees{'texi_glossary'}{'contents'}[0]{'contents'}[1]{'contents'}[6]{'parent'}
 = $result_trees{'texi_glossary'}{'contents'}[0]{'contents'}[1];
 
$result_trees{'texi_glossary'}{'contents'}[0]{'contents'}[1]{'contents'}[7]{'parent'}
 = $result_trees{'texi_glossary'}{'contents'}[0]{'contents'}[1];
 $result_trees{'texi_glossary'}{'contents'}[0]{'contents'}[1]{'parent'} = 
$result_trees{'texi_glossary'}{'contents'}[0];
@@ -1489,10 +1445,9 @@ 
$result_trees{'texi_glossary'}{'contents'}[2]{'contents'}[3]{'contents'}[4]{'con
 
$result_trees{'texi_glossary'}{'contents'}[2]{'contents'}[3]{'contents'}[4]{'contents'}[1]{'contents'}[0]{'parent'}
 = 
$result_trees{'texi_glossary'}{'contents'}[2]{'contents'}[3]{'contents'}[4]{'contents'}[1];
 
$result_trees{'texi_glossary'}{'contents'}[2]{'contents'}[3]{'contents'}[4]{'contents'}[1]{'contents'}[1]{'parent'}
 = 
$result_trees{'texi_glossary'}{'contents'}[2]{'contents'}[3]{'contents'}[4]{'contents'}[1];
 
$result_trees{'texi_glossary'}{'contents'}[2]{'contents'}[3]{'contents'}[4]{'contents'}[1]{'contents'}[2]{'parent'}
 = 
$result_trees{'texi_glossary'}{'contents'}[2]{'contents'}[3]{'contents'}[4]{'contents'}[1];
+$result_trees{'texi_glossary'}{'contents'}[2]{'contents'}[3]{'contents'}[4]{'contents'}[1]{'contents'}[3]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'texi_glossary'}{'contents'}[2]{'contents'}[3]{'contents'}[4]{'contents'}[1]{'contents'}[3]{'args'}[0];
+$result_trees{'texi_glossary'}{'contents'}[2]{'contents'}[3]{'contents'}[4]{'contents'}[1]{'contents'}[3]{'args'}[0]{'parent'}
 = 
$result_trees{'texi_glossary'}{'contents'}[2]{'contents'}[3]{'contents'}[4]{'contents'}[1]{'contents'}[3];
 
$result_trees{'texi_glossary'}{'contents'}[2]{'contents'}[3]{'contents'}[4]{'contents'}[1]{'contents'}[3]{'parent'}
 = 
$result_trees{'texi_glossary'}{'contents'}[2]{'contents'}[3]{'contents'}[4]{'contents'}[1];
-$result_trees{'texi_glossary'}{'contents'}[2]{'contents'}[3]{'contents'}[4]{'contents'}[1]{'contents'}[4]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'texi_glossary'}{'contents'}[2]{'contents'}[3]{'contents'}[4]{'contents'}[1]{'contents'}[4]{'args'}[0];
-$result_trees{'texi_glossary'}{'contents'}[2]{'contents'}[3]{'contents'}[4]{'contents'}[1]{'contents'}[4]{'args'}[0]{'parent'}
 = 
$result_trees{'texi_glossary'}{'contents'}[2]{'contents'}[3]{'contents'}[4]{'contents'}[1]{'contents'}[4];
-$result_trees{'texi_glossary'}{'contents'}[2]{'contents'}[3]{'contents'}[4]{'contents'}[1]{'contents'}[4]{'parent'}
 = 
$result_trees{'texi_glossary'}{'contents'}[2]{'contents'}[3]{'contents'}[4]{'contents'}[1];
 
$result_trees{'texi_glossary'}{'contents'}[2]{'contents'}[3]{'contents'}[4]{'contents'}[1]{'parent'}
 = $result_trees{'texi_glossary'}{'contents'}[2]{'contents'}[3]{'contents'}[4];
 
$result_trees{'texi_glossary'}{'contents'}[2]{'contents'}[3]{'contents'}[4]{'contents'}[2]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'texi_glossary'}{'contents'}[2]{'contents'}[3]{'contents'}[4]{'contents'}[2]{'args'}[0];
 
$result_trees{'texi_glossary'}{'contents'}[2]{'contents'}[3]{'contents'}[4]{'contents'}[2]{'args'}[0]{'parent'}
 = 
$result_trees{'texi_glossary'}{'contents'}[2]{'contents'}[3]{'contents'}[4]{'contents'}[2];
@@ -1504,10 +1459,9 @@ 
$result_trees{'texi_glossary'}{'contents'}[2]{'contents'}[3]{'contents'}[6]{'arg
 
$result_trees{'texi_glossary'}{'contents'}[2]{'contents'}[3]{'contents'}[6]{'contents'}[0]{'parent'}
 = $result_trees{'texi_glossary'}{'contents'}[2]{'contents'}[3]{'contents'}[6];
 
$result_trees{'texi_glossary'}{'contents'}[2]{'contents'}[3]{'contents'}[6]{'contents'}[1]{'parent'}
 = $result_trees{'texi_glossary'}{'contents'}[2]{'contents'}[3]{'contents'}[6];
 
$result_trees{'texi_glossary'}{'contents'}[2]{'contents'}[3]{'contents'}[6]{'contents'}[2]{'parent'}
 = $result_trees{'texi_glossary'}{'contents'}[2]{'contents'}[3]{'contents'}[6];
+$result_trees{'texi_glossary'}{'contents'}[2]{'contents'}[3]{'contents'}[6]{'contents'}[3]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'texi_glossary'}{'contents'}[2]{'contents'}[3]{'contents'}[6]{'contents'}[3]{'args'}[0];
+$result_trees{'texi_glossary'}{'contents'}[2]{'contents'}[3]{'contents'}[6]{'contents'}[3]{'args'}[0]{'parent'}
 = 
$result_trees{'texi_glossary'}{'contents'}[2]{'contents'}[3]{'contents'}[6]{'contents'}[3];
 
$result_trees{'texi_glossary'}{'contents'}[2]{'contents'}[3]{'contents'}[6]{'contents'}[3]{'parent'}
 = $result_trees{'texi_glossary'}{'contents'}[2]{'contents'}[3]{'contents'}[6];
-$result_trees{'texi_glossary'}{'contents'}[2]{'contents'}[3]{'contents'}[6]{'contents'}[4]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'texi_glossary'}{'contents'}[2]{'contents'}[3]{'contents'}[6]{'contents'}[4]{'args'}[0];
-$result_trees{'texi_glossary'}{'contents'}[2]{'contents'}[3]{'contents'}[6]{'contents'}[4]{'args'}[0]{'parent'}
 = 
$result_trees{'texi_glossary'}{'contents'}[2]{'contents'}[3]{'contents'}[6]{'contents'}[4];
-$result_trees{'texi_glossary'}{'contents'}[2]{'contents'}[3]{'contents'}[6]{'contents'}[4]{'parent'}
 = $result_trees{'texi_glossary'}{'contents'}[2]{'contents'}[3]{'contents'}[6];
 
$result_trees{'texi_glossary'}{'contents'}[2]{'contents'}[3]{'contents'}[6]{'parent'}
 = $result_trees{'texi_glossary'}{'contents'}[2]{'contents'}[3];
 
$result_trees{'texi_glossary'}{'contents'}[2]{'contents'}[3]{'contents'}[7]{'parent'}
 = $result_trees{'texi_glossary'}{'contents'}[2]{'contents'}[3];
 
$result_trees{'texi_glossary'}{'contents'}[2]{'contents'}[3]{'contents'}[8]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'texi_glossary'}{'contents'}[2]{'contents'}[3]{'contents'}[8]{'args'}[0];
@@ -1540,10 +1494,9 @@ 
$result_trees{'texi_glossary'}{'contents'}[2]{'contents'}[3]{'contents'}[11]{'co
 
$result_trees{'texi_glossary'}{'contents'}[2]{'contents'}[3]{'contents'}[11]{'contents'}[1]{'contents'}[0]{'parent'}
 = 
$result_trees{'texi_glossary'}{'contents'}[2]{'contents'}[3]{'contents'}[11]{'contents'}[1];
 
$result_trees{'texi_glossary'}{'contents'}[2]{'contents'}[3]{'contents'}[11]{'contents'}[1]{'contents'}[1]{'parent'}
 = 
$result_trees{'texi_glossary'}{'contents'}[2]{'contents'}[3]{'contents'}[11]{'contents'}[1];
 
$result_trees{'texi_glossary'}{'contents'}[2]{'contents'}[3]{'contents'}[11]{'contents'}[1]{'contents'}[2]{'parent'}
 = 
$result_trees{'texi_glossary'}{'contents'}[2]{'contents'}[3]{'contents'}[11]{'contents'}[1];
+$result_trees{'texi_glossary'}{'contents'}[2]{'contents'}[3]{'contents'}[11]{'contents'}[1]{'contents'}[3]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'texi_glossary'}{'contents'}[2]{'contents'}[3]{'contents'}[11]{'contents'}[1]{'contents'}[3]{'args'}[0];
+$result_trees{'texi_glossary'}{'contents'}[2]{'contents'}[3]{'contents'}[11]{'contents'}[1]{'contents'}[3]{'args'}[0]{'parent'}
 = 
$result_trees{'texi_glossary'}{'contents'}[2]{'contents'}[3]{'contents'}[11]{'contents'}[1]{'contents'}[3];
 
$result_trees{'texi_glossary'}{'contents'}[2]{'contents'}[3]{'contents'}[11]{'contents'}[1]{'contents'}[3]{'parent'}
 = 
$result_trees{'texi_glossary'}{'contents'}[2]{'contents'}[3]{'contents'}[11]{'contents'}[1];
-$result_trees{'texi_glossary'}{'contents'}[2]{'contents'}[3]{'contents'}[11]{'contents'}[1]{'contents'}[4]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'texi_glossary'}{'contents'}[2]{'contents'}[3]{'contents'}[11]{'contents'}[1]{'contents'}[4]{'args'}[0];
-$result_trees{'texi_glossary'}{'contents'}[2]{'contents'}[3]{'contents'}[11]{'contents'}[1]{'contents'}[4]{'args'}[0]{'parent'}
 = 
$result_trees{'texi_glossary'}{'contents'}[2]{'contents'}[3]{'contents'}[11]{'contents'}[1]{'contents'}[4];
-$result_trees{'texi_glossary'}{'contents'}[2]{'contents'}[3]{'contents'}[11]{'contents'}[1]{'contents'}[4]{'parent'}
 = 
$result_trees{'texi_glossary'}{'contents'}[2]{'contents'}[3]{'contents'}[11]{'contents'}[1];
 
$result_trees{'texi_glossary'}{'contents'}[2]{'contents'}[3]{'contents'}[11]{'contents'}[1]{'parent'}
 = $result_trees{'texi_glossary'}{'contents'}[2]{'contents'}[3]{'contents'}[11];
 
$result_trees{'texi_glossary'}{'contents'}[2]{'contents'}[3]{'contents'}[11]{'contents'}[2]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'texi_glossary'}{'contents'}[2]{'contents'}[3]{'contents'}[11]{'contents'}[2]{'args'}[0];
 
$result_trees{'texi_glossary'}{'contents'}[2]{'contents'}[3]{'contents'}[11]{'contents'}[2]{'args'}[0]{'parent'}
 = 
$result_trees{'texi_glossary'}{'contents'}[2]{'contents'}[3]{'contents'}[11]{'contents'}[2];
@@ -1555,10 +1508,9 @@ 
$result_trees{'texi_glossary'}{'contents'}[2]{'contents'}[3]{'contents'}[13]{'ar
 
$result_trees{'texi_glossary'}{'contents'}[2]{'contents'}[3]{'contents'}[13]{'contents'}[0]{'parent'}
 = $result_trees{'texi_glossary'}{'contents'}[2]{'contents'}[3]{'contents'}[13];
 
$result_trees{'texi_glossary'}{'contents'}[2]{'contents'}[3]{'contents'}[13]{'contents'}[1]{'parent'}
 = $result_trees{'texi_glossary'}{'contents'}[2]{'contents'}[3]{'contents'}[13];
 
$result_trees{'texi_glossary'}{'contents'}[2]{'contents'}[3]{'contents'}[13]{'contents'}[2]{'parent'}
 = $result_trees{'texi_glossary'}{'contents'}[2]{'contents'}[3]{'contents'}[13];
+$result_trees{'texi_glossary'}{'contents'}[2]{'contents'}[3]{'contents'}[13]{'contents'}[3]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'texi_glossary'}{'contents'}[2]{'contents'}[3]{'contents'}[13]{'contents'}[3]{'args'}[0];
+$result_trees{'texi_glossary'}{'contents'}[2]{'contents'}[3]{'contents'}[13]{'contents'}[3]{'args'}[0]{'parent'}
 = 
$result_trees{'texi_glossary'}{'contents'}[2]{'contents'}[3]{'contents'}[13]{'contents'}[3];
 
$result_trees{'texi_glossary'}{'contents'}[2]{'contents'}[3]{'contents'}[13]{'contents'}[3]{'parent'}
 = $result_trees{'texi_glossary'}{'contents'}[2]{'contents'}[3]{'contents'}[13];
-$result_trees{'texi_glossary'}{'contents'}[2]{'contents'}[3]{'contents'}[13]{'contents'}[4]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'texi_glossary'}{'contents'}[2]{'contents'}[3]{'contents'}[13]{'contents'}[4]{'args'}[0];
-$result_trees{'texi_glossary'}{'contents'}[2]{'contents'}[3]{'contents'}[13]{'contents'}[4]{'args'}[0]{'parent'}
 = 
$result_trees{'texi_glossary'}{'contents'}[2]{'contents'}[3]{'contents'}[13]{'contents'}[4];
-$result_trees{'texi_glossary'}{'contents'}[2]{'contents'}[3]{'contents'}[13]{'contents'}[4]{'parent'}
 = $result_trees{'texi_glossary'}{'contents'}[2]{'contents'}[3]{'contents'}[13];
 
$result_trees{'texi_glossary'}{'contents'}[2]{'contents'}[3]{'contents'}[13]{'parent'}
 = $result_trees{'texi_glossary'}{'contents'}[2]{'contents'}[3];
 
$result_trees{'texi_glossary'}{'contents'}[2]{'contents'}[3]{'contents'}[14]{'parent'}
 = $result_trees{'texi_glossary'}{'contents'}[2]{'contents'}[3];
 $result_trees{'texi_glossary'}{'contents'}[2]{'contents'}[3]{'parent'} = 
$result_trees{'texi_glossary'}{'contents'}[2];
diff --git a/tp/t/results/include/cpp_lines.pl 
b/tp/t/results/include/cpp_lines.pl
index deb7ce97c4..35159424b5 100644
--- a/tp/t/results/include/cpp_lines.pl
+++ b/tp/t/results/include/cpp_lines.pl
@@ -245,14 +245,9 @@ $result_trees{'cpp_lines'} = {
           'contents' => [
             {
               'parent' => {},
-              'text' => '# line 7 "k"',
-              'type' => 'raw'
-            },
-            {
-              'parent' => {},
-              'text' => '
+              'text' => '# line 7 "k"
 ',
-              'type' => 'last_raw_newline'
+              'type' => 'raw'
             },
             {
               'args' => [
@@ -414,14 +409,9 @@ $result_trees{'cpp_lines'} = {
             },
             {
               'parent' => {},
-              'text' => '# line 666 "x"',
-              'type' => 'raw'
-            },
-            {
-              'parent' => {},
-              'text' => '
+              'text' => '# line 666 "x"
 ',
-              'type' => 'last_raw_newline'
+              'type' => 'raw'
             },
             {
               'args' => [
@@ -1247,10 +1237,9 @@ 
$result_trees{'cpp_lines'}{'contents'}[1]{'contents'}[3]{'parent'} = $result_tre
 $result_trees{'cpp_lines'}{'contents'}[1]{'contents'}[4]{'parent'} = 
$result_trees{'cpp_lines'}{'contents'}[1];
 $result_trees{'cpp_lines'}{'contents'}[1]{'contents'}[5]{'args'}[0]{'parent'} 
= $result_trees{'cpp_lines'}{'contents'}[1]{'contents'}[5];
 
$result_trees{'cpp_lines'}{'contents'}[1]{'contents'}[5]{'contents'}[0]{'parent'}
 = $result_trees{'cpp_lines'}{'contents'}[1]{'contents'}[5];
+$result_trees{'cpp_lines'}{'contents'}[1]{'contents'}[5]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'cpp_lines'}{'contents'}[1]{'contents'}[5]{'contents'}[1]{'args'}[0];
+$result_trees{'cpp_lines'}{'contents'}[1]{'contents'}[5]{'contents'}[1]{'args'}[0]{'parent'}
 = $result_trees{'cpp_lines'}{'contents'}[1]{'contents'}[5]{'contents'}[1];
 
$result_trees{'cpp_lines'}{'contents'}[1]{'contents'}[5]{'contents'}[1]{'parent'}
 = $result_trees{'cpp_lines'}{'contents'}[1]{'contents'}[5];
-$result_trees{'cpp_lines'}{'contents'}[1]{'contents'}[5]{'contents'}[2]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'cpp_lines'}{'contents'}[1]{'contents'}[5]{'contents'}[2]{'args'}[0];
-$result_trees{'cpp_lines'}{'contents'}[1]{'contents'}[5]{'contents'}[2]{'args'}[0]{'parent'}
 = $result_trees{'cpp_lines'}{'contents'}[1]{'contents'}[5]{'contents'}[2];
-$result_trees{'cpp_lines'}{'contents'}[1]{'contents'}[5]{'contents'}[2]{'parent'}
 = $result_trees{'cpp_lines'}{'contents'}[1]{'contents'}[5];
 $result_trees{'cpp_lines'}{'contents'}[1]{'contents'}[5]{'parent'} = 
$result_trees{'cpp_lines'}{'contents'}[1];
 $result_trees{'cpp_lines'}{'contents'}[1]{'contents'}[6]{'parent'} = 
$result_trees{'cpp_lines'}{'contents'}[1];
 
$result_trees{'cpp_lines'}{'contents'}[1]{'contents'}[7]{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'cpp_lines'}{'contents'}[1]{'contents'}[7]{'contents'}[0]{'args'}[0];
@@ -1271,10 +1260,9 @@ 
$result_trees{'cpp_lines'}{'contents'}[1]{'contents'}[12]{'parent'} = $result_tr
 $result_trees{'cpp_lines'}{'contents'}[1]{'contents'}[13]{'args'}[0]{'parent'} 
= $result_trees{'cpp_lines'}{'contents'}[1]{'contents'}[13];
 
$result_trees{'cpp_lines'}{'contents'}[1]{'contents'}[13]{'contents'}[0]{'parent'}
 = $result_trees{'cpp_lines'}{'contents'}[1]{'contents'}[13];
 
$result_trees{'cpp_lines'}{'contents'}[1]{'contents'}[13]{'contents'}[1]{'parent'}
 = $result_trees{'cpp_lines'}{'contents'}[1]{'contents'}[13];
+$result_trees{'cpp_lines'}{'contents'}[1]{'contents'}[13]{'contents'}[2]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'cpp_lines'}{'contents'}[1]{'contents'}[13]{'contents'}[2]{'args'}[0];
+$result_trees{'cpp_lines'}{'contents'}[1]{'contents'}[13]{'contents'}[2]{'args'}[0]{'parent'}
 = $result_trees{'cpp_lines'}{'contents'}[1]{'contents'}[13]{'contents'}[2];
 
$result_trees{'cpp_lines'}{'contents'}[1]{'contents'}[13]{'contents'}[2]{'parent'}
 = $result_trees{'cpp_lines'}{'contents'}[1]{'contents'}[13];
-$result_trees{'cpp_lines'}{'contents'}[1]{'contents'}[13]{'contents'}[3]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'cpp_lines'}{'contents'}[1]{'contents'}[13]{'contents'}[3]{'args'}[0];
-$result_trees{'cpp_lines'}{'contents'}[1]{'contents'}[13]{'contents'}[3]{'args'}[0]{'parent'}
 = $result_trees{'cpp_lines'}{'contents'}[1]{'contents'}[13]{'contents'}[3];
-$result_trees{'cpp_lines'}{'contents'}[1]{'contents'}[13]{'contents'}[3]{'parent'}
 = $result_trees{'cpp_lines'}{'contents'}[1]{'contents'}[13];
 $result_trees{'cpp_lines'}{'contents'}[1]{'contents'}[13]{'parent'} = 
$result_trees{'cpp_lines'}{'contents'}[1];
 $result_trees{'cpp_lines'}{'contents'}[1]{'contents'}[14]{'parent'} = 
$result_trees{'cpp_lines'}{'contents'}[1];
 
$result_trees{'cpp_lines'}{'contents'}[1]{'contents'}[15]{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'cpp_lines'}{'contents'}[1]{'contents'}[15]{'contents'}[0]{'args'}[0];
diff --git a/tp/t/results/include/macro_and_commands_in_early_commands.pl 
b/tp/t/results/include/macro_and_commands_in_early_commands.pl
index 1474472a48..d640760a0a 100644
--- a/tp/t/results/include/macro_and_commands_in_early_commands.pl
+++ b/tp/t/results/include/macro_and_commands_in_early_commands.pl
@@ -21,14 +21,9 @@ $result_trees{'macro_and_commands_in_early_commands'} = {
           'contents' => [
             {
               'parent' => {},
-              'text' => 'macro_i--n_pass@@',
-              'type' => 'raw'
-            },
-            {
-              'parent' => {},
-              'text' => '
+              'text' => 'macro_i--n_pass@@
 ',
-              'type' => 'last_raw_newline'
+              'type' => 'raw'
             },
             {
               'args' => [
@@ -132,14 +127,9 @@ $result_trees{'macro_and_commands_in_early_commands'} = {
           'contents' => [
             {
               'parent' => {},
-              'text' => 'ISO-8859-1@@',
-              'type' => 'raw'
-            },
-            {
-              'parent' => {},
-              'text' => '
+              'text' => 'ISO-8859-1@@
 ',
-              'type' => 'last_raw_newline'
+              'type' => 'raw'
             },
             {
               'args' => [
@@ -245,14 +235,9 @@ $result_trees{'macro_and_commands_in_early_commands'} = {
             },
             {
               'parent' => {},
-              'text' => '@include inc_@@f--ile.texi',
-              'type' => 'raw'
-            },
-            {
-              'parent' => {},
-              'text' => '
+              'text' => '@include inc_@@f--ile.texi
 ',
-              'type' => 'last_raw_newline'
+              'type' => 'raw'
             },
             {
               'args' => [
@@ -383,14 +368,9 @@ $result_trees{'macro_and_commands_in_early_commands'} = {
           'contents' => [
             {
               'parent' => {},
-              'text' => 'in themacro',
-              'type' => 'raw'
-            },
-            {
-              'parent' => {},
-              'text' => '
+              'text' => 'in themacro
 ',
-              'type' => 'last_raw_newline'
+              'type' => 'raw'
             },
             {
               'args' => [
@@ -521,10 +501,9 @@ $result_trees{'macro_and_commands_in_early_commands'} = {
 };
 
$result_trees{'macro_and_commands_in_early_commands'}{'contents'}[0]{'contents'}[0]{'args'}[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'}[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]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'macro_and_commands_in_early_commands'}{'contents'}[0]{'contents'}[0]{'contents'}[1]{'args'}[0];
+$result_trees{'macro_and_commands_in_early_commands'}{'contents'}[0]{'contents'}[0]{'contents'}[1]{'args'}[0]{'parent'}
 = 
$result_trees{'macro_and_commands_in_early_commands'}{'contents'}[0]{'contents'}[0]{'contents'}[1];
 
$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]{'contents'}[2]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'macro_and_commands_in_early_commands'}{'contents'}[0]{'contents'}[0]{'contents'}[2]{'args'}[0];
-$result_trees{'macro_and_commands_in_early_commands'}{'contents'}[0]{'contents'}[0]{'contents'}[2]{'args'}[0]{'parent'}
 = 
$result_trees{'macro_and_commands_in_early_commands'}{'contents'}[0]{'contents'}[0]{'contents'}[2];
-$result_trees{'macro_and_commands_in_early_commands'}{'contents'}[0]{'contents'}[0]{'contents'}[2]{'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]{'parent'}
 = $result_trees{'macro_and_commands_in_early_commands'}{'contents'}[0];
 
$result_trees{'macro_and_commands_in_early_commands'}{'contents'}[0]{'contents'}[2]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'macro_and_commands_in_early_commands'}{'contents'}[0]{'contents'}[2]{'args'}[0];
@@ -535,10 +514,9 @@ 
$result_trees{'macro_and_commands_in_early_commands'}{'contents'}[0]{'contents'}
 
$result_trees{'macro_and_commands_in_early_commands'}{'contents'}[0]{'contents'}[3]{'parent'}
 = $result_trees{'macro_and_commands_in_early_commands'}{'contents'}[0];
 
$result_trees{'macro_and_commands_in_early_commands'}{'contents'}[0]{'contents'}[4]{'args'}[0]{'parent'}
 = 
$result_trees{'macro_and_commands_in_early_commands'}{'contents'}[0]{'contents'}[4];
 
$result_trees{'macro_and_commands_in_early_commands'}{'contents'}[0]{'contents'}[4]{'contents'}[0]{'parent'}
 = 
$result_trees{'macro_and_commands_in_early_commands'}{'contents'}[0]{'contents'}[4];
+$result_trees{'macro_and_commands_in_early_commands'}{'contents'}[0]{'contents'}[4]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'macro_and_commands_in_early_commands'}{'contents'}[0]{'contents'}[4]{'contents'}[1]{'args'}[0];
+$result_trees{'macro_and_commands_in_early_commands'}{'contents'}[0]{'contents'}[4]{'contents'}[1]{'args'}[0]{'parent'}
 = 
$result_trees{'macro_and_commands_in_early_commands'}{'contents'}[0]{'contents'}[4]{'contents'}[1];
 
$result_trees{'macro_and_commands_in_early_commands'}{'contents'}[0]{'contents'}[4]{'contents'}[1]{'parent'}
 = 
$result_trees{'macro_and_commands_in_early_commands'}{'contents'}[0]{'contents'}[4];
-$result_trees{'macro_and_commands_in_early_commands'}{'contents'}[0]{'contents'}[4]{'contents'}[2]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'macro_and_commands_in_early_commands'}{'contents'}[0]{'contents'}[4]{'contents'}[2]{'args'}[0];
-$result_trees{'macro_and_commands_in_early_commands'}{'contents'}[0]{'contents'}[4]{'contents'}[2]{'args'}[0]{'parent'}
 = 
$result_trees{'macro_and_commands_in_early_commands'}{'contents'}[0]{'contents'}[4]{'contents'}[2];
-$result_trees{'macro_and_commands_in_early_commands'}{'contents'}[0]{'contents'}[4]{'contents'}[2]{'parent'}
 = 
$result_trees{'macro_and_commands_in_early_commands'}{'contents'}[0]{'contents'}[4];
 
$result_trees{'macro_and_commands_in_early_commands'}{'contents'}[0]{'contents'}[4]{'parent'}
 = $result_trees{'macro_and_commands_in_early_commands'}{'contents'}[0];
 
$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]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'macro_and_commands_in_early_commands'}{'contents'}[0]{'contents'}[6]{'args'}[0];
@@ -549,10 +527,9 @@ 
$result_trees{'macro_and_commands_in_early_commands'}{'contents'}[0]{'contents'}
 
$result_trees{'macro_and_commands_in_early_commands'}{'contents'}[0]{'contents'}[8]{'args'}[0]{'parent'}
 = 
$result_trees{'macro_and_commands_in_early_commands'}{'contents'}[0]{'contents'}[8];
 
$result_trees{'macro_and_commands_in_early_commands'}{'contents'}[0]{'contents'}[8]{'contents'}[0]{'parent'}
 = 
$result_trees{'macro_and_commands_in_early_commands'}{'contents'}[0]{'contents'}[8];
 
$result_trees{'macro_and_commands_in_early_commands'}{'contents'}[0]{'contents'}[8]{'contents'}[1]{'parent'}
 = 
$result_trees{'macro_and_commands_in_early_commands'}{'contents'}[0]{'contents'}[8];
+$result_trees{'macro_and_commands_in_early_commands'}{'contents'}[0]{'contents'}[8]{'contents'}[2]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'macro_and_commands_in_early_commands'}{'contents'}[0]{'contents'}[8]{'contents'}[2]{'args'}[0];
+$result_trees{'macro_and_commands_in_early_commands'}{'contents'}[0]{'contents'}[8]{'contents'}[2]{'args'}[0]{'parent'}
 = 
$result_trees{'macro_and_commands_in_early_commands'}{'contents'}[0]{'contents'}[8]{'contents'}[2];
 
$result_trees{'macro_and_commands_in_early_commands'}{'contents'}[0]{'contents'}[8]{'contents'}[2]{'parent'}
 = 
$result_trees{'macro_and_commands_in_early_commands'}{'contents'}[0]{'contents'}[8];
-$result_trees{'macro_and_commands_in_early_commands'}{'contents'}[0]{'contents'}[8]{'contents'}[3]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'macro_and_commands_in_early_commands'}{'contents'}[0]{'contents'}[8]{'contents'}[3]{'args'}[0];
-$result_trees{'macro_and_commands_in_early_commands'}{'contents'}[0]{'contents'}[8]{'contents'}[3]{'args'}[0]{'parent'}
 = 
$result_trees{'macro_and_commands_in_early_commands'}{'contents'}[0]{'contents'}[8]{'contents'}[3];
-$result_trees{'macro_and_commands_in_early_commands'}{'contents'}[0]{'contents'}[8]{'contents'}[3]{'parent'}
 = 
$result_trees{'macro_and_commands_in_early_commands'}{'contents'}[0]{'contents'}[8];
 
$result_trees{'macro_and_commands_in_early_commands'}{'contents'}[0]{'contents'}[8]{'parent'}
 = $result_trees{'macro_and_commands_in_early_commands'}{'contents'}[0];
 
$result_trees{'macro_and_commands_in_early_commands'}{'contents'}[0]{'contents'}[9]{'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'};
@@ -566,10 +543,9 @@ 
$result_trees{'macro_and_commands_in_early_commands'}{'contents'}[2]{'args'}[0]{
 
$result_trees{'macro_and_commands_in_early_commands'}{'contents'}[2]{'contents'}[0]{'parent'}
 = $result_trees{'macro_and_commands_in_early_commands'}{'contents'}[2];
 
$result_trees{'macro_and_commands_in_early_commands'}{'contents'}[2]{'contents'}[1]{'args'}[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'}[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]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'macro_and_commands_in_early_commands'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'args'}[0];
+$result_trees{'macro_and_commands_in_early_commands'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'args'}[0]{'parent'}
 = 
$result_trees{'macro_and_commands_in_early_commands'}{'contents'}[2]{'contents'}[1]{'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]{'contents'}[2]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'macro_and_commands_in_early_commands'}{'contents'}[2]{'contents'}[1]{'contents'}[2]{'args'}[0];
-$result_trees{'macro_and_commands_in_early_commands'}{'contents'}[2]{'contents'}[1]{'contents'}[2]{'args'}[0]{'parent'}
 = 
$result_trees{'macro_and_commands_in_early_commands'}{'contents'}[2]{'contents'}[1]{'contents'}[2];
-$result_trees{'macro_and_commands_in_early_commands'}{'contents'}[2]{'contents'}[1]{'contents'}[2]{'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]{'contents'}[0]{'parent'}
 = 
$result_trees{'macro_and_commands_in_early_commands'}{'contents'}[2]{'contents'}[2];
 
$result_trees{'macro_and_commands_in_early_commands'}{'contents'}[2]{'contents'}[2]{'parent'}
 = $result_trees{'macro_and_commands_in_early_commands'}{'contents'}[2];
diff --git a/tp/t/results/include/macro_definition_in_include.pl 
b/tp/t/results/include/macro_definition_in_include.pl
index 9e12169154..146bd676d9 100644
--- a/tp/t/results/include/macro_definition_in_include.pl
+++ b/tp/t/results/include/macro_definition_in_include.pl
@@ -21,14 +21,9 @@ $result_trees{'macro_definition_in_include'} = {
           'contents' => [
             {
               'parent' => {},
-              'text' => 'in themacro',
-              'type' => 'raw'
-            },
-            {
-              'parent' => {},
-              'text' => '
+              'text' => 'in themacro
 ',
-              'type' => 'last_raw_newline'
+              'type' => 'raw'
             },
             {
               'args' => [
@@ -102,10 +97,9 @@ $result_trees{'macro_definition_in_include'} = {
 };
 
$result_trees{'macro_definition_in_include'}{'contents'}[0]{'contents'}[0]{'args'}[0]{'parent'}
 = $result_trees{'macro_definition_in_include'}{'contents'}[0]{'contents'}[0];
 
$result_trees{'macro_definition_in_include'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'parent'}
 = $result_trees{'macro_definition_in_include'}{'contents'}[0]{'contents'}[0];
+$result_trees{'macro_definition_in_include'}{'contents'}[0]{'contents'}[0]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'macro_definition_in_include'}{'contents'}[0]{'contents'}[0]{'contents'}[1]{'args'}[0];
+$result_trees{'macro_definition_in_include'}{'contents'}[0]{'contents'}[0]{'contents'}[1]{'args'}[0]{'parent'}
 = 
$result_trees{'macro_definition_in_include'}{'contents'}[0]{'contents'}[0]{'contents'}[1];
 
$result_trees{'macro_definition_in_include'}{'contents'}[0]{'contents'}[0]{'contents'}[1]{'parent'}
 = $result_trees{'macro_definition_in_include'}{'contents'}[0]{'contents'}[0];
-$result_trees{'macro_definition_in_include'}{'contents'}[0]{'contents'}[0]{'contents'}[2]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'macro_definition_in_include'}{'contents'}[0]{'contents'}[0]{'contents'}[2]{'args'}[0];
-$result_trees{'macro_definition_in_include'}{'contents'}[0]{'contents'}[0]{'contents'}[2]{'args'}[0]{'parent'}
 = 
$result_trees{'macro_definition_in_include'}{'contents'}[0]{'contents'}[0]{'contents'}[2];
-$result_trees{'macro_definition_in_include'}{'contents'}[0]{'contents'}[0]{'contents'}[2]{'parent'}
 = $result_trees{'macro_definition_in_include'}{'contents'}[0]{'contents'}[0];
 
$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]{'contents'}[2]{'contents'}[0]{'parent'}
 = $result_trees{'macro_definition_in_include'}{'contents'}[0]{'contents'}[2];
diff --git a/tp/t/results/include/macro_in_early_commands.pl 
b/tp/t/results/include/macro_in_early_commands.pl
index 6e9cb489c7..aa06249f95 100644
--- a/tp/t/results/include/macro_in_early_commands.pl
+++ b/tp/t/results/include/macro_in_early_commands.pl
@@ -21,14 +21,9 @@ $result_trees{'macro_in_early_commands'} = {
           'contents' => [
             {
               'parent' => {},
-              'text' => 'macro_in_pass',
-              'type' => 'raw'
-            },
-            {
-              'parent' => {},
-              'text' => '
+              'text' => 'macro_in_pass
 ',
-              'type' => 'last_raw_newline'
+              'type' => 'raw'
             },
             {
               'args' => [
@@ -88,14 +83,9 @@ $result_trees{'macro_in_early_commands'} = {
           'contents' => [
             {
               'parent' => {},
-              'text' => 'texi_commands.\\ext\\',
-              'type' => 'raw'
-            },
-            {
-              'parent' => {},
-              'text' => '
+              'text' => 'texi_commands.\\ext\\
 ',
-              'type' => 'last_raw_newline'
+              'type' => 'raw'
             },
             {
               'args' => [
@@ -191,14 +181,9 @@ $result_trees{'macro_in_early_commands'} = {
           'contents' => [
             {
               'parent' => {},
-              'text' => 'ISO-8859-1',
-              'type' => 'raw'
-            },
-            {
-              'parent' => {},
-              'text' => '
+              'text' => 'ISO-8859-1
 ',
-              'type' => 'last_raw_newline'
+              'type' => 'raw'
             },
             {
               'args' => [
@@ -259,14 +244,9 @@ $result_trees{'macro_in_early_commands'} = {
           'contents' => [
             {
               'parent' => {},
-              'text' => '@documentencoding',
-              'type' => 'raw'
-            },
-            {
-              'parent' => {},
-              'text' => '
+              'text' => '@documentencoding
 ',
-              'type' => 'last_raw_newline'
+              'type' => 'raw'
             },
             {
               'args' => [
@@ -370,14 +350,9 @@ $result_trees{'macro_in_early_commands'} = {
             },
             {
               'parent' => {},
-              'text' => '@include inc_file.texi',
-              'type' => 'raw'
-            },
-            {
-              'parent' => {},
-              'text' => '
+              'text' => '@include inc_file.texi
 ',
-              'type' => 'last_raw_newline'
+              'type' => 'raw'
             },
             {
               'args' => [
@@ -508,14 +483,9 @@ $result_trees{'macro_in_early_commands'} = {
           'contents' => [
             {
               'parent' => {},
-              'text' => 'in themacro',
-              'type' => 'raw'
-            },
-            {
-              'parent' => {},
-              'text' => '
+              'text' => 'in themacro
 ',
-              'type' => 'last_raw_newline'
+              'type' => 'raw'
             },
             {
               'args' => [
@@ -640,18 +610,16 @@ $result_trees{'macro_in_early_commands'} = {
 };
 
$result_trees{'macro_in_early_commands'}{'contents'}[0]{'contents'}[0]{'args'}[0]{'parent'}
 = $result_trees{'macro_in_early_commands'}{'contents'}[0]{'contents'}[0];
 
$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]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'macro_in_early_commands'}{'contents'}[0]{'contents'}[0]{'contents'}[1]{'args'}[0];
+$result_trees{'macro_in_early_commands'}{'contents'}[0]{'contents'}[0]{'contents'}[1]{'args'}[0]{'parent'}
 = 
$result_trees{'macro_in_early_commands'}{'contents'}[0]{'contents'}[0]{'contents'}[1];
 
$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]{'contents'}[2]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'macro_in_early_commands'}{'contents'}[0]{'contents'}[0]{'contents'}[2]{'args'}[0];
-$result_trees{'macro_in_early_commands'}{'contents'}[0]{'contents'}[0]{'contents'}[2]{'args'}[0]{'parent'}
 = 
$result_trees{'macro_in_early_commands'}{'contents'}[0]{'contents'}[0]{'contents'}[2];
-$result_trees{'macro_in_early_commands'}{'contents'}[0]{'contents'}[0]{'contents'}[2]{'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]{'args'}[0]{'parent'}
 = $result_trees{'macro_in_early_commands'}{'contents'}[0]{'contents'}[1];
 
$result_trees{'macro_in_early_commands'}{'contents'}[0]{'contents'}[1]{'args'}[1]{'parent'}
 = $result_trees{'macro_in_early_commands'}{'contents'}[0]{'contents'}[1];
 
$result_trees{'macro_in_early_commands'}{'contents'}[0]{'contents'}[1]{'contents'}[0]{'parent'}
 = $result_trees{'macro_in_early_commands'}{'contents'}[0]{'contents'}[1];
+$result_trees{'macro_in_early_commands'}{'contents'}[0]{'contents'}[1]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'macro_in_early_commands'}{'contents'}[0]{'contents'}[1]{'contents'}[1]{'args'}[0];
+$result_trees{'macro_in_early_commands'}{'contents'}[0]{'contents'}[1]{'contents'}[1]{'args'}[0]{'parent'}
 = 
$result_trees{'macro_in_early_commands'}{'contents'}[0]{'contents'}[1]{'contents'}[1];
 
$result_trees{'macro_in_early_commands'}{'contents'}[0]{'contents'}[1]{'contents'}[1]{'parent'}
 = $result_trees{'macro_in_early_commands'}{'contents'}[0]{'contents'}[1];
-$result_trees{'macro_in_early_commands'}{'contents'}[0]{'contents'}[1]{'contents'}[2]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'macro_in_early_commands'}{'contents'}[0]{'contents'}[1]{'contents'}[2]{'args'}[0];
-$result_trees{'macro_in_early_commands'}{'contents'}[0]{'contents'}[1]{'contents'}[2]{'args'}[0]{'parent'}
 = 
$result_trees{'macro_in_early_commands'}{'contents'}[0]{'contents'}[1]{'contents'}[2];
-$result_trees{'macro_in_early_commands'}{'contents'}[0]{'contents'}[1]{'contents'}[2]{'parent'}
 = $result_trees{'macro_in_early_commands'}{'contents'}[0]{'contents'}[1];
 
$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]{'parent'}
 = $result_trees{'macro_in_early_commands'}{'contents'}[0];
 
$result_trees{'macro_in_early_commands'}{'contents'}[0]{'contents'}[3]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'macro_in_early_commands'}{'contents'}[0]{'contents'}[3]{'args'}[0];
@@ -660,18 +628,16 @@ 
$result_trees{'macro_in_early_commands'}{'contents'}[0]{'contents'}[3]{'parent'}
 
$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]{'parent'}
 = $result_trees{'macro_in_early_commands'}{'contents'}[0]{'contents'}[5];
 
$result_trees{'macro_in_early_commands'}{'contents'}[0]{'contents'}[5]{'contents'}[0]{'parent'}
 = $result_trees{'macro_in_early_commands'}{'contents'}[0]{'contents'}[5];
+$result_trees{'macro_in_early_commands'}{'contents'}[0]{'contents'}[5]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'macro_in_early_commands'}{'contents'}[0]{'contents'}[5]{'contents'}[1]{'args'}[0];
+$result_trees{'macro_in_early_commands'}{'contents'}[0]{'contents'}[5]{'contents'}[1]{'args'}[0]{'parent'}
 = 
$result_trees{'macro_in_early_commands'}{'contents'}[0]{'contents'}[5]{'contents'}[1];
 
$result_trees{'macro_in_early_commands'}{'contents'}[0]{'contents'}[5]{'contents'}[1]{'parent'}
 = $result_trees{'macro_in_early_commands'}{'contents'}[0]{'contents'}[5];
-$result_trees{'macro_in_early_commands'}{'contents'}[0]{'contents'}[5]{'contents'}[2]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'macro_in_early_commands'}{'contents'}[0]{'contents'}[5]{'contents'}[2]{'args'}[0];
-$result_trees{'macro_in_early_commands'}{'contents'}[0]{'contents'}[5]{'contents'}[2]{'args'}[0]{'parent'}
 = 
$result_trees{'macro_in_early_commands'}{'contents'}[0]{'contents'}[5]{'contents'}[2];
-$result_trees{'macro_in_early_commands'}{'contents'}[0]{'contents'}[5]{'contents'}[2]{'parent'}
 = $result_trees{'macro_in_early_commands'}{'contents'}[0]{'contents'}[5];
 
$result_trees{'macro_in_early_commands'}{'contents'}[0]{'contents'}[5]{'parent'}
 = $result_trees{'macro_in_early_commands'}{'contents'}[0];
 
$result_trees{'macro_in_early_commands'}{'contents'}[0]{'contents'}[6]{'parent'}
 = $result_trees{'macro_in_early_commands'}{'contents'}[0];
 
$result_trees{'macro_in_early_commands'}{'contents'}[0]{'contents'}[7]{'args'}[0]{'parent'}
 = $result_trees{'macro_in_early_commands'}{'contents'}[0]{'contents'}[7];
 
$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]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'macro_in_early_commands'}{'contents'}[0]{'contents'}[7]{'contents'}[1]{'args'}[0];
+$result_trees{'macro_in_early_commands'}{'contents'}[0]{'contents'}[7]{'contents'}[1]{'args'}[0]{'parent'}
 = 
$result_trees{'macro_in_early_commands'}{'contents'}[0]{'contents'}[7]{'contents'}[1];
 
$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]{'contents'}[2]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'macro_in_early_commands'}{'contents'}[0]{'contents'}[7]{'contents'}[2]{'args'}[0];
-$result_trees{'macro_in_early_commands'}{'contents'}[0]{'contents'}[7]{'contents'}[2]{'args'}[0]{'parent'}
 = 
$result_trees{'macro_in_early_commands'}{'contents'}[0]{'contents'}[7]{'contents'}[2];
-$result_trees{'macro_in_early_commands'}{'contents'}[0]{'contents'}[7]{'contents'}[2]{'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]{'parent'}
 = $result_trees{'macro_in_early_commands'}{'contents'}[0];
 
$result_trees{'macro_in_early_commands'}{'contents'}[0]{'contents'}[9]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'macro_in_early_commands'}{'contents'}[0]{'contents'}[9]{'args'}[0];
@@ -681,10 +647,9 @@ 
$result_trees{'macro_in_early_commands'}{'contents'}[0]{'contents'}[10]{'parent'
 
$result_trees{'macro_in_early_commands'}{'contents'}[0]{'contents'}[11]{'args'}[0]{'parent'}
 = $result_trees{'macro_in_early_commands'}{'contents'}[0]{'contents'}[11];
 
$result_trees{'macro_in_early_commands'}{'contents'}[0]{'contents'}[11]{'contents'}[0]{'parent'}
 = $result_trees{'macro_in_early_commands'}{'contents'}[0]{'contents'}[11];
 
$result_trees{'macro_in_early_commands'}{'contents'}[0]{'contents'}[11]{'contents'}[1]{'parent'}
 = $result_trees{'macro_in_early_commands'}{'contents'}[0]{'contents'}[11];
+$result_trees{'macro_in_early_commands'}{'contents'}[0]{'contents'}[11]{'contents'}[2]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'macro_in_early_commands'}{'contents'}[0]{'contents'}[11]{'contents'}[2]{'args'}[0];
+$result_trees{'macro_in_early_commands'}{'contents'}[0]{'contents'}[11]{'contents'}[2]{'args'}[0]{'parent'}
 = 
$result_trees{'macro_in_early_commands'}{'contents'}[0]{'contents'}[11]{'contents'}[2];
 
$result_trees{'macro_in_early_commands'}{'contents'}[0]{'contents'}[11]{'contents'}[2]{'parent'}
 = $result_trees{'macro_in_early_commands'}{'contents'}[0]{'contents'}[11];
-$result_trees{'macro_in_early_commands'}{'contents'}[0]{'contents'}[11]{'contents'}[3]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'macro_in_early_commands'}{'contents'}[0]{'contents'}[11]{'contents'}[3]{'args'}[0];
-$result_trees{'macro_in_early_commands'}{'contents'}[0]{'contents'}[11]{'contents'}[3]{'args'}[0]{'parent'}
 = 
$result_trees{'macro_in_early_commands'}{'contents'}[0]{'contents'}[11]{'contents'}[3];
-$result_trees{'macro_in_early_commands'}{'contents'}[0]{'contents'}[11]{'contents'}[3]{'parent'}
 = $result_trees{'macro_in_early_commands'}{'contents'}[0]{'contents'}[11];
 
$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]{'parent'} = 
$result_trees{'macro_in_early_commands'};
@@ -698,10 +663,9 @@ 
$result_trees{'macro_in_early_commands'}{'contents'}[2]{'args'}[0]{'parent'} = $
 
$result_trees{'macro_in_early_commands'}{'contents'}[2]{'contents'}[0]{'parent'}
 = $result_trees{'macro_in_early_commands'}{'contents'}[2];
 
$result_trees{'macro_in_early_commands'}{'contents'}[2]{'contents'}[1]{'args'}[0]{'parent'}
 = $result_trees{'macro_in_early_commands'}{'contents'}[2]{'contents'}[1];
 
$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]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'macro_in_early_commands'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'args'}[0];
+$result_trees{'macro_in_early_commands'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'args'}[0]{'parent'}
 = 
$result_trees{'macro_in_early_commands'}{'contents'}[2]{'contents'}[1]{'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]{'contents'}[2]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'macro_in_early_commands'}{'contents'}[2]{'contents'}[1]{'contents'}[2]{'args'}[0];
-$result_trees{'macro_in_early_commands'}{'contents'}[2]{'contents'}[1]{'contents'}[2]{'args'}[0]{'parent'}
 = 
$result_trees{'macro_in_early_commands'}{'contents'}[2]{'contents'}[1]{'contents'}[2];
-$result_trees{'macro_in_early_commands'}{'contents'}[2]{'contents'}[1]{'contents'}[2]{'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]{'contents'}[0]{'parent'}
 = $result_trees{'macro_in_early_commands'}{'contents'}[2]{'contents'}[2];
 
$result_trees{'macro_in_early_commands'}{'contents'}[2]{'contents'}[2]{'parent'}
 = $result_trees{'macro_in_early_commands'}{'contents'}[2];
diff --git a/tp/t/results/info_tests/def_in_copying.pl 
b/tp/t/results/info_tests/def_in_copying.pl
index 4abc13f679..05d71e13c9 100644
--- a/tp/t/results/info_tests/def_in_copying.pl
+++ b/tp/t/results/info_tests/def_in_copying.pl
@@ -39,14 +39,9 @@ $result_trees{'def_in_copying'} = {
             },
             {
               'parent' => {},
-              'text' => '@end deffn',
-              'type' => 'raw'
-            },
-            {
-              'parent' => {},
-              'text' => '
+              'text' => '@end deffn
 ',
-              'type' => 'last_raw_newline'
+              'type' => 'raw'
             },
             {
               'args' => [
@@ -773,10 +768,9 @@ 
$result_trees{'def_in_copying'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'pa
 
$result_trees{'def_in_copying'}{'contents'}[0]{'contents'}[0]{'contents'}[1]{'parent'}
 = $result_trees{'def_in_copying'}{'contents'}[0]{'contents'}[0];
 
$result_trees{'def_in_copying'}{'contents'}[0]{'contents'}[0]{'contents'}[2]{'parent'}
 = $result_trees{'def_in_copying'}{'contents'}[0]{'contents'}[0];
 
$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]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'def_in_copying'}{'contents'}[0]{'contents'}[0]{'contents'}[4]{'args'}[0];
+$result_trees{'def_in_copying'}{'contents'}[0]{'contents'}[0]{'contents'}[4]{'args'}[0]{'parent'}
 = $result_trees{'def_in_copying'}{'contents'}[0]{'contents'}[0]{'contents'}[4];
 
$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]{'contents'}[5]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'def_in_copying'}{'contents'}[0]{'contents'}[0]{'contents'}[5]{'args'}[0];
-$result_trees{'def_in_copying'}{'contents'}[0]{'contents'}[0]{'contents'}[5]{'args'}[0]{'parent'}
 = $result_trees{'def_in_copying'}{'contents'}[0]{'contents'}[0]{'contents'}[5];
-$result_trees{'def_in_copying'}{'contents'}[0]{'contents'}[0]{'contents'}[5]{'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]{'parent'} = 
$result_trees{'def_in_copying'}{'contents'}[0];
 $result_trees{'def_in_copying'}{'contents'}[0]{'parent'} = 
$result_trees{'def_in_copying'};
diff --git a/tp/t/results/invalid_nestings/ignore_in_xref.pl 
b/tp/t/results/invalid_nestings/ignore_in_xref.pl
index 4deff1b80e..0b880b3ecf 100644
--- a/tp/t/results/invalid_nestings/ignore_in_xref.pl
+++ b/tp/t/results/invalid_nestings/ignore_in_xref.pl
@@ -69,14 +69,9 @@ $result_trees{'ignore_in_xref'} = {
                       'contents' => [
                         {
                           'parent' => {},
-                          'text' => 'ignore me',
-                          'type' => 'raw'
-                        },
-                        {
-                          'parent' => {},
-                          'text' => '
+                          'text' => 'ignore me
 ',
-                          'type' => 'last_raw_newline'
+                          'type' => 'raw'
                         },
                         {
                           'args' => [
@@ -185,10 +180,9 @@ 
$result_trees{'ignore_in_xref'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'ar
 
$result_trees{'ignore_in_xref'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'args'}[0]{'parent'}
 = $result_trees{'ignore_in_xref'}{'contents'}[1]{'contents'}[1]{'contents'}[0];
 
$result_trees{'ignore_in_xref'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'args'}[1]{'contents'}[0]{'args'}[0]{'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]{'contents'}[0]{'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]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'ignore_in_xref'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'args'}[1]{'contents'}[0]{'contents'}[1]{'args'}[0];
+$result_trees{'ignore_in_xref'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'args'}[1]{'contents'}[0]{'contents'}[1]{'args'}[0]{'parent'}
 = 
$result_trees{'ignore_in_xref'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'args'}[1]{'contents'}[0]{'contents'}[1];
 
$result_trees{'ignore_in_xref'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'args'}[1]{'contents'}[0]{'contents'}[1]{'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]{'contents'}[2]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'ignore_in_xref'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'args'}[1]{'contents'}[0]{'contents'}[2]{'args'}[0];
-$result_trees{'ignore_in_xref'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'args'}[1]{'contents'}[0]{'contents'}[2]{'args'}[0]{'parent'}
 = 
$result_trees{'ignore_in_xref'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'args'}[1]{'contents'}[0]{'contents'}[2];
-$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]{'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];
diff --git a/tp/t/results/macro/arg_body_expansion_order.pl 
b/tp/t/results/macro/arg_body_expansion_order.pl
index 641f798114..66c04827f3 100644
--- a/tp/t/results/macro/arg_body_expansion_order.pl
+++ b/tp/t/results/macro/arg_body_expansion_order.pl
@@ -27,14 +27,9 @@ $result_trees{'arg_body_expansion_order'} = {
           'contents' => [
             {
               'parent' => {},
-              'text' => 'initial',
-              'type' => 'raw'
-            },
-            {
-              'parent' => {},
-              'text' => '
+              'text' => 'initial
 ',
-              'type' => 'last_raw_newline'
+              'type' => 'raw'
             },
             {
               'args' => [
@@ -109,14 +104,9 @@ $result_trees{'arg_body_expansion_order'} = {
               'contents' => [
                 {
                   'parent' => {},
-                  'text' => 'different',
-                  'type' => 'raw'
-                },
-                {
-                  'parent' => {},
-                  'text' => '
+                  'text' => 'different
 ',
-                  'type' => 'last_raw_newline'
+                  'type' => 'raw'
                 },
                 {
                   'args' => [
@@ -156,14 +146,9 @@ $result_trees{'arg_body_expansion_order'} = {
             },
             {
               'parent' => {},
-              'text' => '\\arg\\',
-              'type' => 'raw'
-            },
-            {
-              'parent' => {},
-              'text' => '
+              'text' => '\\arg\\
 ',
-              'type' => 'last_raw_newline'
+              'type' => 'raw'
             },
             {
               'args' => [
@@ -242,14 +227,9 @@ $result_trees{'arg_body_expansion_order'} = {
           'contents' => [
             {
               'parent' => {},
-              'text' => 'different',
-              'type' => 'raw'
-            },
-            {
-              'parent' => {},
-              'text' => '
+              'text' => 'different
 ',
-              'type' => 'last_raw_newline'
+              'type' => 'raw'
             },
             {
               'args' => [
@@ -313,36 +293,32 @@ $result_trees{'arg_body_expansion_order'} = {
 
$result_trees{'arg_body_expansion_order'}{'contents'}[0]{'contents'}[0]{'parent'}
 = $result_trees{'arg_body_expansion_order'}{'contents'}[0];
 
$result_trees{'arg_body_expansion_order'}{'contents'}[0]{'contents'}[1]{'args'}[0]{'parent'}
 = $result_trees{'arg_body_expansion_order'}{'contents'}[0]{'contents'}[1];
 
$result_trees{'arg_body_expansion_order'}{'contents'}[0]{'contents'}[1]{'contents'}[0]{'parent'}
 = $result_trees{'arg_body_expansion_order'}{'contents'}[0]{'contents'}[1];
+$result_trees{'arg_body_expansion_order'}{'contents'}[0]{'contents'}[1]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'arg_body_expansion_order'}{'contents'}[0]{'contents'}[1]{'contents'}[1]{'args'}[0];
+$result_trees{'arg_body_expansion_order'}{'contents'}[0]{'contents'}[1]{'contents'}[1]{'args'}[0]{'parent'}
 = 
$result_trees{'arg_body_expansion_order'}{'contents'}[0]{'contents'}[1]{'contents'}[1];
 
$result_trees{'arg_body_expansion_order'}{'contents'}[0]{'contents'}[1]{'contents'}[1]{'parent'}
 = $result_trees{'arg_body_expansion_order'}{'contents'}[0]{'contents'}[1];
-$result_trees{'arg_body_expansion_order'}{'contents'}[0]{'contents'}[1]{'contents'}[2]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'arg_body_expansion_order'}{'contents'}[0]{'contents'}[1]{'contents'}[2]{'args'}[0];
-$result_trees{'arg_body_expansion_order'}{'contents'}[0]{'contents'}[1]{'contents'}[2]{'args'}[0]{'parent'}
 = 
$result_trees{'arg_body_expansion_order'}{'contents'}[0]{'contents'}[1]{'contents'}[2];
-$result_trees{'arg_body_expansion_order'}{'contents'}[0]{'contents'}[1]{'contents'}[2]{'parent'}
 = $result_trees{'arg_body_expansion_order'}{'contents'}[0]{'contents'}[1];
 
$result_trees{'arg_body_expansion_order'}{'contents'}[0]{'contents'}[1]{'parent'}
 = $result_trees{'arg_body_expansion_order'}{'contents'}[0];
 
$result_trees{'arg_body_expansion_order'}{'contents'}[0]{'contents'}[2]{'parent'}
 = $result_trees{'arg_body_expansion_order'}{'contents'}[0];
 
$result_trees{'arg_body_expansion_order'}{'contents'}[0]{'contents'}[3]{'args'}[0]{'parent'}
 = $result_trees{'arg_body_expansion_order'}{'contents'}[0]{'contents'}[3];
 
$result_trees{'arg_body_expansion_order'}{'contents'}[0]{'contents'}[3]{'args'}[1]{'parent'}
 = $result_trees{'arg_body_expansion_order'}{'contents'}[0]{'contents'}[3];
 
$result_trees{'arg_body_expansion_order'}{'contents'}[0]{'contents'}[3]{'contents'}[0]{'parent'}
 = $result_trees{'arg_body_expansion_order'}{'contents'}[0]{'contents'}[3];
 
$result_trees{'arg_body_expansion_order'}{'contents'}[0]{'contents'}[3]{'contents'}[1]{'contents'}[0]{'parent'}
 = 
$result_trees{'arg_body_expansion_order'}{'contents'}[0]{'contents'}[3]{'contents'}[1];
+$result_trees{'arg_body_expansion_order'}{'contents'}[0]{'contents'}[3]{'contents'}[1]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'arg_body_expansion_order'}{'contents'}[0]{'contents'}[3]{'contents'}[1]{'contents'}[1]{'args'}[0];
+$result_trees{'arg_body_expansion_order'}{'contents'}[0]{'contents'}[3]{'contents'}[1]{'contents'}[1]{'args'}[0]{'parent'}
 = 
$result_trees{'arg_body_expansion_order'}{'contents'}[0]{'contents'}[3]{'contents'}[1]{'contents'}[1];
 
$result_trees{'arg_body_expansion_order'}{'contents'}[0]{'contents'}[3]{'contents'}[1]{'contents'}[1]{'parent'}
 = 
$result_trees{'arg_body_expansion_order'}{'contents'}[0]{'contents'}[3]{'contents'}[1];
-$result_trees{'arg_body_expansion_order'}{'contents'}[0]{'contents'}[3]{'contents'}[1]{'contents'}[2]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'arg_body_expansion_order'}{'contents'}[0]{'contents'}[3]{'contents'}[1]{'contents'}[2]{'args'}[0];
-$result_trees{'arg_body_expansion_order'}{'contents'}[0]{'contents'}[3]{'contents'}[1]{'contents'}[2]{'args'}[0]{'parent'}
 = 
$result_trees{'arg_body_expansion_order'}{'contents'}[0]{'contents'}[3]{'contents'}[1]{'contents'}[2];
-$result_trees{'arg_body_expansion_order'}{'contents'}[0]{'contents'}[3]{'contents'}[1]{'contents'}[2]{'parent'}
 = 
$result_trees{'arg_body_expansion_order'}{'contents'}[0]{'contents'}[3]{'contents'}[1];
 
$result_trees{'arg_body_expansion_order'}{'contents'}[0]{'contents'}[3]{'contents'}[1]{'parent'}
 = $result_trees{'arg_body_expansion_order'}{'contents'}[0]{'contents'}[3];
 
$result_trees{'arg_body_expansion_order'}{'contents'}[0]{'contents'}[3]{'contents'}[2]{'parent'}
 = $result_trees{'arg_body_expansion_order'}{'contents'}[0]{'contents'}[3];
+$result_trees{'arg_body_expansion_order'}{'contents'}[0]{'contents'}[3]{'contents'}[3]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'arg_body_expansion_order'}{'contents'}[0]{'contents'}[3]{'contents'}[3]{'args'}[0];
+$result_trees{'arg_body_expansion_order'}{'contents'}[0]{'contents'}[3]{'contents'}[3]{'args'}[0]{'parent'}
 = 
$result_trees{'arg_body_expansion_order'}{'contents'}[0]{'contents'}[3]{'contents'}[3];
 
$result_trees{'arg_body_expansion_order'}{'contents'}[0]{'contents'}[3]{'contents'}[3]{'parent'}
 = $result_trees{'arg_body_expansion_order'}{'contents'}[0]{'contents'}[3];
-$result_trees{'arg_body_expansion_order'}{'contents'}[0]{'contents'}[3]{'contents'}[4]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'arg_body_expansion_order'}{'contents'}[0]{'contents'}[3]{'contents'}[4]{'args'}[0];
-$result_trees{'arg_body_expansion_order'}{'contents'}[0]{'contents'}[3]{'contents'}[4]{'args'}[0]{'parent'}
 = 
$result_trees{'arg_body_expansion_order'}{'contents'}[0]{'contents'}[3]{'contents'}[4];
-$result_trees{'arg_body_expansion_order'}{'contents'}[0]{'contents'}[3]{'contents'}[4]{'parent'}
 = $result_trees{'arg_body_expansion_order'}{'contents'}[0]{'contents'}[3];
 
$result_trees{'arg_body_expansion_order'}{'contents'}[0]{'contents'}[3]{'parent'}
 = $result_trees{'arg_body_expansion_order'}{'contents'}[0];
 
$result_trees{'arg_body_expansion_order'}{'contents'}[0]{'contents'}[4]{'parent'}
 = $result_trees{'arg_body_expansion_order'}{'contents'}[0];
 
$result_trees{'arg_body_expansion_order'}{'contents'}[0]{'contents'}[5]{'args'}[0]{'parent'}
 = $result_trees{'arg_body_expansion_order'}{'contents'}[0]{'contents'}[5];
 
$result_trees{'arg_body_expansion_order'}{'contents'}[0]{'contents'}[5]{'parent'}
 = $result_trees{'arg_body_expansion_order'}{'contents'}[0];
 
$result_trees{'arg_body_expansion_order'}{'contents'}[0]{'contents'}[6]{'args'}[0]{'parent'}
 = $result_trees{'arg_body_expansion_order'}{'contents'}[0]{'contents'}[6];
 
$result_trees{'arg_body_expansion_order'}{'contents'}[0]{'contents'}[6]{'contents'}[0]{'parent'}
 = $result_trees{'arg_body_expansion_order'}{'contents'}[0]{'contents'}[6];
+$result_trees{'arg_body_expansion_order'}{'contents'}[0]{'contents'}[6]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'arg_body_expansion_order'}{'contents'}[0]{'contents'}[6]{'contents'}[1]{'args'}[0];
+$result_trees{'arg_body_expansion_order'}{'contents'}[0]{'contents'}[6]{'contents'}[1]{'args'}[0]{'parent'}
 = 
$result_trees{'arg_body_expansion_order'}{'contents'}[0]{'contents'}[6]{'contents'}[1];
 
$result_trees{'arg_body_expansion_order'}{'contents'}[0]{'contents'}[6]{'contents'}[1]{'parent'}
 = $result_trees{'arg_body_expansion_order'}{'contents'}[0]{'contents'}[6];
-$result_trees{'arg_body_expansion_order'}{'contents'}[0]{'contents'}[6]{'contents'}[2]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'arg_body_expansion_order'}{'contents'}[0]{'contents'}[6]{'contents'}[2]{'args'}[0];
-$result_trees{'arg_body_expansion_order'}{'contents'}[0]{'contents'}[6]{'contents'}[2]{'args'}[0]{'parent'}
 = 
$result_trees{'arg_body_expansion_order'}{'contents'}[0]{'contents'}[6]{'contents'}[2];
-$result_trees{'arg_body_expansion_order'}{'contents'}[0]{'contents'}[6]{'contents'}[2]{'parent'}
 = $result_trees{'arg_body_expansion_order'}{'contents'}[0]{'contents'}[6];
 
$result_trees{'arg_body_expansion_order'}{'contents'}[0]{'contents'}[6]{'parent'}
 = $result_trees{'arg_body_expansion_order'}{'contents'}[0];
 
$result_trees{'arg_body_expansion_order'}{'contents'}[0]{'contents'}[7]{'contents'}[0]{'parent'}
 = $result_trees{'arg_body_expansion_order'}{'contents'}[0]{'contents'}[7];
 
$result_trees{'arg_body_expansion_order'}{'contents'}[0]{'contents'}[7]{'parent'}
 = $result_trees{'arg_body_expansion_order'}{'contents'}[0];
diff --git a/tp/t/results/macro/arg_not_closed.pl 
b/tp/t/results/macro/arg_not_closed.pl
index 25d8c25e93..740900e0f8 100644
--- a/tp/t/results/macro/arg_not_closed.pl
+++ b/tp/t/results/macro/arg_not_closed.pl
@@ -26,14 +26,9 @@ $result_trees{'arg_not_closed'} = {
           'contents' => [
             {
               'parent' => {},
-              'text' => 'foo',
-              'type' => 'raw'
-            },
-            {
-              'parent' => {},
-              'text' => '
+              'text' => 'foo
 ',
-              'type' => 'last_raw_newline'
+              'type' => 'raw'
             },
             {
               'args' => [
@@ -103,10 +98,9 @@ $result_trees{'arg_not_closed'} = {
 
$result_trees{'arg_not_closed'}{'contents'}[0]{'contents'}[0]{'args'}[0]{'parent'}
 = $result_trees{'arg_not_closed'}{'contents'}[0]{'contents'}[0];
 
$result_trees{'arg_not_closed'}{'contents'}[0]{'contents'}[0]{'args'}[1]{'parent'}
 = $result_trees{'arg_not_closed'}{'contents'}[0]{'contents'}[0];
 
$result_trees{'arg_not_closed'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'parent'}
 = $result_trees{'arg_not_closed'}{'contents'}[0]{'contents'}[0];
+$result_trees{'arg_not_closed'}{'contents'}[0]{'contents'}[0]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'arg_not_closed'}{'contents'}[0]{'contents'}[0]{'contents'}[1]{'args'}[0];
+$result_trees{'arg_not_closed'}{'contents'}[0]{'contents'}[0]{'contents'}[1]{'args'}[0]{'parent'}
 = $result_trees{'arg_not_closed'}{'contents'}[0]{'contents'}[0]{'contents'}[1];
 
$result_trees{'arg_not_closed'}{'contents'}[0]{'contents'}[0]{'contents'}[1]{'parent'}
 = $result_trees{'arg_not_closed'}{'contents'}[0]{'contents'}[0];
-$result_trees{'arg_not_closed'}{'contents'}[0]{'contents'}[0]{'contents'}[2]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'arg_not_closed'}{'contents'}[0]{'contents'}[0]{'contents'}[2]{'args'}[0];
-$result_trees{'arg_not_closed'}{'contents'}[0]{'contents'}[0]{'contents'}[2]{'args'}[0]{'parent'}
 = $result_trees{'arg_not_closed'}{'contents'}[0]{'contents'}[0]{'contents'}[2];
-$result_trees{'arg_not_closed'}{'contents'}[0]{'contents'}[0]{'contents'}[2]{'parent'}
 = $result_trees{'arg_not_closed'}{'contents'}[0]{'contents'}[0];
 $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]{'contents'}[2]{'contents'}[0]{'parent'}
 = $result_trees{'arg_not_closed'}{'contents'}[0]{'contents'}[2];
diff --git a/tp/t/results/macro/backslash_in_arg.pl 
b/tp/t/results/macro/backslash_in_arg.pl
index 6882d9f12d..dfc7b8624f 100644
--- a/tp/t/results/macro/backslash_in_arg.pl
+++ b/tp/t/results/macro/backslash_in_arg.pl
@@ -54,14 +54,9 @@ $result_trees{'backslash_in_arg'} = {
           'contents' => [
             {
               'parent' => {},
-              'text' => '@findex \\TEXT\\',
-              'type' => 'raw'
-            },
-            {
-              'parent' => {},
-              'text' => '
+              'text' => '@findex \\TEXT\\
 ',
-              'type' => 'last_raw_newline'
+              'type' => 'raw'
             },
             {
               'args' => [
@@ -339,10 +334,9 @@ 
$result_trees{'backslash_in_arg'}{'contents'}[1]{'contents'}[0]{'parent'} = $res
 
$result_trees{'backslash_in_arg'}{'contents'}[1]{'contents'}[1]{'args'}[0]{'parent'}
 = $result_trees{'backslash_in_arg'}{'contents'}[1]{'contents'}[1];
 
$result_trees{'backslash_in_arg'}{'contents'}[1]{'contents'}[1]{'args'}[1]{'parent'}
 = $result_trees{'backslash_in_arg'}{'contents'}[1]{'contents'}[1];
 
$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]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'backslash_in_arg'}{'contents'}[1]{'contents'}[1]{'contents'}[1]{'args'}[0];
+$result_trees{'backslash_in_arg'}{'contents'}[1]{'contents'}[1]{'contents'}[1]{'args'}[0]{'parent'}
 = 
$result_trees{'backslash_in_arg'}{'contents'}[1]{'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]{'contents'}[2]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'backslash_in_arg'}{'contents'}[1]{'contents'}[1]{'contents'}[2]{'args'}[0];
-$result_trees{'backslash_in_arg'}{'contents'}[1]{'contents'}[1]{'contents'}[2]{'args'}[0]{'parent'}
 = 
$result_trees{'backslash_in_arg'}{'contents'}[1]{'contents'}[1]{'contents'}[2];
-$result_trees{'backslash_in_arg'}{'contents'}[1]{'contents'}[1]{'contents'}[2]{'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]{'parent'} = 
$result_trees{'backslash_in_arg'}{'contents'}[1];
 
$result_trees{'backslash_in_arg'}{'contents'}[1]{'contents'}[3]{'args'}[0]{'contents'}[0]{'parent'}
 = $result_trees{'backslash_in_arg'}{'contents'}[1]{'contents'}[3]{'args'}[0];
diff --git a/tp/t/results/macro/bad_argument.pl 
b/tp/t/results/macro/bad_argument.pl
index 3cbd13c2d7..387b4cd1bf 100644
--- a/tp/t/results/macro/bad_argument.pl
+++ b/tp/t/results/macro/bad_argument.pl
@@ -14,14 +14,9 @@ $result_trees{'bad_argument'} = {
           'contents' => [
             {
               'parent' => {},
-              'text' => 'in macro',
-              'type' => 'raw'
-            },
-            {
-              'parent' => {},
-              'text' => '
+              'text' => 'in macro
 ',
-              'type' => 'last_raw_newline'
+              'type' => 'raw'
             },
             {
               'args' => [
@@ -83,14 +78,9 @@ $result_trees{'bad_argument'} = {
           'contents' => [
             {
               'parent' => {},
-              'text' => 'in',
-              'type' => 'raw'
-            },
-            {
-              'parent' => {},
-              'text' => '
+              'text' => 'in
 ',
-              'type' => 'last_raw_newline'
+              'type' => 'raw'
             },
             {
               'args' => [
@@ -157,14 +147,9 @@ $result_trees{'bad_argument'} = {
           'contents' => [
             {
               'parent' => {},
-              'text' => 'in macro',
-              'type' => 'raw'
-            },
-            {
-              'parent' => {},
-              'text' => '
+              'text' => 'in macro
 ',
-              'type' => 'last_raw_newline'
+              'type' => 'raw'
             },
             {
               'args' => [
@@ -219,14 +204,9 @@ $result_trees{'bad_argument'} = {
           'contents' => [
             {
               'parent' => {},
-              'text' => 'in #',
-              'type' => 'raw'
-            },
-            {
-              'parent' => {},
-              'text' => '
+              'text' => 'in #
 ',
-              'type' => 'last_raw_newline'
+              'type' => 'raw'
             },
             {
               'args' => [
@@ -278,34 +258,30 @@ $result_trees{'bad_argument'} = {
   'type' => 'document_root'
 };
 
$result_trees{'bad_argument'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'parent'}
 = $result_trees{'bad_argument'}{'contents'}[0]{'contents'}[0];
+$result_trees{'bad_argument'}{'contents'}[0]{'contents'}[0]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'bad_argument'}{'contents'}[0]{'contents'}[0]{'contents'}[1]{'args'}[0];
+$result_trees{'bad_argument'}{'contents'}[0]{'contents'}[0]{'contents'}[1]{'args'}[0]{'parent'}
 = $result_trees{'bad_argument'}{'contents'}[0]{'contents'}[0]{'contents'}[1];
 
$result_trees{'bad_argument'}{'contents'}[0]{'contents'}[0]{'contents'}[1]{'parent'}
 = $result_trees{'bad_argument'}{'contents'}[0]{'contents'}[0];
-$result_trees{'bad_argument'}{'contents'}[0]{'contents'}[0]{'contents'}[2]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'bad_argument'}{'contents'}[0]{'contents'}[0]{'contents'}[2]{'args'}[0];
-$result_trees{'bad_argument'}{'contents'}[0]{'contents'}[0]{'contents'}[2]{'args'}[0]{'parent'}
 = $result_trees{'bad_argument'}{'contents'}[0]{'contents'}[0]{'contents'}[2];
-$result_trees{'bad_argument'}{'contents'}[0]{'contents'}[0]{'contents'}[2]{'parent'}
 = $result_trees{'bad_argument'}{'contents'}[0]{'contents'}[0];
 $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]{'contents'}[2]{'args'}[0]{'parent'}
 = $result_trees{'bad_argument'}{'contents'}[0]{'contents'}[2];
 
$result_trees{'bad_argument'}{'contents'}[0]{'contents'}[2]{'contents'}[0]{'parent'}
 = $result_trees{'bad_argument'}{'contents'}[0]{'contents'}[2];
+$result_trees{'bad_argument'}{'contents'}[0]{'contents'}[2]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'bad_argument'}{'contents'}[0]{'contents'}[2]{'contents'}[1]{'args'}[0];
+$result_trees{'bad_argument'}{'contents'}[0]{'contents'}[2]{'contents'}[1]{'args'}[0]{'parent'}
 = $result_trees{'bad_argument'}{'contents'}[0]{'contents'}[2]{'contents'}[1];
 
$result_trees{'bad_argument'}{'contents'}[0]{'contents'}[2]{'contents'}[1]{'parent'}
 = $result_trees{'bad_argument'}{'contents'}[0]{'contents'}[2];
-$result_trees{'bad_argument'}{'contents'}[0]{'contents'}[2]{'contents'}[2]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'bad_argument'}{'contents'}[0]{'contents'}[2]{'contents'}[2]{'args'}[0];
-$result_trees{'bad_argument'}{'contents'}[0]{'contents'}[2]{'contents'}[2]{'args'}[0]{'parent'}
 = $result_trees{'bad_argument'}{'contents'}[0]{'contents'}[2]{'contents'}[2];
-$result_trees{'bad_argument'}{'contents'}[0]{'contents'}[2]{'contents'}[2]{'parent'}
 = $result_trees{'bad_argument'}{'contents'}[0]{'contents'}[2];
 $result_trees{'bad_argument'}{'contents'}[0]{'contents'}[2]{'parent'} = 
$result_trees{'bad_argument'}{'contents'}[0];
 $result_trees{'bad_argument'}{'contents'}[0]{'contents'}[3]{'parent'} = 
$result_trees{'bad_argument'}{'contents'}[0];
 
$result_trees{'bad_argument'}{'contents'}[0]{'contents'}[4]{'args'}[0]{'parent'}
 = $result_trees{'bad_argument'}{'contents'}[0]{'contents'}[4];
 
$result_trees{'bad_argument'}{'contents'}[0]{'contents'}[4]{'args'}[1]{'parent'}
 = $result_trees{'bad_argument'}{'contents'}[0]{'contents'}[4];
 
$result_trees{'bad_argument'}{'contents'}[0]{'contents'}[4]{'contents'}[0]{'parent'}
 = $result_trees{'bad_argument'}{'contents'}[0]{'contents'}[4];
+$result_trees{'bad_argument'}{'contents'}[0]{'contents'}[4]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'bad_argument'}{'contents'}[0]{'contents'}[4]{'contents'}[1]{'args'}[0];
+$result_trees{'bad_argument'}{'contents'}[0]{'contents'}[4]{'contents'}[1]{'args'}[0]{'parent'}
 = $result_trees{'bad_argument'}{'contents'}[0]{'contents'}[4]{'contents'}[1];
 
$result_trees{'bad_argument'}{'contents'}[0]{'contents'}[4]{'contents'}[1]{'parent'}
 = $result_trees{'bad_argument'}{'contents'}[0]{'contents'}[4];
-$result_trees{'bad_argument'}{'contents'}[0]{'contents'}[4]{'contents'}[2]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'bad_argument'}{'contents'}[0]{'contents'}[4]{'contents'}[2]{'args'}[0];
-$result_trees{'bad_argument'}{'contents'}[0]{'contents'}[4]{'contents'}[2]{'args'}[0]{'parent'}
 = $result_trees{'bad_argument'}{'contents'}[0]{'contents'}[4]{'contents'}[2];
-$result_trees{'bad_argument'}{'contents'}[0]{'contents'}[4]{'contents'}[2]{'parent'}
 = $result_trees{'bad_argument'}{'contents'}[0]{'contents'}[4];
 $result_trees{'bad_argument'}{'contents'}[0]{'contents'}[4]{'parent'} = 
$result_trees{'bad_argument'}{'contents'}[0];
 $result_trees{'bad_argument'}{'contents'}[0]{'contents'}[5]{'parent'} = 
$result_trees{'bad_argument'}{'contents'}[0];
 
$result_trees{'bad_argument'}{'contents'}[0]{'contents'}[6]{'contents'}[0]{'parent'}
 = $result_trees{'bad_argument'}{'contents'}[0]{'contents'}[6];
+$result_trees{'bad_argument'}{'contents'}[0]{'contents'}[6]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'bad_argument'}{'contents'}[0]{'contents'}[6]{'contents'}[1]{'args'}[0];
+$result_trees{'bad_argument'}{'contents'}[0]{'contents'}[6]{'contents'}[1]{'args'}[0]{'parent'}
 = $result_trees{'bad_argument'}{'contents'}[0]{'contents'}[6]{'contents'}[1];
 
$result_trees{'bad_argument'}{'contents'}[0]{'contents'}[6]{'contents'}[1]{'parent'}
 = $result_trees{'bad_argument'}{'contents'}[0]{'contents'}[6];
-$result_trees{'bad_argument'}{'contents'}[0]{'contents'}[6]{'contents'}[2]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'bad_argument'}{'contents'}[0]{'contents'}[6]{'contents'}[2]{'args'}[0];
-$result_trees{'bad_argument'}{'contents'}[0]{'contents'}[6]{'contents'}[2]{'args'}[0]{'parent'}
 = $result_trees{'bad_argument'}{'contents'}[0]{'contents'}[6]{'contents'}[2];
-$result_trees{'bad_argument'}{'contents'}[0]{'contents'}[6]{'contents'}[2]{'parent'}
 = $result_trees{'bad_argument'}{'contents'}[0]{'contents'}[6];
 $result_trees{'bad_argument'}{'contents'}[0]{'contents'}[6]{'parent'} = 
$result_trees{'bad_argument'}{'contents'}[0];
 $result_trees{'bad_argument'}{'contents'}[0]{'parent'} = 
$result_trees{'bad_argument'};
 
diff --git a/tp/t/results/macro/bad_formal_arg.pl 
b/tp/t/results/macro/bad_formal_arg.pl
index 9cf6ee27bf..0e1b99e4b5 100644
--- a/tp/t/results/macro/bad_formal_arg.pl
+++ b/tp/t/results/macro/bad_formal_arg.pl
@@ -37,14 +37,9 @@ $result_trees{'bad_formal_arg'} = {
           'contents' => [
             {
               'parent' => {},
-              'text' => 'in bad macro',
-              'type' => 'raw'
-            },
-            {
-              'parent' => {},
-              'text' => '
+              'text' => 'in bad macro
 ',
-              'type' => 'last_raw_newline'
+              'type' => 'raw'
             },
             {
               'args' => [
@@ -116,14 +111,9 @@ $result_trees{'bad_formal_arg'} = {
           'contents' => [
             {
               'parent' => {},
-              'text' => 'bad space',
-              'type' => 'raw'
-            },
-            {
-              'parent' => {},
-              'text' => '
+              'text' => 'bad space
 ',
-              'type' => 'last_raw_newline'
+              'type' => 'raw'
             },
             {
               'args' => [
@@ -199,14 +189,9 @@ $result_trees{'bad_formal_arg'} = {
               'contents' => [
                 {
                   'parent' => {},
-                  'text' => 'in macro foo',
-                  'type' => 'raw'
-                },
-                {
-                  'parent' => {},
-                  'text' => '
+                  'text' => 'in macro foo
 ',
-                  'type' => 'last_raw_newline'
+                  'type' => 'raw'
                 },
                 {
                   'args' => [
@@ -298,30 +283,27 @@ 
$result_trees{'bad_formal_arg'}{'contents'}[0]{'contents'}[1]{'args'}[0]{'parent
 
$result_trees{'bad_formal_arg'}{'contents'}[0]{'contents'}[1]{'args'}[1]{'parent'}
 = $result_trees{'bad_formal_arg'}{'contents'}[0]{'contents'}[1];
 
$result_trees{'bad_formal_arg'}{'contents'}[0]{'contents'}[1]{'args'}[2]{'parent'}
 = $result_trees{'bad_formal_arg'}{'contents'}[0]{'contents'}[1];
 
$result_trees{'bad_formal_arg'}{'contents'}[0]{'contents'}[1]{'contents'}[0]{'parent'}
 = $result_trees{'bad_formal_arg'}{'contents'}[0]{'contents'}[1];
+$result_trees{'bad_formal_arg'}{'contents'}[0]{'contents'}[1]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'bad_formal_arg'}{'contents'}[0]{'contents'}[1]{'contents'}[1]{'args'}[0];
+$result_trees{'bad_formal_arg'}{'contents'}[0]{'contents'}[1]{'contents'}[1]{'args'}[0]{'parent'}
 = $result_trees{'bad_formal_arg'}{'contents'}[0]{'contents'}[1]{'contents'}[1];
 
$result_trees{'bad_formal_arg'}{'contents'}[0]{'contents'}[1]{'contents'}[1]{'parent'}
 = $result_trees{'bad_formal_arg'}{'contents'}[0]{'contents'}[1];
-$result_trees{'bad_formal_arg'}{'contents'}[0]{'contents'}[1]{'contents'}[2]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'bad_formal_arg'}{'contents'}[0]{'contents'}[1]{'contents'}[2]{'args'}[0];
-$result_trees{'bad_formal_arg'}{'contents'}[0]{'contents'}[1]{'contents'}[2]{'args'}[0]{'parent'}
 = $result_trees{'bad_formal_arg'}{'contents'}[0]{'contents'}[1]{'contents'}[2];
-$result_trees{'bad_formal_arg'}{'contents'}[0]{'contents'}[1]{'contents'}[2]{'parent'}
 = $result_trees{'bad_formal_arg'}{'contents'}[0]{'contents'}[1];
 $result_trees{'bad_formal_arg'}{'contents'}[0]{'contents'}[1]{'parent'} = 
$result_trees{'bad_formal_arg'}{'contents'}[0];
 $result_trees{'bad_formal_arg'}{'contents'}[0]{'contents'}[2]{'parent'} = 
$result_trees{'bad_formal_arg'}{'contents'}[0];
 
$result_trees{'bad_formal_arg'}{'contents'}[0]{'contents'}[3]{'args'}[0]{'parent'}
 = $result_trees{'bad_formal_arg'}{'contents'}[0]{'contents'}[3];
 
$result_trees{'bad_formal_arg'}{'contents'}[0]{'contents'}[3]{'args'}[1]{'parent'}
 = $result_trees{'bad_formal_arg'}{'contents'}[0]{'contents'}[3];
 
$result_trees{'bad_formal_arg'}{'contents'}[0]{'contents'}[3]{'args'}[2]{'parent'}
 = $result_trees{'bad_formal_arg'}{'contents'}[0]{'contents'}[3];
 
$result_trees{'bad_formal_arg'}{'contents'}[0]{'contents'}[3]{'contents'}[0]{'parent'}
 = $result_trees{'bad_formal_arg'}{'contents'}[0]{'contents'}[3];
+$result_trees{'bad_formal_arg'}{'contents'}[0]{'contents'}[3]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'bad_formal_arg'}{'contents'}[0]{'contents'}[3]{'contents'}[1]{'args'}[0];
+$result_trees{'bad_formal_arg'}{'contents'}[0]{'contents'}[3]{'contents'}[1]{'args'}[0]{'parent'}
 = $result_trees{'bad_formal_arg'}{'contents'}[0]{'contents'}[3]{'contents'}[1];
 
$result_trees{'bad_formal_arg'}{'contents'}[0]{'contents'}[3]{'contents'}[1]{'parent'}
 = $result_trees{'bad_formal_arg'}{'contents'}[0]{'contents'}[3];
-$result_trees{'bad_formal_arg'}{'contents'}[0]{'contents'}[3]{'contents'}[2]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'bad_formal_arg'}{'contents'}[0]{'contents'}[3]{'contents'}[2]{'args'}[0];
-$result_trees{'bad_formal_arg'}{'contents'}[0]{'contents'}[3]{'contents'}[2]{'args'}[0]{'parent'}
 = $result_trees{'bad_formal_arg'}{'contents'}[0]{'contents'}[3]{'contents'}[2];
-$result_trees{'bad_formal_arg'}{'contents'}[0]{'contents'}[3]{'contents'}[2]{'parent'}
 = $result_trees{'bad_formal_arg'}{'contents'}[0]{'contents'}[3];
 $result_trees{'bad_formal_arg'}{'contents'}[0]{'contents'}[3]{'parent'} = 
$result_trees{'bad_formal_arg'}{'contents'}[0];
 $result_trees{'bad_formal_arg'}{'contents'}[0]{'contents'}[4]{'parent'} = 
$result_trees{'bad_formal_arg'}{'contents'}[0];
 
$result_trees{'bad_formal_arg'}{'contents'}[0]{'contents'}[5]{'args'}[0]{'parent'}
 = $result_trees{'bad_formal_arg'}{'contents'}[0]{'contents'}[5];
 
$result_trees{'bad_formal_arg'}{'contents'}[0]{'contents'}[5]{'args'}[1]{'parent'}
 = $result_trees{'bad_formal_arg'}{'contents'}[0]{'contents'}[5];
 
$result_trees{'bad_formal_arg'}{'contents'}[0]{'contents'}[5]{'contents'}[0]{'parent'}
 = $result_trees{'bad_formal_arg'}{'contents'}[0]{'contents'}[5];
 
$result_trees{'bad_formal_arg'}{'contents'}[0]{'contents'}[5]{'contents'}[1]{'contents'}[0]{'parent'}
 = $result_trees{'bad_formal_arg'}{'contents'}[0]{'contents'}[5]{'contents'}[1];
+$result_trees{'bad_formal_arg'}{'contents'}[0]{'contents'}[5]{'contents'}[1]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'bad_formal_arg'}{'contents'}[0]{'contents'}[5]{'contents'}[1]{'contents'}[1]{'args'}[0];
+$result_trees{'bad_formal_arg'}{'contents'}[0]{'contents'}[5]{'contents'}[1]{'contents'}[1]{'args'}[0]{'parent'}
 = 
$result_trees{'bad_formal_arg'}{'contents'}[0]{'contents'}[5]{'contents'}[1]{'contents'}[1];
 
$result_trees{'bad_formal_arg'}{'contents'}[0]{'contents'}[5]{'contents'}[1]{'contents'}[1]{'parent'}
 = $result_trees{'bad_formal_arg'}{'contents'}[0]{'contents'}[5]{'contents'}[1];
-$result_trees{'bad_formal_arg'}{'contents'}[0]{'contents'}[5]{'contents'}[1]{'contents'}[2]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'bad_formal_arg'}{'contents'}[0]{'contents'}[5]{'contents'}[1]{'contents'}[2]{'args'}[0];
-$result_trees{'bad_formal_arg'}{'contents'}[0]{'contents'}[5]{'contents'}[1]{'contents'}[2]{'args'}[0]{'parent'}
 = 
$result_trees{'bad_formal_arg'}{'contents'}[0]{'contents'}[5]{'contents'}[1]{'contents'}[2];
-$result_trees{'bad_formal_arg'}{'contents'}[0]{'contents'}[5]{'contents'}[1]{'contents'}[2]{'parent'}
 = $result_trees{'bad_formal_arg'}{'contents'}[0]{'contents'}[5]{'contents'}[1];
 
$result_trees{'bad_formal_arg'}{'contents'}[0]{'contents'}[5]{'contents'}[1]{'parent'}
 = $result_trees{'bad_formal_arg'}{'contents'}[0]{'contents'}[5];
 
$result_trees{'bad_formal_arg'}{'contents'}[0]{'contents'}[5]{'contents'}[2]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'bad_formal_arg'}{'contents'}[0]{'contents'}[5]{'contents'}[2]{'args'}[0];
 
$result_trees{'bad_formal_arg'}{'contents'}[0]{'contents'}[5]{'contents'}[2]{'args'}[0]{'parent'}
 = $result_trees{'bad_formal_arg'}{'contents'}[0]{'contents'}[5]{'contents'}[2];
diff --git a/tp/t/results/macro/bad_macro_name_with_underscore.pl 
b/tp/t/results/macro/bad_macro_name_with_underscore.pl
index 084a9463cd..73d1b12549 100644
--- a/tp/t/results/macro/bad_macro_name_with_underscore.pl
+++ b/tp/t/results/macro/bad_macro_name_with_underscore.pl
@@ -31,14 +31,9 @@ $result_trees{'bad_macro_name_with_underscore'} = {
           'contents' => [
             {
               'parent' => {},
-              'text' => 'In macro',
-              'type' => 'raw'
-            },
-            {
-              'parent' => {},
-              'text' => '
+              'text' => 'In macro
 ',
-              'type' => 'last_raw_newline'
+              'type' => 'raw'
             },
             {
               'args' => [
@@ -92,10 +87,9 @@ 
$result_trees{'bad_macro_name_with_underscore'}{'contents'}[0]{'contents'}[0]{'a
 
$result_trees{'bad_macro_name_with_underscore'}{'contents'}[0]{'contents'}[0]{'args'}[1]{'parent'}
 = 
$result_trees{'bad_macro_name_with_underscore'}{'contents'}[0]{'contents'}[0];
 
$result_trees{'bad_macro_name_with_underscore'}{'contents'}[0]{'contents'}[0]{'args'}[2]{'parent'}
 = 
$result_trees{'bad_macro_name_with_underscore'}{'contents'}[0]{'contents'}[0];
 
$result_trees{'bad_macro_name_with_underscore'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'bad_macro_name_with_underscore'}{'contents'}[0]{'contents'}[0];
+$result_trees{'bad_macro_name_with_underscore'}{'contents'}[0]{'contents'}[0]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'bad_macro_name_with_underscore'}{'contents'}[0]{'contents'}[0]{'contents'}[1]{'args'}[0];
+$result_trees{'bad_macro_name_with_underscore'}{'contents'}[0]{'contents'}[0]{'contents'}[1]{'args'}[0]{'parent'}
 = 
$result_trees{'bad_macro_name_with_underscore'}{'contents'}[0]{'contents'}[0]{'contents'}[1];
 
$result_trees{'bad_macro_name_with_underscore'}{'contents'}[0]{'contents'}[0]{'contents'}[1]{'parent'}
 = 
$result_trees{'bad_macro_name_with_underscore'}{'contents'}[0]{'contents'}[0];
-$result_trees{'bad_macro_name_with_underscore'}{'contents'}[0]{'contents'}[0]{'contents'}[2]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'bad_macro_name_with_underscore'}{'contents'}[0]{'contents'}[0]{'contents'}[2]{'args'}[0];
-$result_trees{'bad_macro_name_with_underscore'}{'contents'}[0]{'contents'}[0]{'contents'}[2]{'args'}[0]{'parent'}
 = 
$result_trees{'bad_macro_name_with_underscore'}{'contents'}[0]{'contents'}[0]{'contents'}[2];
-$result_trees{'bad_macro_name_with_underscore'}{'contents'}[0]{'contents'}[0]{'contents'}[2]{'parent'}
 = 
$result_trees{'bad_macro_name_with_underscore'}{'contents'}[0]{'contents'}[0];
 
$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]{'parent'} = 
$result_trees{'bad_macro_name_with_underscore'};
 
diff --git a/tp/t/results/macro/complete_macro_for_end.pl 
b/tp/t/results/macro/complete_macro_for_end.pl
index 651b31d3e9..bc6ee29cfc 100644
--- a/tp/t/results/macro/complete_macro_for_end.pl
+++ b/tp/t/results/macro/complete_macro_for_end.pl
@@ -21,14 +21,9 @@ $result_trees{'complete_macro_for_end'} = {
           'contents' => [
             {
               'parent' => {},
-              'text' => '@end cartouche',
-              'type' => 'raw'
-            },
-            {
-              'parent' => {},
-              'text' => '
+              'text' => '@end cartouche
 ',
-              'type' => 'last_raw_newline'
+              'type' => 'raw'
             },
             {
               'args' => [
@@ -133,10 +128,9 @@ $result_trees{'complete_macro_for_end'} = {
 };
 
$result_trees{'complete_macro_for_end'}{'contents'}[0]{'contents'}[0]{'args'}[0]{'parent'}
 = $result_trees{'complete_macro_for_end'}{'contents'}[0]{'contents'}[0];
 
$result_trees{'complete_macro_for_end'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'parent'}
 = $result_trees{'complete_macro_for_end'}{'contents'}[0]{'contents'}[0];
+$result_trees{'complete_macro_for_end'}{'contents'}[0]{'contents'}[0]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'complete_macro_for_end'}{'contents'}[0]{'contents'}[0]{'contents'}[1]{'args'}[0];
+$result_trees{'complete_macro_for_end'}{'contents'}[0]{'contents'}[0]{'contents'}[1]{'args'}[0]{'parent'}
 = 
$result_trees{'complete_macro_for_end'}{'contents'}[0]{'contents'}[0]{'contents'}[1];
 
$result_trees{'complete_macro_for_end'}{'contents'}[0]{'contents'}[0]{'contents'}[1]{'parent'}
 = $result_trees{'complete_macro_for_end'}{'contents'}[0]{'contents'}[0];
-$result_trees{'complete_macro_for_end'}{'contents'}[0]{'contents'}[0]{'contents'}[2]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'complete_macro_for_end'}{'contents'}[0]{'contents'}[0]{'contents'}[2]{'args'}[0];
-$result_trees{'complete_macro_for_end'}{'contents'}[0]{'contents'}[0]{'contents'}[2]{'args'}[0]{'parent'}
 = 
$result_trees{'complete_macro_for_end'}{'contents'}[0]{'contents'}[0]{'contents'}[2];
-$result_trees{'complete_macro_for_end'}{'contents'}[0]{'contents'}[0]{'contents'}[2]{'parent'}
 = $result_trees{'complete_macro_for_end'}{'contents'}[0]{'contents'}[0];
 
$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]{'contents'}[2]{'args'}[0]{'parent'}
 = $result_trees{'complete_macro_for_end'}{'contents'}[0]{'contents'}[2];
diff --git a/tp/t/results/macro/complex_argument.pl 
b/tp/t/results/macro/complex_argument.pl
index 4a5770f9de..3b318ab5de 100644
--- a/tp/t/results/macro/complex_argument.pl
+++ b/tp/t/results/macro/complex_argument.pl
@@ -26,14 +26,9 @@ $result_trees{'complex_argument'} = {
           'contents' => [
             {
               'parent' => {},
-              'text' => 'coucou \\arg\\ after arg',
-              'type' => 'raw'
-            },
-            {
-              'parent' => {},
-              'text' => '
+              'text' => 'coucou \\arg\\ after arg
 ',
-              'type' => 'last_raw_newline'
+              'type' => 'raw'
             },
             {
               'args' => [
@@ -112,14 +107,9 @@ $result_trees{'complex_argument'} = {
             },
             {
               'parent' => {},
-              'text' => '4',
-              'type' => 'raw'
-            },
-            {
-              'parent' => {},
-              'text' => '
+              'text' => '4
 ',
-              'type' => 'last_raw_newline'
+              'type' => 'raw'
             },
             {
               'args' => [
@@ -196,14 +186,9 @@ $result_trees{'complex_argument'} = {
             },
             {
               'parent' => {},
-              'text' => '&&&& \\arg\\',
-              'type' => 'raw'
-            },
-            {
-              'parent' => {},
-              'text' => '
+              'text' => '&&&& \\arg\\
 ',
-              'type' => 'last_raw_newline'
+              'type' => 'raw'
             },
             {
               'args' => [
@@ -466,14 +451,9 @@ $result_trees{'complex_argument'} = {
           'contents' => [
             {
               'parent' => {},
-              'text' => '@macrofour',
-              'type' => 'raw'
-            },
-            {
-              'parent' => {},
-              'text' => '
+              'text' => '@macrofour
 ',
-              'type' => 'last_raw_newline'
+              'type' => 'raw'
             },
             {
               'args' => [
@@ -529,14 +509,9 @@ $result_trees{'complex_argument'} = {
           'contents' => [
             {
               'parent' => {},
-              'text' => '@emph{\\truc\\}',
-              'type' => 'raw'
-            },
-            {
-              'parent' => {},
-              'text' => '
+              'text' => '@emph{\\truc\\}
 ',
-              'type' => 'last_raw_newline'
+              'type' => 'raw'
             },
             {
               'args' => [
@@ -687,10 +662,9 @@ $result_trees{'complex_argument'} = {
 
$result_trees{'complex_argument'}{'contents'}[0]{'contents'}[0]{'args'}[0]{'parent'}
 = $result_trees{'complex_argument'}{'contents'}[0]{'contents'}[0];
 
$result_trees{'complex_argument'}{'contents'}[0]{'contents'}[0]{'args'}[1]{'parent'}
 = $result_trees{'complex_argument'}{'contents'}[0]{'contents'}[0];
 
$result_trees{'complex_argument'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'parent'}
 = $result_trees{'complex_argument'}{'contents'}[0]{'contents'}[0];
+$result_trees{'complex_argument'}{'contents'}[0]{'contents'}[0]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'complex_argument'}{'contents'}[0]{'contents'}[0]{'contents'}[1]{'args'}[0];
+$result_trees{'complex_argument'}{'contents'}[0]{'contents'}[0]{'contents'}[1]{'args'}[0]{'parent'}
 = 
$result_trees{'complex_argument'}{'contents'}[0]{'contents'}[0]{'contents'}[1];
 
$result_trees{'complex_argument'}{'contents'}[0]{'contents'}[0]{'contents'}[1]{'parent'}
 = $result_trees{'complex_argument'}{'contents'}[0]{'contents'}[0];
-$result_trees{'complex_argument'}{'contents'}[0]{'contents'}[0]{'contents'}[2]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'complex_argument'}{'contents'}[0]{'contents'}[0]{'contents'}[2]{'args'}[0];
-$result_trees{'complex_argument'}{'contents'}[0]{'contents'}[0]{'contents'}[2]{'args'}[0]{'parent'}
 = 
$result_trees{'complex_argument'}{'contents'}[0]{'contents'}[0]{'contents'}[2];
-$result_trees{'complex_argument'}{'contents'}[0]{'contents'}[0]{'contents'}[2]{'parent'}
 = $result_trees{'complex_argument'}{'contents'}[0]{'contents'}[0];
 $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]{'contents'}[2]{'args'}[0]{'parent'}
 = $result_trees{'complex_argument'}{'contents'}[0]{'contents'}[2];
@@ -698,10 +672,9 @@ 
$result_trees{'complex_argument'}{'contents'}[0]{'contents'}[2]{'contents'}[0]{'
 
$result_trees{'complex_argument'}{'contents'}[0]{'contents'}[2]{'contents'}[1]{'parent'}
 = $result_trees{'complex_argument'}{'contents'}[0]{'contents'}[2];
 
$result_trees{'complex_argument'}{'contents'}[0]{'contents'}[2]{'contents'}[2]{'parent'}
 = $result_trees{'complex_argument'}{'contents'}[0]{'contents'}[2];
 
$result_trees{'complex_argument'}{'contents'}[0]{'contents'}[2]{'contents'}[3]{'parent'}
 = $result_trees{'complex_argument'}{'contents'}[0]{'contents'}[2];
+$result_trees{'complex_argument'}{'contents'}[0]{'contents'}[2]{'contents'}[4]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'complex_argument'}{'contents'}[0]{'contents'}[2]{'contents'}[4]{'args'}[0];
+$result_trees{'complex_argument'}{'contents'}[0]{'contents'}[2]{'contents'}[4]{'args'}[0]{'parent'}
 = 
$result_trees{'complex_argument'}{'contents'}[0]{'contents'}[2]{'contents'}[4];
 
$result_trees{'complex_argument'}{'contents'}[0]{'contents'}[2]{'contents'}[4]{'parent'}
 = $result_trees{'complex_argument'}{'contents'}[0]{'contents'}[2];
-$result_trees{'complex_argument'}{'contents'}[0]{'contents'}[2]{'contents'}[5]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'complex_argument'}{'contents'}[0]{'contents'}[2]{'contents'}[5]{'args'}[0];
-$result_trees{'complex_argument'}{'contents'}[0]{'contents'}[2]{'contents'}[5]{'args'}[0]{'parent'}
 = 
$result_trees{'complex_argument'}{'contents'}[0]{'contents'}[2]{'contents'}[5];
-$result_trees{'complex_argument'}{'contents'}[0]{'contents'}[2]{'contents'}[5]{'parent'}
 = $result_trees{'complex_argument'}{'contents'}[0]{'contents'}[2];
 $result_trees{'complex_argument'}{'contents'}[0]{'contents'}[2]{'parent'} = 
$result_trees{'complex_argument'}{'contents'}[0];
 $result_trees{'complex_argument'}{'contents'}[0]{'contents'}[3]{'parent'} = 
$result_trees{'complex_argument'}{'contents'}[0];
 
$result_trees{'complex_argument'}{'contents'}[0]{'contents'}[4]{'args'}[0]{'parent'}
 = $result_trees{'complex_argument'}{'contents'}[0]{'contents'}[4];
@@ -709,10 +682,9 @@ 
$result_trees{'complex_argument'}{'contents'}[0]{'contents'}[4]{'args'}[1]{'pare
 
$result_trees{'complex_argument'}{'contents'}[0]{'contents'}[4]{'args'}[2]{'parent'}
 = $result_trees{'complex_argument'}{'contents'}[0]{'contents'}[4];
 
$result_trees{'complex_argument'}{'contents'}[0]{'contents'}[4]{'contents'}[0]{'parent'}
 = $result_trees{'complex_argument'}{'contents'}[0]{'contents'}[4];
 
$result_trees{'complex_argument'}{'contents'}[0]{'contents'}[4]{'contents'}[1]{'parent'}
 = $result_trees{'complex_argument'}{'contents'}[0]{'contents'}[4];
+$result_trees{'complex_argument'}{'contents'}[0]{'contents'}[4]{'contents'}[2]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'complex_argument'}{'contents'}[0]{'contents'}[4]{'contents'}[2]{'args'}[0];
+$result_trees{'complex_argument'}{'contents'}[0]{'contents'}[4]{'contents'}[2]{'args'}[0]{'parent'}
 = 
$result_trees{'complex_argument'}{'contents'}[0]{'contents'}[4]{'contents'}[2];
 
$result_trees{'complex_argument'}{'contents'}[0]{'contents'}[4]{'contents'}[2]{'parent'}
 = $result_trees{'complex_argument'}{'contents'}[0]{'contents'}[4];
-$result_trees{'complex_argument'}{'contents'}[0]{'contents'}[4]{'contents'}[3]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'complex_argument'}{'contents'}[0]{'contents'}[4]{'contents'}[3]{'args'}[0];
-$result_trees{'complex_argument'}{'contents'}[0]{'contents'}[4]{'contents'}[3]{'args'}[0]{'parent'}
 = 
$result_trees{'complex_argument'}{'contents'}[0]{'contents'}[4]{'contents'}[3];
-$result_trees{'complex_argument'}{'contents'}[0]{'contents'}[4]{'contents'}[3]{'parent'}
 = $result_trees{'complex_argument'}{'contents'}[0]{'contents'}[4];
 $result_trees{'complex_argument'}{'contents'}[0]{'contents'}[4]{'parent'} = 
$result_trees{'complex_argument'}{'contents'}[0];
 $result_trees{'complex_argument'}{'contents'}[0]{'contents'}[5]{'parent'} = 
$result_trees{'complex_argument'}{'contents'}[0];
 
$result_trees{'complex_argument'}{'contents'}[0]{'contents'}[6]{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'complex_argument'}{'contents'}[0]{'contents'}[6]{'contents'}[0]{'args'}[0];
@@ -742,18 +714,16 @@ 
$result_trees{'complex_argument'}{'contents'}[0]{'contents'}[7]{'contents'}[1]{'
 $result_trees{'complex_argument'}{'contents'}[0]{'contents'}[7]{'parent'} = 
$result_trees{'complex_argument'}{'contents'}[0];
 
$result_trees{'complex_argument'}{'contents'}[0]{'contents'}[8]{'args'}[0]{'parent'}
 = $result_trees{'complex_argument'}{'contents'}[0]{'contents'}[8];
 
$result_trees{'complex_argument'}{'contents'}[0]{'contents'}[8]{'contents'}[0]{'parent'}
 = $result_trees{'complex_argument'}{'contents'}[0]{'contents'}[8];
+$result_trees{'complex_argument'}{'contents'}[0]{'contents'}[8]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'complex_argument'}{'contents'}[0]{'contents'}[8]{'contents'}[1]{'args'}[0];
+$result_trees{'complex_argument'}{'contents'}[0]{'contents'}[8]{'contents'}[1]{'args'}[0]{'parent'}
 = 
$result_trees{'complex_argument'}{'contents'}[0]{'contents'}[8]{'contents'}[1];
 
$result_trees{'complex_argument'}{'contents'}[0]{'contents'}[8]{'contents'}[1]{'parent'}
 = $result_trees{'complex_argument'}{'contents'}[0]{'contents'}[8];
-$result_trees{'complex_argument'}{'contents'}[0]{'contents'}[8]{'contents'}[2]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'complex_argument'}{'contents'}[0]{'contents'}[8]{'contents'}[2]{'args'}[0];
-$result_trees{'complex_argument'}{'contents'}[0]{'contents'}[8]{'contents'}[2]{'args'}[0]{'parent'}
 = 
$result_trees{'complex_argument'}{'contents'}[0]{'contents'}[8]{'contents'}[2];
-$result_trees{'complex_argument'}{'contents'}[0]{'contents'}[8]{'contents'}[2]{'parent'}
 = $result_trees{'complex_argument'}{'contents'}[0]{'contents'}[8];
 $result_trees{'complex_argument'}{'contents'}[0]{'contents'}[8]{'parent'} = 
$result_trees{'complex_argument'}{'contents'}[0];
 
$result_trees{'complex_argument'}{'contents'}[0]{'contents'}[9]{'args'}[0]{'parent'}
 = $result_trees{'complex_argument'}{'contents'}[0]{'contents'}[9];
 
$result_trees{'complex_argument'}{'contents'}[0]{'contents'}[9]{'args'}[1]{'parent'}
 = $result_trees{'complex_argument'}{'contents'}[0]{'contents'}[9];
 
$result_trees{'complex_argument'}{'contents'}[0]{'contents'}[9]{'contents'}[0]{'parent'}
 = $result_trees{'complex_argument'}{'contents'}[0]{'contents'}[9];
+$result_trees{'complex_argument'}{'contents'}[0]{'contents'}[9]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'complex_argument'}{'contents'}[0]{'contents'}[9]{'contents'}[1]{'args'}[0];
+$result_trees{'complex_argument'}{'contents'}[0]{'contents'}[9]{'contents'}[1]{'args'}[0]{'parent'}
 = 
$result_trees{'complex_argument'}{'contents'}[0]{'contents'}[9]{'contents'}[1];
 
$result_trees{'complex_argument'}{'contents'}[0]{'contents'}[9]{'contents'}[1]{'parent'}
 = $result_trees{'complex_argument'}{'contents'}[0]{'contents'}[9];
-$result_trees{'complex_argument'}{'contents'}[0]{'contents'}[9]{'contents'}[2]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'complex_argument'}{'contents'}[0]{'contents'}[9]{'contents'}[2]{'args'}[0];
-$result_trees{'complex_argument'}{'contents'}[0]{'contents'}[9]{'contents'}[2]{'args'}[0]{'parent'}
 = 
$result_trees{'complex_argument'}{'contents'}[0]{'contents'}[9]{'contents'}[2];
-$result_trees{'complex_argument'}{'contents'}[0]{'contents'}[9]{'contents'}[2]{'parent'}
 = $result_trees{'complex_argument'}{'contents'}[0]{'contents'}[9];
 $result_trees{'complex_argument'}{'contents'}[0]{'contents'}[9]{'parent'} = 
$result_trees{'complex_argument'}{'contents'}[0];
 
$result_trees{'complex_argument'}{'contents'}[0]{'contents'}[10]{'contents'}[0]{'parent'}
 = $result_trees{'complex_argument'}{'contents'}[0]{'contents'}[10];
 
$result_trees{'complex_argument'}{'contents'}[0]{'contents'}[10]{'contents'}[1]{'parent'}
 = $result_trees{'complex_argument'}{'contents'}[0]{'contents'}[10];
diff --git a/tp/t/results/macro/double_recursive_macro_call.pl 
b/tp/t/results/macro/double_recursive_macro_call.pl
index e0aaa431f3..4eab334cab 100644
--- a/tp/t/results/macro/double_recursive_macro_call.pl
+++ b/tp/t/results/macro/double_recursive_macro_call.pl
@@ -32,14 +32,9 @@ $result_trees{'double_recursive_macro_call'} = {
           'contents' => [
             {
               'parent' => {},
-              'text' => '@mactwo{}',
-              'type' => 'raw'
-            },
-            {
-              'parent' => {},
-              'text' => '
+              'text' => '@mactwo{}
 ',
-              'type' => 'last_raw_newline'
+              'type' => 'raw'
             },
             {
               'args' => [
@@ -105,14 +100,9 @@ $result_trees{'double_recursive_macro_call'} = {
           'contents' => [
             {
               'parent' => {},
-              'text' => '@macone{}',
-              'type' => 'raw'
-            },
-            {
-              'parent' => {},
-              'text' => '
+              'text' => '@macone{}
 ',
-              'type' => 'last_raw_newline'
+              'type' => 'raw'
             },
             {
               'args' => [
@@ -178,19 +168,17 @@ 
$result_trees{'double_recursive_macro_call'}{'contents'}[0]{'contents'}[0]{'pare
 
$result_trees{'double_recursive_macro_call'}{'contents'}[0]{'contents'}[1]{'args'}[0]{'parent'}
 = $result_trees{'double_recursive_macro_call'}{'contents'}[0]{'contents'}[1];
 
$result_trees{'double_recursive_macro_call'}{'contents'}[0]{'contents'}[1]{'args'}[1]{'parent'}
 = $result_trees{'double_recursive_macro_call'}{'contents'}[0]{'contents'}[1];
 
$result_trees{'double_recursive_macro_call'}{'contents'}[0]{'contents'}[1]{'contents'}[0]{'parent'}
 = $result_trees{'double_recursive_macro_call'}{'contents'}[0]{'contents'}[1];
+$result_trees{'double_recursive_macro_call'}{'contents'}[0]{'contents'}[1]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'double_recursive_macro_call'}{'contents'}[0]{'contents'}[1]{'contents'}[1]{'args'}[0];
+$result_trees{'double_recursive_macro_call'}{'contents'}[0]{'contents'}[1]{'contents'}[1]{'args'}[0]{'parent'}
 = 
$result_trees{'double_recursive_macro_call'}{'contents'}[0]{'contents'}[1]{'contents'}[1];
 
$result_trees{'double_recursive_macro_call'}{'contents'}[0]{'contents'}[1]{'contents'}[1]{'parent'}
 = $result_trees{'double_recursive_macro_call'}{'contents'}[0]{'contents'}[1];
-$result_trees{'double_recursive_macro_call'}{'contents'}[0]{'contents'}[1]{'contents'}[2]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'double_recursive_macro_call'}{'contents'}[0]{'contents'}[1]{'contents'}[2]{'args'}[0];
-$result_trees{'double_recursive_macro_call'}{'contents'}[0]{'contents'}[1]{'contents'}[2]{'args'}[0]{'parent'}
 = 
$result_trees{'double_recursive_macro_call'}{'contents'}[0]{'contents'}[1]{'contents'}[2];
-$result_trees{'double_recursive_macro_call'}{'contents'}[0]{'contents'}[1]{'contents'}[2]{'parent'}
 = $result_trees{'double_recursive_macro_call'}{'contents'}[0]{'contents'}[1];
 
$result_trees{'double_recursive_macro_call'}{'contents'}[0]{'contents'}[1]{'parent'}
 = $result_trees{'double_recursive_macro_call'}{'contents'}[0];
 
$result_trees{'double_recursive_macro_call'}{'contents'}[0]{'contents'}[2]{'parent'}
 = $result_trees{'double_recursive_macro_call'}{'contents'}[0];
 
$result_trees{'double_recursive_macro_call'}{'contents'}[0]{'contents'}[3]{'args'}[0]{'parent'}
 = $result_trees{'double_recursive_macro_call'}{'contents'}[0]{'contents'}[3];
 
$result_trees{'double_recursive_macro_call'}{'contents'}[0]{'contents'}[3]{'args'}[1]{'parent'}
 = $result_trees{'double_recursive_macro_call'}{'contents'}[0]{'contents'}[3];
 
$result_trees{'double_recursive_macro_call'}{'contents'}[0]{'contents'}[3]{'contents'}[0]{'parent'}
 = $result_trees{'double_recursive_macro_call'}{'contents'}[0]{'contents'}[3];
+$result_trees{'double_recursive_macro_call'}{'contents'}[0]{'contents'}[3]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'double_recursive_macro_call'}{'contents'}[0]{'contents'}[3]{'contents'}[1]{'args'}[0];
+$result_trees{'double_recursive_macro_call'}{'contents'}[0]{'contents'}[3]{'contents'}[1]{'args'}[0]{'parent'}
 = 
$result_trees{'double_recursive_macro_call'}{'contents'}[0]{'contents'}[3]{'contents'}[1];
 
$result_trees{'double_recursive_macro_call'}{'contents'}[0]{'contents'}[3]{'contents'}[1]{'parent'}
 = $result_trees{'double_recursive_macro_call'}{'contents'}[0]{'contents'}[3];
-$result_trees{'double_recursive_macro_call'}{'contents'}[0]{'contents'}[3]{'contents'}[2]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'double_recursive_macro_call'}{'contents'}[0]{'contents'}[3]{'contents'}[2]{'args'}[0];
-$result_trees{'double_recursive_macro_call'}{'contents'}[0]{'contents'}[3]{'contents'}[2]{'args'}[0]{'parent'}
 = 
$result_trees{'double_recursive_macro_call'}{'contents'}[0]{'contents'}[3]{'contents'}[2];
-$result_trees{'double_recursive_macro_call'}{'contents'}[0]{'contents'}[3]{'contents'}[2]{'parent'}
 = $result_trees{'double_recursive_macro_call'}{'contents'}[0]{'contents'}[3];
 
$result_trees{'double_recursive_macro_call'}{'contents'}[0]{'contents'}[3]{'parent'}
 = $result_trees{'double_recursive_macro_call'}{'contents'}[0];
 
$result_trees{'double_recursive_macro_call'}{'contents'}[0]{'contents'}[4]{'parent'}
 = $result_trees{'double_recursive_macro_call'}{'contents'}[0];
 
$result_trees{'double_recursive_macro_call'}{'contents'}[0]{'contents'}[5]{'parent'}
 = $result_trees{'double_recursive_macro_call'}{'contents'}[0];
diff --git a/tp/t/results/macro/empty_end.pl b/tp/t/results/macro/empty_end.pl
index 5c082f0bd6..73baa99880 100644
--- a/tp/t/results/macro/empty_end.pl
+++ b/tp/t/results/macro/empty_end.pl
@@ -26,14 +26,9 @@ $result_trees{'empty_end'} = {
           'contents' => [
             {
               'parent' => {},
-              'text' => 'in foo',
-              'type' => 'raw'
-            },
-            {
-              'parent' => {},
-              'text' => '
+              'text' => 'in foo
 ',
-              'type' => 'last_raw_newline'
+              'type' => 'raw'
             },
             {
               'args' => [
@@ -82,10 +77,9 @@ $result_trees{'empty_end'} = {
 $result_trees{'empty_end'}{'contents'}[0]{'contents'}[0]{'args'}[0]{'parent'} 
= $result_trees{'empty_end'}{'contents'}[0]{'contents'}[0];
 $result_trees{'empty_end'}{'contents'}[0]{'contents'}[0]{'args'}[1]{'parent'} 
= $result_trees{'empty_end'}{'contents'}[0]{'contents'}[0];
 
$result_trees{'empty_end'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'parent'}
 = $result_trees{'empty_end'}{'contents'}[0]{'contents'}[0];
+$result_trees{'empty_end'}{'contents'}[0]{'contents'}[0]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'empty_end'}{'contents'}[0]{'contents'}[0]{'contents'}[1]{'args'}[0];
+$result_trees{'empty_end'}{'contents'}[0]{'contents'}[0]{'contents'}[1]{'args'}[0]{'parent'}
 = $result_trees{'empty_end'}{'contents'}[0]{'contents'}[0]{'contents'}[1];
 
$result_trees{'empty_end'}{'contents'}[0]{'contents'}[0]{'contents'}[1]{'parent'}
 = $result_trees{'empty_end'}{'contents'}[0]{'contents'}[0];
-$result_trees{'empty_end'}{'contents'}[0]{'contents'}[0]{'contents'}[2]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'empty_end'}{'contents'}[0]{'contents'}[0]{'contents'}[2]{'args'}[0];
-$result_trees{'empty_end'}{'contents'}[0]{'contents'}[0]{'contents'}[2]{'args'}[0]{'parent'}
 = $result_trees{'empty_end'}{'contents'}[0]{'contents'}[0]{'contents'}[2];
-$result_trees{'empty_end'}{'contents'}[0]{'contents'}[0]{'contents'}[2]{'parent'}
 = $result_trees{'empty_end'}{'contents'}[0]{'contents'}[0];
 $result_trees{'empty_end'}{'contents'}[0]{'contents'}[0]{'parent'} = 
$result_trees{'empty_end'}{'contents'}[0];
 $result_trees{'empty_end'}{'contents'}[0]{'parent'} = 
$result_trees{'empty_end'};
 
diff --git a/tp/t/results/macro/empty_macro_argument.pl 
b/tp/t/results/macro/empty_macro_argument.pl
index 931fd3c192..d89fa27441 100644
--- a/tp/t/results/macro/empty_macro_argument.pl
+++ b/tp/t/results/macro/empty_macro_argument.pl
@@ -21,14 +21,9 @@ $result_trees{'empty_macro_argument'} = {
           'contents' => [
             {
               'parent' => {},
-              'text' => 'text',
-              'type' => 'raw'
-            },
-            {
-              'parent' => {},
-              'text' => '
+              'text' => 'text
 ',
-              'type' => 'last_raw_newline'
+              'type' => 'raw'
             },
             {
               'args' => [
@@ -111,14 +106,9 @@ $result_trees{'empty_macro_argument'} = {
           'contents' => [
             {
               'parent' => {},
-              'text' => 'X\\arg\\X',
-              'type' => 'raw'
-            },
-            {
-              'parent' => {},
-              'text' => '
+              'text' => 'X\\arg\\X
 ',
-              'type' => 'last_raw_newline'
+              'type' => 'raw'
             },
             {
               'args' => [
@@ -186,10 +176,9 @@ $result_trees{'empty_macro_argument'} = {
 };
 
$result_trees{'empty_macro_argument'}{'contents'}[0]{'contents'}[0]{'args'}[0]{'parent'}
 = $result_trees{'empty_macro_argument'}{'contents'}[0]{'contents'}[0];
 
$result_trees{'empty_macro_argument'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'parent'}
 = $result_trees{'empty_macro_argument'}{'contents'}[0]{'contents'}[0];
+$result_trees{'empty_macro_argument'}{'contents'}[0]{'contents'}[0]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'empty_macro_argument'}{'contents'}[0]{'contents'}[0]{'contents'}[1]{'args'}[0];
+$result_trees{'empty_macro_argument'}{'contents'}[0]{'contents'}[0]{'contents'}[1]{'args'}[0]{'parent'}
 = 
$result_trees{'empty_macro_argument'}{'contents'}[0]{'contents'}[0]{'contents'}[1];
 
$result_trees{'empty_macro_argument'}{'contents'}[0]{'contents'}[0]{'contents'}[1]{'parent'}
 = $result_trees{'empty_macro_argument'}{'contents'}[0]{'contents'}[0];
-$result_trees{'empty_macro_argument'}{'contents'}[0]{'contents'}[0]{'contents'}[2]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'empty_macro_argument'}{'contents'}[0]{'contents'}[0]{'contents'}[2]{'args'}[0];
-$result_trees{'empty_macro_argument'}{'contents'}[0]{'contents'}[0]{'contents'}[2]{'args'}[0]{'parent'}
 = 
$result_trees{'empty_macro_argument'}{'contents'}[0]{'contents'}[0]{'contents'}[2];
-$result_trees{'empty_macro_argument'}{'contents'}[0]{'contents'}[0]{'contents'}[2]{'parent'}
 = $result_trees{'empty_macro_argument'}{'contents'}[0]{'contents'}[0];
 $result_trees{'empty_macro_argument'}{'contents'}[0]{'contents'}[0]{'parent'} 
= $result_trees{'empty_macro_argument'}{'contents'}[0];
 $result_trees{'empty_macro_argument'}{'contents'}[0]{'contents'}[1]{'parent'} 
= $result_trees{'empty_macro_argument'}{'contents'}[0];
 
$result_trees{'empty_macro_argument'}{'contents'}[0]{'contents'}[2]{'contents'}[0]{'parent'}
 = $result_trees{'empty_macro_argument'}{'contents'}[0]{'contents'}[2];
@@ -198,10 +187,9 @@ 
$result_trees{'empty_macro_argument'}{'contents'}[0]{'contents'}[3]{'parent'} =
 
$result_trees{'empty_macro_argument'}{'contents'}[0]{'contents'}[4]{'args'}[0]{'parent'}
 = $result_trees{'empty_macro_argument'}{'contents'}[0]{'contents'}[4];
 
$result_trees{'empty_macro_argument'}{'contents'}[0]{'contents'}[4]{'args'}[1]{'parent'}
 = $result_trees{'empty_macro_argument'}{'contents'}[0]{'contents'}[4];
 
$result_trees{'empty_macro_argument'}{'contents'}[0]{'contents'}[4]{'contents'}[0]{'parent'}
 = $result_trees{'empty_macro_argument'}{'contents'}[0]{'contents'}[4];
+$result_trees{'empty_macro_argument'}{'contents'}[0]{'contents'}[4]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'empty_macro_argument'}{'contents'}[0]{'contents'}[4]{'contents'}[1]{'args'}[0];
+$result_trees{'empty_macro_argument'}{'contents'}[0]{'contents'}[4]{'contents'}[1]{'args'}[0]{'parent'}
 = 
$result_trees{'empty_macro_argument'}{'contents'}[0]{'contents'}[4]{'contents'}[1];
 
$result_trees{'empty_macro_argument'}{'contents'}[0]{'contents'}[4]{'contents'}[1]{'parent'}
 = $result_trees{'empty_macro_argument'}{'contents'}[0]{'contents'}[4];
-$result_trees{'empty_macro_argument'}{'contents'}[0]{'contents'}[4]{'contents'}[2]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'empty_macro_argument'}{'contents'}[0]{'contents'}[4]{'contents'}[2]{'args'}[0];
-$result_trees{'empty_macro_argument'}{'contents'}[0]{'contents'}[4]{'contents'}[2]{'args'}[0]{'parent'}
 = 
$result_trees{'empty_macro_argument'}{'contents'}[0]{'contents'}[4]{'contents'}[2];
-$result_trees{'empty_macro_argument'}{'contents'}[0]{'contents'}[4]{'contents'}[2]{'parent'}
 = $result_trees{'empty_macro_argument'}{'contents'}[0]{'contents'}[4];
 $result_trees{'empty_macro_argument'}{'contents'}[0]{'contents'}[4]{'parent'} 
= $result_trees{'empty_macro_argument'}{'contents'}[0];
 $result_trees{'empty_macro_argument'}{'contents'}[0]{'contents'}[5]{'parent'} 
= $result_trees{'empty_macro_argument'}{'contents'}[0];
 
$result_trees{'empty_macro_argument'}{'contents'}[0]{'contents'}[6]{'contents'}[0]{'parent'}
 = $result_trees{'empty_macro_argument'}{'contents'}[0]{'contents'}[6];
diff --git a/tp/t/results/macro/expand_two_same.pl 
b/tp/t/results/macro/expand_two_same.pl
index 3874e065de..26bf8c6737 100644
--- a/tp/t/results/macro/expand_two_same.pl
+++ b/tp/t/results/macro/expand_two_same.pl
@@ -30,16 +30,11 @@ $result_trees{'expand_two_same'} = {
 ',
               'type' => 'raw'
             },
-            {
-              'parent' => {},
-              'text' => '',
-              'type' => 'raw'
-            },
             {
               'parent' => {},
               'text' => '
 ',
-              'type' => 'last_raw_newline'
+              'type' => 'raw'
             },
             {
               'args' => [
@@ -210,10 +205,9 @@ 
$result_trees{'expand_two_same'}{'contents'}[0]{'contents'}[0]{'args'}[0]{'paren
 
$result_trees{'expand_two_same'}{'contents'}[0]{'contents'}[0]{'args'}[1]{'parent'}
 = $result_trees{'expand_two_same'}{'contents'}[0]{'contents'}[0];
 
$result_trees{'expand_two_same'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'parent'}
 = $result_trees{'expand_two_same'}{'contents'}[0]{'contents'}[0];
 
$result_trees{'expand_two_same'}{'contents'}[0]{'contents'}[0]{'contents'}[1]{'parent'}
 = $result_trees{'expand_two_same'}{'contents'}[0]{'contents'}[0];
+$result_trees{'expand_two_same'}{'contents'}[0]{'contents'}[0]{'contents'}[2]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'expand_two_same'}{'contents'}[0]{'contents'}[0]{'contents'}[2]{'args'}[0];
+$result_trees{'expand_two_same'}{'contents'}[0]{'contents'}[0]{'contents'}[2]{'args'}[0]{'parent'}
 = 
$result_trees{'expand_two_same'}{'contents'}[0]{'contents'}[0]{'contents'}[2];
 
$result_trees{'expand_two_same'}{'contents'}[0]{'contents'}[0]{'contents'}[2]{'parent'}
 = $result_trees{'expand_two_same'}{'contents'}[0]{'contents'}[0];
-$result_trees{'expand_two_same'}{'contents'}[0]{'contents'}[0]{'contents'}[3]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'expand_two_same'}{'contents'}[0]{'contents'}[0]{'contents'}[3]{'args'}[0];
-$result_trees{'expand_two_same'}{'contents'}[0]{'contents'}[0]{'contents'}[3]{'args'}[0]{'parent'}
 = 
$result_trees{'expand_two_same'}{'contents'}[0]{'contents'}[0]{'contents'}[3];
-$result_trees{'expand_two_same'}{'contents'}[0]{'contents'}[0]{'contents'}[3]{'parent'}
 = $result_trees{'expand_two_same'}{'contents'}[0]{'contents'}[0];
 $result_trees{'expand_two_same'}{'contents'}[0]{'contents'}[0]{'parent'} = 
$result_trees{'expand_two_same'}{'contents'}[0];
 
$result_trees{'expand_two_same'}{'contents'}[0]{'contents'}[1]{'contents'}[0]{'parent'}
 = $result_trees{'expand_two_same'}{'contents'}[0]{'contents'}[1];
 
$result_trees{'expand_two_same'}{'contents'}[0]{'contents'}[1]{'contents'}[1]{'parent'}
 = $result_trees{'expand_two_same'}{'contents'}[0]{'contents'}[1];
diff --git a/tp/t/results/macro/expansion_order.pl 
b/tp/t/results/macro/expansion_order.pl
index c2f0c72e8a..8c2ed7ff57 100644
--- a/tp/t/results/macro/expansion_order.pl
+++ b/tp/t/results/macro/expansion_order.pl
@@ -26,14 +26,9 @@ $result_trees{'expansion_order'} = {
           'contents' => [
             {
               'parent' => {},
-              'text' => '@machin{}',
-              'type' => 'raw'
-            },
-            {
-              'parent' => {},
-              'text' => '
+              'text' => '@machin{}
 ',
-              'type' => 'last_raw_newline'
+              'type' => 'raw'
             },
             {
               'args' => [
@@ -98,16 +93,11 @@ $result_trees{'expansion_order'} = {
 ',
               'type' => 'raw'
             },
-            {
-              'parent' => {},
-              'text' => '',
-              'type' => 'raw'
-            },
             {
               'parent' => {},
               'text' => '
 ',
-              'type' => 'last_raw_newline'
+              'type' => 'raw'
             },
             {
               'args' => [
@@ -183,19 +173,17 @@ $result_trees{'expansion_order'} = {
 
$result_trees{'expansion_order'}{'contents'}[0]{'contents'}[0]{'args'}[0]{'parent'}
 = $result_trees{'expansion_order'}{'contents'}[0]{'contents'}[0];
 
$result_trees{'expansion_order'}{'contents'}[0]{'contents'}[0]{'args'}[1]{'parent'}
 = $result_trees{'expansion_order'}{'contents'}[0]{'contents'}[0];
 
$result_trees{'expansion_order'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'parent'}
 = $result_trees{'expansion_order'}{'contents'}[0]{'contents'}[0];
+$result_trees{'expansion_order'}{'contents'}[0]{'contents'}[0]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'expansion_order'}{'contents'}[0]{'contents'}[0]{'contents'}[1]{'args'}[0];
+$result_trees{'expansion_order'}{'contents'}[0]{'contents'}[0]{'contents'}[1]{'args'}[0]{'parent'}
 = 
$result_trees{'expansion_order'}{'contents'}[0]{'contents'}[0]{'contents'}[1];
 
$result_trees{'expansion_order'}{'contents'}[0]{'contents'}[0]{'contents'}[1]{'parent'}
 = $result_trees{'expansion_order'}{'contents'}[0]{'contents'}[0];
-$result_trees{'expansion_order'}{'contents'}[0]{'contents'}[0]{'contents'}[2]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'expansion_order'}{'contents'}[0]{'contents'}[0]{'contents'}[2]{'args'}[0];
-$result_trees{'expansion_order'}{'contents'}[0]{'contents'}[0]{'contents'}[2]{'args'}[0]{'parent'}
 = 
$result_trees{'expansion_order'}{'contents'}[0]{'contents'}[0]{'contents'}[2];
-$result_trees{'expansion_order'}{'contents'}[0]{'contents'}[0]{'contents'}[2]{'parent'}
 = $result_trees{'expansion_order'}{'contents'}[0]{'contents'}[0];
 $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]{'contents'}[2]{'args'}[0]{'parent'}
 = $result_trees{'expansion_order'}{'contents'}[0]{'contents'}[2];
 
$result_trees{'expansion_order'}{'contents'}[0]{'contents'}[2]{'contents'}[0]{'parent'}
 = $result_trees{'expansion_order'}{'contents'}[0]{'contents'}[2];
 
$result_trees{'expansion_order'}{'contents'}[0]{'contents'}[2]{'contents'}[1]{'parent'}
 = $result_trees{'expansion_order'}{'contents'}[0]{'contents'}[2];
+$result_trees{'expansion_order'}{'contents'}[0]{'contents'}[2]{'contents'}[2]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'expansion_order'}{'contents'}[0]{'contents'}[2]{'contents'}[2]{'args'}[0];
+$result_trees{'expansion_order'}{'contents'}[0]{'contents'}[2]{'contents'}[2]{'args'}[0]{'parent'}
 = 
$result_trees{'expansion_order'}{'contents'}[0]{'contents'}[2]{'contents'}[2];
 
$result_trees{'expansion_order'}{'contents'}[0]{'contents'}[2]{'contents'}[2]{'parent'}
 = $result_trees{'expansion_order'}{'contents'}[0]{'contents'}[2];
-$result_trees{'expansion_order'}{'contents'}[0]{'contents'}[2]{'contents'}[3]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'expansion_order'}{'contents'}[0]{'contents'}[2]{'contents'}[3]{'args'}[0];
-$result_trees{'expansion_order'}{'contents'}[0]{'contents'}[2]{'contents'}[3]{'args'}[0]{'parent'}
 = 
$result_trees{'expansion_order'}{'contents'}[0]{'contents'}[2]{'contents'}[3];
-$result_trees{'expansion_order'}{'contents'}[0]{'contents'}[2]{'contents'}[3]{'parent'}
 = $result_trees{'expansion_order'}{'contents'}[0]{'contents'}[2];
 $result_trees{'expansion_order'}{'contents'}[0]{'contents'}[2]{'parent'} = 
$result_trees{'expansion_order'}{'contents'}[0];
 $result_trees{'expansion_order'}{'contents'}[0]{'contents'}[3]{'parent'} = 
$result_trees{'expansion_order'}{'contents'}[0];
 
$result_trees{'expansion_order'}{'contents'}[0]{'contents'}[4]{'contents'}[0]{'parent'}
 = $result_trees{'expansion_order'}{'contents'}[0]{'contents'}[4];
diff --git a/tp/t/results/macro/form_feeds.pl b/tp/t/results/macro/form_feeds.pl
index 6873678ba4..75d8b68697 100644
--- a/tp/t/results/macro/form_feeds.pl
+++ b/tp/t/results/macro/form_feeds.pl
@@ -31,14 +31,9 @@ $result_trees{'form_feeds'} = {
           'contents' => [
             {
               'parent' => {},
-              'text' => 'f \\a\\ n \\b\\',
-              'type' => 'raw'
-            },
-            {
-              'parent' => {},
-              'text' => '
+              'text' => 'f \\a\\ n \\b\\
 ',
-              'type' => 'last_raw_newline'
+              'type' => 'raw'
             },
             {
               'args' => [
@@ -104,14 +99,9 @@ $result_trees{'form_feeds'} = {
           'contents' => [
             {
               'parent' => {},
-              'text' => 'g \\c\\ v',
-              'type' => 'raw'
-            },
-            {
-              'parent' => {},
-              'text' => '
+              'text' => 'g \\c\\ v
 ',
-              'type' => 'last_raw_newline'
+              'type' => 'raw'
             },
             {
               'args' => [
@@ -233,19 +223,17 @@ 
$result_trees{'form_feeds'}{'contents'}[0]{'contents'}[0]{'args'}[0]{'parent'} =
 $result_trees{'form_feeds'}{'contents'}[0]{'contents'}[0]{'args'}[1]{'parent'} 
= $result_trees{'form_feeds'}{'contents'}[0]{'contents'}[0];
 $result_trees{'form_feeds'}{'contents'}[0]{'contents'}[0]{'args'}[2]{'parent'} 
= $result_trees{'form_feeds'}{'contents'}[0]{'contents'}[0];
 
$result_trees{'form_feeds'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'parent'}
 = $result_trees{'form_feeds'}{'contents'}[0]{'contents'}[0];
+$result_trees{'form_feeds'}{'contents'}[0]{'contents'}[0]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'form_feeds'}{'contents'}[0]{'contents'}[0]{'contents'}[1]{'args'}[0];
+$result_trees{'form_feeds'}{'contents'}[0]{'contents'}[0]{'contents'}[1]{'args'}[0]{'parent'}
 = $result_trees{'form_feeds'}{'contents'}[0]{'contents'}[0]{'contents'}[1];
 
$result_trees{'form_feeds'}{'contents'}[0]{'contents'}[0]{'contents'}[1]{'parent'}
 = $result_trees{'form_feeds'}{'contents'}[0]{'contents'}[0];
-$result_trees{'form_feeds'}{'contents'}[0]{'contents'}[0]{'contents'}[2]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'form_feeds'}{'contents'}[0]{'contents'}[0]{'contents'}[2]{'args'}[0];
-$result_trees{'form_feeds'}{'contents'}[0]{'contents'}[0]{'contents'}[2]{'args'}[0]{'parent'}
 = $result_trees{'form_feeds'}{'contents'}[0]{'contents'}[0]{'contents'}[2];
-$result_trees{'form_feeds'}{'contents'}[0]{'contents'}[0]{'contents'}[2]{'parent'}
 = $result_trees{'form_feeds'}{'contents'}[0]{'contents'}[0];
 $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]{'contents'}[2]{'args'}[0]{'parent'} 
= $result_trees{'form_feeds'}{'contents'}[0]{'contents'}[2];
 $result_trees{'form_feeds'}{'contents'}[0]{'contents'}[2]{'args'}[1]{'parent'} 
= $result_trees{'form_feeds'}{'contents'}[0]{'contents'}[2];
 
$result_trees{'form_feeds'}{'contents'}[0]{'contents'}[2]{'contents'}[0]{'parent'}
 = $result_trees{'form_feeds'}{'contents'}[0]{'contents'}[2];
+$result_trees{'form_feeds'}{'contents'}[0]{'contents'}[2]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'form_feeds'}{'contents'}[0]{'contents'}[2]{'contents'}[1]{'args'}[0];
+$result_trees{'form_feeds'}{'contents'}[0]{'contents'}[2]{'contents'}[1]{'args'}[0]{'parent'}
 = $result_trees{'form_feeds'}{'contents'}[0]{'contents'}[2]{'contents'}[1];
 
$result_trees{'form_feeds'}{'contents'}[0]{'contents'}[2]{'contents'}[1]{'parent'}
 = $result_trees{'form_feeds'}{'contents'}[0]{'contents'}[2];
-$result_trees{'form_feeds'}{'contents'}[0]{'contents'}[2]{'contents'}[2]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'form_feeds'}{'contents'}[0]{'contents'}[2]{'contents'}[2]{'args'}[0];
-$result_trees{'form_feeds'}{'contents'}[0]{'contents'}[2]{'contents'}[2]{'args'}[0]{'parent'}
 = $result_trees{'form_feeds'}{'contents'}[0]{'contents'}[2]{'contents'}[2];
-$result_trees{'form_feeds'}{'contents'}[0]{'contents'}[2]{'contents'}[2]{'parent'}
 = $result_trees{'form_feeds'}{'contents'}[0]{'contents'}[2];
 $result_trees{'form_feeds'}{'contents'}[0]{'contents'}[2]{'parent'} = 
$result_trees{'form_feeds'}{'contents'}[0];
 $result_trees{'form_feeds'}{'contents'}[0]{'contents'}[3]{'parent'} = 
$result_trees{'form_feeds'}{'contents'}[0];
 
$result_trees{'form_feeds'}{'contents'}[0]{'contents'}[4]{'contents'}[0]{'parent'}
 = $result_trees{'form_feeds'}{'contents'}[0]{'contents'}[4];
diff --git a/tp/t/results/macro/ifclear_in_macro.pl 
b/tp/t/results/macro/ifclear_in_macro.pl
index ca4e4a5a94..34331dea00 100644
--- a/tp/t/results/macro/ifclear_in_macro.pl
+++ b/tp/t/results/macro/ifclear_in_macro.pl
@@ -38,14 +38,9 @@ $result_trees{'ifclear_in_macro'} = {
             },
             {
               'parent' => {},
-              'text' => '@end ifclear',
-              'type' => 'raw'
-            },
-            {
-              'parent' => {},
-              'text' => '
+              'text' => '@end ifclear
 ',
-              'type' => 'last_raw_newline'
+              'type' => 'raw'
             },
             {
               'args' => [
@@ -123,10 +118,9 @@ 
$result_trees{'ifclear_in_macro'}{'contents'}[0]{'contents'}[0]{'args'}[1]{'pare
 
$result_trees{'ifclear_in_macro'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'parent'}
 = $result_trees{'ifclear_in_macro'}{'contents'}[0]{'contents'}[0];
 
$result_trees{'ifclear_in_macro'}{'contents'}[0]{'contents'}[0]{'contents'}[1]{'parent'}
 = $result_trees{'ifclear_in_macro'}{'contents'}[0]{'contents'}[0];
 
$result_trees{'ifclear_in_macro'}{'contents'}[0]{'contents'}[0]{'contents'}[2]{'parent'}
 = $result_trees{'ifclear_in_macro'}{'contents'}[0]{'contents'}[0];
+$result_trees{'ifclear_in_macro'}{'contents'}[0]{'contents'}[0]{'contents'}[3]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'ifclear_in_macro'}{'contents'}[0]{'contents'}[0]{'contents'}[3]{'args'}[0];
+$result_trees{'ifclear_in_macro'}{'contents'}[0]{'contents'}[0]{'contents'}[3]{'args'}[0]{'parent'}
 = 
$result_trees{'ifclear_in_macro'}{'contents'}[0]{'contents'}[0]{'contents'}[3];
 
$result_trees{'ifclear_in_macro'}{'contents'}[0]{'contents'}[0]{'contents'}[3]{'parent'}
 = $result_trees{'ifclear_in_macro'}{'contents'}[0]{'contents'}[0];
-$result_trees{'ifclear_in_macro'}{'contents'}[0]{'contents'}[0]{'contents'}[4]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'ifclear_in_macro'}{'contents'}[0]{'contents'}[0]{'contents'}[4]{'args'}[0];
-$result_trees{'ifclear_in_macro'}{'contents'}[0]{'contents'}[0]{'contents'}[4]{'args'}[0]{'parent'}
 = 
$result_trees{'ifclear_in_macro'}{'contents'}[0]{'contents'}[0]{'contents'}[4];
-$result_trees{'ifclear_in_macro'}{'contents'}[0]{'contents'}[0]{'contents'}[4]{'parent'}
 = $result_trees{'ifclear_in_macro'}{'contents'}[0]{'contents'}[0];
 $result_trees{'ifclear_in_macro'}{'contents'}[0]{'contents'}[0]{'parent'} = 
$result_trees{'ifclear_in_macro'}{'contents'}[0];
 $result_trees{'ifclear_in_macro'}{'contents'}[0]{'contents'}[1]{'parent'} = 
$result_trees{'ifclear_in_macro'}{'contents'}[0];
 
$result_trees{'ifclear_in_macro'}{'contents'}[0]{'contents'}[2]{'contents'}[0]{'parent'}
 = $result_trees{'ifclear_in_macro'}{'contents'}[0]{'contents'}[2];
diff --git a/tp/t/results/macro/ifset_and_end_isef_in_macro.pl 
b/tp/t/results/macro/ifset_and_end_isef_in_macro.pl
index bbfa3d1ead..1a129dee78 100644
--- a/tp/t/results/macro/ifset_and_end_isef_in_macro.pl
+++ b/tp/t/results/macro/ifset_and_end_isef_in_macro.pl
@@ -21,14 +21,9 @@ $result_trees{'ifset_and_end_isef_in_macro'} = {
           'contents' => [
             {
               'parent' => {},
-              'text' => '@ifset a',
-              'type' => 'raw'
-            },
-            {
-              'parent' => {},
-              'text' => '
+              'text' => '@ifset a
 ',
-              'type' => 'last_raw_newline'
+              'type' => 'raw'
             },
             {
               'args' => [
@@ -89,14 +84,9 @@ $result_trees{'ifset_and_end_isef_in_macro'} = {
           'contents' => [
             {
               'parent' => {},
-              'text' => '@end ifset',
-              'type' => 'raw'
-            },
-            {
-              'parent' => {},
-              'text' => '
+              'text' => '@end ifset
 ',
-              'type' => 'last_raw_newline'
+              'type' => 'raw'
             },
             {
               'args' => [
@@ -154,18 +144,16 @@ $result_trees{'ifset_and_end_isef_in_macro'} = {
 };
 
$result_trees{'ifset_and_end_isef_in_macro'}{'contents'}[0]{'contents'}[0]{'args'}[0]{'parent'}
 = $result_trees{'ifset_and_end_isef_in_macro'}{'contents'}[0]{'contents'}[0];
 
$result_trees{'ifset_and_end_isef_in_macro'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'parent'}
 = $result_trees{'ifset_and_end_isef_in_macro'}{'contents'}[0]{'contents'}[0];
+$result_trees{'ifset_and_end_isef_in_macro'}{'contents'}[0]{'contents'}[0]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'ifset_and_end_isef_in_macro'}{'contents'}[0]{'contents'}[0]{'contents'}[1]{'args'}[0];
+$result_trees{'ifset_and_end_isef_in_macro'}{'contents'}[0]{'contents'}[0]{'contents'}[1]{'args'}[0]{'parent'}
 = 
$result_trees{'ifset_and_end_isef_in_macro'}{'contents'}[0]{'contents'}[0]{'contents'}[1];
 
$result_trees{'ifset_and_end_isef_in_macro'}{'contents'}[0]{'contents'}[0]{'contents'}[1]{'parent'}
 = $result_trees{'ifset_and_end_isef_in_macro'}{'contents'}[0]{'contents'}[0];
-$result_trees{'ifset_and_end_isef_in_macro'}{'contents'}[0]{'contents'}[0]{'contents'}[2]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'ifset_and_end_isef_in_macro'}{'contents'}[0]{'contents'}[0]{'contents'}[2]{'args'}[0];
-$result_trees{'ifset_and_end_isef_in_macro'}{'contents'}[0]{'contents'}[0]{'contents'}[2]{'args'}[0]{'parent'}
 = 
$result_trees{'ifset_and_end_isef_in_macro'}{'contents'}[0]{'contents'}[0]{'contents'}[2];
-$result_trees{'ifset_and_end_isef_in_macro'}{'contents'}[0]{'contents'}[0]{'contents'}[2]{'parent'}
 = $result_trees{'ifset_and_end_isef_in_macro'}{'contents'}[0]{'contents'}[0];
 
$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]{'contents'}[2]{'args'}[0]{'parent'}
 = $result_trees{'ifset_and_end_isef_in_macro'}{'contents'}[0]{'contents'}[2];
 
$result_trees{'ifset_and_end_isef_in_macro'}{'contents'}[0]{'contents'}[2]{'contents'}[0]{'parent'}
 = $result_trees{'ifset_and_end_isef_in_macro'}{'contents'}[0]{'contents'}[2];
+$result_trees{'ifset_and_end_isef_in_macro'}{'contents'}[0]{'contents'}[2]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'ifset_and_end_isef_in_macro'}{'contents'}[0]{'contents'}[2]{'contents'}[1]{'args'}[0];
+$result_trees{'ifset_and_end_isef_in_macro'}{'contents'}[0]{'contents'}[2]{'contents'}[1]{'args'}[0]{'parent'}
 = 
$result_trees{'ifset_and_end_isef_in_macro'}{'contents'}[0]{'contents'}[2]{'contents'}[1];
 
$result_trees{'ifset_and_end_isef_in_macro'}{'contents'}[0]{'contents'}[2]{'contents'}[1]{'parent'}
 = $result_trees{'ifset_and_end_isef_in_macro'}{'contents'}[0]{'contents'}[2];
-$result_trees{'ifset_and_end_isef_in_macro'}{'contents'}[0]{'contents'}[2]{'contents'}[2]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'ifset_and_end_isef_in_macro'}{'contents'}[0]{'contents'}[2]{'contents'}[2]{'args'}[0];
-$result_trees{'ifset_and_end_isef_in_macro'}{'contents'}[0]{'contents'}[2]{'contents'}[2]{'args'}[0]{'parent'}
 = 
$result_trees{'ifset_and_end_isef_in_macro'}{'contents'}[0]{'contents'}[2]{'contents'}[2];
-$result_trees{'ifset_and_end_isef_in_macro'}{'contents'}[0]{'contents'}[2]{'contents'}[2]{'parent'}
 = $result_trees{'ifset_and_end_isef_in_macro'}{'contents'}[0]{'contents'}[2];
 
$result_trees{'ifset_and_end_isef_in_macro'}{'contents'}[0]{'contents'}[2]{'parent'}
 = $result_trees{'ifset_and_end_isef_in_macro'}{'contents'}[0];
 
$result_trees{'ifset_and_end_isef_in_macro'}{'contents'}[0]{'contents'}[3]{'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'};
diff --git a/tp/t/results/macro/ifset_in_macro.pl 
b/tp/t/results/macro/ifset_in_macro.pl
index 3218d68cd9..781102ea8d 100644
--- a/tp/t/results/macro/ifset_in_macro.pl
+++ b/tp/t/results/macro/ifset_in_macro.pl
@@ -38,14 +38,9 @@ $result_trees{'ifset_in_macro'} = {
             },
             {
               'parent' => {},
-              'text' => '@end ifset',
-              'type' => 'raw'
-            },
-            {
-              'parent' => {},
-              'text' => '
+              'text' => '@end ifset
 ',
-              'type' => 'last_raw_newline'
+              'type' => 'raw'
             },
             {
               'args' => [
@@ -106,10 +101,9 @@ 
$result_trees{'ifset_in_macro'}{'contents'}[0]{'contents'}[0]{'args'}[1]{'parent
 
$result_trees{'ifset_in_macro'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'parent'}
 = $result_trees{'ifset_in_macro'}{'contents'}[0]{'contents'}[0];
 
$result_trees{'ifset_in_macro'}{'contents'}[0]{'contents'}[0]{'contents'}[1]{'parent'}
 = $result_trees{'ifset_in_macro'}{'contents'}[0]{'contents'}[0];
 
$result_trees{'ifset_in_macro'}{'contents'}[0]{'contents'}[0]{'contents'}[2]{'parent'}
 = $result_trees{'ifset_in_macro'}{'contents'}[0]{'contents'}[0];
+$result_trees{'ifset_in_macro'}{'contents'}[0]{'contents'}[0]{'contents'}[3]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'ifset_in_macro'}{'contents'}[0]{'contents'}[0]{'contents'}[3]{'args'}[0];
+$result_trees{'ifset_in_macro'}{'contents'}[0]{'contents'}[0]{'contents'}[3]{'args'}[0]{'parent'}
 = $result_trees{'ifset_in_macro'}{'contents'}[0]{'contents'}[0]{'contents'}[3];
 
$result_trees{'ifset_in_macro'}{'contents'}[0]{'contents'}[0]{'contents'}[3]{'parent'}
 = $result_trees{'ifset_in_macro'}{'contents'}[0]{'contents'}[0];
-$result_trees{'ifset_in_macro'}{'contents'}[0]{'contents'}[0]{'contents'}[4]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'ifset_in_macro'}{'contents'}[0]{'contents'}[0]{'contents'}[4]{'args'}[0];
-$result_trees{'ifset_in_macro'}{'contents'}[0]{'contents'}[0]{'contents'}[4]{'args'}[0]{'parent'}
 = $result_trees{'ifset_in_macro'}{'contents'}[0]{'contents'}[0]{'contents'}[4];
-$result_trees{'ifset_in_macro'}{'contents'}[0]{'contents'}[0]{'contents'}[4]{'parent'}
 = $result_trees{'ifset_in_macro'}{'contents'}[0]{'contents'}[0];
 $result_trees{'ifset_in_macro'}{'contents'}[0]{'contents'}[0]{'parent'} = 
$result_trees{'ifset_in_macro'}{'contents'}[0];
 $result_trees{'ifset_in_macro'}{'contents'}[0]{'contents'}[1]{'parent'} = 
$result_trees{'ifset_in_macro'}{'contents'}[0];
 $result_trees{'ifset_in_macro'}{'contents'}[0]{'parent'} = 
$result_trees{'ifset_in_macro'};
diff --git a/tp/t/results/macro/ifset_in_macro_set.pl 
b/tp/t/results/macro/ifset_in_macro_set.pl
index e2a2fc58a7..c463da87f2 100644
--- a/tp/t/results/macro/ifset_in_macro_set.pl
+++ b/tp/t/results/macro/ifset_in_macro_set.pl
@@ -38,14 +38,9 @@ $result_trees{'ifset_in_macro_set'} = {
             },
             {
               'parent' => {},
-              'text' => '@end ifset',
-              'type' => 'raw'
-            },
-            {
-              'parent' => {},
-              'text' => '
+              'text' => '@end ifset
 ',
-              'type' => 'last_raw_newline'
+              'type' => 'raw'
             },
             {
               'args' => [
@@ -123,10 +118,9 @@ 
$result_trees{'ifset_in_macro_set'}{'contents'}[0]{'contents'}[0]{'args'}[1]{'pa
 
$result_trees{'ifset_in_macro_set'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'parent'}
 = $result_trees{'ifset_in_macro_set'}{'contents'}[0]{'contents'}[0];
 
$result_trees{'ifset_in_macro_set'}{'contents'}[0]{'contents'}[0]{'contents'}[1]{'parent'}
 = $result_trees{'ifset_in_macro_set'}{'contents'}[0]{'contents'}[0];
 
$result_trees{'ifset_in_macro_set'}{'contents'}[0]{'contents'}[0]{'contents'}[2]{'parent'}
 = $result_trees{'ifset_in_macro_set'}{'contents'}[0]{'contents'}[0];
+$result_trees{'ifset_in_macro_set'}{'contents'}[0]{'contents'}[0]{'contents'}[3]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'ifset_in_macro_set'}{'contents'}[0]{'contents'}[0]{'contents'}[3]{'args'}[0];
+$result_trees{'ifset_in_macro_set'}{'contents'}[0]{'contents'}[0]{'contents'}[3]{'args'}[0]{'parent'}
 = 
$result_trees{'ifset_in_macro_set'}{'contents'}[0]{'contents'}[0]{'contents'}[3];
 
$result_trees{'ifset_in_macro_set'}{'contents'}[0]{'contents'}[0]{'contents'}[3]{'parent'}
 = $result_trees{'ifset_in_macro_set'}{'contents'}[0]{'contents'}[0];
-$result_trees{'ifset_in_macro_set'}{'contents'}[0]{'contents'}[0]{'contents'}[4]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'ifset_in_macro_set'}{'contents'}[0]{'contents'}[0]{'contents'}[4]{'args'}[0];
-$result_trees{'ifset_in_macro_set'}{'contents'}[0]{'contents'}[0]{'contents'}[4]{'args'}[0]{'parent'}
 = 
$result_trees{'ifset_in_macro_set'}{'contents'}[0]{'contents'}[0]{'contents'}[4];
-$result_trees{'ifset_in_macro_set'}{'contents'}[0]{'contents'}[0]{'contents'}[4]{'parent'}
 = $result_trees{'ifset_in_macro_set'}{'contents'}[0]{'contents'}[0];
 $result_trees{'ifset_in_macro_set'}{'contents'}[0]{'contents'}[0]{'parent'} = 
$result_trees{'ifset_in_macro_set'}{'contents'}[0];
 $result_trees{'ifset_in_macro_set'}{'contents'}[0]{'contents'}[1]{'parent'} = 
$result_trees{'ifset_in_macro_set'}{'contents'}[0];
 
$result_trees{'ifset_in_macro_set'}{'contents'}[0]{'contents'}[2]{'contents'}[0]{'parent'}
 = $result_trees{'ifset_in_macro_set'}{'contents'}[0]{'contents'}[2];
diff --git a/tp/t/results/macro/ignored_macro_definition.pl 
b/tp/t/results/macro/ignored_macro_definition.pl
index 0f25527b50..8b82b23a5e 100644
--- a/tp/t/results/macro/ignored_macro_definition.pl
+++ b/tp/t/results/macro/ignored_macro_definition.pl
@@ -21,14 +21,9 @@ $result_trees{'ignored_macro_definition'} = {
           'contents' => [
             {
               'parent' => {},
-              'text' => 'outside',
-              'type' => 'raw'
-            },
-            {
-              'parent' => {},
-              'text' => '
+              'text' => 'outside
 ',
-              'type' => 'last_raw_newline'
+              'type' => 'raw'
             },
             {
               'args' => [
@@ -150,10 +145,9 @@ $result_trees{'ignored_macro_definition'} = {
 };
 
$result_trees{'ignored_macro_definition'}{'contents'}[0]{'contents'}[0]{'args'}[0]{'parent'}
 = $result_trees{'ignored_macro_definition'}{'contents'}[0]{'contents'}[0];
 
$result_trees{'ignored_macro_definition'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'parent'}
 = $result_trees{'ignored_macro_definition'}{'contents'}[0]{'contents'}[0];
+$result_trees{'ignored_macro_definition'}{'contents'}[0]{'contents'}[0]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'ignored_macro_definition'}{'contents'}[0]{'contents'}[0]{'contents'}[1]{'args'}[0];
+$result_trees{'ignored_macro_definition'}{'contents'}[0]{'contents'}[0]{'contents'}[1]{'args'}[0]{'parent'}
 = 
$result_trees{'ignored_macro_definition'}{'contents'}[0]{'contents'}[0]{'contents'}[1];
 
$result_trees{'ignored_macro_definition'}{'contents'}[0]{'contents'}[0]{'contents'}[1]{'parent'}
 = $result_trees{'ignored_macro_definition'}{'contents'}[0]{'contents'}[0];
-$result_trees{'ignored_macro_definition'}{'contents'}[0]{'contents'}[0]{'contents'}[2]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'ignored_macro_definition'}{'contents'}[0]{'contents'}[0]{'contents'}[2]{'args'}[0];
-$result_trees{'ignored_macro_definition'}{'contents'}[0]{'contents'}[0]{'contents'}[2]{'args'}[0]{'parent'}
 = 
$result_trees{'ignored_macro_definition'}{'contents'}[0]{'contents'}[0]{'contents'}[2];
-$result_trees{'ignored_macro_definition'}{'contents'}[0]{'contents'}[0]{'contents'}[2]{'parent'}
 = $result_trees{'ignored_macro_definition'}{'contents'}[0]{'contents'}[0];
 
$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]{'contents'}[2]{'parent'}
 = $result_trees{'ignored_macro_definition'}{'contents'}[0];
diff --git a/tp/t/results/macro/implicit_quoting_one_arg.pl 
b/tp/t/results/macro/implicit_quoting_one_arg.pl
index 500e876167..91b9918132 100644
--- a/tp/t/results/macro/implicit_quoting_one_arg.pl
+++ b/tp/t/results/macro/implicit_quoting_one_arg.pl
@@ -32,14 +32,9 @@ $result_trees{'implicit_quoting_one_arg'} = {
           'contents' => [
             {
               'parent' => {},
-              'text' => '@strong{FIXAME: \\a\\}',
-              'type' => 'raw'
-            },
-            {
-              'parent' => {},
-              'text' => '
+              'text' => '@strong{FIXAME: \\a\\}
 ',
-              'type' => 'last_raw_newline'
+              'type' => 'raw'
             },
             {
               'args' => [
@@ -132,10 +127,9 @@ 
$result_trees{'implicit_quoting_one_arg'}{'contents'}[0]{'contents'}[0]{'parent'
 
$result_trees{'implicit_quoting_one_arg'}{'contents'}[0]{'contents'}[1]{'args'}[0]{'parent'}
 = $result_trees{'implicit_quoting_one_arg'}{'contents'}[0]{'contents'}[1];
 
$result_trees{'implicit_quoting_one_arg'}{'contents'}[0]{'contents'}[1]{'args'}[1]{'parent'}
 = $result_trees{'implicit_quoting_one_arg'}{'contents'}[0]{'contents'}[1];
 
$result_trees{'implicit_quoting_one_arg'}{'contents'}[0]{'contents'}[1]{'contents'}[0]{'parent'}
 = $result_trees{'implicit_quoting_one_arg'}{'contents'}[0]{'contents'}[1];
+$result_trees{'implicit_quoting_one_arg'}{'contents'}[0]{'contents'}[1]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'implicit_quoting_one_arg'}{'contents'}[0]{'contents'}[1]{'contents'}[1]{'args'}[0];
+$result_trees{'implicit_quoting_one_arg'}{'contents'}[0]{'contents'}[1]{'contents'}[1]{'args'}[0]{'parent'}
 = 
$result_trees{'implicit_quoting_one_arg'}{'contents'}[0]{'contents'}[1]{'contents'}[1];
 
$result_trees{'implicit_quoting_one_arg'}{'contents'}[0]{'contents'}[1]{'contents'}[1]{'parent'}
 = $result_trees{'implicit_quoting_one_arg'}{'contents'}[0]{'contents'}[1];
-$result_trees{'implicit_quoting_one_arg'}{'contents'}[0]{'contents'}[1]{'contents'}[2]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'implicit_quoting_one_arg'}{'contents'}[0]{'contents'}[1]{'contents'}[2]{'args'}[0];
-$result_trees{'implicit_quoting_one_arg'}{'contents'}[0]{'contents'}[1]{'contents'}[2]{'args'}[0]{'parent'}
 = 
$result_trees{'implicit_quoting_one_arg'}{'contents'}[0]{'contents'}[1]{'contents'}[2];
-$result_trees{'implicit_quoting_one_arg'}{'contents'}[0]{'contents'}[1]{'contents'}[2]{'parent'}
 = $result_trees{'implicit_quoting_one_arg'}{'contents'}[0]{'contents'}[1];
 
$result_trees{'implicit_quoting_one_arg'}{'contents'}[0]{'contents'}[1]{'parent'}
 = $result_trees{'implicit_quoting_one_arg'}{'contents'}[0];
 
$result_trees{'implicit_quoting_one_arg'}{'contents'}[0]{'contents'}[2]{'parent'}
 = $result_trees{'implicit_quoting_one_arg'}{'contents'}[0];
 
$result_trees{'implicit_quoting_one_arg'}{'contents'}[0]{'contents'}[3]{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'implicit_quoting_one_arg'}{'contents'}[0]{'contents'}[3]{'contents'}[0]{'args'}[0];
diff --git a/tp/t/results/macro/implicit_quoting_recursion.pl 
b/tp/t/results/macro/implicit_quoting_recursion.pl
index 04b531f0bd..043e92c168 100644
--- a/tp/t/results/macro/implicit_quoting_recursion.pl
+++ b/tp/t/results/macro/implicit_quoting_recursion.pl
@@ -31,14 +31,9 @@ $result_trees{'implicit_quoting_recursion'} = {
           'contents' => [
             {
               'parent' => {},
-              'text' => '\\a\\\\b\\',
-              'type' => 'raw'
-            },
-            {
-              'parent' => {},
-              'text' => '
+              'text' => '\\a\\\\b\\
 ',
-              'type' => 'last_raw_newline'
+              'type' => 'raw'
             },
             {
               'args' => [
@@ -109,10 +104,9 @@ 
$result_trees{'implicit_quoting_recursion'}{'contents'}[0]{'contents'}[0]{'args'
 
$result_trees{'implicit_quoting_recursion'}{'contents'}[0]{'contents'}[0]{'args'}[1]{'parent'}
 = $result_trees{'implicit_quoting_recursion'}{'contents'}[0]{'contents'}[0];
 
$result_trees{'implicit_quoting_recursion'}{'contents'}[0]{'contents'}[0]{'args'}[2]{'parent'}
 = $result_trees{'implicit_quoting_recursion'}{'contents'}[0]{'contents'}[0];
 
$result_trees{'implicit_quoting_recursion'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'parent'}
 = $result_trees{'implicit_quoting_recursion'}{'contents'}[0]{'contents'}[0];
+$result_trees{'implicit_quoting_recursion'}{'contents'}[0]{'contents'}[0]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'implicit_quoting_recursion'}{'contents'}[0]{'contents'}[0]{'contents'}[1]{'args'}[0];
+$result_trees{'implicit_quoting_recursion'}{'contents'}[0]{'contents'}[0]{'contents'}[1]{'args'}[0]{'parent'}
 = 
$result_trees{'implicit_quoting_recursion'}{'contents'}[0]{'contents'}[0]{'contents'}[1];
 
$result_trees{'implicit_quoting_recursion'}{'contents'}[0]{'contents'}[0]{'contents'}[1]{'parent'}
 = $result_trees{'implicit_quoting_recursion'}{'contents'}[0]{'contents'}[0];
-$result_trees{'implicit_quoting_recursion'}{'contents'}[0]{'contents'}[0]{'contents'}[2]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'implicit_quoting_recursion'}{'contents'}[0]{'contents'}[0]{'contents'}[2]{'args'}[0];
-$result_trees{'implicit_quoting_recursion'}{'contents'}[0]{'contents'}[0]{'contents'}[2]{'args'}[0]{'parent'}
 = 
$result_trees{'implicit_quoting_recursion'}{'contents'}[0]{'contents'}[0]{'contents'}[2];
-$result_trees{'implicit_quoting_recursion'}{'contents'}[0]{'contents'}[0]{'contents'}[2]{'parent'}
 = $result_trees{'implicit_quoting_recursion'}{'contents'}[0]{'contents'}[0];
 
$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]{'contents'}[2]{'contents'}[0]{'parent'}
 = $result_trees{'implicit_quoting_recursion'}{'contents'}[0]{'contents'}[2];
diff --git a/tp/t/results/macro/include_after_empty_line_arg.pl 
b/tp/t/results/macro/include_after_empty_line_arg.pl
index 1ef93bd7ed..9b3263e872 100644
--- a/tp/t/results/macro/include_after_empty_line_arg.pl
+++ b/tp/t/results/macro/include_after_empty_line_arg.pl
@@ -26,14 +26,9 @@ $result_trees{'include_after_empty_line_arg'} = {
           'contents' => [
             {
               'parent' => {},
-              'text' => '@code{\\body\\}',
-              'type' => 'raw'
-            },
-            {
-              'parent' => {},
-              'text' => '
+              'text' => '@code{\\body\\}
 ',
-              'type' => 'last_raw_newline'
+              'type' => 'raw'
             },
             {
               'args' => [
@@ -125,10 +120,9 @@ $result_trees{'include_after_empty_line_arg'} = {
 
$result_trees{'include_after_empty_line_arg'}{'contents'}[0]{'contents'}[0]{'args'}[0]{'parent'}
 = $result_trees{'include_after_empty_line_arg'}{'contents'}[0]{'contents'}[0];
 
$result_trees{'include_after_empty_line_arg'}{'contents'}[0]{'contents'}[0]{'args'}[1]{'parent'}
 = $result_trees{'include_after_empty_line_arg'}{'contents'}[0]{'contents'}[0];
 
$result_trees{'include_after_empty_line_arg'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'parent'}
 = $result_trees{'include_after_empty_line_arg'}{'contents'}[0]{'contents'}[0];
+$result_trees{'include_after_empty_line_arg'}{'contents'}[0]{'contents'}[0]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'include_after_empty_line_arg'}{'contents'}[0]{'contents'}[0]{'contents'}[1]{'args'}[0];
+$result_trees{'include_after_empty_line_arg'}{'contents'}[0]{'contents'}[0]{'contents'}[1]{'args'}[0]{'parent'}
 = 
$result_trees{'include_after_empty_line_arg'}{'contents'}[0]{'contents'}[0]{'contents'}[1];
 
$result_trees{'include_after_empty_line_arg'}{'contents'}[0]{'contents'}[0]{'contents'}[1]{'parent'}
 = $result_trees{'include_after_empty_line_arg'}{'contents'}[0]{'contents'}[0];
-$result_trees{'include_after_empty_line_arg'}{'contents'}[0]{'contents'}[0]{'contents'}[2]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'include_after_empty_line_arg'}{'contents'}[0]{'contents'}[0]{'contents'}[2]{'args'}[0];
-$result_trees{'include_after_empty_line_arg'}{'contents'}[0]{'contents'}[0]{'contents'}[2]{'args'}[0]{'parent'}
 = 
$result_trees{'include_after_empty_line_arg'}{'contents'}[0]{'contents'}[0]{'contents'}[2];
-$result_trees{'include_after_empty_line_arg'}{'contents'}[0]{'contents'}[0]{'contents'}[2]{'parent'}
 = $result_trees{'include_after_empty_line_arg'}{'contents'}[0]{'contents'}[0];
 
$result_trees{'include_after_empty_line_arg'}{'contents'}[0]{'contents'}[0]{'parent'}
 = $result_trees{'include_after_empty_line_arg'}{'contents'}[0];
 
$result_trees{'include_after_empty_line_arg'}{'contents'}[0]{'contents'}[1]{'parent'}
 = $result_trees{'include_after_empty_line_arg'}{'contents'}[0];
 
$result_trees{'include_after_empty_line_arg'}{'contents'}[0]{'contents'}[2]{'contents'}[0]{'args'}[0]{'parent'}
 = 
$result_trees{'include_after_empty_line_arg'}{'contents'}[0]{'contents'}[2]{'contents'}[0];
diff --git a/tp/t/results/macro/leading_spaces_no_ignore.pl 
b/tp/t/results/macro/leading_spaces_no_ignore.pl
index 93c8e6760a..908cb3d1a7 100644
--- a/tp/t/results/macro/leading_spaces_no_ignore.pl
+++ b/tp/t/results/macro/leading_spaces_no_ignore.pl
@@ -27,14 +27,9 @@ $result_trees{'leading_spaces_no_ignore'} = {
             },
             {
               'parent' => {},
-              'text' => '  text',
-              'type' => 'raw'
-            },
-            {
-              'parent' => {},
-              'text' => '
+              'text' => '  text
 ',
-              'type' => 'last_raw_newline'
+              'type' => 'raw'
             },
             {
               'args' => [
@@ -114,10 +109,9 @@ $result_trees{'leading_spaces_no_ignore'} = {
 
$result_trees{'leading_spaces_no_ignore'}{'contents'}[0]{'contents'}[0]{'args'}[0]{'parent'}
 = $result_trees{'leading_spaces_no_ignore'}{'contents'}[0]{'contents'}[0];
 
$result_trees{'leading_spaces_no_ignore'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'parent'}
 = $result_trees{'leading_spaces_no_ignore'}{'contents'}[0]{'contents'}[0];
 
$result_trees{'leading_spaces_no_ignore'}{'contents'}[0]{'contents'}[0]{'contents'}[1]{'parent'}
 = $result_trees{'leading_spaces_no_ignore'}{'contents'}[0]{'contents'}[0];
+$result_trees{'leading_spaces_no_ignore'}{'contents'}[0]{'contents'}[0]{'contents'}[2]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'leading_spaces_no_ignore'}{'contents'}[0]{'contents'}[0]{'contents'}[2]{'args'}[0];
+$result_trees{'leading_spaces_no_ignore'}{'contents'}[0]{'contents'}[0]{'contents'}[2]{'args'}[0]{'parent'}
 = 
$result_trees{'leading_spaces_no_ignore'}{'contents'}[0]{'contents'}[0]{'contents'}[2];
 
$result_trees{'leading_spaces_no_ignore'}{'contents'}[0]{'contents'}[0]{'contents'}[2]{'parent'}
 = $result_trees{'leading_spaces_no_ignore'}{'contents'}[0]{'contents'}[0];
-$result_trees{'leading_spaces_no_ignore'}{'contents'}[0]{'contents'}[0]{'contents'}[3]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'leading_spaces_no_ignore'}{'contents'}[0]{'contents'}[0]{'contents'}[3]{'args'}[0];
-$result_trees{'leading_spaces_no_ignore'}{'contents'}[0]{'contents'}[0]{'contents'}[3]{'args'}[0]{'parent'}
 = 
$result_trees{'leading_spaces_no_ignore'}{'contents'}[0]{'contents'}[0]{'contents'}[3];
-$result_trees{'leading_spaces_no_ignore'}{'contents'}[0]{'contents'}[0]{'contents'}[3]{'parent'}
 = $result_trees{'leading_spaces_no_ignore'}{'contents'}[0]{'contents'}[0];
 
$result_trees{'leading_spaces_no_ignore'}{'contents'}[0]{'contents'}[0]{'parent'}
 = $result_trees{'leading_spaces_no_ignore'}{'contents'}[0];
 
$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];
diff --git a/tp/t/results/macro/line_after_recursive_call.pl 
b/tp/t/results/macro/line_after_recursive_call.pl
index c8cdb1429a..155442b718 100644
--- a/tp/t/results/macro/line_after_recursive_call.pl
+++ b/tp/t/results/macro/line_after_recursive_call.pl
@@ -33,14 +33,9 @@ $result_trees{'line_after_recursive_call'} = {
             },
             {
               'parent' => {},
-              'text' => 'fff',
-              'type' => 'raw'
-            },
-            {
-              'parent' => {},
-              'text' => '
+              'text' => 'fff
 ',
-              'type' => 'last_raw_newline'
+              'type' => 'raw'
             },
             {
               'args' => [
@@ -114,10 +109,9 @@ 
$result_trees{'line_after_recursive_call'}{'contents'}[0]{'contents'}[0]{'args'}
 
$result_trees{'line_after_recursive_call'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'parent'}
 = $result_trees{'line_after_recursive_call'}{'contents'}[0]{'contents'}[0];
 
$result_trees{'line_after_recursive_call'}{'contents'}[0]{'contents'}[0]{'contents'}[1]{'parent'}
 = $result_trees{'line_after_recursive_call'}{'contents'}[0]{'contents'}[0];
 
$result_trees{'line_after_recursive_call'}{'contents'}[0]{'contents'}[0]{'contents'}[2]{'parent'}
 = $result_trees{'line_after_recursive_call'}{'contents'}[0]{'contents'}[0];
+$result_trees{'line_after_recursive_call'}{'contents'}[0]{'contents'}[0]{'contents'}[3]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'line_after_recursive_call'}{'contents'}[0]{'contents'}[0]{'contents'}[3]{'args'}[0];
+$result_trees{'line_after_recursive_call'}{'contents'}[0]{'contents'}[0]{'contents'}[3]{'args'}[0]{'parent'}
 = 
$result_trees{'line_after_recursive_call'}{'contents'}[0]{'contents'}[0]{'contents'}[3];
 
$result_trees{'line_after_recursive_call'}{'contents'}[0]{'contents'}[0]{'contents'}[3]{'parent'}
 = $result_trees{'line_after_recursive_call'}{'contents'}[0]{'contents'}[0];
-$result_trees{'line_after_recursive_call'}{'contents'}[0]{'contents'}[0]{'contents'}[4]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'line_after_recursive_call'}{'contents'}[0]{'contents'}[0]{'contents'}[4]{'args'}[0];
-$result_trees{'line_after_recursive_call'}{'contents'}[0]{'contents'}[0]{'contents'}[4]{'args'}[0]{'parent'}
 = 
$result_trees{'line_after_recursive_call'}{'contents'}[0]{'contents'}[0]{'contents'}[4];
-$result_trees{'line_after_recursive_call'}{'contents'}[0]{'contents'}[0]{'contents'}[4]{'parent'}
 = $result_trees{'line_after_recursive_call'}{'contents'}[0]{'contents'}[0];
 
$result_trees{'line_after_recursive_call'}{'contents'}[0]{'contents'}[0]{'parent'}
 = $result_trees{'line_after_recursive_call'}{'contents'}[0];
 
$result_trees{'line_after_recursive_call'}{'contents'}[0]{'contents'}[1]{'contents'}[0]{'parent'}
 = $result_trees{'line_after_recursive_call'}{'contents'}[0]{'contents'}[1];
 
$result_trees{'line_after_recursive_call'}{'contents'}[0]{'contents'}[1]{'contents'}[1]{'parent'}
 = $result_trees{'line_after_recursive_call'}{'contents'}[0]{'contents'}[1];
diff --git a/tp/t/results/macro/macro_expands_to_empty.pl 
b/tp/t/results/macro/macro_expands_to_empty.pl
index 85639a198c..1ad3e8820f 100644
--- a/tp/t/results/macro/macro_expands_to_empty.pl
+++ b/tp/t/results/macro/macro_expands_to_empty.pl
@@ -26,14 +26,9 @@ $result_trees{'macro_expands_to_empty'} = {
           'contents' => [
             {
               'parent' => {},
-              'text' => '\\arg\\',
-              'type' => 'raw'
-            },
-            {
-              'parent' => {},
-              'text' => '
+              'text' => '\\arg\\
 ',
-              'type' => 'last_raw_newline'
+              'type' => 'raw'
             },
             {
               'args' => [
@@ -109,10 +104,9 @@ $result_trees{'macro_expands_to_empty'} = {
 
$result_trees{'macro_expands_to_empty'}{'contents'}[0]{'contents'}[0]{'args'}[0]{'parent'}
 = $result_trees{'macro_expands_to_empty'}{'contents'}[0]{'contents'}[0];
 
$result_trees{'macro_expands_to_empty'}{'contents'}[0]{'contents'}[0]{'args'}[1]{'parent'}
 = $result_trees{'macro_expands_to_empty'}{'contents'}[0]{'contents'}[0];
 
$result_trees{'macro_expands_to_empty'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'parent'}
 = $result_trees{'macro_expands_to_empty'}{'contents'}[0]{'contents'}[0];
+$result_trees{'macro_expands_to_empty'}{'contents'}[0]{'contents'}[0]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'macro_expands_to_empty'}{'contents'}[0]{'contents'}[0]{'contents'}[1]{'args'}[0];
+$result_trees{'macro_expands_to_empty'}{'contents'}[0]{'contents'}[0]{'contents'}[1]{'args'}[0]{'parent'}
 = 
$result_trees{'macro_expands_to_empty'}{'contents'}[0]{'contents'}[0]{'contents'}[1];
 
$result_trees{'macro_expands_to_empty'}{'contents'}[0]{'contents'}[0]{'contents'}[1]{'parent'}
 = $result_trees{'macro_expands_to_empty'}{'contents'}[0]{'contents'}[0];
-$result_trees{'macro_expands_to_empty'}{'contents'}[0]{'contents'}[0]{'contents'}[2]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'macro_expands_to_empty'}{'contents'}[0]{'contents'}[0]{'contents'}[2]{'args'}[0];
-$result_trees{'macro_expands_to_empty'}{'contents'}[0]{'contents'}[0]{'contents'}[2]{'args'}[0]{'parent'}
 = 
$result_trees{'macro_expands_to_empty'}{'contents'}[0]{'contents'}[0]{'contents'}[2];
-$result_trees{'macro_expands_to_empty'}{'contents'}[0]{'contents'}[0]{'contents'}[2]{'parent'}
 = $result_trees{'macro_expands_to_empty'}{'contents'}[0]{'contents'}[0];
 
$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]{'contents'}[2]{'parent'} 
= $result_trees{'macro_expands_to_empty'}{'contents'}[0];
diff --git a/tp/t/results/macro/macro_expansion.pl 
b/tp/t/results/macro/macro_expansion.pl
index 339bd3b6eb..b8678ea02c 100644
--- a/tp/t/results/macro/macro_expansion.pl
+++ b/tp/t/results/macro/macro_expansion.pl
@@ -55,14 +55,9 @@ $result_trees{'macro_expansion'} = {
             },
             {
               'parent' => {},
-              'text' => '@end verbatim',
-              'type' => 'raw'
-            },
-            {
-              'parent' => {},
-              'text' => '
+              'text' => '@end verbatim
 ',
-              'type' => 'last_raw_newline'
+              'type' => 'raw'
             },
             {
               'args' => [
@@ -615,10 +610,9 @@ 
$result_trees{'macro_expansion'}{'contents'}[0]{'contents'}[1]{'contents'}[0]{'p
 
$result_trees{'macro_expansion'}{'contents'}[0]{'contents'}[1]{'contents'}[1]{'parent'}
 = $result_trees{'macro_expansion'}{'contents'}[0]{'contents'}[1];
 
$result_trees{'macro_expansion'}{'contents'}[0]{'contents'}[1]{'contents'}[2]{'parent'}
 = $result_trees{'macro_expansion'}{'contents'}[0]{'contents'}[1];
 
$result_trees{'macro_expansion'}{'contents'}[0]{'contents'}[1]{'contents'}[3]{'parent'}
 = $result_trees{'macro_expansion'}{'contents'}[0]{'contents'}[1];
+$result_trees{'macro_expansion'}{'contents'}[0]{'contents'}[1]{'contents'}[4]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'macro_expansion'}{'contents'}[0]{'contents'}[1]{'contents'}[4]{'args'}[0];
+$result_trees{'macro_expansion'}{'contents'}[0]{'contents'}[1]{'contents'}[4]{'args'}[0]{'parent'}
 = 
$result_trees{'macro_expansion'}{'contents'}[0]{'contents'}[1]{'contents'}[4];
 
$result_trees{'macro_expansion'}{'contents'}[0]{'contents'}[1]{'contents'}[4]{'parent'}
 = $result_trees{'macro_expansion'}{'contents'}[0]{'contents'}[1];
-$result_trees{'macro_expansion'}{'contents'}[0]{'contents'}[1]{'contents'}[5]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'macro_expansion'}{'contents'}[0]{'contents'}[1]{'contents'}[5]{'args'}[0];
-$result_trees{'macro_expansion'}{'contents'}[0]{'contents'}[1]{'contents'}[5]{'args'}[0]{'parent'}
 = 
$result_trees{'macro_expansion'}{'contents'}[0]{'contents'}[1]{'contents'}[5];
-$result_trees{'macro_expansion'}{'contents'}[0]{'contents'}[1]{'contents'}[5]{'parent'}
 = $result_trees{'macro_expansion'}{'contents'}[0]{'contents'}[1];
 $result_trees{'macro_expansion'}{'contents'}[0]{'contents'}[1]{'parent'} = 
$result_trees{'macro_expansion'}{'contents'}[0];
 $result_trees{'macro_expansion'}{'contents'}[0]{'contents'}[2]{'parent'} = 
$result_trees{'macro_expansion'}{'contents'}[0];
 
$result_trees{'macro_expansion'}{'contents'}[0]{'contents'}[3]{'contents'}[0]{'parent'}
 = $result_trees{'macro_expansion'}{'contents'}[0]{'contents'}[3];
diff --git a/tp/t/results/macro/macro_for_end.pl 
b/tp/t/results/macro/macro_for_end.pl
index 3fefcb6f12..788d579c28 100644
--- a/tp/t/results/macro/macro_for_end.pl
+++ b/tp/t/results/macro/macro_for_end.pl
@@ -21,14 +21,9 @@ $result_trees{'macro_for_end'} = {
           'contents' => [
             {
               'parent' => {},
-              'text' => '@end',
-              'type' => 'raw'
-            },
-            {
-              'parent' => {},
-              'text' => '
+              'text' => '@end
 ',
-              'type' => 'last_raw_newline'
+              'type' => 'raw'
             },
             {
               'args' => [
@@ -137,10 +132,9 @@ $result_trees{'macro_for_end'} = {
 };
 
$result_trees{'macro_for_end'}{'contents'}[0]{'contents'}[0]{'args'}[0]{'parent'}
 = $result_trees{'macro_for_end'}{'contents'}[0]{'contents'}[0];
 
$result_trees{'macro_for_end'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'parent'}
 = $result_trees{'macro_for_end'}{'contents'}[0]{'contents'}[0];
+$result_trees{'macro_for_end'}{'contents'}[0]{'contents'}[0]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'macro_for_end'}{'contents'}[0]{'contents'}[0]{'contents'}[1]{'args'}[0];
+$result_trees{'macro_for_end'}{'contents'}[0]{'contents'}[0]{'contents'}[1]{'args'}[0]{'parent'}
 = $result_trees{'macro_for_end'}{'contents'}[0]{'contents'}[0]{'contents'}[1];
 
$result_trees{'macro_for_end'}{'contents'}[0]{'contents'}[0]{'contents'}[1]{'parent'}
 = $result_trees{'macro_for_end'}{'contents'}[0]{'contents'}[0];
-$result_trees{'macro_for_end'}{'contents'}[0]{'contents'}[0]{'contents'}[2]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'macro_for_end'}{'contents'}[0]{'contents'}[0]{'contents'}[2]{'args'}[0];
-$result_trees{'macro_for_end'}{'contents'}[0]{'contents'}[0]{'contents'}[2]{'args'}[0]{'parent'}
 = $result_trees{'macro_for_end'}{'contents'}[0]{'contents'}[0]{'contents'}[2];
-$result_trees{'macro_for_end'}{'contents'}[0]{'contents'}[0]{'contents'}[2]{'parent'}
 = $result_trees{'macro_for_end'}{'contents'}[0]{'contents'}[0];
 $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]{'contents'}[2]{'args'}[0]{'parent'}
 = $result_trees{'macro_for_end'}{'contents'}[0]{'contents'}[2];
diff --git a/tp/t/results/macro/macro_for_ignored_line_command.pl 
b/tp/t/results/macro/macro_for_ignored_line_command.pl
index 0ae62861c8..70e425aca1 100644
--- a/tp/t/results/macro/macro_for_ignored_line_command.pl
+++ b/tp/t/results/macro/macro_for_ignored_line_command.pl
@@ -21,14 +21,9 @@ $result_trees{'macro_for_ignored_line_command'} = {
           'contents' => [
             {
               'parent' => {},
-              'text' => '@page',
-              'type' => 'raw'
-            },
-            {
-              'parent' => {},
-              'text' => '
+              'text' => '@page
 ',
-              'type' => 'last_raw_newline'
+              'type' => 'raw'
             },
             {
               'args' => [
@@ -98,10 +93,9 @@ $result_trees{'macro_for_ignored_line_command'} = {
 };
 
$result_trees{'macro_for_ignored_line_command'}{'contents'}[0]{'contents'}[0]{'args'}[0]{'parent'}
 = 
$result_trees{'macro_for_ignored_line_command'}{'contents'}[0]{'contents'}[0];
 
$result_trees{'macro_for_ignored_line_command'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'macro_for_ignored_line_command'}{'contents'}[0]{'contents'}[0];
+$result_trees{'macro_for_ignored_line_command'}{'contents'}[0]{'contents'}[0]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'macro_for_ignored_line_command'}{'contents'}[0]{'contents'}[0]{'contents'}[1]{'args'}[0];
+$result_trees{'macro_for_ignored_line_command'}{'contents'}[0]{'contents'}[0]{'contents'}[1]{'args'}[0]{'parent'}
 = 
$result_trees{'macro_for_ignored_line_command'}{'contents'}[0]{'contents'}[0]{'contents'}[1];
 
$result_trees{'macro_for_ignored_line_command'}{'contents'}[0]{'contents'}[0]{'contents'}[1]{'parent'}
 = 
$result_trees{'macro_for_ignored_line_command'}{'contents'}[0]{'contents'}[0];
-$result_trees{'macro_for_ignored_line_command'}{'contents'}[0]{'contents'}[0]{'contents'}[2]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'macro_for_ignored_line_command'}{'contents'}[0]{'contents'}[0]{'contents'}[2]{'args'}[0];
-$result_trees{'macro_for_ignored_line_command'}{'contents'}[0]{'contents'}[0]{'contents'}[2]{'args'}[0]{'parent'}
 = 
$result_trees{'macro_for_ignored_line_command'}{'contents'}[0]{'contents'}[0]{'contents'}[2];
-$result_trees{'macro_for_ignored_line_command'}{'contents'}[0]{'contents'}[0]{'contents'}[2]{'parent'}
 = 
$result_trees{'macro_for_ignored_line_command'}{'contents'}[0]{'contents'}[0];
 
$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]{'contents'}[2]{'args'}[0]{'parent'}
 = 
$result_trees{'macro_for_ignored_line_command'}{'contents'}[0]{'contents'}[2];
diff --git a/tp/t/results/macro/macro_in_accent.pl 
b/tp/t/results/macro/macro_in_accent.pl
index 91a17da221..81af030284 100644
--- a/tp/t/results/macro/macro_in_accent.pl
+++ b/tp/t/results/macro/macro_in_accent.pl
@@ -21,14 +21,9 @@ $result_trees{'macro_in_accent'} = {
           'contents' => [
             {
               'parent' => {},
-              'text' => 'a',
-              'type' => 'raw'
-            },
-            {
-              'parent' => {},
-              'text' => '
+              'text' => 'a
 ',
-              'type' => 'last_raw_newline'
+              'type' => 'raw'
             },
             {
               'args' => [
@@ -89,14 +84,9 @@ $result_trees{'macro_in_accent'} = {
           'contents' => [
             {
               'parent' => {},
-              'text' => '  ',
-              'type' => 'raw'
-            },
-            {
-              'parent' => {},
-              'text' => '
+              'text' => '  
 ',
-              'type' => 'last_raw_newline'
+              'type' => 'raw'
             },
             {
               'args' => [
@@ -313,18 +303,16 @@ $result_trees{'macro_in_accent'} = {
 };
 
$result_trees{'macro_in_accent'}{'contents'}[0]{'contents'}[0]{'args'}[0]{'parent'}
 = $result_trees{'macro_in_accent'}{'contents'}[0]{'contents'}[0];
 
$result_trees{'macro_in_accent'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'parent'}
 = $result_trees{'macro_in_accent'}{'contents'}[0]{'contents'}[0];
+$result_trees{'macro_in_accent'}{'contents'}[0]{'contents'}[0]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'macro_in_accent'}{'contents'}[0]{'contents'}[0]{'contents'}[1]{'args'}[0];
+$result_trees{'macro_in_accent'}{'contents'}[0]{'contents'}[0]{'contents'}[1]{'args'}[0]{'parent'}
 = 
$result_trees{'macro_in_accent'}{'contents'}[0]{'contents'}[0]{'contents'}[1];
 
$result_trees{'macro_in_accent'}{'contents'}[0]{'contents'}[0]{'contents'}[1]{'parent'}
 = $result_trees{'macro_in_accent'}{'contents'}[0]{'contents'}[0];
-$result_trees{'macro_in_accent'}{'contents'}[0]{'contents'}[0]{'contents'}[2]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'macro_in_accent'}{'contents'}[0]{'contents'}[0]{'contents'}[2]{'args'}[0];
-$result_trees{'macro_in_accent'}{'contents'}[0]{'contents'}[0]{'contents'}[2]{'args'}[0]{'parent'}
 = 
$result_trees{'macro_in_accent'}{'contents'}[0]{'contents'}[0]{'contents'}[2];
-$result_trees{'macro_in_accent'}{'contents'}[0]{'contents'}[0]{'contents'}[2]{'parent'}
 = $result_trees{'macro_in_accent'}{'contents'}[0]{'contents'}[0];
 $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]{'contents'}[2]{'args'}[0]{'parent'}
 = $result_trees{'macro_in_accent'}{'contents'}[0]{'contents'}[2];
 
$result_trees{'macro_in_accent'}{'contents'}[0]{'contents'}[2]{'contents'}[0]{'parent'}
 = $result_trees{'macro_in_accent'}{'contents'}[0]{'contents'}[2];
+$result_trees{'macro_in_accent'}{'contents'}[0]{'contents'}[2]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'macro_in_accent'}{'contents'}[0]{'contents'}[2]{'contents'}[1]{'args'}[0];
+$result_trees{'macro_in_accent'}{'contents'}[0]{'contents'}[2]{'contents'}[1]{'args'}[0]{'parent'}
 = 
$result_trees{'macro_in_accent'}{'contents'}[0]{'contents'}[2]{'contents'}[1];
 
$result_trees{'macro_in_accent'}{'contents'}[0]{'contents'}[2]{'contents'}[1]{'parent'}
 = $result_trees{'macro_in_accent'}{'contents'}[0]{'contents'}[2];
-$result_trees{'macro_in_accent'}{'contents'}[0]{'contents'}[2]{'contents'}[2]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'macro_in_accent'}{'contents'}[0]{'contents'}[2]{'contents'}[2]{'args'}[0];
-$result_trees{'macro_in_accent'}{'contents'}[0]{'contents'}[2]{'contents'}[2]{'args'}[0]{'parent'}
 = 
$result_trees{'macro_in_accent'}{'contents'}[0]{'contents'}[2]{'contents'}[2];
-$result_trees{'macro_in_accent'}{'contents'}[0]{'contents'}[2]{'contents'}[2]{'parent'}
 = $result_trees{'macro_in_accent'}{'contents'}[0]{'contents'}[2];
 $result_trees{'macro_in_accent'}{'contents'}[0]{'contents'}[2]{'parent'} = 
$result_trees{'macro_in_accent'}{'contents'}[0];
 $result_trees{'macro_in_accent'}{'contents'}[0]{'contents'}[3]{'parent'} = 
$result_trees{'macro_in_accent'}{'contents'}[0];
 
$result_trees{'macro_in_accent'}{'contents'}[0]{'contents'}[4]{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'macro_in_accent'}{'contents'}[0]{'contents'}[4]{'contents'}[0]{'args'}[0];
diff --git a/tp/t/results/macro/macro_in_brace_command.pl 
b/tp/t/results/macro/macro_in_brace_command.pl
index c862af69a8..560c91207f 100644
--- a/tp/t/results/macro/macro_in_brace_command.pl
+++ b/tp/t/results/macro/macro_in_brace_command.pl
@@ -21,14 +21,9 @@ $result_trees{'macro_in_brace_command'} = {
           'contents' => [
             {
               'parent' => {},
-              'text' => 'foo-expansion',
-              'type' => 'raw'
-            },
-            {
-              'parent' => {},
-              'text' => '
+              'text' => 'foo-expansion
 ',
-              'type' => 'last_raw_newline'
+              'type' => 'raw'
             },
             {
               'args' => [
@@ -89,14 +84,9 @@ $result_trees{'macro_in_brace_command'} = {
           'contents' => [
             {
               'parent' => {},
-              'text' => 'bar-expansion',
-              'type' => 'raw'
-            },
-            {
-              'parent' => {},
-              'text' => '
+              'text' => 'bar-expansion
 ',
-              'type' => 'last_raw_newline'
+              'type' => 'raw'
             },
             {
               'args' => [
@@ -282,18 +272,16 @@ $result_trees{'macro_in_brace_command'} = {
 };
 
$result_trees{'macro_in_brace_command'}{'contents'}[0]{'contents'}[0]{'args'}[0]{'parent'}
 = $result_trees{'macro_in_brace_command'}{'contents'}[0]{'contents'}[0];
 
$result_trees{'macro_in_brace_command'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'parent'}
 = $result_trees{'macro_in_brace_command'}{'contents'}[0]{'contents'}[0];
+$result_trees{'macro_in_brace_command'}{'contents'}[0]{'contents'}[0]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'macro_in_brace_command'}{'contents'}[0]{'contents'}[0]{'contents'}[1]{'args'}[0];
+$result_trees{'macro_in_brace_command'}{'contents'}[0]{'contents'}[0]{'contents'}[1]{'args'}[0]{'parent'}
 = 
$result_trees{'macro_in_brace_command'}{'contents'}[0]{'contents'}[0]{'contents'}[1];
 
$result_trees{'macro_in_brace_command'}{'contents'}[0]{'contents'}[0]{'contents'}[1]{'parent'}
 = $result_trees{'macro_in_brace_command'}{'contents'}[0]{'contents'}[0];
-$result_trees{'macro_in_brace_command'}{'contents'}[0]{'contents'}[0]{'contents'}[2]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'macro_in_brace_command'}{'contents'}[0]{'contents'}[0]{'contents'}[2]{'args'}[0];
-$result_trees{'macro_in_brace_command'}{'contents'}[0]{'contents'}[0]{'contents'}[2]{'args'}[0]{'parent'}
 = 
$result_trees{'macro_in_brace_command'}{'contents'}[0]{'contents'}[0]{'contents'}[2];
-$result_trees{'macro_in_brace_command'}{'contents'}[0]{'contents'}[0]{'contents'}[2]{'parent'}
 = $result_trees{'macro_in_brace_command'}{'contents'}[0]{'contents'}[0];
 
$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]{'contents'}[2]{'args'}[0]{'parent'}
 = $result_trees{'macro_in_brace_command'}{'contents'}[0]{'contents'}[2];
 
$result_trees{'macro_in_brace_command'}{'contents'}[0]{'contents'}[2]{'contents'}[0]{'parent'}
 = $result_trees{'macro_in_brace_command'}{'contents'}[0]{'contents'}[2];
+$result_trees{'macro_in_brace_command'}{'contents'}[0]{'contents'}[2]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'macro_in_brace_command'}{'contents'}[0]{'contents'}[2]{'contents'}[1]{'args'}[0];
+$result_trees{'macro_in_brace_command'}{'contents'}[0]{'contents'}[2]{'contents'}[1]{'args'}[0]{'parent'}
 = 
$result_trees{'macro_in_brace_command'}{'contents'}[0]{'contents'}[2]{'contents'}[1];
 
$result_trees{'macro_in_brace_command'}{'contents'}[0]{'contents'}[2]{'contents'}[1]{'parent'}
 = $result_trees{'macro_in_brace_command'}{'contents'}[0]{'contents'}[2];
-$result_trees{'macro_in_brace_command'}{'contents'}[0]{'contents'}[2]{'contents'}[2]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'macro_in_brace_command'}{'contents'}[0]{'contents'}[2]{'contents'}[2]{'args'}[0];
-$result_trees{'macro_in_brace_command'}{'contents'}[0]{'contents'}[2]{'contents'}[2]{'args'}[0]{'parent'}
 = 
$result_trees{'macro_in_brace_command'}{'contents'}[0]{'contents'}[2]{'contents'}[2];
-$result_trees{'macro_in_brace_command'}{'contents'}[0]{'contents'}[2]{'contents'}[2]{'parent'}
 = $result_trees{'macro_in_brace_command'}{'contents'}[0]{'contents'}[2];
 
$result_trees{'macro_in_brace_command'}{'contents'}[0]{'contents'}[2]{'parent'} 
= $result_trees{'macro_in_brace_command'}{'contents'}[0];
 
$result_trees{'macro_in_brace_command'}{'contents'}[0]{'contents'}[3]{'parent'} 
= $result_trees{'macro_in_brace_command'}{'contents'}[0];
 
$result_trees{'macro_in_brace_command'}{'contents'}[0]{'contents'}[4]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'macro_in_brace_command'}{'contents'}[0]{'contents'}[4]{'args'}[0];
diff --git a/tp/t/results/macro/macro_in_end_argument.pl 
b/tp/t/results/macro/macro_in_end_argument.pl
index aec8d06d5b..3715d4c59e 100644
--- a/tp/t/results/macro/macro_in_end_argument.pl
+++ b/tp/t/results/macro/macro_in_end_argument.pl
@@ -21,14 +21,9 @@ $result_trees{'macro_in_end_argument'} = {
           'contents' => [
             {
               'parent' => {},
-              'text' => 'cartouche',
-              'type' => 'raw'
-            },
-            {
-              'parent' => {},
-              'text' => '
+              'text' => 'cartouche
 ',
-              'type' => 'last_raw_newline'
+              'type' => 'raw'
             },
             {
               'args' => [
@@ -137,10 +132,9 @@ $result_trees{'macro_in_end_argument'} = {
 };
 
$result_trees{'macro_in_end_argument'}{'contents'}[0]{'contents'}[0]{'args'}[0]{'parent'}
 = $result_trees{'macro_in_end_argument'}{'contents'}[0]{'contents'}[0];
 
$result_trees{'macro_in_end_argument'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'parent'}
 = $result_trees{'macro_in_end_argument'}{'contents'}[0]{'contents'}[0];
+$result_trees{'macro_in_end_argument'}{'contents'}[0]{'contents'}[0]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'macro_in_end_argument'}{'contents'}[0]{'contents'}[0]{'contents'}[1]{'args'}[0];
+$result_trees{'macro_in_end_argument'}{'contents'}[0]{'contents'}[0]{'contents'}[1]{'args'}[0]{'parent'}
 = 
$result_trees{'macro_in_end_argument'}{'contents'}[0]{'contents'}[0]{'contents'}[1];
 
$result_trees{'macro_in_end_argument'}{'contents'}[0]{'contents'}[0]{'contents'}[1]{'parent'}
 = $result_trees{'macro_in_end_argument'}{'contents'}[0]{'contents'}[0];
-$result_trees{'macro_in_end_argument'}{'contents'}[0]{'contents'}[0]{'contents'}[2]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'macro_in_end_argument'}{'contents'}[0]{'contents'}[0]{'contents'}[2]{'args'}[0];
-$result_trees{'macro_in_end_argument'}{'contents'}[0]{'contents'}[0]{'contents'}[2]{'args'}[0]{'parent'}
 = 
$result_trees{'macro_in_end_argument'}{'contents'}[0]{'contents'}[0]{'contents'}[2];
-$result_trees{'macro_in_end_argument'}{'contents'}[0]{'contents'}[0]{'contents'}[2]{'parent'}
 = $result_trees{'macro_in_end_argument'}{'contents'}[0]{'contents'}[0];
 $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]{'contents'}[2]{'args'}[0]{'parent'}
 = $result_trees{'macro_in_end_argument'}{'contents'}[0]{'contents'}[2];
diff --git a/tp/t/results/macro/macro_in_ifset.pl 
b/tp/t/results/macro/macro_in_ifset.pl
index 06c4c48d42..f904967754 100644
--- a/tp/t/results/macro/macro_in_ifset.pl
+++ b/tp/t/results/macro/macro_in_ifset.pl
@@ -26,14 +26,9 @@ $result_trees{'macro_in_ifset'} = {
           'contents' => [
             {
               'parent' => {},
-              'text' => '@end ifset',
-              'type' => 'raw'
-            },
-            {
-              'parent' => {},
-              'text' => '
+              'text' => '@end ifset
 ',
-              'type' => 'last_raw_newline'
+              'type' => 'raw'
             },
             {
               'args' => [
@@ -92,10 +87,9 @@ $result_trees{'macro_in_ifset'} = {
 
$result_trees{'macro_in_ifset'}{'contents'}[0]{'contents'}[0]{'args'}[0]{'parent'}
 = $result_trees{'macro_in_ifset'}{'contents'}[0]{'contents'}[0];
 
$result_trees{'macro_in_ifset'}{'contents'}[0]{'contents'}[0]{'args'}[1]{'parent'}
 = $result_trees{'macro_in_ifset'}{'contents'}[0]{'contents'}[0];
 
$result_trees{'macro_in_ifset'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'parent'}
 = $result_trees{'macro_in_ifset'}{'contents'}[0]{'contents'}[0];
+$result_trees{'macro_in_ifset'}{'contents'}[0]{'contents'}[0]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'macro_in_ifset'}{'contents'}[0]{'contents'}[0]{'contents'}[1]{'args'}[0];
+$result_trees{'macro_in_ifset'}{'contents'}[0]{'contents'}[0]{'contents'}[1]{'args'}[0]{'parent'}
 = $result_trees{'macro_in_ifset'}{'contents'}[0]{'contents'}[0]{'contents'}[1];
 
$result_trees{'macro_in_ifset'}{'contents'}[0]{'contents'}[0]{'contents'}[1]{'parent'}
 = $result_trees{'macro_in_ifset'}{'contents'}[0]{'contents'}[0];
-$result_trees{'macro_in_ifset'}{'contents'}[0]{'contents'}[0]{'contents'}[2]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'macro_in_ifset'}{'contents'}[0]{'contents'}[0]{'contents'}[2]{'args'}[0];
-$result_trees{'macro_in_ifset'}{'contents'}[0]{'contents'}[0]{'contents'}[2]{'args'}[0]{'parent'}
 = $result_trees{'macro_in_ifset'}{'contents'}[0]{'contents'}[0]{'contents'}[2];
-$result_trees{'macro_in_ifset'}{'contents'}[0]{'contents'}[0]{'contents'}[2]{'parent'}
 = $result_trees{'macro_in_ifset'}{'contents'}[0]{'contents'}[0];
 $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'};
diff --git a/tp/t/results/macro/macro_in_ifset_end_in_arg.pl 
b/tp/t/results/macro/macro_in_ifset_end_in_arg.pl
index 4a34a19475..b2e56e4281 100644
--- a/tp/t/results/macro/macro_in_ifset_end_in_arg.pl
+++ b/tp/t/results/macro/macro_in_ifset_end_in_arg.pl
@@ -26,14 +26,9 @@ $result_trees{'macro_in_ifset_end_in_arg'} = {
           'contents' => [
             {
               'parent' => {},
-              'text' => '@end ifset',
-              'type' => 'raw'
-            },
-            {
-              'parent' => {},
-              'text' => '
+              'text' => '@end ifset
 ',
-              'type' => 'last_raw_newline'
+              'type' => 'raw'
             },
             {
               'args' => [
@@ -137,10 +132,9 @@ $result_trees{'macro_in_ifset_end_in_arg'} = {
 
$result_trees{'macro_in_ifset_end_in_arg'}{'contents'}[0]{'contents'}[0]{'args'}[0]{'parent'}
 = $result_trees{'macro_in_ifset_end_in_arg'}{'contents'}[0]{'contents'}[0];
 
$result_trees{'macro_in_ifset_end_in_arg'}{'contents'}[0]{'contents'}[0]{'args'}[1]{'parent'}
 = $result_trees{'macro_in_ifset_end_in_arg'}{'contents'}[0]{'contents'}[0];
 
$result_trees{'macro_in_ifset_end_in_arg'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'parent'}
 = $result_trees{'macro_in_ifset_end_in_arg'}{'contents'}[0]{'contents'}[0];
+$result_trees{'macro_in_ifset_end_in_arg'}{'contents'}[0]{'contents'}[0]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'macro_in_ifset_end_in_arg'}{'contents'}[0]{'contents'}[0]{'contents'}[1]{'args'}[0];
+$result_trees{'macro_in_ifset_end_in_arg'}{'contents'}[0]{'contents'}[0]{'contents'}[1]{'args'}[0]{'parent'}
 = 
$result_trees{'macro_in_ifset_end_in_arg'}{'contents'}[0]{'contents'}[0]{'contents'}[1];
 
$result_trees{'macro_in_ifset_end_in_arg'}{'contents'}[0]{'contents'}[0]{'contents'}[1]{'parent'}
 = $result_trees{'macro_in_ifset_end_in_arg'}{'contents'}[0]{'contents'}[0];
-$result_trees{'macro_in_ifset_end_in_arg'}{'contents'}[0]{'contents'}[0]{'contents'}[2]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'macro_in_ifset_end_in_arg'}{'contents'}[0]{'contents'}[0]{'contents'}[2]{'args'}[0];
-$result_trees{'macro_in_ifset_end_in_arg'}{'contents'}[0]{'contents'}[0]{'contents'}[2]{'args'}[0]{'parent'}
 = 
$result_trees{'macro_in_ifset_end_in_arg'}{'contents'}[0]{'contents'}[0]{'contents'}[2];
-$result_trees{'macro_in_ifset_end_in_arg'}{'contents'}[0]{'contents'}[0]{'contents'}[2]{'parent'}
 = $result_trees{'macro_in_ifset_end_in_arg'}{'contents'}[0]{'contents'}[0];
 
$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]{'contents'}[2]{'parent'}
 = $result_trees{'macro_in_ifset_end_in_arg'}{'contents'}[0];
diff --git a/tp/t/results/macro/macro_in_index_commands.pl 
b/tp/t/results/macro/macro_in_index_commands.pl
index 6e302327af..066ce1b5a8 100644
--- a/tp/t/results/macro/macro_in_index_commands.pl
+++ b/tp/t/results/macro/macro_in_index_commands.pl
@@ -21,14 +21,9 @@ $result_trees{'macro_in_index_commands'} = {
           'contents' => [
             {
               'parent' => {},
-              'text' => 'cp',
-              'type' => 'raw'
-            },
-            {
-              'parent' => {},
-              'text' => '
+              'text' => 'cp
 ',
-              'type' => 'last_raw_newline'
+              'type' => 'raw'
             },
             {
               'args' => [
@@ -83,14 +78,9 @@ $result_trees{'macro_in_index_commands'} = {
           'contents' => [
             {
               'parent' => {},
-              'text' => 'fn',
-              'type' => 'raw'
-            },
-            {
-              'parent' => {},
-              'text' => '
+              'text' => 'fn
 ',
-              'type' => 'last_raw_newline'
+              'type' => 'raw'
             },
             {
               'args' => [
@@ -145,14 +135,9 @@ $result_trees{'macro_in_index_commands'} = {
           'contents' => [
             {
               'parent' => {},
-              'text' => '@syncodeindex',
-              'type' => 'raw'
-            },
-            {
-              'parent' => {},
-              'text' => '
+              'text' => '@syncodeindex
 ',
-              'type' => 'last_raw_newline'
+              'type' => 'raw'
             },
             {
               'args' => [
@@ -283,14 +268,9 @@ $result_trees{'macro_in_index_commands'} = {
           'contents' => [
             {
               'parent' => {},
-              'text' => 'truc',
-              'type' => 'raw'
-            },
-            {
-              'parent' => {},
-              'text' => '
+              'text' => 'truc
 ',
-              'type' => 'last_raw_newline'
+              'type' => 'raw'
             },
             {
               'args' => [
@@ -404,14 +384,9 @@ $result_trees{'macro_in_index_commands'} = {
           'contents' => [
             {
               'parent' => {},
-              'text' => '@trucindex',
-              'type' => 'raw'
-            },
-            {
-              'parent' => {},
-              'text' => '
+              'text' => '@trucindex
 ',
-              'type' => 'last_raw_newline'
+              'type' => 'raw'
             },
             {
               'args' => [
@@ -472,14 +447,9 @@ $result_trees{'macro_in_index_commands'} = {
           'contents' => [
             {
               'parent' => {},
-              'text' => 'codeidx',
-              'type' => 'raw'
-            },
-            {
-              'parent' => {},
-              'text' => '
+              'text' => 'codeidx
 ',
-              'type' => 'last_raw_newline'
+              'type' => 'raw'
             },
             {
               'args' => [
@@ -577,14 +547,9 @@ $result_trees{'macro_in_index_commands'} = {
           'contents' => [
             {
               'parent' => {},
-              'text' => 'a @var{index entry} t@\'e @^{@dotless{i}}',
-              'type' => 'raw'
-            },
-            {
-              'parent' => {},
-              'text' => '
+              'text' => 'a @var{index entry} t@\'e @^{@dotless{i}}
 ',
-              'type' => 'last_raw_newline'
+              'type' => 'raw'
             },
             {
               'args' => [
@@ -1061,24 +1026,21 @@ $result_trees{'macro_in_index_commands'} = {
 };
 
$result_trees{'macro_in_index_commands'}{'contents'}[0]{'contents'}[0]{'args'}[0]{'parent'}
 = $result_trees{'macro_in_index_commands'}{'contents'}[0]{'contents'}[0];
 
$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]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'macro_in_index_commands'}{'contents'}[0]{'contents'}[0]{'contents'}[1]{'args'}[0];
+$result_trees{'macro_in_index_commands'}{'contents'}[0]{'contents'}[0]{'contents'}[1]{'args'}[0]{'parent'}
 = 
$result_trees{'macro_in_index_commands'}{'contents'}[0]{'contents'}[0]{'contents'}[1];
 
$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]{'contents'}[2]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'macro_in_index_commands'}{'contents'}[0]{'contents'}[0]{'contents'}[2]{'args'}[0];
-$result_trees{'macro_in_index_commands'}{'contents'}[0]{'contents'}[0]{'contents'}[2]{'args'}[0]{'parent'}
 = 
$result_trees{'macro_in_index_commands'}{'contents'}[0]{'contents'}[0]{'contents'}[2];
-$result_trees{'macro_in_index_commands'}{'contents'}[0]{'contents'}[0]{'contents'}[2]{'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]{'args'}[0]{'parent'}
 = $result_trees{'macro_in_index_commands'}{'contents'}[0]{'contents'}[1];
 
$result_trees{'macro_in_index_commands'}{'contents'}[0]{'contents'}[1]{'contents'}[0]{'parent'}
 = $result_trees{'macro_in_index_commands'}{'contents'}[0]{'contents'}[1];
+$result_trees{'macro_in_index_commands'}{'contents'}[0]{'contents'}[1]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'macro_in_index_commands'}{'contents'}[0]{'contents'}[1]{'contents'}[1]{'args'}[0];
+$result_trees{'macro_in_index_commands'}{'contents'}[0]{'contents'}[1]{'contents'}[1]{'args'}[0]{'parent'}
 = 
$result_trees{'macro_in_index_commands'}{'contents'}[0]{'contents'}[1]{'contents'}[1];
 
$result_trees{'macro_in_index_commands'}{'contents'}[0]{'contents'}[1]{'contents'}[1]{'parent'}
 = $result_trees{'macro_in_index_commands'}{'contents'}[0]{'contents'}[1];
-$result_trees{'macro_in_index_commands'}{'contents'}[0]{'contents'}[1]{'contents'}[2]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'macro_in_index_commands'}{'contents'}[0]{'contents'}[1]{'contents'}[2]{'args'}[0];
-$result_trees{'macro_in_index_commands'}{'contents'}[0]{'contents'}[1]{'contents'}[2]{'args'}[0]{'parent'}
 = 
$result_trees{'macro_in_index_commands'}{'contents'}[0]{'contents'}[1]{'contents'}[2];
-$result_trees{'macro_in_index_commands'}{'contents'}[0]{'contents'}[1]{'contents'}[2]{'parent'}
 = $result_trees{'macro_in_index_commands'}{'contents'}[0]{'contents'}[1];
 
$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]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'macro_in_index_commands'}{'contents'}[0]{'contents'}[2]{'contents'}[1]{'args'}[0];
+$result_trees{'macro_in_index_commands'}{'contents'}[0]{'contents'}[2]{'contents'}[1]{'args'}[0]{'parent'}
 = 
$result_trees{'macro_in_index_commands'}{'contents'}[0]{'contents'}[2]{'contents'}[1];
 
$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]{'contents'}[2]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'macro_in_index_commands'}{'contents'}[0]{'contents'}[2]{'contents'}[2]{'args'}[0];
-$result_trees{'macro_in_index_commands'}{'contents'}[0]{'contents'}[2]{'contents'}[2]{'args'}[0]{'parent'}
 = 
$result_trees{'macro_in_index_commands'}{'contents'}[0]{'contents'}[2]{'contents'}[2];
-$result_trees{'macro_in_index_commands'}{'contents'}[0]{'contents'}[2]{'contents'}[2]{'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]{'parent'}
 = $result_trees{'macro_in_index_commands'}{'contents'}[0];
 
$result_trees{'macro_in_index_commands'}{'contents'}[0]{'contents'}[4]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'macro_in_index_commands'}{'contents'}[0]{'contents'}[4]{'args'}[0];
@@ -1090,10 +1052,9 @@ 
$result_trees{'macro_in_index_commands'}{'contents'}[0]{'contents'}[5]{'parent'}
 
$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]{'parent'}
 = $result_trees{'macro_in_index_commands'}{'contents'}[0]{'contents'}[7];
 
$result_trees{'macro_in_index_commands'}{'contents'}[0]{'contents'}[7]{'contents'}[0]{'parent'}
 = $result_trees{'macro_in_index_commands'}{'contents'}[0]{'contents'}[7];
+$result_trees{'macro_in_index_commands'}{'contents'}[0]{'contents'}[7]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'macro_in_index_commands'}{'contents'}[0]{'contents'}[7]{'contents'}[1]{'args'}[0];
+$result_trees{'macro_in_index_commands'}{'contents'}[0]{'contents'}[7]{'contents'}[1]{'args'}[0]{'parent'}
 = 
$result_trees{'macro_in_index_commands'}{'contents'}[0]{'contents'}[7]{'contents'}[1];
 
$result_trees{'macro_in_index_commands'}{'contents'}[0]{'contents'}[7]{'contents'}[1]{'parent'}
 = $result_trees{'macro_in_index_commands'}{'contents'}[0]{'contents'}[7];
-$result_trees{'macro_in_index_commands'}{'contents'}[0]{'contents'}[7]{'contents'}[2]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'macro_in_index_commands'}{'contents'}[0]{'contents'}[7]{'contents'}[2]{'args'}[0];
-$result_trees{'macro_in_index_commands'}{'contents'}[0]{'contents'}[7]{'contents'}[2]{'args'}[0]{'parent'}
 = 
$result_trees{'macro_in_index_commands'}{'contents'}[0]{'contents'}[7]{'contents'}[2];
-$result_trees{'macro_in_index_commands'}{'contents'}[0]{'contents'}[7]{'contents'}[2]{'parent'}
 = $result_trees{'macro_in_index_commands'}{'contents'}[0]{'contents'}[7];
 
$result_trees{'macro_in_index_commands'}{'contents'}[0]{'contents'}[7]{'parent'}
 = $result_trees{'macro_in_index_commands'}{'contents'}[0];
 
$result_trees{'macro_in_index_commands'}{'contents'}[0]{'contents'}[8]{'parent'}
 = $result_trees{'macro_in_index_commands'}{'contents'}[0];
 
$result_trees{'macro_in_index_commands'}{'contents'}[0]{'contents'}[9]{'contents'}[0]{'parent'}
 = $result_trees{'macro_in_index_commands'}{'contents'}[0]{'contents'}[9];
@@ -1105,18 +1066,16 @@ 
$result_trees{'macro_in_index_commands'}{'contents'}[0]{'contents'}[9]{'parent'}
 
$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]{'args'}[0]{'parent'}
 = $result_trees{'macro_in_index_commands'}{'contents'}[0]{'contents'}[11];
 
$result_trees{'macro_in_index_commands'}{'contents'}[0]{'contents'}[11]{'contents'}[0]{'parent'}
 = $result_trees{'macro_in_index_commands'}{'contents'}[0]{'contents'}[11];
+$result_trees{'macro_in_index_commands'}{'contents'}[0]{'contents'}[11]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'macro_in_index_commands'}{'contents'}[0]{'contents'}[11]{'contents'}[1]{'args'}[0];
+$result_trees{'macro_in_index_commands'}{'contents'}[0]{'contents'}[11]{'contents'}[1]{'args'}[0]{'parent'}
 = 
$result_trees{'macro_in_index_commands'}{'contents'}[0]{'contents'}[11]{'contents'}[1];
 
$result_trees{'macro_in_index_commands'}{'contents'}[0]{'contents'}[11]{'contents'}[1]{'parent'}
 = $result_trees{'macro_in_index_commands'}{'contents'}[0]{'contents'}[11];
-$result_trees{'macro_in_index_commands'}{'contents'}[0]{'contents'}[11]{'contents'}[2]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'macro_in_index_commands'}{'contents'}[0]{'contents'}[11]{'contents'}[2]{'args'}[0];
-$result_trees{'macro_in_index_commands'}{'contents'}[0]{'contents'}[11]{'contents'}[2]{'args'}[0]{'parent'}
 = 
$result_trees{'macro_in_index_commands'}{'contents'}[0]{'contents'}[11]{'contents'}[2];
-$result_trees{'macro_in_index_commands'}{'contents'}[0]{'contents'}[11]{'contents'}[2]{'parent'}
 = $result_trees{'macro_in_index_commands'}{'contents'}[0]{'contents'}[11];
 
$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]{'args'}[0]{'parent'}
 = $result_trees{'macro_in_index_commands'}{'contents'}[0]{'contents'}[13];
 
$result_trees{'macro_in_index_commands'}{'contents'}[0]{'contents'}[13]{'contents'}[0]{'parent'}
 = $result_trees{'macro_in_index_commands'}{'contents'}[0]{'contents'}[13];
+$result_trees{'macro_in_index_commands'}{'contents'}[0]{'contents'}[13]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'macro_in_index_commands'}{'contents'}[0]{'contents'}[13]{'contents'}[1]{'args'}[0];
+$result_trees{'macro_in_index_commands'}{'contents'}[0]{'contents'}[13]{'contents'}[1]{'args'}[0]{'parent'}
 = 
$result_trees{'macro_in_index_commands'}{'contents'}[0]{'contents'}[13]{'contents'}[1];
 
$result_trees{'macro_in_index_commands'}{'contents'}[0]{'contents'}[13]{'contents'}[1]{'parent'}
 = $result_trees{'macro_in_index_commands'}{'contents'}[0]{'contents'}[13];
-$result_trees{'macro_in_index_commands'}{'contents'}[0]{'contents'}[13]{'contents'}[2]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'macro_in_index_commands'}{'contents'}[0]{'contents'}[13]{'contents'}[2]{'args'}[0];
-$result_trees{'macro_in_index_commands'}{'contents'}[0]{'contents'}[13]{'contents'}[2]{'args'}[0]{'parent'}
 = 
$result_trees{'macro_in_index_commands'}{'contents'}[0]{'contents'}[13]{'contents'}[2];
-$result_trees{'macro_in_index_commands'}{'contents'}[0]{'contents'}[13]{'contents'}[2]{'parent'}
 = $result_trees{'macro_in_index_commands'}{'contents'}[0]{'contents'}[13];
 
$result_trees{'macro_in_index_commands'}{'contents'}[0]{'contents'}[13]{'parent'}
 = $result_trees{'macro_in_index_commands'}{'contents'}[0];
 
$result_trees{'macro_in_index_commands'}{'contents'}[0]{'contents'}[14]{'parent'}
 = $result_trees{'macro_in_index_commands'}{'contents'}[0];
 
$result_trees{'macro_in_index_commands'}{'contents'}[0]{'contents'}[15]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'macro_in_index_commands'}{'contents'}[0]{'contents'}[15]{'args'}[0];
@@ -1125,10 +1084,9 @@ 
$result_trees{'macro_in_index_commands'}{'contents'}[0]{'contents'}[15]{'parent'
 
$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]{'args'}[0]{'parent'}
 = $result_trees{'macro_in_index_commands'}{'contents'}[0]{'contents'}[17];
 
$result_trees{'macro_in_index_commands'}{'contents'}[0]{'contents'}[17]{'contents'}[0]{'parent'}
 = $result_trees{'macro_in_index_commands'}{'contents'}[0]{'contents'}[17];
+$result_trees{'macro_in_index_commands'}{'contents'}[0]{'contents'}[17]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'macro_in_index_commands'}{'contents'}[0]{'contents'}[17]{'contents'}[1]{'args'}[0];
+$result_trees{'macro_in_index_commands'}{'contents'}[0]{'contents'}[17]{'contents'}[1]{'args'}[0]{'parent'}
 = 
$result_trees{'macro_in_index_commands'}{'contents'}[0]{'contents'}[17]{'contents'}[1];
 
$result_trees{'macro_in_index_commands'}{'contents'}[0]{'contents'}[17]{'contents'}[1]{'parent'}
 = $result_trees{'macro_in_index_commands'}{'contents'}[0]{'contents'}[17];
-$result_trees{'macro_in_index_commands'}{'contents'}[0]{'contents'}[17]{'contents'}[2]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'macro_in_index_commands'}{'contents'}[0]{'contents'}[17]{'contents'}[2]{'args'}[0];
-$result_trees{'macro_in_index_commands'}{'contents'}[0]{'contents'}[17]{'contents'}[2]{'args'}[0]{'parent'}
 = 
$result_trees{'macro_in_index_commands'}{'contents'}[0]{'contents'}[17]{'contents'}[2];
-$result_trees{'macro_in_index_commands'}{'contents'}[0]{'contents'}[17]{'contents'}[2]{'parent'}
 = $result_trees{'macro_in_index_commands'}{'contents'}[0]{'contents'}[17];
 
$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]{'parent'}
 = $result_trees{'macro_in_index_commands'}{'contents'}[0];
 $result_trees{'macro_in_index_commands'}{'contents'}[0]{'parent'} = 
$result_trees{'macro_in_index_commands'};
diff --git a/tp/t/results/macro/macro_in_invalid_documentencoding.pl 
b/tp/t/results/macro/macro_in_invalid_documentencoding.pl
index f10dec5720..ba0a21fbfe 100644
--- a/tp/t/results/macro/macro_in_invalid_documentencoding.pl
+++ b/tp/t/results/macro/macro_in_invalid_documentencoding.pl
@@ -21,14 +21,9 @@ $result_trees{'macro_in_invalid_documentencoding'} = {
           'contents' => [
             {
               'parent' => {},
-              'text' => 'badm',
-              'type' => 'raw'
-            },
-            {
-              'parent' => {},
-              'text' => '
+              'text' => 'badm
 ',
-              'type' => 'last_raw_newline'
+              'type' => 'raw'
             },
             {
               'args' => [
@@ -109,10 +104,9 @@ $result_trees{'macro_in_invalid_documentencoding'} = {
 };
 
$result_trees{'macro_in_invalid_documentencoding'}{'contents'}[0]{'contents'}[0]{'args'}[0]{'parent'}
 = 
$result_trees{'macro_in_invalid_documentencoding'}{'contents'}[0]{'contents'}[0];
 
$result_trees{'macro_in_invalid_documentencoding'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'macro_in_invalid_documentencoding'}{'contents'}[0]{'contents'}[0];
+$result_trees{'macro_in_invalid_documentencoding'}{'contents'}[0]{'contents'}[0]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'macro_in_invalid_documentencoding'}{'contents'}[0]{'contents'}[0]{'contents'}[1]{'args'}[0];
+$result_trees{'macro_in_invalid_documentencoding'}{'contents'}[0]{'contents'}[0]{'contents'}[1]{'args'}[0]{'parent'}
 = 
$result_trees{'macro_in_invalid_documentencoding'}{'contents'}[0]{'contents'}[0]{'contents'}[1];
 
$result_trees{'macro_in_invalid_documentencoding'}{'contents'}[0]{'contents'}[0]{'contents'}[1]{'parent'}
 = 
$result_trees{'macro_in_invalid_documentencoding'}{'contents'}[0]{'contents'}[0];
-$result_trees{'macro_in_invalid_documentencoding'}{'contents'}[0]{'contents'}[0]{'contents'}[2]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'macro_in_invalid_documentencoding'}{'contents'}[0]{'contents'}[0]{'contents'}[2]{'args'}[0];
-$result_trees{'macro_in_invalid_documentencoding'}{'contents'}[0]{'contents'}[0]{'contents'}[2]{'args'}[0]{'parent'}
 = 
$result_trees{'macro_in_invalid_documentencoding'}{'contents'}[0]{'contents'}[0]{'contents'}[2];
-$result_trees{'macro_in_invalid_documentencoding'}{'contents'}[0]{'contents'}[0]{'contents'}[2]{'parent'}
 = 
$result_trees{'macro_in_invalid_documentencoding'}{'contents'}[0]{'contents'}[0];
 
$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]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'macro_in_invalid_documentencoding'}{'contents'}[0]{'contents'}[1]{'args'}[0];
 
$result_trees{'macro_in_invalid_documentencoding'}{'contents'}[0]{'contents'}[1]{'args'}[0]{'parent'}
 = 
$result_trees{'macro_in_invalid_documentencoding'}{'contents'}[0]{'contents'}[1];
diff --git a/tp/t/results/macro/macro_in_macro_arg.pl 
b/tp/t/results/macro/macro_in_macro_arg.pl
index bde978c10a..fcd4c2a964 100644
--- a/tp/t/results/macro/macro_in_macro_arg.pl
+++ b/tp/t/results/macro/macro_in_macro_arg.pl
@@ -27,14 +27,9 @@ $result_trees{'macro_in_macro_arg'} = {
           'contents' => [
             {
               'parent' => {},
-              'text' => 'a, @macrotwo',
-              'type' => 'raw'
-            },
-            {
-              'parent' => {},
-              'text' => '
+              'text' => 'a, @macrotwo
 ',
-              'type' => 'last_raw_newline'
+              'type' => 'raw'
             },
             {
               'args' => [
@@ -100,14 +95,9 @@ $result_trees{'macro_in_macro_arg'} = {
           'contents' => [
             {
               'parent' => {},
-              'text' => 'hello \\arg\\ after arg',
-              'type' => 'raw'
-            },
-            {
-              'parent' => {},
-              'text' => '
+              'text' => 'hello \\arg\\ after arg
 ',
-              'type' => 'last_raw_newline'
+              'type' => 'raw'
             },
             {
               'args' => [
@@ -184,14 +174,9 @@ $result_trees{'macro_in_macro_arg'} = {
             },
             {
               'parent' => {},
-              'text' => '&&&& \\arg\\',
-              'type' => 'raw'
-            },
-            {
-              'parent' => {},
-              'text' => '
+              'text' => '&&&& \\arg\\
 ',
-              'type' => 'last_raw_newline'
+              'type' => 'raw'
             },
             {
               'args' => [
@@ -266,19 +251,17 @@ $result_trees{'macro_in_macro_arg'} = {
 $result_trees{'macro_in_macro_arg'}{'contents'}[0]{'contents'}[0]{'parent'} = 
$result_trees{'macro_in_macro_arg'}{'contents'}[0];
 
$result_trees{'macro_in_macro_arg'}{'contents'}[0]{'contents'}[1]{'args'}[0]{'parent'}
 = $result_trees{'macro_in_macro_arg'}{'contents'}[0]{'contents'}[1];
 
$result_trees{'macro_in_macro_arg'}{'contents'}[0]{'contents'}[1]{'contents'}[0]{'parent'}
 = $result_trees{'macro_in_macro_arg'}{'contents'}[0]{'contents'}[1];
+$result_trees{'macro_in_macro_arg'}{'contents'}[0]{'contents'}[1]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'macro_in_macro_arg'}{'contents'}[0]{'contents'}[1]{'contents'}[1]{'args'}[0];
+$result_trees{'macro_in_macro_arg'}{'contents'}[0]{'contents'}[1]{'contents'}[1]{'args'}[0]{'parent'}
 = 
$result_trees{'macro_in_macro_arg'}{'contents'}[0]{'contents'}[1]{'contents'}[1];
 
$result_trees{'macro_in_macro_arg'}{'contents'}[0]{'contents'}[1]{'contents'}[1]{'parent'}
 = $result_trees{'macro_in_macro_arg'}{'contents'}[0]{'contents'}[1];
-$result_trees{'macro_in_macro_arg'}{'contents'}[0]{'contents'}[1]{'contents'}[2]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'macro_in_macro_arg'}{'contents'}[0]{'contents'}[1]{'contents'}[2]{'args'}[0];
-$result_trees{'macro_in_macro_arg'}{'contents'}[0]{'contents'}[1]{'contents'}[2]{'args'}[0]{'parent'}
 = 
$result_trees{'macro_in_macro_arg'}{'contents'}[0]{'contents'}[1]{'contents'}[2];
-$result_trees{'macro_in_macro_arg'}{'contents'}[0]{'contents'}[1]{'contents'}[2]{'parent'}
 = $result_trees{'macro_in_macro_arg'}{'contents'}[0]{'contents'}[1];
 $result_trees{'macro_in_macro_arg'}{'contents'}[0]{'contents'}[1]{'parent'} = 
$result_trees{'macro_in_macro_arg'}{'contents'}[0];
 $result_trees{'macro_in_macro_arg'}{'contents'}[0]{'contents'}[2]{'parent'} = 
$result_trees{'macro_in_macro_arg'}{'contents'}[0];
 
$result_trees{'macro_in_macro_arg'}{'contents'}[0]{'contents'}[3]{'args'}[0]{'parent'}
 = $result_trees{'macro_in_macro_arg'}{'contents'}[0]{'contents'}[3];
 
$result_trees{'macro_in_macro_arg'}{'contents'}[0]{'contents'}[3]{'args'}[1]{'parent'}
 = $result_trees{'macro_in_macro_arg'}{'contents'}[0]{'contents'}[3];
 
$result_trees{'macro_in_macro_arg'}{'contents'}[0]{'contents'}[3]{'contents'}[0]{'parent'}
 = $result_trees{'macro_in_macro_arg'}{'contents'}[0]{'contents'}[3];
+$result_trees{'macro_in_macro_arg'}{'contents'}[0]{'contents'}[3]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'macro_in_macro_arg'}{'contents'}[0]{'contents'}[3]{'contents'}[1]{'args'}[0];
+$result_trees{'macro_in_macro_arg'}{'contents'}[0]{'contents'}[3]{'contents'}[1]{'args'}[0]{'parent'}
 = 
$result_trees{'macro_in_macro_arg'}{'contents'}[0]{'contents'}[3]{'contents'}[1];
 
$result_trees{'macro_in_macro_arg'}{'contents'}[0]{'contents'}[3]{'contents'}[1]{'parent'}
 = $result_trees{'macro_in_macro_arg'}{'contents'}[0]{'contents'}[3];
-$result_trees{'macro_in_macro_arg'}{'contents'}[0]{'contents'}[3]{'contents'}[2]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'macro_in_macro_arg'}{'contents'}[0]{'contents'}[3]{'contents'}[2]{'args'}[0];
-$result_trees{'macro_in_macro_arg'}{'contents'}[0]{'contents'}[3]{'contents'}[2]{'args'}[0]{'parent'}
 = 
$result_trees{'macro_in_macro_arg'}{'contents'}[0]{'contents'}[3]{'contents'}[2];
-$result_trees{'macro_in_macro_arg'}{'contents'}[0]{'contents'}[3]{'contents'}[2]{'parent'}
 = $result_trees{'macro_in_macro_arg'}{'contents'}[0]{'contents'}[3];
 $result_trees{'macro_in_macro_arg'}{'contents'}[0]{'contents'}[3]{'parent'} = 
$result_trees{'macro_in_macro_arg'}{'contents'}[0];
 $result_trees{'macro_in_macro_arg'}{'contents'}[0]{'contents'}[4]{'parent'} = 
$result_trees{'macro_in_macro_arg'}{'contents'}[0];
 
$result_trees{'macro_in_macro_arg'}{'contents'}[0]{'contents'}[5]{'args'}[0]{'parent'}
 = $result_trees{'macro_in_macro_arg'}{'contents'}[0]{'contents'}[5];
@@ -286,10 +269,9 @@ 
$result_trees{'macro_in_macro_arg'}{'contents'}[0]{'contents'}[5]{'args'}[1]{'pa
 
$result_trees{'macro_in_macro_arg'}{'contents'}[0]{'contents'}[5]{'args'}[2]{'parent'}
 = $result_trees{'macro_in_macro_arg'}{'contents'}[0]{'contents'}[5];
 
$result_trees{'macro_in_macro_arg'}{'contents'}[0]{'contents'}[5]{'contents'}[0]{'parent'}
 = $result_trees{'macro_in_macro_arg'}{'contents'}[0]{'contents'}[5];
 
$result_trees{'macro_in_macro_arg'}{'contents'}[0]{'contents'}[5]{'contents'}[1]{'parent'}
 = $result_trees{'macro_in_macro_arg'}{'contents'}[0]{'contents'}[5];
+$result_trees{'macro_in_macro_arg'}{'contents'}[0]{'contents'}[5]{'contents'}[2]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'macro_in_macro_arg'}{'contents'}[0]{'contents'}[5]{'contents'}[2]{'args'}[0];
+$result_trees{'macro_in_macro_arg'}{'contents'}[0]{'contents'}[5]{'contents'}[2]{'args'}[0]{'parent'}
 = 
$result_trees{'macro_in_macro_arg'}{'contents'}[0]{'contents'}[5]{'contents'}[2];
 
$result_trees{'macro_in_macro_arg'}{'contents'}[0]{'contents'}[5]{'contents'}[2]{'parent'}
 = $result_trees{'macro_in_macro_arg'}{'contents'}[0]{'contents'}[5];
-$result_trees{'macro_in_macro_arg'}{'contents'}[0]{'contents'}[5]{'contents'}[3]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'macro_in_macro_arg'}{'contents'}[0]{'contents'}[5]{'contents'}[3]{'args'}[0];
-$result_trees{'macro_in_macro_arg'}{'contents'}[0]{'contents'}[5]{'contents'}[3]{'args'}[0]{'parent'}
 = 
$result_trees{'macro_in_macro_arg'}{'contents'}[0]{'contents'}[5]{'contents'}[3];
-$result_trees{'macro_in_macro_arg'}{'contents'}[0]{'contents'}[5]{'contents'}[3]{'parent'}
 = $result_trees{'macro_in_macro_arg'}{'contents'}[0]{'contents'}[5];
 $result_trees{'macro_in_macro_arg'}{'contents'}[0]{'contents'}[5]{'parent'} = 
$result_trees{'macro_in_macro_arg'}{'contents'}[0];
 $result_trees{'macro_in_macro_arg'}{'contents'}[0]{'contents'}[6]{'parent'} = 
$result_trees{'macro_in_macro_arg'}{'contents'}[0];
 
$result_trees{'macro_in_macro_arg'}{'contents'}[0]{'contents'}[7]{'contents'}[0]{'parent'}
 = $result_trees{'macro_in_macro_arg'}{'contents'}[0]{'contents'}[7];
diff --git a/tp/t/results/macro/macro_in_macro_arg_simpler.pl 
b/tp/t/results/macro/macro_in_macro_arg_simpler.pl
index 424b0177ef..b2672d7a3d 100644
--- a/tp/t/results/macro/macro_in_macro_arg_simpler.pl
+++ b/tp/t/results/macro/macro_in_macro_arg_simpler.pl
@@ -21,14 +21,9 @@ $result_trees{'macro_in_macro_arg_simpler'} = {
           'contents' => [
             {
               'parent' => {},
-              'text' => 'a, macro2',
-              'type' => 'raw'
-            },
-            {
-              'parent' => {},
-              'text' => '
+              'text' => 'a, macro2
 ',
-              'type' => 'last_raw_newline'
+              'type' => 'raw'
             },
             {
               'args' => [
@@ -105,14 +100,9 @@ $result_trees{'macro_in_macro_arg_simpler'} = {
             },
             {
               'parent' => {},
-              'text' => '&&&& \\arg\\',
-              'type' => 'raw'
-            },
-            {
-              'parent' => {},
-              'text' => '
+              'text' => '&&&& \\arg\\
 ',
-              'type' => 'last_raw_newline'
+              'type' => 'raw'
             },
             {
               'args' => [
@@ -186,10 +176,9 @@ $result_trees{'macro_in_macro_arg_simpler'} = {
 };
 
$result_trees{'macro_in_macro_arg_simpler'}{'contents'}[0]{'contents'}[0]{'args'}[0]{'parent'}
 = $result_trees{'macro_in_macro_arg_simpler'}{'contents'}[0]{'contents'}[0];
 
$result_trees{'macro_in_macro_arg_simpler'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'parent'}
 = $result_trees{'macro_in_macro_arg_simpler'}{'contents'}[0]{'contents'}[0];
+$result_trees{'macro_in_macro_arg_simpler'}{'contents'}[0]{'contents'}[0]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'macro_in_macro_arg_simpler'}{'contents'}[0]{'contents'}[0]{'contents'}[1]{'args'}[0];
+$result_trees{'macro_in_macro_arg_simpler'}{'contents'}[0]{'contents'}[0]{'contents'}[1]{'args'}[0]{'parent'}
 = 
$result_trees{'macro_in_macro_arg_simpler'}{'contents'}[0]{'contents'}[0]{'contents'}[1];
 
$result_trees{'macro_in_macro_arg_simpler'}{'contents'}[0]{'contents'}[0]{'contents'}[1]{'parent'}
 = $result_trees{'macro_in_macro_arg_simpler'}{'contents'}[0]{'contents'}[0];
-$result_trees{'macro_in_macro_arg_simpler'}{'contents'}[0]{'contents'}[0]{'contents'}[2]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'macro_in_macro_arg_simpler'}{'contents'}[0]{'contents'}[0]{'contents'}[2]{'args'}[0];
-$result_trees{'macro_in_macro_arg_simpler'}{'contents'}[0]{'contents'}[0]{'contents'}[2]{'args'}[0]{'parent'}
 = 
$result_trees{'macro_in_macro_arg_simpler'}{'contents'}[0]{'contents'}[0]{'contents'}[2];
-$result_trees{'macro_in_macro_arg_simpler'}{'contents'}[0]{'contents'}[0]{'contents'}[2]{'parent'}
 = $result_trees{'macro_in_macro_arg_simpler'}{'contents'}[0]{'contents'}[0];
 
$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]{'contents'}[2]{'args'}[0]{'parent'}
 = $result_trees{'macro_in_macro_arg_simpler'}{'contents'}[0]{'contents'}[2];
@@ -197,10 +186,9 @@ 
$result_trees{'macro_in_macro_arg_simpler'}{'contents'}[0]{'contents'}[2]{'args'
 
$result_trees{'macro_in_macro_arg_simpler'}{'contents'}[0]{'contents'}[2]{'args'}[2]{'parent'}
 = $result_trees{'macro_in_macro_arg_simpler'}{'contents'}[0]{'contents'}[2];
 
$result_trees{'macro_in_macro_arg_simpler'}{'contents'}[0]{'contents'}[2]{'contents'}[0]{'parent'}
 = $result_trees{'macro_in_macro_arg_simpler'}{'contents'}[0]{'contents'}[2];
 
$result_trees{'macro_in_macro_arg_simpler'}{'contents'}[0]{'contents'}[2]{'contents'}[1]{'parent'}
 = $result_trees{'macro_in_macro_arg_simpler'}{'contents'}[0]{'contents'}[2];
+$result_trees{'macro_in_macro_arg_simpler'}{'contents'}[0]{'contents'}[2]{'contents'}[2]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'macro_in_macro_arg_simpler'}{'contents'}[0]{'contents'}[2]{'contents'}[2]{'args'}[0];
+$result_trees{'macro_in_macro_arg_simpler'}{'contents'}[0]{'contents'}[2]{'contents'}[2]{'args'}[0]{'parent'}
 = 
$result_trees{'macro_in_macro_arg_simpler'}{'contents'}[0]{'contents'}[2]{'contents'}[2];
 
$result_trees{'macro_in_macro_arg_simpler'}{'contents'}[0]{'contents'}[2]{'contents'}[2]{'parent'}
 = $result_trees{'macro_in_macro_arg_simpler'}{'contents'}[0]{'contents'}[2];
-$result_trees{'macro_in_macro_arg_simpler'}{'contents'}[0]{'contents'}[2]{'contents'}[3]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'macro_in_macro_arg_simpler'}{'contents'}[0]{'contents'}[2]{'contents'}[3]{'args'}[0];
-$result_trees{'macro_in_macro_arg_simpler'}{'contents'}[0]{'contents'}[2]{'contents'}[3]{'args'}[0]{'parent'}
 = 
$result_trees{'macro_in_macro_arg_simpler'}{'contents'}[0]{'contents'}[2]{'contents'}[3];
-$result_trees{'macro_in_macro_arg_simpler'}{'contents'}[0]{'contents'}[2]{'contents'}[3]{'parent'}
 = $result_trees{'macro_in_macro_arg_simpler'}{'contents'}[0]{'contents'}[2];
 
$result_trees{'macro_in_macro_arg_simpler'}{'contents'}[0]{'contents'}[2]{'parent'}
 = $result_trees{'macro_in_macro_arg_simpler'}{'contents'}[0];
 
$result_trees{'macro_in_macro_arg_simpler'}{'contents'}[0]{'contents'}[3]{'parent'}
 = $result_trees{'macro_in_macro_arg_simpler'}{'contents'}[0];
 
$result_trees{'macro_in_macro_arg_simpler'}{'contents'}[0]{'contents'}[4]{'contents'}[0]{'parent'}
 = $result_trees{'macro_in_macro_arg_simpler'}{'contents'}[0]{'contents'}[4];
diff --git a/tp/t/results/macro/macro_in_menu.pl 
b/tp/t/results/macro/macro_in_menu.pl
index 095f9b9cd0..9d2b1d343d 100644
--- a/tp/t/results/macro/macro_in_menu.pl
+++ b/tp/t/results/macro/macro_in_menu.pl
@@ -27,14 +27,9 @@ $result_trees{'macro_in_menu'} = {
           'contents' => [
             {
               'parent' => {},
-              'text' => '*',
-              'type' => 'raw'
-            },
-            {
-              'parent' => {},
-              'text' => '
+              'text' => '*
 ',
-              'type' => 'last_raw_newline'
+              'type' => 'raw'
             },
             {
               'args' => [
@@ -95,14 +90,9 @@ $result_trees{'macro_in_menu'} = {
           'contents' => [
             {
               'parent' => {},
-              'text' => '* ',
-              'type' => 'raw'
-            },
-            {
-              'parent' => {},
-              'text' => '
+              'text' => '* 
 ',
-              'type' => 'last_raw_newline'
+              'type' => 'raw'
             },
             {
               'args' => [
@@ -163,14 +153,9 @@ $result_trees{'macro_in_menu'} = {
           'contents' => [
             {
               'parent' => {},
-              'text' => '  ',
-              'type' => 'raw'
-            },
-            {
-              'parent' => {},
-              'text' => '
+              'text' => '  
 ',
-              'type' => 'last_raw_newline'
+              'type' => 'raw'
             },
             {
               'args' => [
@@ -231,14 +216,9 @@ $result_trees{'macro_in_menu'} = {
           'contents' => [
             {
               'parent' => {},
-              'text' => ' ',
-              'type' => 'raw'
-            },
-            {
-              'parent' => {},
-              'text' => '
+              'text' => ' 
 ',
-              'type' => 'last_raw_newline'
+              'type' => 'raw'
             },
             {
               'args' => [
@@ -299,14 +279,9 @@ $result_trees{'macro_in_menu'} = {
           'contents' => [
             {
               'parent' => {},
-              'text' => '::',
-              'type' => 'raw'
-            },
-            {
-              'parent' => {},
-              'text' => '
+              'text' => '::
 ',
-              'type' => 'last_raw_newline'
+              'type' => 'raw'
             },
             {
               'args' => [
@@ -367,14 +342,9 @@ $result_trees{'macro_in_menu'} = {
           'contents' => [
             {
               'parent' => {},
-              'text' => ':',
-              'type' => 'raw'
-            },
-            {
-              'parent' => {},
-              'text' => '
+              'text' => ':
 ',
-              'type' => 'last_raw_newline'
+              'type' => 'raw'
             },
             {
               'args' => [
@@ -808,50 +778,44 @@ $result_trees{'macro_in_menu'} = {
 $result_trees{'macro_in_menu'}{'contents'}[0]{'contents'}[0]{'parent'} = 
$result_trees{'macro_in_menu'}{'contents'}[0];
 
$result_trees{'macro_in_menu'}{'contents'}[0]{'contents'}[1]{'args'}[0]{'parent'}
 = $result_trees{'macro_in_menu'}{'contents'}[0]{'contents'}[1];
 
$result_trees{'macro_in_menu'}{'contents'}[0]{'contents'}[1]{'contents'}[0]{'parent'}
 = $result_trees{'macro_in_menu'}{'contents'}[0]{'contents'}[1];
+$result_trees{'macro_in_menu'}{'contents'}[0]{'contents'}[1]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'macro_in_menu'}{'contents'}[0]{'contents'}[1]{'contents'}[1]{'args'}[0];
+$result_trees{'macro_in_menu'}{'contents'}[0]{'contents'}[1]{'contents'}[1]{'args'}[0]{'parent'}
 = $result_trees{'macro_in_menu'}{'contents'}[0]{'contents'}[1]{'contents'}[1];
 
$result_trees{'macro_in_menu'}{'contents'}[0]{'contents'}[1]{'contents'}[1]{'parent'}
 = $result_trees{'macro_in_menu'}{'contents'}[0]{'contents'}[1];
-$result_trees{'macro_in_menu'}{'contents'}[0]{'contents'}[1]{'contents'}[2]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'macro_in_menu'}{'contents'}[0]{'contents'}[1]{'contents'}[2]{'args'}[0];
-$result_trees{'macro_in_menu'}{'contents'}[0]{'contents'}[1]{'contents'}[2]{'args'}[0]{'parent'}
 = $result_trees{'macro_in_menu'}{'contents'}[0]{'contents'}[1]{'contents'}[2];
-$result_trees{'macro_in_menu'}{'contents'}[0]{'contents'}[1]{'contents'}[2]{'parent'}
 = $result_trees{'macro_in_menu'}{'contents'}[0]{'contents'}[1];
 $result_trees{'macro_in_menu'}{'contents'}[0]{'contents'}[1]{'parent'} = 
$result_trees{'macro_in_menu'}{'contents'}[0];
 $result_trees{'macro_in_menu'}{'contents'}[0]{'contents'}[2]{'parent'} = 
$result_trees{'macro_in_menu'}{'contents'}[0];
 
$result_trees{'macro_in_menu'}{'contents'}[0]{'contents'}[3]{'args'}[0]{'parent'}
 = $result_trees{'macro_in_menu'}{'contents'}[0]{'contents'}[3];
 
$result_trees{'macro_in_menu'}{'contents'}[0]{'contents'}[3]{'contents'}[0]{'parent'}
 = $result_trees{'macro_in_menu'}{'contents'}[0]{'contents'}[3];
+$result_trees{'macro_in_menu'}{'contents'}[0]{'contents'}[3]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'macro_in_menu'}{'contents'}[0]{'contents'}[3]{'contents'}[1]{'args'}[0];
+$result_trees{'macro_in_menu'}{'contents'}[0]{'contents'}[3]{'contents'}[1]{'args'}[0]{'parent'}
 = $result_trees{'macro_in_menu'}{'contents'}[0]{'contents'}[3]{'contents'}[1];
 
$result_trees{'macro_in_menu'}{'contents'}[0]{'contents'}[3]{'contents'}[1]{'parent'}
 = $result_trees{'macro_in_menu'}{'contents'}[0]{'contents'}[3];
-$result_trees{'macro_in_menu'}{'contents'}[0]{'contents'}[3]{'contents'}[2]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'macro_in_menu'}{'contents'}[0]{'contents'}[3]{'contents'}[2]{'args'}[0];
-$result_trees{'macro_in_menu'}{'contents'}[0]{'contents'}[3]{'contents'}[2]{'args'}[0]{'parent'}
 = $result_trees{'macro_in_menu'}{'contents'}[0]{'contents'}[3]{'contents'}[2];
-$result_trees{'macro_in_menu'}{'contents'}[0]{'contents'}[3]{'contents'}[2]{'parent'}
 = $result_trees{'macro_in_menu'}{'contents'}[0]{'contents'}[3];
 $result_trees{'macro_in_menu'}{'contents'}[0]{'contents'}[3]{'parent'} = 
$result_trees{'macro_in_menu'}{'contents'}[0];
 $result_trees{'macro_in_menu'}{'contents'}[0]{'contents'}[4]{'parent'} = 
$result_trees{'macro_in_menu'}{'contents'}[0];
 
$result_trees{'macro_in_menu'}{'contents'}[0]{'contents'}[5]{'args'}[0]{'parent'}
 = $result_trees{'macro_in_menu'}{'contents'}[0]{'contents'}[5];
 
$result_trees{'macro_in_menu'}{'contents'}[0]{'contents'}[5]{'contents'}[0]{'parent'}
 = $result_trees{'macro_in_menu'}{'contents'}[0]{'contents'}[5];
+$result_trees{'macro_in_menu'}{'contents'}[0]{'contents'}[5]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'macro_in_menu'}{'contents'}[0]{'contents'}[5]{'contents'}[1]{'args'}[0];
+$result_trees{'macro_in_menu'}{'contents'}[0]{'contents'}[5]{'contents'}[1]{'args'}[0]{'parent'}
 = $result_trees{'macro_in_menu'}{'contents'}[0]{'contents'}[5]{'contents'}[1];
 
$result_trees{'macro_in_menu'}{'contents'}[0]{'contents'}[5]{'contents'}[1]{'parent'}
 = $result_trees{'macro_in_menu'}{'contents'}[0]{'contents'}[5];
-$result_trees{'macro_in_menu'}{'contents'}[0]{'contents'}[5]{'contents'}[2]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'macro_in_menu'}{'contents'}[0]{'contents'}[5]{'contents'}[2]{'args'}[0];
-$result_trees{'macro_in_menu'}{'contents'}[0]{'contents'}[5]{'contents'}[2]{'args'}[0]{'parent'}
 = $result_trees{'macro_in_menu'}{'contents'}[0]{'contents'}[5]{'contents'}[2];
-$result_trees{'macro_in_menu'}{'contents'}[0]{'contents'}[5]{'contents'}[2]{'parent'}
 = $result_trees{'macro_in_menu'}{'contents'}[0]{'contents'}[5];
 $result_trees{'macro_in_menu'}{'contents'}[0]{'contents'}[5]{'parent'} = 
$result_trees{'macro_in_menu'}{'contents'}[0];
 $result_trees{'macro_in_menu'}{'contents'}[0]{'contents'}[6]{'parent'} = 
$result_trees{'macro_in_menu'}{'contents'}[0];
 
$result_trees{'macro_in_menu'}{'contents'}[0]{'contents'}[7]{'args'}[0]{'parent'}
 = $result_trees{'macro_in_menu'}{'contents'}[0]{'contents'}[7];
 
$result_trees{'macro_in_menu'}{'contents'}[0]{'contents'}[7]{'contents'}[0]{'parent'}
 = $result_trees{'macro_in_menu'}{'contents'}[0]{'contents'}[7];
+$result_trees{'macro_in_menu'}{'contents'}[0]{'contents'}[7]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'macro_in_menu'}{'contents'}[0]{'contents'}[7]{'contents'}[1]{'args'}[0];
+$result_trees{'macro_in_menu'}{'contents'}[0]{'contents'}[7]{'contents'}[1]{'args'}[0]{'parent'}
 = $result_trees{'macro_in_menu'}{'contents'}[0]{'contents'}[7]{'contents'}[1];
 
$result_trees{'macro_in_menu'}{'contents'}[0]{'contents'}[7]{'contents'}[1]{'parent'}
 = $result_trees{'macro_in_menu'}{'contents'}[0]{'contents'}[7];
-$result_trees{'macro_in_menu'}{'contents'}[0]{'contents'}[7]{'contents'}[2]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'macro_in_menu'}{'contents'}[0]{'contents'}[7]{'contents'}[2]{'args'}[0];
-$result_trees{'macro_in_menu'}{'contents'}[0]{'contents'}[7]{'contents'}[2]{'args'}[0]{'parent'}
 = $result_trees{'macro_in_menu'}{'contents'}[0]{'contents'}[7]{'contents'}[2];
-$result_trees{'macro_in_menu'}{'contents'}[0]{'contents'}[7]{'contents'}[2]{'parent'}
 = $result_trees{'macro_in_menu'}{'contents'}[0]{'contents'}[7];
 $result_trees{'macro_in_menu'}{'contents'}[0]{'contents'}[7]{'parent'} = 
$result_trees{'macro_in_menu'}{'contents'}[0];
 $result_trees{'macro_in_menu'}{'contents'}[0]{'contents'}[8]{'parent'} = 
$result_trees{'macro_in_menu'}{'contents'}[0];
 
$result_trees{'macro_in_menu'}{'contents'}[0]{'contents'}[9]{'args'}[0]{'parent'}
 = $result_trees{'macro_in_menu'}{'contents'}[0]{'contents'}[9];
 
$result_trees{'macro_in_menu'}{'contents'}[0]{'contents'}[9]{'contents'}[0]{'parent'}
 = $result_trees{'macro_in_menu'}{'contents'}[0]{'contents'}[9];
+$result_trees{'macro_in_menu'}{'contents'}[0]{'contents'}[9]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'macro_in_menu'}{'contents'}[0]{'contents'}[9]{'contents'}[1]{'args'}[0];
+$result_trees{'macro_in_menu'}{'contents'}[0]{'contents'}[9]{'contents'}[1]{'args'}[0]{'parent'}
 = $result_trees{'macro_in_menu'}{'contents'}[0]{'contents'}[9]{'contents'}[1];
 
$result_trees{'macro_in_menu'}{'contents'}[0]{'contents'}[9]{'contents'}[1]{'parent'}
 = $result_trees{'macro_in_menu'}{'contents'}[0]{'contents'}[9];
-$result_trees{'macro_in_menu'}{'contents'}[0]{'contents'}[9]{'contents'}[2]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'macro_in_menu'}{'contents'}[0]{'contents'}[9]{'contents'}[2]{'args'}[0];
-$result_trees{'macro_in_menu'}{'contents'}[0]{'contents'}[9]{'contents'}[2]{'args'}[0]{'parent'}
 = $result_trees{'macro_in_menu'}{'contents'}[0]{'contents'}[9]{'contents'}[2];
-$result_trees{'macro_in_menu'}{'contents'}[0]{'contents'}[9]{'contents'}[2]{'parent'}
 = $result_trees{'macro_in_menu'}{'contents'}[0]{'contents'}[9];
 $result_trees{'macro_in_menu'}{'contents'}[0]{'contents'}[9]{'parent'} = 
$result_trees{'macro_in_menu'}{'contents'}[0];
 $result_trees{'macro_in_menu'}{'contents'}[0]{'contents'}[10]{'parent'} = 
$result_trees{'macro_in_menu'}{'contents'}[0];
 
$result_trees{'macro_in_menu'}{'contents'}[0]{'contents'}[11]{'args'}[0]{'parent'}
 = $result_trees{'macro_in_menu'}{'contents'}[0]{'contents'}[11];
 
$result_trees{'macro_in_menu'}{'contents'}[0]{'contents'}[11]{'contents'}[0]{'parent'}
 = $result_trees{'macro_in_menu'}{'contents'}[0]{'contents'}[11];
+$result_trees{'macro_in_menu'}{'contents'}[0]{'contents'}[11]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'macro_in_menu'}{'contents'}[0]{'contents'}[11]{'contents'}[1]{'args'}[0];
+$result_trees{'macro_in_menu'}{'contents'}[0]{'contents'}[11]{'contents'}[1]{'args'}[0]{'parent'}
 = $result_trees{'macro_in_menu'}{'contents'}[0]{'contents'}[11]{'contents'}[1];
 
$result_trees{'macro_in_menu'}{'contents'}[0]{'contents'}[11]{'contents'}[1]{'parent'}
 = $result_trees{'macro_in_menu'}{'contents'}[0]{'contents'}[11];
-$result_trees{'macro_in_menu'}{'contents'}[0]{'contents'}[11]{'contents'}[2]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'macro_in_menu'}{'contents'}[0]{'contents'}[11]{'contents'}[2]{'args'}[0];
-$result_trees{'macro_in_menu'}{'contents'}[0]{'contents'}[11]{'contents'}[2]{'args'}[0]{'parent'}
 = $result_trees{'macro_in_menu'}{'contents'}[0]{'contents'}[11]{'contents'}[2];
-$result_trees{'macro_in_menu'}{'contents'}[0]{'contents'}[11]{'contents'}[2]{'parent'}
 = $result_trees{'macro_in_menu'}{'contents'}[0]{'contents'}[11];
 $result_trees{'macro_in_menu'}{'contents'}[0]{'contents'}[11]{'parent'} = 
$result_trees{'macro_in_menu'}{'contents'}[0];
 $result_trees{'macro_in_menu'}{'contents'}[0]{'contents'}[12]{'parent'} = 
$result_trees{'macro_in_menu'}{'contents'}[0];
 
$result_trees{'macro_in_menu'}{'contents'}[0]{'contents'}[13]{'args'}[0]{'parent'}
 = $result_trees{'macro_in_menu'}{'contents'}[0]{'contents'}[13];
diff --git a/tp/t/results/macro/macro_in_misc_commands.pl 
b/tp/t/results/macro/macro_in_misc_commands.pl
index 82d0cfa0d0..c36cd4a263 100644
--- a/tp/t/results/macro/macro_in_misc_commands.pl
+++ b/tp/t/results/macro/macro_in_misc_commands.pl
@@ -21,14 +21,9 @@ $result_trees{'macro_in_misc_commands'} = {
           'contents' => [
             {
               'parent' => {},
-              'text' => 'atext',
-              'type' => 'raw'
-            },
-            {
-              'parent' => {},
-              'text' => '
+              'text' => 'atext
 ',
-              'type' => 'last_raw_newline'
+              'type' => 'raw'
             },
             {
               'args' => [
@@ -89,14 +84,9 @@ $result_trees{'macro_in_misc_commands'} = {
           'contents' => [
             {
               'parent' => {},
-              'text' => 'Top',
-              'type' => 'raw'
-            },
-            {
-              'parent' => {},
-              'text' => '
+              'text' => 'Top
 ',
-              'type' => 'last_raw_newline'
+              'type' => 'raw'
             },
             {
               'args' => [
@@ -307,14 +297,9 @@ $result_trees{'macro_in_misc_commands'} = {
           'contents' => [
             {
               'parent' => {},
-              'text' => 'en',
-              'type' => 'raw'
-            },
-            {
-              'parent' => {},
-              'text' => '
+              'text' => 'en
 ',
-              'type' => 'last_raw_newline'
+              'type' => 'raw'
             },
             {
               'args' => [
@@ -369,14 +354,9 @@ $result_trees{'macro_in_misc_commands'} = {
           'contents' => [
             {
               'parent' => {},
-              'text' => '@documentlanguage',
-              'type' => 'raw'
-            },
-            {
-              'parent' => {},
-              'text' => '
+              'text' => '@documentlanguage
 ',
-              'type' => 'last_raw_newline'
+              'type' => 'raw'
             },
             {
               'args' => [
@@ -533,14 +513,9 @@ $result_trees{'macro_in_misc_commands'} = {
           'contents' => [
             {
               'parent' => {},
-              'text' => '200mm,150mm',
-              'type' => 'raw'
-            },
-            {
-              'parent' => {},
-              'text' => '
+              'text' => '200mm,150mm
 ',
-              'type' => 'last_raw_newline'
+              'type' => 'raw'
             },
             {
               'args' => [
@@ -601,14 +576,9 @@ $result_trees{'macro_in_misc_commands'} = {
           'contents' => [
             {
               'parent' => {},
-              'text' => '@afourpaper',
-              'type' => 'raw'
-            },
-            {
-              'parent' => {},
-              'text' => '
+              'text' => '@afourpaper
 ',
-              'type' => 'last_raw_newline'
+              'type' => 'raw'
             },
             {
               'args' => [
@@ -804,14 +774,9 @@ $result_trees{'macro_in_misc_commands'} = {
           'contents' => [
             {
               'parent' => {},
-              'text' => '0.1',
-              'type' => 'raw'
-            },
-            {
-              'parent' => {},
-              'text' => '
+              'text' => '0.1
 ',
-              'type' => 'last_raw_newline'
+              'type' => 'raw'
             },
             {
               'args' => [
@@ -909,14 +874,9 @@ $result_trees{'macro_in_misc_commands'} = {
           'contents' => [
             {
               'parent' => {},
-              'text' => '@raisesections',
-              'type' => 'raw'
-            },
-            {
-              'parent' => {},
-              'text' => '
+              'text' => '@raisesections
 ',
-              'type' => 'last_raw_newline'
+              'type' => 'raw'
             },
             {
               'args' => [
@@ -983,14 +943,9 @@ $result_trees{'macro_in_misc_commands'} = {
           'contents' => [
             {
               'parent' => {},
-              'text' => '@lowersections',
-              'type' => 'raw'
-            },
-            {
-              'parent' => {},
-              'text' => '
+              'text' => '@lowersections
 ',
-              'type' => 'last_raw_newline'
+              'type' => 'raw'
             },
             {
               'args' => [
@@ -1155,14 +1110,9 @@ $result_trees{'macro_in_misc_commands'} = {
           'contents' => [
             {
               'parent' => {},
-              'text' => 'phi',
-              'type' => 'raw'
-            },
-            {
-              'parent' => {},
-              'text' => '
+              'text' => 'phi
 ',
-              'type' => 'last_raw_newline'
+              'type' => 'raw'
             },
             {
               'args' => [
@@ -1295,14 +1245,9 @@ $result_trees{'macro_in_misc_commands'} = {
           'contents' => [
             {
               'parent' => {},
-              'text' => '@strong',
-              'type' => 'raw'
-            },
-            {
-              'parent' => {},
-              'text' => '
+              'text' => '@strong
 ',
-              'type' => 'last_raw_newline'
+              'type' => 'raw'
             },
             {
               'args' => [
@@ -1357,14 +1302,9 @@ $result_trees{'macro_in_misc_commands'} = {
           'contents' => [
             {
               'parent' => {},
-              'text' => 'strong',
-              'type' => 'raw'
-            },
-            {
-              'parent' => {},
-              'text' => '
+              'text' => 'strong
 ',
-              'type' => 'last_raw_newline'
+              'type' => 'raw'
             },
             {
               'args' => [
@@ -1581,14 +1521,9 @@ $result_trees{'macro_in_misc_commands'} = {
           'contents' => [
             {
               'parent' => {},
-              'text' => 'code',
-              'type' => 'raw'
-            },
-            {
-              'parent' => {},
-              'text' => '
+              'text' => 'code
 ',
-              'type' => 'last_raw_newline'
+              'type' => 'raw'
             },
             {
               'args' => [
@@ -1815,14 +1750,9 @@ $result_trees{'macro_in_misc_commands'} = {
           'contents' => [
             {
               'parent' => {},
-              'text' => 'asis',
-              'type' => 'raw'
-            },
-            {
-              'parent' => {},
-              'text' => '
+              'text' => 'asis
 ',
-              'type' => 'last_raw_newline'
+              'type' => 'raw'
             },
             {
               'args' => [
@@ -1877,14 +1807,9 @@ $result_trees{'macro_in_misc_commands'} = {
           'contents' => [
             {
               'parent' => {},
-              'text' => '0',
-              'type' => 'raw'
-            },
-            {
-              'parent' => {},
-              'text' => '
+              'text' => '0
 ',
-              'type' => 'last_raw_newline'
+              'type' => 'raw'
             },
             {
               'args' => [
@@ -1939,14 +1864,9 @@ $result_trees{'macro_in_misc_commands'} = {
           'contents' => [
             {
               'parent' => {},
-              'text' => 'none',
-              'type' => 'raw'
-            },
-            {
-              'parent' => {},
-              'text' => '
+              'text' => 'none
 ',
-              'type' => 'last_raw_newline'
+              'type' => 'raw'
             },
             {
               'args' => [
@@ -2001,14 +1921,9 @@ $result_trees{'macro_in_misc_commands'} = {
           'contents' => [
             {
               'parent' => {},
-              'text' => '4',
-              'type' => 'raw'
-            },
-            {
-              'parent' => {},
-              'text' => '
+              'text' => '4
 ',
-              'type' => 'last_raw_newline'
+              'type' => 'raw'
             },
             {
               'args' => [
@@ -2063,14 +1978,9 @@ $result_trees{'macro_in_misc_commands'} = {
           'contents' => [
             {
               'parent' => {},
-              'text' => '6',
-              'type' => 'raw'
-            },
-            {
-              'parent' => {},
-              'text' => '
+              'text' => '6
 ',
-              'type' => 'last_raw_newline'
+              'type' => 'raw'
             },
             {
               'args' => [
@@ -2323,14 +2233,9 @@ $result_trees{'macro_in_misc_commands'} = {
           'contents' => [
             {
               'parent' => {},
-              'text' => 'end',
-              'type' => 'raw'
-            },
-            {
-              'parent' => {},
-              'text' => '
+              'text' => 'end
 ',
-              'type' => 'last_raw_newline'
+              'type' => 'raw'
             },
             {
               'args' => [
@@ -2385,14 +2290,9 @@ $result_trees{'macro_in_misc_commands'} = {
           'contents' => [
             {
               'parent' => {},
-              'text' => 'separate ',
-              'type' => 'raw'
-            },
-            {
-              'parent' => {},
-              'text' => '
+              'text' => 'separate 
 ',
-              'type' => 'last_raw_newline'
+              'type' => 'raw'
             },
             {
               'args' => [
@@ -2515,14 +2415,9 @@ $result_trees{'macro_in_misc_commands'} = {
           'contents' => [
             {
               'parent' => {},
-              'text' => 'on',
-              'type' => 'raw'
-            },
-            {
-              'parent' => {},
-              'text' => '
+              'text' => 'on
 ',
-              'type' => 'last_raw_newline'
+              'type' => 'raw'
             },
             {
               'args' => [
@@ -2577,14 +2472,9 @@ $result_trees{'macro_in_misc_commands'} = {
           'contents' => [
             {
               'parent' => {},
-              'text' => 'off',
-              'type' => 'raw'
-            },
-            {
-              'parent' => {},
-              'text' => '
+              'text' => 'off
 ',
-              'type' => 'last_raw_newline'
+              'type' => 'raw'
             },
             {
               'args' => [
@@ -2725,14 +2615,9 @@ $result_trees{'macro_in_misc_commands'} = {
           'contents' => [
             {
               'parent' => {},
-              'text' => '10',
-              'type' => 'raw'
-            },
-            {
-              'parent' => {},
-              'text' => '
+              'text' => '10
 ',
-              'type' => 'last_raw_newline'
+              'type' => 'raw'
             },
             {
               'args' => [
@@ -2836,14 +2721,9 @@ $result_trees{'macro_in_misc_commands'} = {
           'contents' => [
             {
               'parent' => {},
-              'text' => 'false',
-              'type' => 'raw'
-            },
-            {
-              'parent' => {},
-              'text' => '
+              'text' => 'false
 ',
-              'type' => 'last_raw_newline'
+              'type' => 'raw'
             },
             {
               'args' => [
@@ -2898,14 +2778,9 @@ $result_trees{'macro_in_misc_commands'} = {
           'contents' => [
             {
               'parent' => {},
-              'text' => 'true',
-              'type' => 'raw'
-            },
-            {
-              'parent' => {},
-              'text' => '
+              'text' => 'true
 ',
-              'type' => 'last_raw_newline'
+              'type' => 'raw'
             },
             {
               'args' => [
@@ -3034,14 +2909,9 @@ $result_trees{'macro_in_misc_commands'} = {
           'contents' => [
             {
               'parent' => {},
-              'text' => '@page',
-              'type' => 'raw'
-            },
-            {
-              'parent' => {},
-              'text' => '
+              'text' => '@page
 ',
-              'type' => 'last_raw_newline'
+              'type' => 'raw'
             },
             {
               'args' => [
@@ -3096,14 +2966,9 @@ $result_trees{'macro_in_misc_commands'} = {
           'contents' => [
             {
               'parent' => {},
-              'text' => '@noindent',
-              'type' => 'raw'
-            },
-            {
-              'parent' => {},
-              'text' => '
+              'text' => '@noindent
 ',
-              'type' => 'last_raw_newline'
+              'type' => 'raw'
             },
             {
               'args' => [
@@ -3158,14 +3023,9 @@ $result_trees{'macro_in_misc_commands'} = {
           'contents' => [
             {
               'parent' => {},
-              'text' => '@refill',
-              'type' => 'raw'
-            },
-            {
-              'parent' => {},
-              'text' => '
+              'text' => '@refill
 ',
-              'type' => 'last_raw_newline'
+              'type' => 'raw'
             },
             {
               'args' => [
@@ -3491,14 +3351,9 @@ $result_trees{'macro_in_misc_commands'} = {
           'contents' => [
             {
               'parent' => {},
-              'text' => '@contents',
-              'type' => 'raw'
-            },
-            {
-              'parent' => {},
-              'text' => '
+              'text' => '@contents
 ',
-              'type' => 'last_raw_newline'
+              'type' => 'raw'
             },
             {
               'args' => [
@@ -3600,14 +3455,9 @@ $result_trees{'macro_in_misc_commands'} = {
           'contents' => [
             {
               'parent' => {},
-              'text' => '@exdent',
-              'type' => 'raw'
-            },
-            {
-              'parent' => {},
-              'text' => '
+              'text' => '@exdent
 ',
-              'type' => 'last_raw_newline'
+              'type' => 'raw'
             },
             {
               'args' => [
@@ -3696,14 +3546,9 @@ $result_trees{'macro_in_misc_commands'} = {
           'contents' => [
             {
               'parent' => {},
-              'text' => '2',
-              'type' => 'raw'
-            },
-            {
-              'parent' => {},
-              'text' => '
+              'text' => '2
 ',
-              'type' => 'last_raw_newline'
+              'type' => 'raw'
             },
             {
               'args' => [
@@ -3795,14 +3640,9 @@ $result_trees{'macro_in_misc_commands'} = {
           'contents' => [
             {
               'parent' => {},
-              'text' => '@result',
-              'type' => 'raw'
-            },
-            {
-              'parent' => {},
-              'text' => '
+              'text' => '@result
 ',
-              'type' => 'last_raw_newline'
+              'type' => 'raw'
             },
             {
               'args' => [
@@ -4106,14 +3946,9 @@ $result_trees{'macro_in_misc_commands'} = {
           'contents' => [
             {
               'parent' => {},
-              'text' => '@shortcontents',
-              'type' => 'raw'
-            },
-            {
-              'parent' => {},
-              'text' => '
+              'text' => '@shortcontents
 ',
-              'type' => 'last_raw_newline'
+              'type' => 'raw'
             },
             {
               'args' => [
@@ -4191,14 +4026,9 @@ $result_trees{'macro_in_misc_commands'} = {
           'contents' => [
             {
               'parent' => {},
-              'text' => '@bye',
-              'type' => 'raw'
-            },
-            {
-              'parent' => {},
-              'text' => '
+              'text' => '@bye
 ',
-              'type' => 'last_raw_newline'
+              'type' => 'raw'
             },
             {
               'args' => [
@@ -4275,18 +4105,16 @@ $result_trees{'macro_in_misc_commands'} = {
 };
 
$result_trees{'macro_in_misc_commands'}{'contents'}[0]{'contents'}[0]{'args'}[0]{'parent'}
 = $result_trees{'macro_in_misc_commands'}{'contents'}[0]{'contents'}[0];
 
$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]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'macro_in_misc_commands'}{'contents'}[0]{'contents'}[0]{'contents'}[1]{'args'}[0];
+$result_trees{'macro_in_misc_commands'}{'contents'}[0]{'contents'}[0]{'contents'}[1]{'args'}[0]{'parent'}
 = 
$result_trees{'macro_in_misc_commands'}{'contents'}[0]{'contents'}[0]{'contents'}[1];
 
$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]{'contents'}[2]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'macro_in_misc_commands'}{'contents'}[0]{'contents'}[0]{'contents'}[2]{'args'}[0];
-$result_trees{'macro_in_misc_commands'}{'contents'}[0]{'contents'}[0]{'contents'}[2]{'args'}[0]{'parent'}
 = 
$result_trees{'macro_in_misc_commands'}{'contents'}[0]{'contents'}[0]{'contents'}[2];
-$result_trees{'macro_in_misc_commands'}{'contents'}[0]{'contents'}[0]{'contents'}[2]{'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]{'parent'} 
= $result_trees{'macro_in_misc_commands'}{'contents'}[0];
 
$result_trees{'macro_in_misc_commands'}{'contents'}[0]{'contents'}[2]{'args'}[0]{'parent'}
 = $result_trees{'macro_in_misc_commands'}{'contents'}[0]{'contents'}[2];
 
$result_trees{'macro_in_misc_commands'}{'contents'}[0]{'contents'}[2]{'contents'}[0]{'parent'}
 = $result_trees{'macro_in_misc_commands'}{'contents'}[0]{'contents'}[2];
+$result_trees{'macro_in_misc_commands'}{'contents'}[0]{'contents'}[2]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'macro_in_misc_commands'}{'contents'}[0]{'contents'}[2]{'contents'}[1]{'args'}[0];
+$result_trees{'macro_in_misc_commands'}{'contents'}[0]{'contents'}[2]{'contents'}[1]{'args'}[0]{'parent'}
 = 
$result_trees{'macro_in_misc_commands'}{'contents'}[0]{'contents'}[2]{'contents'}[1];
 
$result_trees{'macro_in_misc_commands'}{'contents'}[0]{'contents'}[2]{'contents'}[1]{'parent'}
 = $result_trees{'macro_in_misc_commands'}{'contents'}[0]{'contents'}[2];
-$result_trees{'macro_in_misc_commands'}{'contents'}[0]{'contents'}[2]{'contents'}[2]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'macro_in_misc_commands'}{'contents'}[0]{'contents'}[2]{'contents'}[2]{'args'}[0];
-$result_trees{'macro_in_misc_commands'}{'contents'}[0]{'contents'}[2]{'contents'}[2]{'args'}[0]{'parent'}
 = 
$result_trees{'macro_in_misc_commands'}{'contents'}[0]{'contents'}[2]{'contents'}[2];
-$result_trees{'macro_in_misc_commands'}{'contents'}[0]{'contents'}[2]{'contents'}[2]{'parent'}
 = $result_trees{'macro_in_misc_commands'}{'contents'}[0]{'contents'}[2];
 
$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]{'parent'} 
= $result_trees{'macro_in_misc_commands'}{'contents'}[0];
 $result_trees{'macro_in_misc_commands'}{'contents'}[0]{'parent'} = 
$result_trees{'macro_in_misc_commands'};
@@ -4310,17 +4138,15 @@ 
$result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[2]{'parent'}
 
$result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[3]{'parent'} 
= $result_trees{'macro_in_misc_commands'}{'contents'}[2];
 
$result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[4]{'args'}[0]{'parent'}
 = $result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[4];
 
$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]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[4]{'contents'}[1]{'args'}[0];
+$result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[4]{'contents'}[1]{'args'}[0]{'parent'}
 = 
$result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[4]{'contents'}[1];
 
$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]{'contents'}[2]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[4]{'contents'}[2]{'args'}[0];
-$result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[4]{'contents'}[2]{'args'}[0]{'parent'}
 = 
$result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[4]{'contents'}[2];
-$result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[4]{'contents'}[2]{'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]{'args'}[0]{'parent'}
 = $result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[5];
 
$result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[5]{'contents'}[0]{'parent'}
 = $result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[5];
+$result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[5]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[5]{'contents'}[1]{'args'}[0];
+$result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[5]{'contents'}[1]{'args'}[0]{'parent'}
 = 
$result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[5]{'contents'}[1];
 
$result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[5]{'contents'}[1]{'parent'}
 = $result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[5];
-$result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[5]{'contents'}[2]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[5]{'contents'}[2]{'args'}[0];
-$result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[5]{'contents'}[2]{'args'}[0]{'parent'}
 = 
$result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[5]{'contents'}[2];
-$result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[5]{'contents'}[2]{'parent'}
 = $result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[5];
 
$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]{'parent'} 
= $result_trees{'macro_in_misc_commands'}{'contents'}[2];
 
$result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[7]{'contents'}[0]{'parent'}
 = $result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[7];
@@ -4338,18 +4164,16 @@ 
$result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[9]{'parent'}
 
$result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[10]{'parent'}
 = $result_trees{'macro_in_misc_commands'}{'contents'}[2];
 
$result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[11]{'args'}[0]{'parent'}
 = $result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[11];
 
$result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[11]{'contents'}[0]{'parent'}
 = $result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[11];
+$result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[11]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[11]{'contents'}[1]{'args'}[0];
+$result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[11]{'contents'}[1]{'args'}[0]{'parent'}
 = 
$result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[11]{'contents'}[1];
 
$result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[11]{'contents'}[1]{'parent'}
 = $result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[11];
-$result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[11]{'contents'}[2]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[11]{'contents'}[2]{'args'}[0];
-$result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[11]{'contents'}[2]{'args'}[0]{'parent'}
 = 
$result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[11]{'contents'}[2];
-$result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[11]{'contents'}[2]{'parent'}
 = $result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[11];
 
$result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[11]{'parent'}
 = $result_trees{'macro_in_misc_commands'}{'contents'}[2];
 
$result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[12]{'parent'}
 = $result_trees{'macro_in_misc_commands'}{'contents'}[2];
 
$result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[13]{'args'}[0]{'parent'}
 = $result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[13];
 
$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]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[13]{'contents'}[1]{'args'}[0];
+$result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[13]{'contents'}[1]{'args'}[0]{'parent'}
 = 
$result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[13]{'contents'}[1];
 
$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]{'contents'}[2]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[13]{'contents'}[2]{'args'}[0];
-$result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[13]{'contents'}[2]{'args'}[0]{'parent'}
 = 
$result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[13]{'contents'}[2];
-$result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[13]{'contents'}[2]{'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]{'parent'}
 = $result_trees{'macro_in_misc_commands'}{'contents'}[2];
 
$result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[15]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[15]{'args'}[0];
@@ -4369,10 +4193,9 @@ 
$result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[19]{'parent'}
 
$result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[20]{'parent'}
 = $result_trees{'macro_in_misc_commands'}{'contents'}[2];
 
$result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[21]{'args'}[0]{'parent'}
 = $result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[21];
 
$result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[21]{'contents'}[0]{'parent'}
 = $result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[21];
+$result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[21]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[21]{'contents'}[1]{'args'}[0];
+$result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[21]{'contents'}[1]{'args'}[0]{'parent'}
 = 
$result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[21]{'contents'}[1];
 
$result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[21]{'contents'}[1]{'parent'}
 = $result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[21];
-$result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[21]{'contents'}[2]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[21]{'contents'}[2]{'args'}[0];
-$result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[21]{'contents'}[2]{'args'}[0]{'parent'}
 = 
$result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[21]{'contents'}[2];
-$result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[21]{'contents'}[2]{'parent'}
 = $result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[21];
 
$result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[21]{'parent'}
 = $result_trees{'macro_in_misc_commands'}{'contents'}[2];
 
$result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[22]{'parent'}
 = $result_trees{'macro_in_misc_commands'}{'contents'}[2];
 
$result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[23]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[23]{'args'}[0];
@@ -4381,19 +4204,17 @@ 
$result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[23]{'parent'}
 
$result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[24]{'parent'}
 = $result_trees{'macro_in_misc_commands'}{'contents'}[2];
 
$result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[25]{'args'}[0]{'parent'}
 = $result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[25];
 
$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]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[25]{'contents'}[1]{'args'}[0];
+$result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[25]{'contents'}[1]{'args'}[0]{'parent'}
 = 
$result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[25]{'contents'}[1];
 
$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]{'contents'}[2]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[25]{'contents'}[2]{'args'}[0];
-$result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[25]{'contents'}[2]{'args'}[0]{'parent'}
 = 
$result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[25]{'contents'}[2];
-$result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[25]{'contents'}[2]{'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]{'args'}[0]{'parent'}
 = $result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[26];
 
$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]{'args'}[0]{'parent'}
 = $result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[27];
 
$result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[27]{'contents'}[0]{'parent'}
 = $result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[27];
+$result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[27]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[27]{'contents'}[1]{'args'}[0];
+$result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[27]{'contents'}[1]{'args'}[0]{'parent'}
 = 
$result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[27]{'contents'}[1];
 
$result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[27]{'contents'}[1]{'parent'}
 = $result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[27];
-$result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[27]{'contents'}[2]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[27]{'contents'}[2]{'args'}[0];
-$result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[27]{'contents'}[2]{'args'}[0]{'parent'}
 = 
$result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[27]{'contents'}[2];
-$result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[27]{'contents'}[2]{'parent'}
 = $result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[27];
 
$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]{'parent'}
 = $result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[28];
 
$result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[28]{'parent'}
 = $result_trees{'macro_in_misc_commands'}{'contents'}[2];
@@ -4413,10 +4234,9 @@ 
$result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[32]{'parent'}
 
$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]{'args'}[0]{'parent'}
 = $result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[34];
 
$result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[34]{'contents'}[0]{'parent'}
 = $result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[34];
+$result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[34]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[34]{'contents'}[1]{'args'}[0];
+$result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[34]{'contents'}[1]{'args'}[0]{'parent'}
 = 
$result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[34]{'contents'}[1];
 
$result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[34]{'contents'}[1]{'parent'}
 = $result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[34];
-$result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[34]{'contents'}[2]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[34]{'contents'}[2]{'args'}[0];
-$result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[34]{'contents'}[2]{'args'}[0]{'parent'}
 = 
$result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[34]{'contents'}[2];
-$result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[34]{'contents'}[2]{'parent'}
 = $result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[34];
 
$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]{'contents'}[0]{'parent'}
 = 
$result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[35]{'args'}[0];
 
$result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[35]{'args'}[0]{'parent'}
 = $result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[35];
@@ -4430,17 +4250,15 @@ 
$result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[37]{'parent'}
 
$result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[38]{'parent'}
 = $result_trees{'macro_in_misc_commands'}{'contents'}[2];
 
$result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[39]{'args'}[0]{'parent'}
 = $result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[39];
 
$result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[39]{'contents'}[0]{'parent'}
 = $result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[39];
+$result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[39]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[39]{'contents'}[1]{'args'}[0];
+$result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[39]{'contents'}[1]{'args'}[0]{'parent'}
 = 
$result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[39]{'contents'}[1];
 
$result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[39]{'contents'}[1]{'parent'}
 = $result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[39];
-$result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[39]{'contents'}[2]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[39]{'contents'}[2]{'args'}[0];
-$result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[39]{'contents'}[2]{'args'}[0]{'parent'}
 = 
$result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[39]{'contents'}[2];
-$result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[39]{'contents'}[2]{'parent'}
 = $result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[39];
 
$result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[39]{'parent'}
 = $result_trees{'macro_in_misc_commands'}{'contents'}[2];
 
$result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[40]{'args'}[0]{'parent'}
 = $result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[40];
 
$result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[40]{'contents'}[0]{'parent'}
 = $result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[40];
+$result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[40]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[40]{'contents'}[1]{'args'}[0];
+$result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[40]{'contents'}[1]{'args'}[0]{'parent'}
 = 
$result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[40]{'contents'}[1];
 
$result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[40]{'contents'}[1]{'parent'}
 = $result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[40];
-$result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[40]{'contents'}[2]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[40]{'contents'}[2]{'args'}[0];
-$result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[40]{'contents'}[2]{'args'}[0]{'parent'}
 = 
$result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[40]{'contents'}[2];
-$result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[40]{'contents'}[2]{'parent'}
 = $result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[40];
 
$result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[40]{'parent'}
 = $result_trees{'macro_in_misc_commands'}{'contents'}[2];
 
$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]{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[42]{'contents'}[0]{'args'}[0];
@@ -4467,10 +4285,9 @@ 
$result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[48]{'parent'}
 
$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]{'args'}[0]{'parent'}
 = $result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[50];
 
$result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[50]{'contents'}[0]{'parent'}
 = $result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[50];
+$result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[50]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[50]{'contents'}[1]{'args'}[0];
+$result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[50]{'contents'}[1]{'args'}[0]{'parent'}
 = 
$result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[50]{'contents'}[1];
 
$result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[50]{'contents'}[1]{'parent'}
 = $result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[50];
-$result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[50]{'contents'}[2]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[50]{'contents'}[2]{'args'}[0];
-$result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[50]{'contents'}[2]{'args'}[0]{'parent'}
 = 
$result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[50]{'contents'}[2];
-$result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[50]{'contents'}[2]{'parent'}
 = $result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[50];
 
$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]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[51]{'args'}[0];
 
$result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[51]{'args'}[0]{'parent'}
 = $result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[51];
@@ -4495,38 +4312,33 @@ 
$result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[55]{'parent'}
 
$result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[56]{'parent'}
 = $result_trees{'macro_in_misc_commands'}{'contents'}[2];
 
$result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[57]{'args'}[0]{'parent'}
 = $result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[57];
 
$result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[57]{'contents'}[0]{'parent'}
 = $result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[57];
+$result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[57]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[57]{'contents'}[1]{'args'}[0];
+$result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[57]{'contents'}[1]{'args'}[0]{'parent'}
 = 
$result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[57]{'contents'}[1];
 
$result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[57]{'contents'}[1]{'parent'}
 = $result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[57];
-$result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[57]{'contents'}[2]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[57]{'contents'}[2]{'args'}[0];
-$result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[57]{'contents'}[2]{'args'}[0]{'parent'}
 = 
$result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[57]{'contents'}[2];
-$result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[57]{'contents'}[2]{'parent'}
 = $result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[57];
 
$result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[57]{'parent'}
 = $result_trees{'macro_in_misc_commands'}{'contents'}[2];
 
$result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[58]{'args'}[0]{'parent'}
 = $result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[58];
 
$result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[58]{'contents'}[0]{'parent'}
 = $result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[58];
+$result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[58]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[58]{'contents'}[1]{'args'}[0];
+$result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[58]{'contents'}[1]{'args'}[0]{'parent'}
 = 
$result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[58]{'contents'}[1];
 
$result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[58]{'contents'}[1]{'parent'}
 = $result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[58];
-$result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[58]{'contents'}[2]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[58]{'contents'}[2]{'args'}[0];
-$result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[58]{'contents'}[2]{'args'}[0]{'parent'}
 = 
$result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[58]{'contents'}[2];
-$result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[58]{'contents'}[2]{'parent'}
 = $result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[58];
 
$result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[58]{'parent'}
 = $result_trees{'macro_in_misc_commands'}{'contents'}[2];
 
$result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[59]{'args'}[0]{'parent'}
 = $result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[59];
 
$result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[59]{'contents'}[0]{'parent'}
 = $result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[59];
+$result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[59]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[59]{'contents'}[1]{'args'}[0];
+$result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[59]{'contents'}[1]{'args'}[0]{'parent'}
 = 
$result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[59]{'contents'}[1];
 
$result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[59]{'contents'}[1]{'parent'}
 = $result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[59];
-$result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[59]{'contents'}[2]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[59]{'contents'}[2]{'args'}[0];
-$result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[59]{'contents'}[2]{'args'}[0]{'parent'}
 = 
$result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[59]{'contents'}[2];
-$result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[59]{'contents'}[2]{'parent'}
 = $result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[59];
 
$result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[59]{'parent'}
 = $result_trees{'macro_in_misc_commands'}{'contents'}[2];
 
$result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[60]{'args'}[0]{'parent'}
 = $result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[60];
 
$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]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[60]{'contents'}[1]{'args'}[0];
+$result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[60]{'contents'}[1]{'args'}[0]{'parent'}
 = 
$result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[60]{'contents'}[1];
 
$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]{'contents'}[2]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[60]{'contents'}[2]{'args'}[0];
-$result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[60]{'contents'}[2]{'args'}[0]{'parent'}
 = 
$result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[60]{'contents'}[2];
-$result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[60]{'contents'}[2]{'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]{'args'}[0]{'parent'}
 = $result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[61];
 
$result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[61]{'contents'}[0]{'parent'}
 = $result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[61];
+$result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[61]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[61]{'contents'}[1]{'args'}[0];
+$result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[61]{'contents'}[1]{'args'}[0]{'parent'}
 = 
$result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[61]{'contents'}[1];
 
$result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[61]{'contents'}[1]{'parent'}
 = $result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[61];
-$result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[61]{'contents'}[2]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[61]{'contents'}[2]{'args'}[0];
-$result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[61]{'contents'}[2]{'args'}[0]{'parent'}
 = 
$result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[61]{'contents'}[2];
-$result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[61]{'contents'}[2]{'parent'}
 = $result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[61];
 
$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]{'parent'}
 = $result_trees{'macro_in_misc_commands'}{'contents'}[2];
 
$result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[63]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[63]{'args'}[0];
@@ -4550,17 +4362,15 @@ 
$result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[68]{'parent'}
 
$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]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[70]{'contents'}[1]{'args'}[0];
+$result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[70]{'contents'}[1]{'args'}[0]{'parent'}
 = 
$result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[70]{'contents'}[1];
 
$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]{'contents'}[2]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[70]{'contents'}[2]{'args'}[0];
-$result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[70]{'contents'}[2]{'args'}[0]{'parent'}
 = 
$result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[70]{'contents'}[2];
-$result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[70]{'contents'}[2]{'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]{'args'}[0]{'parent'}
 = $result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[71];
 
$result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[71]{'contents'}[0]{'parent'}
 = $result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[71];
+$result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[71]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[71]{'contents'}[1]{'args'}[0];
+$result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[71]{'contents'}[1]{'args'}[0]{'parent'}
 = 
$result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[71]{'contents'}[1];
 
$result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[71]{'contents'}[1]{'parent'}
 = $result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[71];
-$result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[71]{'contents'}[2]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[71]{'contents'}[2]{'args'}[0];
-$result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[71]{'contents'}[2]{'args'}[0]{'parent'}
 = 
$result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[71]{'contents'}[2];
-$result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[71]{'contents'}[2]{'parent'}
 = $result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[71];
 
$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]{'contents'}[0]{'parent'}
 = 
$result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[72]{'args'}[0];
 
$result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[72]{'args'}[0]{'parent'}
 = $result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[72];
@@ -4571,17 +4381,15 @@ 
$result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[73]{'parent'}
 
$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]{'args'}[0]{'parent'}
 = $result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[75];
 
$result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[75]{'contents'}[0]{'parent'}
 = $result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[75];
+$result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[75]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[75]{'contents'}[1]{'args'}[0];
+$result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[75]{'contents'}[1]{'args'}[0]{'parent'}
 = 
$result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[75]{'contents'}[1];
 
$result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[75]{'contents'}[1]{'parent'}
 = $result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[75];
-$result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[75]{'contents'}[2]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[75]{'contents'}[2]{'args'}[0];
-$result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[75]{'contents'}[2]{'args'}[0]{'parent'}
 = 
$result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[75]{'contents'}[2];
-$result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[75]{'contents'}[2]{'parent'}
 = $result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[75];
 
$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]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[76]{'contents'}[1]{'args'}[0];
+$result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[76]{'contents'}[1]{'args'}[0]{'parent'}
 = 
$result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[76]{'contents'}[1];
 
$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]{'contents'}[2]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[76]{'contents'}[2]{'args'}[0];
-$result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[76]{'contents'}[2]{'args'}[0]{'parent'}
 = 
$result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[76]{'contents'}[2];
-$result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[76]{'contents'}[2]{'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]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[77]{'args'}[0];
 
$result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[77]{'args'}[0]{'parent'}
 = $result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[77];
@@ -4594,10 +4402,9 @@ 
$result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[80]{'args'}[0
 
$result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[80]{'parent'}
 = $result_trees{'macro_in_misc_commands'}{'contents'}[2];
 
$result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[81]{'args'}[0]{'parent'}
 = $result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[81];
 
$result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[81]{'contents'}[0]{'parent'}
 = $result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[81];
+$result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[81]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[81]{'contents'}[1]{'args'}[0];
+$result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[81]{'contents'}[1]{'args'}[0]{'parent'}
 = 
$result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[81]{'contents'}[1];
 
$result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[81]{'contents'}[1]{'parent'}
 = $result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[81];
-$result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[81]{'contents'}[2]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[81]{'contents'}[2]{'args'}[0];
-$result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[81]{'contents'}[2]{'args'}[0]{'parent'}
 = 
$result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[81]{'contents'}[2];
-$result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[81]{'contents'}[2]{'parent'}
 = $result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[81];
 
$result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[81]{'parent'}
 = $result_trees{'macro_in_misc_commands'}{'contents'}[2];
 
$result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[82]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[82]{'args'}[0];
 
$result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[82]{'args'}[0]{'parent'}
 = $result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[82];
@@ -4606,17 +4413,15 @@ 
$result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[83]{'args'}[0
 
$result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[83]{'parent'}
 = $result_trees{'macro_in_misc_commands'}{'contents'}[2];
 
$result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[84]{'args'}[0]{'parent'}
 = $result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[84];
 
$result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[84]{'contents'}[0]{'parent'}
 = $result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[84];
+$result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[84]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[84]{'contents'}[1]{'args'}[0];
+$result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[84]{'contents'}[1]{'args'}[0]{'parent'}
 = 
$result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[84]{'contents'}[1];
 
$result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[84]{'contents'}[1]{'parent'}
 = $result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[84];
-$result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[84]{'contents'}[2]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[84]{'contents'}[2]{'args'}[0];
-$result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[84]{'contents'}[2]{'args'}[0]{'parent'}
 = 
$result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[84]{'contents'}[2];
-$result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[84]{'contents'}[2]{'parent'}
 = $result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[84];
 
$result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[84]{'parent'}
 = $result_trees{'macro_in_misc_commands'}{'contents'}[2];
 
$result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[85]{'args'}[0]{'parent'}
 = $result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[85];
 
$result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[85]{'contents'}[0]{'parent'}
 = $result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[85];
+$result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[85]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[85]{'contents'}[1]{'args'}[0];
+$result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[85]{'contents'}[1]{'args'}[0]{'parent'}
 = 
$result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[85]{'contents'}[1];
 
$result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[85]{'contents'}[1]{'parent'}
 = $result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[85];
-$result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[85]{'contents'}[2]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[85]{'contents'}[2]{'args'}[0];
-$result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[85]{'contents'}[2]{'args'}[0]{'parent'}
 = 
$result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[85]{'contents'}[2];
-$result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[85]{'contents'}[2]{'parent'}
 = $result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[85];
 
$result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[85]{'parent'}
 = $result_trees{'macro_in_misc_commands'}{'contents'}[2];
 
$result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[86]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[86]{'args'}[0];
 
$result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[86]{'args'}[0]{'parent'}
 = $result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[86];
@@ -4628,24 +4433,21 @@ 
$result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[88]{'parent'}
 
$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]{'parent'}
 = $result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[90];
 
$result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[90]{'contents'}[0]{'parent'}
 = $result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[90];
+$result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[90]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[90]{'contents'}[1]{'args'}[0];
+$result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[90]{'contents'}[1]{'args'}[0]{'parent'}
 = 
$result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[90]{'contents'}[1];
 
$result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[90]{'contents'}[1]{'parent'}
 = $result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[90];
-$result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[90]{'contents'}[2]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[90]{'contents'}[2]{'args'}[0];
-$result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[90]{'contents'}[2]{'args'}[0]{'parent'}
 = 
$result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[90]{'contents'}[2];
-$result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[90]{'contents'}[2]{'parent'}
 = $result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[90];
 
$result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[90]{'parent'}
 = $result_trees{'macro_in_misc_commands'}{'contents'}[2];
 
$result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[91]{'args'}[0]{'parent'}
 = $result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[91];
 
$result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[91]{'contents'}[0]{'parent'}
 = $result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[91];
+$result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[91]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[91]{'contents'}[1]{'args'}[0];
+$result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[91]{'contents'}[1]{'args'}[0]{'parent'}
 = 
$result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[91]{'contents'}[1];
 
$result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[91]{'contents'}[1]{'parent'}
 = $result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[91];
-$result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[91]{'contents'}[2]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[91]{'contents'}[2]{'args'}[0];
-$result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[91]{'contents'}[2]{'args'}[0]{'parent'}
 = 
$result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[91]{'contents'}[2];
-$result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[91]{'contents'}[2]{'parent'}
 = $result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[91];
 
$result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[91]{'parent'}
 = $result_trees{'macro_in_misc_commands'}{'contents'}[2];
 
$result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[92]{'args'}[0]{'parent'}
 = $result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[92];
 
$result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[92]{'contents'}[0]{'parent'}
 = $result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[92];
+$result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[92]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[92]{'contents'}[1]{'args'}[0];
+$result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[92]{'contents'}[1]{'args'}[0]{'parent'}
 = 
$result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[92]{'contents'}[1];
 
$result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[92]{'contents'}[1]{'parent'}
 = $result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[92];
-$result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[92]{'contents'}[2]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[92]{'contents'}[2]{'args'}[0];
-$result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[92]{'contents'}[2]{'args'}[0]{'parent'}
 = 
$result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[92]{'contents'}[2];
-$result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[92]{'contents'}[2]{'parent'}
 = $result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[92];
 
$result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[92]{'parent'}
 = $result_trees{'macro_in_misc_commands'}{'contents'}[2];
 
$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]{'contents'}[0]{'parent'}
 = $result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[94];
@@ -4696,10 +4498,9 @@ 
$result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[106]{'parent'
 
$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]{'args'}[0]{'parent'}
 = $result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[108];
 
$result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[108]{'contents'}[0]{'parent'}
 = $result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[108];
+$result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[108]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[108]{'contents'}[1]{'args'}[0];
+$result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[108]{'contents'}[1]{'args'}[0]{'parent'}
 = 
$result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[108]{'contents'}[1];
 
$result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[108]{'contents'}[1]{'parent'}
 = $result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[108];
-$result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[108]{'contents'}[2]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[108]{'contents'}[2]{'args'}[0];
-$result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[108]{'contents'}[2]{'args'}[0]{'parent'}
 = 
$result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[108]{'contents'}[2];
-$result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[108]{'contents'}[2]{'parent'}
 = $result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[108];
 
$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]{'parent'}
 = $result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[109];
 
$result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[109]{'parent'}
 = $result_trees{'macro_in_misc_commands'}{'contents'}[2];
@@ -4709,10 +4510,9 @@ 
$result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[111]{'parent'
 
$result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[112]{'parent'}
 = $result_trees{'macro_in_misc_commands'}{'contents'}[2];
 
$result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[113]{'args'}[0]{'parent'}
 = $result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[113];
 
$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]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[113]{'contents'}[1]{'args'}[0];
+$result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[113]{'contents'}[1]{'args'}[0]{'parent'}
 = 
$result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[113]{'contents'}[1];
 
$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]{'contents'}[2]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[113]{'contents'}[2]{'args'}[0];
-$result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[113]{'contents'}[2]{'args'}[0]{'parent'}
 = 
$result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[113]{'contents'}[2];
-$result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[113]{'contents'}[2]{'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]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[114]{'args'}[0];
 
$result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[114]{'args'}[0]{'parent'}
 = $result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[114];
@@ -4720,10 +4520,9 @@ 
$result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[114]{'parent'
 
$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]{'args'}[0]{'parent'}
 = $result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[116];
 
$result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[116]{'contents'}[0]{'parent'}
 = $result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[116];
+$result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[116]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[116]{'contents'}[1]{'args'}[0];
+$result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[116]{'contents'}[1]{'args'}[0]{'parent'}
 = 
$result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[116]{'contents'}[1];
 
$result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[116]{'contents'}[1]{'parent'}
 = $result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[116];
-$result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[116]{'contents'}[2]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[116]{'contents'}[2]{'args'}[0];
-$result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[116]{'contents'}[2]{'args'}[0]{'parent'}
 = 
$result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[116]{'contents'}[2];
-$result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[116]{'contents'}[2]{'parent'}
 = $result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[116];
 
$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]{'contents'}[0]{'parent'}
 = 
$result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[117]{'args'}[0];
 
$result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[117]{'args'}[0]{'parent'}
 = $result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[117];
@@ -4731,10 +4530,9 @@ 
$result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[117]{'parent'
 
$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]{'args'}[0]{'parent'}
 = $result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[119];
 
$result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[119]{'contents'}[0]{'parent'}
 = $result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[119];
+$result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[119]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[119]{'contents'}[1]{'args'}[0];
+$result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[119]{'contents'}[1]{'args'}[0]{'parent'}
 = 
$result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[119]{'contents'}[1];
 
$result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[119]{'contents'}[1]{'parent'}
 = $result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[119];
-$result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[119]{'contents'}[2]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[119]{'contents'}[2]{'args'}[0];
-$result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[119]{'contents'}[2]{'args'}[0]{'parent'}
 = 
$result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[119]{'contents'}[2];
-$result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[119]{'contents'}[2]{'parent'}
 = $result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[119];
 
$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]{'parent'}
 = $result_trees{'macro_in_misc_commands'}{'contents'}[2];
 
$result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[121]{'args'}[0]{'parent'}
 = $result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[121];
@@ -4770,20 +4568,18 @@ 
$result_trees{'macro_in_misc_commands'}{'contents'}[4]{'contents'}[1]{'parent'}
 
$result_trees{'macro_in_misc_commands'}{'contents'}[4]{'contents'}[2]{'parent'} 
= $result_trees{'macro_in_misc_commands'}{'contents'}[4];
 
$result_trees{'macro_in_misc_commands'}{'contents'}[4]{'contents'}[3]{'args'}[0]{'parent'}
 = $result_trees{'macro_in_misc_commands'}{'contents'}[4]{'contents'}[3];
 
$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]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'macro_in_misc_commands'}{'contents'}[4]{'contents'}[3]{'contents'}[1]{'args'}[0];
+$result_trees{'macro_in_misc_commands'}{'contents'}[4]{'contents'}[3]{'contents'}[1]{'args'}[0]{'parent'}
 = 
$result_trees{'macro_in_misc_commands'}{'contents'}[4]{'contents'}[3]{'contents'}[1];
 
$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]{'contents'}[2]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'macro_in_misc_commands'}{'contents'}[4]{'contents'}[3]{'contents'}[2]{'args'}[0];
-$result_trees{'macro_in_misc_commands'}{'contents'}[4]{'contents'}[3]{'contents'}[2]{'args'}[0]{'parent'}
 = 
$result_trees{'macro_in_misc_commands'}{'contents'}[4]{'contents'}[3]{'contents'}[2];
-$result_trees{'macro_in_misc_commands'}{'contents'}[4]{'contents'}[3]{'contents'}[2]{'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]{'args'}[0]{'parent'}
 = $result_trees{'macro_in_misc_commands'}{'contents'}[4]{'contents'}[4];
 
$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]{'parent'} 
= $result_trees{'macro_in_misc_commands'}{'contents'}[4];
 
$result_trees{'macro_in_misc_commands'}{'contents'}[4]{'contents'}[6]{'args'}[0]{'parent'}
 = $result_trees{'macro_in_misc_commands'}{'contents'}[4]{'contents'}[6];
 
$result_trees{'macro_in_misc_commands'}{'contents'}[4]{'contents'}[6]{'contents'}[0]{'parent'}
 = $result_trees{'macro_in_misc_commands'}{'contents'}[4]{'contents'}[6];
+$result_trees{'macro_in_misc_commands'}{'contents'}[4]{'contents'}[6]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'macro_in_misc_commands'}{'contents'}[4]{'contents'}[6]{'contents'}[1]{'args'}[0];
+$result_trees{'macro_in_misc_commands'}{'contents'}[4]{'contents'}[6]{'contents'}[1]{'args'}[0]{'parent'}
 = 
$result_trees{'macro_in_misc_commands'}{'contents'}[4]{'contents'}[6]{'contents'}[1];
 
$result_trees{'macro_in_misc_commands'}{'contents'}[4]{'contents'}[6]{'contents'}[1]{'parent'}
 = $result_trees{'macro_in_misc_commands'}{'contents'}[4]{'contents'}[6];
-$result_trees{'macro_in_misc_commands'}{'contents'}[4]{'contents'}[6]{'contents'}[2]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'macro_in_misc_commands'}{'contents'}[4]{'contents'}[6]{'contents'}[2]{'args'}[0];
-$result_trees{'macro_in_misc_commands'}{'contents'}[4]{'contents'}[6]{'contents'}[2]{'args'}[0]{'parent'}
 = 
$result_trees{'macro_in_misc_commands'}{'contents'}[4]{'contents'}[6]{'contents'}[2];
-$result_trees{'macro_in_misc_commands'}{'contents'}[4]{'contents'}[6]{'contents'}[2]{'parent'}
 = $result_trees{'macro_in_misc_commands'}{'contents'}[4]{'contents'}[6];
 
$result_trees{'macro_in_misc_commands'}{'contents'}[4]{'contents'}[6]{'parent'} 
= $result_trees{'macro_in_misc_commands'}{'contents'}[4];
 
$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]{'parent'} = 
$result_trees{'macro_in_misc_commands'};
diff --git a/tp/t/results/macro/macro_name_with_digit.pl 
b/tp/t/results/macro/macro_name_with_digit.pl
index 2f068d64fc..1d970f4498 100644
--- a/tp/t/results/macro/macro_name_with_digit.pl
+++ b/tp/t/results/macro/macro_name_with_digit.pl
@@ -21,14 +21,9 @@ $result_trees{'macro_name_with_digit'} = {
           'contents' => [
             {
               'parent' => {},
-              'text' => 'macro1',
-              'type' => 'raw'
-            },
-            {
-              'parent' => {},
-              'text' => '
+              'text' => 'macro1
 ',
-              'type' => 'last_raw_newline'
+              'type' => 'raw'
             },
             {
               'args' => [
@@ -94,14 +89,9 @@ $result_trees{'macro_name_with_digit'} = {
           'contents' => [
             {
               'parent' => {},
-              'text' => 'expand \\arg\\',
-              'type' => 'raw'
-            },
-            {
-              'parent' => {},
-              'text' => '
+              'text' => 'expand \\arg\\
 ',
-              'type' => 'last_raw_newline'
+              'type' => 'raw'
             },
             {
               'args' => [
@@ -170,19 +160,17 @@ $result_trees{'macro_name_with_digit'} = {
 };
 
$result_trees{'macro_name_with_digit'}{'contents'}[0]{'contents'}[0]{'args'}[0]{'parent'}
 = $result_trees{'macro_name_with_digit'}{'contents'}[0]{'contents'}[0];
 
$result_trees{'macro_name_with_digit'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'parent'}
 = $result_trees{'macro_name_with_digit'}{'contents'}[0]{'contents'}[0];
+$result_trees{'macro_name_with_digit'}{'contents'}[0]{'contents'}[0]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'macro_name_with_digit'}{'contents'}[0]{'contents'}[0]{'contents'}[1]{'args'}[0];
+$result_trees{'macro_name_with_digit'}{'contents'}[0]{'contents'}[0]{'contents'}[1]{'args'}[0]{'parent'}
 = 
$result_trees{'macro_name_with_digit'}{'contents'}[0]{'contents'}[0]{'contents'}[1];
 
$result_trees{'macro_name_with_digit'}{'contents'}[0]{'contents'}[0]{'contents'}[1]{'parent'}
 = $result_trees{'macro_name_with_digit'}{'contents'}[0]{'contents'}[0];
-$result_trees{'macro_name_with_digit'}{'contents'}[0]{'contents'}[0]{'contents'}[2]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'macro_name_with_digit'}{'contents'}[0]{'contents'}[0]{'contents'}[2]{'args'}[0];
-$result_trees{'macro_name_with_digit'}{'contents'}[0]{'contents'}[0]{'contents'}[2]{'args'}[0]{'parent'}
 = 
$result_trees{'macro_name_with_digit'}{'contents'}[0]{'contents'}[0]{'contents'}[2];
-$result_trees{'macro_name_with_digit'}{'contents'}[0]{'contents'}[0]{'contents'}[2]{'parent'}
 = $result_trees{'macro_name_with_digit'}{'contents'}[0]{'contents'}[0];
 $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]{'contents'}[2]{'args'}[0]{'parent'}
 = $result_trees{'macro_name_with_digit'}{'contents'}[0]{'contents'}[2];
 
$result_trees{'macro_name_with_digit'}{'contents'}[0]{'contents'}[2]{'args'}[1]{'parent'}
 = $result_trees{'macro_name_with_digit'}{'contents'}[0]{'contents'}[2];
 
$result_trees{'macro_name_with_digit'}{'contents'}[0]{'contents'}[2]{'contents'}[0]{'parent'}
 = $result_trees{'macro_name_with_digit'}{'contents'}[0]{'contents'}[2];
+$result_trees{'macro_name_with_digit'}{'contents'}[0]{'contents'}[2]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'macro_name_with_digit'}{'contents'}[0]{'contents'}[2]{'contents'}[1]{'args'}[0];
+$result_trees{'macro_name_with_digit'}{'contents'}[0]{'contents'}[2]{'contents'}[1]{'args'}[0]{'parent'}
 = 
$result_trees{'macro_name_with_digit'}{'contents'}[0]{'contents'}[2]{'contents'}[1];
 
$result_trees{'macro_name_with_digit'}{'contents'}[0]{'contents'}[2]{'contents'}[1]{'parent'}
 = $result_trees{'macro_name_with_digit'}{'contents'}[0]{'contents'}[2];
-$result_trees{'macro_name_with_digit'}{'contents'}[0]{'contents'}[2]{'contents'}[2]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'macro_name_with_digit'}{'contents'}[0]{'contents'}[2]{'contents'}[2]{'args'}[0];
-$result_trees{'macro_name_with_digit'}{'contents'}[0]{'contents'}[2]{'contents'}[2]{'args'}[0]{'parent'}
 = 
$result_trees{'macro_name_with_digit'}{'contents'}[0]{'contents'}[2]{'contents'}[2];
-$result_trees{'macro_name_with_digit'}{'contents'}[0]{'contents'}[2]{'contents'}[2]{'parent'}
 = $result_trees{'macro_name_with_digit'}{'contents'}[0]{'contents'}[2];
 $result_trees{'macro_name_with_digit'}{'contents'}[0]{'contents'}[2]{'parent'} 
= $result_trees{'macro_name_with_digit'}{'contents'}[0];
 $result_trees{'macro_name_with_digit'}{'contents'}[0]{'contents'}[3]{'parent'} 
= $result_trees{'macro_name_with_digit'}{'contents'}[0];
 
$result_trees{'macro_name_with_digit'}{'contents'}[0]{'contents'}[4]{'contents'}[0]{'parent'}
 = $result_trees{'macro_name_with_digit'}{'contents'}[0]{'contents'}[4];
diff --git a/tp/t/results/macro/macro_name_with_hyphen.pl 
b/tp/t/results/macro/macro_name_with_hyphen.pl
index 9a8d4fe18c..79627b18fa 100644
--- a/tp/t/results/macro/macro_name_with_hyphen.pl
+++ b/tp/t/results/macro/macro_name_with_hyphen.pl
@@ -31,14 +31,9 @@ $result_trees{'macro_name_with_hyphen'} = {
           'contents' => [
             {
               'parent' => {},
-              'text' => 'This \\arg-one\\ and that \\arg2\\.',
-              'type' => 'raw'
-            },
-            {
-              'parent' => {},
-              'text' => '
+              'text' => 'This \\arg-one\\ and that \\arg2\\.
 ',
-              'type' => 'last_raw_newline'
+              'type' => 'raw'
             },
             {
               'args' => [
@@ -135,10 +130,9 @@ 
$result_trees{'macro_name_with_hyphen'}{'contents'}[0]{'contents'}[0]{'args'}[0]
 
$result_trees{'macro_name_with_hyphen'}{'contents'}[0]{'contents'}[0]{'args'}[1]{'parent'}
 = $result_trees{'macro_name_with_hyphen'}{'contents'}[0]{'contents'}[0];
 
$result_trees{'macro_name_with_hyphen'}{'contents'}[0]{'contents'}[0]{'args'}[2]{'parent'}
 = $result_trees{'macro_name_with_hyphen'}{'contents'}[0]{'contents'}[0];
 
$result_trees{'macro_name_with_hyphen'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'parent'}
 = $result_trees{'macro_name_with_hyphen'}{'contents'}[0]{'contents'}[0];
+$result_trees{'macro_name_with_hyphen'}{'contents'}[0]{'contents'}[0]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'macro_name_with_hyphen'}{'contents'}[0]{'contents'}[0]{'contents'}[1]{'args'}[0];
+$result_trees{'macro_name_with_hyphen'}{'contents'}[0]{'contents'}[0]{'contents'}[1]{'args'}[0]{'parent'}
 = 
$result_trees{'macro_name_with_hyphen'}{'contents'}[0]{'contents'}[0]{'contents'}[1];
 
$result_trees{'macro_name_with_hyphen'}{'contents'}[0]{'contents'}[0]{'contents'}[1]{'parent'}
 = $result_trees{'macro_name_with_hyphen'}{'contents'}[0]{'contents'}[0];
-$result_trees{'macro_name_with_hyphen'}{'contents'}[0]{'contents'}[0]{'contents'}[2]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'macro_name_with_hyphen'}{'contents'}[0]{'contents'}[0]{'contents'}[2]{'args'}[0];
-$result_trees{'macro_name_with_hyphen'}{'contents'}[0]{'contents'}[0]{'contents'}[2]{'args'}[0]{'parent'}
 = 
$result_trees{'macro_name_with_hyphen'}{'contents'}[0]{'contents'}[0]{'contents'}[2];
-$result_trees{'macro_name_with_hyphen'}{'contents'}[0]{'contents'}[0]{'contents'}[2]{'parent'}
 = $result_trees{'macro_name_with_hyphen'}{'contents'}[0]{'contents'}[0];
 
$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]{'contents'}[2]{'contents'}[0]{'parent'}
 = $result_trees{'macro_name_with_hyphen'}{'contents'}[0]{'contents'}[2];
diff --git a/tp/t/results/macro/macro_no_arg_bad_expansion.pl 
b/tp/t/results/macro/macro_no_arg_bad_expansion.pl
index 743b126d32..a734b1a95e 100644
--- a/tp/t/results/macro/macro_no_arg_bad_expansion.pl
+++ b/tp/t/results/macro/macro_no_arg_bad_expansion.pl
@@ -21,14 +21,9 @@ $result_trees{'macro_no_arg_bad_expansion'} = {
           'contents' => [
             {
               'parent' => {},
-              'text' => 'res1',
-              'type' => 'raw'
-            },
-            {
-              'parent' => {},
-              'text' => '
+              'text' => 'res1
 ',
-              'type' => 'last_raw_newline'
+              'type' => 'raw'
             },
             {
               'args' => [
@@ -97,10 +92,9 @@ $result_trees{'macro_no_arg_bad_expansion'} = {
 };
 
$result_trees{'macro_no_arg_bad_expansion'}{'contents'}[0]{'contents'}[0]{'args'}[0]{'parent'}
 = $result_trees{'macro_no_arg_bad_expansion'}{'contents'}[0]{'contents'}[0];
 
$result_trees{'macro_no_arg_bad_expansion'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'parent'}
 = $result_trees{'macro_no_arg_bad_expansion'}{'contents'}[0]{'contents'}[0];
+$result_trees{'macro_no_arg_bad_expansion'}{'contents'}[0]{'contents'}[0]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'macro_no_arg_bad_expansion'}{'contents'}[0]{'contents'}[0]{'contents'}[1]{'args'}[0];
+$result_trees{'macro_no_arg_bad_expansion'}{'contents'}[0]{'contents'}[0]{'contents'}[1]{'args'}[0]{'parent'}
 = 
$result_trees{'macro_no_arg_bad_expansion'}{'contents'}[0]{'contents'}[0]{'contents'}[1];
 
$result_trees{'macro_no_arg_bad_expansion'}{'contents'}[0]{'contents'}[0]{'contents'}[1]{'parent'}
 = $result_trees{'macro_no_arg_bad_expansion'}{'contents'}[0]{'contents'}[0];
-$result_trees{'macro_no_arg_bad_expansion'}{'contents'}[0]{'contents'}[0]{'contents'}[2]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'macro_no_arg_bad_expansion'}{'contents'}[0]{'contents'}[0]{'contents'}[2]{'args'}[0];
-$result_trees{'macro_no_arg_bad_expansion'}{'contents'}[0]{'contents'}[0]{'contents'}[2]{'args'}[0]{'parent'}
 = 
$result_trees{'macro_no_arg_bad_expansion'}{'contents'}[0]{'contents'}[0]{'contents'}[2];
-$result_trees{'macro_no_arg_bad_expansion'}{'contents'}[0]{'contents'}[0]{'contents'}[2]{'parent'}
 = $result_trees{'macro_no_arg_bad_expansion'}{'contents'}[0]{'contents'}[0];
 
$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]{'contents'}[2]{'contents'}[0]{'parent'}
 = $result_trees{'macro_no_arg_bad_expansion'}{'contents'}[0]{'contents'}[2];
diff --git a/tp/t/results/macro/macro_no_arg_expansion.pl 
b/tp/t/results/macro/macro_no_arg_expansion.pl
index 984c18865b..926f9a6b4d 100644
--- a/tp/t/results/macro/macro_no_arg_expansion.pl
+++ b/tp/t/results/macro/macro_no_arg_expansion.pl
@@ -21,14 +21,9 @@ $result_trees{'macro_no_arg_expansion'} = {
           'contents' => [
             {
               'parent' => {},
-              'text' => 'res1',
-              'type' => 'raw'
-            },
-            {
-              'parent' => {},
-              'text' => '
+              'text' => 'res1
 ',
-              'type' => 'last_raw_newline'
+              'type' => 'raw'
             },
             {
               'args' => [
@@ -97,10 +92,9 @@ $result_trees{'macro_no_arg_expansion'} = {
 };
 
$result_trees{'macro_no_arg_expansion'}{'contents'}[0]{'contents'}[0]{'args'}[0]{'parent'}
 = $result_trees{'macro_no_arg_expansion'}{'contents'}[0]{'contents'}[0];
 
$result_trees{'macro_no_arg_expansion'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'parent'}
 = $result_trees{'macro_no_arg_expansion'}{'contents'}[0]{'contents'}[0];
+$result_trees{'macro_no_arg_expansion'}{'contents'}[0]{'contents'}[0]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'macro_no_arg_expansion'}{'contents'}[0]{'contents'}[0]{'contents'}[1]{'args'}[0];
+$result_trees{'macro_no_arg_expansion'}{'contents'}[0]{'contents'}[0]{'contents'}[1]{'args'}[0]{'parent'}
 = 
$result_trees{'macro_no_arg_expansion'}{'contents'}[0]{'contents'}[0]{'contents'}[1];
 
$result_trees{'macro_no_arg_expansion'}{'contents'}[0]{'contents'}[0]{'contents'}[1]{'parent'}
 = $result_trees{'macro_no_arg_expansion'}{'contents'}[0]{'contents'}[0];
-$result_trees{'macro_no_arg_expansion'}{'contents'}[0]{'contents'}[0]{'contents'}[2]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'macro_no_arg_expansion'}{'contents'}[0]{'contents'}[0]{'contents'}[2]{'args'}[0];
-$result_trees{'macro_no_arg_expansion'}{'contents'}[0]{'contents'}[0]{'contents'}[2]{'args'}[0]{'parent'}
 = 
$result_trees{'macro_no_arg_expansion'}{'contents'}[0]{'contents'}[0]{'contents'}[2];
-$result_trees{'macro_no_arg_expansion'}{'contents'}[0]{'contents'}[0]{'contents'}[2]{'parent'}
 = $result_trees{'macro_no_arg_expansion'}{'contents'}[0]{'contents'}[0];
 
$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]{'contents'}[2]{'contents'}[0]{'parent'}
 = $result_trees{'macro_no_arg_expansion'}{'contents'}[0]{'contents'}[2];
diff --git a/tp/t/results/macro/macro_one_arg_end_of_file.pl 
b/tp/t/results/macro/macro_one_arg_end_of_file.pl
index 2f07063d34..7a99ca1c36 100644
--- a/tp/t/results/macro/macro_one_arg_end_of_file.pl
+++ b/tp/t/results/macro/macro_one_arg_end_of_file.pl
@@ -26,14 +26,9 @@ $result_trees{'macro_one_arg_end_of_file'} = {
           'contents' => [
             {
               'parent' => {},
-              'text' => 'Arg \\arg\\.',
-              'type' => 'raw'
-            },
-            {
-              'parent' => {},
-              'text' => '
+              'text' => 'Arg \\arg\\.
 ',
-              'type' => 'last_raw_newline'
+              'type' => 'raw'
             },
             {
               'args' => [
@@ -102,10 +97,9 @@ $result_trees{'macro_one_arg_end_of_file'} = {
 
$result_trees{'macro_one_arg_end_of_file'}{'contents'}[0]{'contents'}[0]{'args'}[0]{'parent'}
 = $result_trees{'macro_one_arg_end_of_file'}{'contents'}[0]{'contents'}[0];
 
$result_trees{'macro_one_arg_end_of_file'}{'contents'}[0]{'contents'}[0]{'args'}[1]{'parent'}
 = $result_trees{'macro_one_arg_end_of_file'}{'contents'}[0]{'contents'}[0];
 
$result_trees{'macro_one_arg_end_of_file'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'parent'}
 = $result_trees{'macro_one_arg_end_of_file'}{'contents'}[0]{'contents'}[0];
+$result_trees{'macro_one_arg_end_of_file'}{'contents'}[0]{'contents'}[0]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'macro_one_arg_end_of_file'}{'contents'}[0]{'contents'}[0]{'contents'}[1]{'args'}[0];
+$result_trees{'macro_one_arg_end_of_file'}{'contents'}[0]{'contents'}[0]{'contents'}[1]{'args'}[0]{'parent'}
 = 
$result_trees{'macro_one_arg_end_of_file'}{'contents'}[0]{'contents'}[0]{'contents'}[1];
 
$result_trees{'macro_one_arg_end_of_file'}{'contents'}[0]{'contents'}[0]{'contents'}[1]{'parent'}
 = $result_trees{'macro_one_arg_end_of_file'}{'contents'}[0]{'contents'}[0];
-$result_trees{'macro_one_arg_end_of_file'}{'contents'}[0]{'contents'}[0]{'contents'}[2]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'macro_one_arg_end_of_file'}{'contents'}[0]{'contents'}[0]{'contents'}[2]{'args'}[0];
-$result_trees{'macro_one_arg_end_of_file'}{'contents'}[0]{'contents'}[0]{'contents'}[2]{'args'}[0]{'parent'}
 = 
$result_trees{'macro_one_arg_end_of_file'}{'contents'}[0]{'contents'}[0]{'contents'}[2];
-$result_trees{'macro_one_arg_end_of_file'}{'contents'}[0]{'contents'}[0]{'contents'}[2]{'parent'}
 = $result_trees{'macro_one_arg_end_of_file'}{'contents'}[0]{'contents'}[0];
 
$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]{'contents'}[2]{'contents'}[0]{'parent'}
 = $result_trees{'macro_one_arg_end_of_file'}{'contents'}[0]{'contents'}[2];
diff --git a/tp/t/results/macro/macro_with_error_at_end_line_after_macro.pl 
b/tp/t/results/macro/macro_with_error_at_end_line_after_macro.pl
index 388e37e53d..04a21214b0 100644
--- a/tp/t/results/macro/macro_with_error_at_end_line_after_macro.pl
+++ b/tp/t/results/macro/macro_with_error_at_end_line_after_macro.pl
@@ -26,14 +26,9 @@ $result_trees{'macro_with_error_at_end_line_after_macro'} = {
           'contents' => [
             {
               'parent' => {},
-              'text' => '@center',
-              'type' => 'raw'
-            },
-            {
-              'parent' => {},
-              'text' => '
+              'text' => '@center
 ',
-              'type' => 'last_raw_newline'
+              'type' => 'raw'
             },
             {
               'args' => [
@@ -115,10 +110,9 @@ $result_trees{'macro_with_error_at_end_line_after_macro'} 
= {
 
$result_trees{'macro_with_error_at_end_line_after_macro'}{'contents'}[0]{'contents'}[0]{'args'}[0]{'parent'}
 = 
$result_trees{'macro_with_error_at_end_line_after_macro'}{'contents'}[0]{'contents'}[0];
 
$result_trees{'macro_with_error_at_end_line_after_macro'}{'contents'}[0]{'contents'}[0]{'args'}[1]{'parent'}
 = 
$result_trees{'macro_with_error_at_end_line_after_macro'}{'contents'}[0]{'contents'}[0];
 
$result_trees{'macro_with_error_at_end_line_after_macro'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'macro_with_error_at_end_line_after_macro'}{'contents'}[0]{'contents'}[0];
+$result_trees{'macro_with_error_at_end_line_after_macro'}{'contents'}[0]{'contents'}[0]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'macro_with_error_at_end_line_after_macro'}{'contents'}[0]{'contents'}[0]{'contents'}[1]{'args'}[0];
+$result_trees{'macro_with_error_at_end_line_after_macro'}{'contents'}[0]{'contents'}[0]{'contents'}[1]{'args'}[0]{'parent'}
 = 
$result_trees{'macro_with_error_at_end_line_after_macro'}{'contents'}[0]{'contents'}[0]{'contents'}[1];
 
$result_trees{'macro_with_error_at_end_line_after_macro'}{'contents'}[0]{'contents'}[0]{'contents'}[1]{'parent'}
 = 
$result_trees{'macro_with_error_at_end_line_after_macro'}{'contents'}[0]{'contents'}[0];
-$result_trees{'macro_with_error_at_end_line_after_macro'}{'contents'}[0]{'contents'}[0]{'contents'}[2]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'macro_with_error_at_end_line_after_macro'}{'contents'}[0]{'contents'}[0]{'contents'}[2]{'args'}[0];
-$result_trees{'macro_with_error_at_end_line_after_macro'}{'contents'}[0]{'contents'}[0]{'contents'}[2]{'args'}[0]{'parent'}
 = 
$result_trees{'macro_with_error_at_end_line_after_macro'}{'contents'}[0]{'contents'}[0]{'contents'}[2];
-$result_trees{'macro_with_error_at_end_line_after_macro'}{'contents'}[0]{'contents'}[0]{'contents'}[2]{'parent'}
 = 
$result_trees{'macro_with_error_at_end_line_after_macro'}{'contents'}[0]{'contents'}[0];
 
$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]{'contents'}[2]{'args'}[0]{'parent'}
 = 
$result_trees{'macro_with_error_at_end_line_after_macro'}{'contents'}[0]{'contents'}[2];
diff --git a/tp/t/results/macro/macro_zero.pl b/tp/t/results/macro/macro_zero.pl
index 5cdeaf0309..06ecad30c4 100644
--- a/tp/t/results/macro/macro_zero.pl
+++ b/tp/t/results/macro/macro_zero.pl
@@ -21,14 +21,9 @@ $result_trees{'macro_zero'} = {
           'contents' => [
             {
               'parent' => {},
-              'text' => '0',
-              'type' => 'raw'
-            },
-            {
-              'parent' => {},
-              'text' => '
+              'text' => '0
 ',
-              'type' => 'last_raw_newline'
+              'type' => 'raw'
             },
             {
               'args' => [
@@ -102,10 +97,9 @@ $result_trees{'macro_zero'} = {
 };
 $result_trees{'macro_zero'}{'contents'}[0]{'contents'}[0]{'args'}[0]{'parent'} 
= $result_trees{'macro_zero'}{'contents'}[0]{'contents'}[0];
 
$result_trees{'macro_zero'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'parent'}
 = $result_trees{'macro_zero'}{'contents'}[0]{'contents'}[0];
+$result_trees{'macro_zero'}{'contents'}[0]{'contents'}[0]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'macro_zero'}{'contents'}[0]{'contents'}[0]{'contents'}[1]{'args'}[0];
+$result_trees{'macro_zero'}{'contents'}[0]{'contents'}[0]{'contents'}[1]{'args'}[0]{'parent'}
 = $result_trees{'macro_zero'}{'contents'}[0]{'contents'}[0]{'contents'}[1];
 
$result_trees{'macro_zero'}{'contents'}[0]{'contents'}[0]{'contents'}[1]{'parent'}
 = $result_trees{'macro_zero'}{'contents'}[0]{'contents'}[0];
-$result_trees{'macro_zero'}{'contents'}[0]{'contents'}[0]{'contents'}[2]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'macro_zero'}{'contents'}[0]{'contents'}[0]{'contents'}[2]{'args'}[0];
-$result_trees{'macro_zero'}{'contents'}[0]{'contents'}[0]{'contents'}[2]{'args'}[0]{'parent'}
 = $result_trees{'macro_zero'}{'contents'}[0]{'contents'}[0]{'contents'}[2];
-$result_trees{'macro_zero'}{'contents'}[0]{'contents'}[0]{'contents'}[2]{'parent'}
 = $result_trees{'macro_zero'}{'contents'}[0]{'contents'}[0];
 $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]{'contents'}[2]{'contents'}[0]{'parent'}
 = $result_trees{'macro_zero'}{'contents'}[0]{'contents'}[2];
diff --git a/tp/t/results/macro/nested_macro_call.pl 
b/tp/t/results/macro/nested_macro_call.pl
index 3a8fca2cd8..6ee694d548 100644
--- a/tp/t/results/macro/nested_macro_call.pl
+++ b/tp/t/results/macro/nested_macro_call.pl
@@ -21,14 +21,9 @@ $result_trees{'nested_macro_call'} = {
           'contents' => [
             {
               'parent' => {},
-              'text' => '(machin)',
-              'type' => 'raw'
-            },
-            {
-              'parent' => {},
-              'text' => '
+              'text' => '(machin)
 ',
-              'type' => 'last_raw_newline'
+              'type' => 'raw'
             },
             {
               'args' => [
@@ -93,16 +88,11 @@ $result_trees{'nested_macro_call'} = {
 ',
               'type' => 'raw'
             },
-            {
-              'parent' => {},
-              'text' => '',
-              'type' => 'raw'
-            },
             {
               'parent' => {},
               'text' => '
 ',
-              'type' => 'last_raw_newline'
+              'type' => 'raw'
             },
             {
               'args' => [
@@ -176,19 +166,17 @@ $result_trees{'nested_macro_call'} = {
 };
 
$result_trees{'nested_macro_call'}{'contents'}[0]{'contents'}[0]{'args'}[0]{'parent'}
 = $result_trees{'nested_macro_call'}{'contents'}[0]{'contents'}[0];
 
$result_trees{'nested_macro_call'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'parent'}
 = $result_trees{'nested_macro_call'}{'contents'}[0]{'contents'}[0];
+$result_trees{'nested_macro_call'}{'contents'}[0]{'contents'}[0]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'nested_macro_call'}{'contents'}[0]{'contents'}[0]{'contents'}[1]{'args'}[0];
+$result_trees{'nested_macro_call'}{'contents'}[0]{'contents'}[0]{'contents'}[1]{'args'}[0]{'parent'}
 = 
$result_trees{'nested_macro_call'}{'contents'}[0]{'contents'}[0]{'contents'}[1];
 
$result_trees{'nested_macro_call'}{'contents'}[0]{'contents'}[0]{'contents'}[1]{'parent'}
 = $result_trees{'nested_macro_call'}{'contents'}[0]{'contents'}[0];
-$result_trees{'nested_macro_call'}{'contents'}[0]{'contents'}[0]{'contents'}[2]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'nested_macro_call'}{'contents'}[0]{'contents'}[0]{'contents'}[2]{'args'}[0];
-$result_trees{'nested_macro_call'}{'contents'}[0]{'contents'}[0]{'contents'}[2]{'args'}[0]{'parent'}
 = 
$result_trees{'nested_macro_call'}{'contents'}[0]{'contents'}[0]{'contents'}[2];
-$result_trees{'nested_macro_call'}{'contents'}[0]{'contents'}[0]{'contents'}[2]{'parent'}
 = $result_trees{'nested_macro_call'}{'contents'}[0]{'contents'}[0];
 $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]{'contents'}[2]{'args'}[0]{'parent'}
 = $result_trees{'nested_macro_call'}{'contents'}[0]{'contents'}[2];
 
$result_trees{'nested_macro_call'}{'contents'}[0]{'contents'}[2]{'contents'}[0]{'parent'}
 = $result_trees{'nested_macro_call'}{'contents'}[0]{'contents'}[2];
 
$result_trees{'nested_macro_call'}{'contents'}[0]{'contents'}[2]{'contents'}[1]{'parent'}
 = $result_trees{'nested_macro_call'}{'contents'}[0]{'contents'}[2];
+$result_trees{'nested_macro_call'}{'contents'}[0]{'contents'}[2]{'contents'}[2]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'nested_macro_call'}{'contents'}[0]{'contents'}[2]{'contents'}[2]{'args'}[0];
+$result_trees{'nested_macro_call'}{'contents'}[0]{'contents'}[2]{'contents'}[2]{'args'}[0]{'parent'}
 = 
$result_trees{'nested_macro_call'}{'contents'}[0]{'contents'}[2]{'contents'}[2];
 
$result_trees{'nested_macro_call'}{'contents'}[0]{'contents'}[2]{'contents'}[2]{'parent'}
 = $result_trees{'nested_macro_call'}{'contents'}[0]{'contents'}[2];
-$result_trees{'nested_macro_call'}{'contents'}[0]{'contents'}[2]{'contents'}[3]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'nested_macro_call'}{'contents'}[0]{'contents'}[2]{'contents'}[3]{'args'}[0];
-$result_trees{'nested_macro_call'}{'contents'}[0]{'contents'}[2]{'contents'}[3]{'args'}[0]{'parent'}
 = 
$result_trees{'nested_macro_call'}{'contents'}[0]{'contents'}[2]{'contents'}[3];
-$result_trees{'nested_macro_call'}{'contents'}[0]{'contents'}[2]{'contents'}[3]{'parent'}
 = $result_trees{'nested_macro_call'}{'contents'}[0]{'contents'}[2];
 $result_trees{'nested_macro_call'}{'contents'}[0]{'contents'}[2]{'parent'} = 
$result_trees{'nested_macro_call'}{'contents'}[0];
 $result_trees{'nested_macro_call'}{'contents'}[0]{'contents'}[3]{'parent'} = 
$result_trees{'nested_macro_call'}{'contents'}[0];
 
$result_trees{'nested_macro_call'}{'contents'}[0]{'contents'}[4]{'contents'}[0]{'parent'}
 = $result_trees{'nested_macro_call'}{'contents'}[0]{'contents'}[4];
diff --git a/tp/t/results/macro/paragraph_and_macro.pl 
b/tp/t/results/macro/paragraph_and_macro.pl
index bd86e7fa98..d967b8ec3d 100644
--- a/tp/t/results/macro/paragraph_and_macro.pl
+++ b/tp/t/results/macro/paragraph_and_macro.pl
@@ -78,14 +78,9 @@ $result_trees{'paragraph_and_macro'} = {
           'contents' => [
             {
               'parent' => {},
-              'text' => '   ',
-              'type' => 'raw'
-            },
-            {
-              'parent' => {},
-              'text' => '
+              'text' => '   
 ',
-              'type' => 'last_raw_newline'
+              'type' => 'raw'
             },
             {
               'args' => [
@@ -146,14 +141,9 @@ $result_trees{'paragraph_and_macro'} = {
           'contents' => [
             {
               'parent' => {},
-              'text' => 'a word',
-              'type' => 'raw'
-            },
-            {
-              'parent' => {},
-              'text' => '
+              'text' => 'a word
 ',
-              'type' => 'last_raw_newline'
+              'type' => 'raw'
             },
             {
               'args' => [
@@ -303,18 +293,16 @@ 
$result_trees{'paragraph_and_macro'}{'contents'}[0]{'contents'}[0]{'parent'} = $
 $result_trees{'paragraph_and_macro'}{'contents'}[0]{'contents'}[1]{'parent'} = 
$result_trees{'paragraph_and_macro'}{'contents'}[0];
 
$result_trees{'paragraph_and_macro'}{'contents'}[0]{'contents'}[2]{'args'}[0]{'parent'}
 = $result_trees{'paragraph_and_macro'}{'contents'}[0]{'contents'}[2];
 
$result_trees{'paragraph_and_macro'}{'contents'}[0]{'contents'}[2]{'contents'}[0]{'parent'}
 = $result_trees{'paragraph_and_macro'}{'contents'}[0]{'contents'}[2];
+$result_trees{'paragraph_and_macro'}{'contents'}[0]{'contents'}[2]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'paragraph_and_macro'}{'contents'}[0]{'contents'}[2]{'contents'}[1]{'args'}[0];
+$result_trees{'paragraph_and_macro'}{'contents'}[0]{'contents'}[2]{'contents'}[1]{'args'}[0]{'parent'}
 = 
$result_trees{'paragraph_and_macro'}{'contents'}[0]{'contents'}[2]{'contents'}[1];
 
$result_trees{'paragraph_and_macro'}{'contents'}[0]{'contents'}[2]{'contents'}[1]{'parent'}
 = $result_trees{'paragraph_and_macro'}{'contents'}[0]{'contents'}[2];
-$result_trees{'paragraph_and_macro'}{'contents'}[0]{'contents'}[2]{'contents'}[2]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'paragraph_and_macro'}{'contents'}[0]{'contents'}[2]{'contents'}[2]{'args'}[0];
-$result_trees{'paragraph_and_macro'}{'contents'}[0]{'contents'}[2]{'contents'}[2]{'args'}[0]{'parent'}
 = 
$result_trees{'paragraph_and_macro'}{'contents'}[0]{'contents'}[2]{'contents'}[2];
-$result_trees{'paragraph_and_macro'}{'contents'}[0]{'contents'}[2]{'contents'}[2]{'parent'}
 = $result_trees{'paragraph_and_macro'}{'contents'}[0]{'contents'}[2];
 $result_trees{'paragraph_and_macro'}{'contents'}[0]{'contents'}[2]{'parent'} = 
$result_trees{'paragraph_and_macro'}{'contents'}[0];
 $result_trees{'paragraph_and_macro'}{'contents'}[0]{'contents'}[3]{'parent'} = 
$result_trees{'paragraph_and_macro'}{'contents'}[0];
 
$result_trees{'paragraph_and_macro'}{'contents'}[0]{'contents'}[4]{'args'}[0]{'parent'}
 = $result_trees{'paragraph_and_macro'}{'contents'}[0]{'contents'}[4];
 
$result_trees{'paragraph_and_macro'}{'contents'}[0]{'contents'}[4]{'contents'}[0]{'parent'}
 = $result_trees{'paragraph_and_macro'}{'contents'}[0]{'contents'}[4];
+$result_trees{'paragraph_and_macro'}{'contents'}[0]{'contents'}[4]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'paragraph_and_macro'}{'contents'}[0]{'contents'}[4]{'contents'}[1]{'args'}[0];
+$result_trees{'paragraph_and_macro'}{'contents'}[0]{'contents'}[4]{'contents'}[1]{'args'}[0]{'parent'}
 = 
$result_trees{'paragraph_and_macro'}{'contents'}[0]{'contents'}[4]{'contents'}[1];
 
$result_trees{'paragraph_and_macro'}{'contents'}[0]{'contents'}[4]{'contents'}[1]{'parent'}
 = $result_trees{'paragraph_and_macro'}{'contents'}[0]{'contents'}[4];
-$result_trees{'paragraph_and_macro'}{'contents'}[0]{'contents'}[4]{'contents'}[2]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'paragraph_and_macro'}{'contents'}[0]{'contents'}[4]{'contents'}[2]{'args'}[0];
-$result_trees{'paragraph_and_macro'}{'contents'}[0]{'contents'}[4]{'contents'}[2]{'args'}[0]{'parent'}
 = 
$result_trees{'paragraph_and_macro'}{'contents'}[0]{'contents'}[4]{'contents'}[2];
-$result_trees{'paragraph_and_macro'}{'contents'}[0]{'contents'}[4]{'contents'}[2]{'parent'}
 = $result_trees{'paragraph_and_macro'}{'contents'}[0]{'contents'}[4];
 $result_trees{'paragraph_and_macro'}{'contents'}[0]{'contents'}[4]{'parent'} = 
$result_trees{'paragraph_and_macro'}{'contents'}[0];
 $result_trees{'paragraph_and_macro'}{'contents'}[0]{'contents'}[5]{'parent'} = 
$result_trees{'paragraph_and_macro'}{'contents'}[0];
 $result_trees{'paragraph_and_macro'}{'contents'}[0]{'contents'}[6]{'parent'} = 
$result_trees{'paragraph_and_macro'}{'contents'}[0];
diff --git a/tp/t/results/macro/protect_comma_macro_line.pl 
b/tp/t/results/macro/protect_comma_macro_line.pl
index 12e8b891e8..a970ad1f0a 100644
--- a/tp/t/results/macro/protect_comma_macro_line.pl
+++ b/tp/t/results/macro/protect_comma_macro_line.pl
@@ -44,14 +44,9 @@ $result_trees{'protect_comma_macro_line'} = {
             },
             {
               'parent' => {},
-              'text' => 'and a last in another paragraph',
-              'type' => 'raw'
-            },
-            {
-              'parent' => {},
-              'text' => '
+              'text' => 'and a last in another paragraph
 ',
-              'type' => 'last_raw_newline'
+              'type' => 'raw'
             },
             {
               'args' => [
@@ -146,10 +141,9 @@ 
$result_trees{'protect_comma_macro_line'}{'contents'}[0]{'contents'}[0]{'content
 
$result_trees{'protect_comma_macro_line'}{'contents'}[0]{'contents'}[0]{'contents'}[1]{'parent'}
 = $result_trees{'protect_comma_macro_line'}{'contents'}[0]{'contents'}[0];
 
$result_trees{'protect_comma_macro_line'}{'contents'}[0]{'contents'}[0]{'contents'}[2]{'parent'}
 = $result_trees{'protect_comma_macro_line'}{'contents'}[0]{'contents'}[0];
 
$result_trees{'protect_comma_macro_line'}{'contents'}[0]{'contents'}[0]{'contents'}[3]{'parent'}
 = $result_trees{'protect_comma_macro_line'}{'contents'}[0]{'contents'}[0];
+$result_trees{'protect_comma_macro_line'}{'contents'}[0]{'contents'}[0]{'contents'}[4]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'protect_comma_macro_line'}{'contents'}[0]{'contents'}[0]{'contents'}[4]{'args'}[0];
+$result_trees{'protect_comma_macro_line'}{'contents'}[0]{'contents'}[0]{'contents'}[4]{'args'}[0]{'parent'}
 = 
$result_trees{'protect_comma_macro_line'}{'contents'}[0]{'contents'}[0]{'contents'}[4];
 
$result_trees{'protect_comma_macro_line'}{'contents'}[0]{'contents'}[0]{'contents'}[4]{'parent'}
 = $result_trees{'protect_comma_macro_line'}{'contents'}[0]{'contents'}[0];
-$result_trees{'protect_comma_macro_line'}{'contents'}[0]{'contents'}[0]{'contents'}[5]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'protect_comma_macro_line'}{'contents'}[0]{'contents'}[0]{'contents'}[5]{'args'}[0];
-$result_trees{'protect_comma_macro_line'}{'contents'}[0]{'contents'}[0]{'contents'}[5]{'args'}[0]{'parent'}
 = 
$result_trees{'protect_comma_macro_line'}{'contents'}[0]{'contents'}[0]{'contents'}[5];
-$result_trees{'protect_comma_macro_line'}{'contents'}[0]{'contents'}[0]{'contents'}[5]{'parent'}
 = $result_trees{'protect_comma_macro_line'}{'contents'}[0]{'contents'}[0];
 
$result_trees{'protect_comma_macro_line'}{'contents'}[0]{'contents'}[0]{'parent'}
 = $result_trees{'protect_comma_macro_line'}{'contents'}[0];
 
$result_trees{'protect_comma_macro_line'}{'contents'}[0]{'contents'}[1]{'parent'}
 = $result_trees{'protect_comma_macro_line'}{'contents'}[0];
 
$result_trees{'protect_comma_macro_line'}{'contents'}[0]{'contents'}[2]{'contents'}[0]{'parent'}
 = $result_trees{'protect_comma_macro_line'}{'contents'}[0]{'contents'}[2];
diff --git a/tp/t/results/macro/protect_in_body.pl 
b/tp/t/results/macro/protect_in_body.pl
index 8111f854c1..c083ff1cce 100644
--- a/tp/t/results/macro/protect_in_body.pl
+++ b/tp/t/results/macro/protect_in_body.pl
@@ -31,14 +31,9 @@ $result_trees{'protect_in_body'} = {
           'contents' => [
             {
               'parent' => {},
-              'text' => 'result: @emph{\\arg1\\} protected \\\\ -> 
\\\\arg1\\\\ @emph{\\arg2\\}',
-              'type' => 'raw'
-            },
-            {
-              'parent' => {},
-              'text' => '
+              'text' => 'result: @emph{\\arg1\\} protected \\\\ -> 
\\\\arg1\\\\ @emph{\\arg2\\}
 ',
-              'type' => 'last_raw_newline'
+              'type' => 'raw'
             },
             {
               'args' => [
@@ -179,10 +174,9 @@ 
$result_trees{'protect_in_body'}{'contents'}[0]{'contents'}[0]{'args'}[0]{'paren
 
$result_trees{'protect_in_body'}{'contents'}[0]{'contents'}[0]{'args'}[1]{'parent'}
 = $result_trees{'protect_in_body'}{'contents'}[0]{'contents'}[0];
 
$result_trees{'protect_in_body'}{'contents'}[0]{'contents'}[0]{'args'}[2]{'parent'}
 = $result_trees{'protect_in_body'}{'contents'}[0]{'contents'}[0];
 
$result_trees{'protect_in_body'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'parent'}
 = $result_trees{'protect_in_body'}{'contents'}[0]{'contents'}[0];
+$result_trees{'protect_in_body'}{'contents'}[0]{'contents'}[0]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'protect_in_body'}{'contents'}[0]{'contents'}[0]{'contents'}[1]{'args'}[0];
+$result_trees{'protect_in_body'}{'contents'}[0]{'contents'}[0]{'contents'}[1]{'args'}[0]{'parent'}
 = 
$result_trees{'protect_in_body'}{'contents'}[0]{'contents'}[0]{'contents'}[1];
 
$result_trees{'protect_in_body'}{'contents'}[0]{'contents'}[0]{'contents'}[1]{'parent'}
 = $result_trees{'protect_in_body'}{'contents'}[0]{'contents'}[0];
-$result_trees{'protect_in_body'}{'contents'}[0]{'contents'}[0]{'contents'}[2]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'protect_in_body'}{'contents'}[0]{'contents'}[0]{'contents'}[2]{'args'}[0];
-$result_trees{'protect_in_body'}{'contents'}[0]{'contents'}[0]{'contents'}[2]{'args'}[0]{'parent'}
 = 
$result_trees{'protect_in_body'}{'contents'}[0]{'contents'}[0]{'contents'}[2];
-$result_trees{'protect_in_body'}{'contents'}[0]{'contents'}[0]{'contents'}[2]{'parent'}
 = $result_trees{'protect_in_body'}{'contents'}[0]{'contents'}[0];
 $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]{'contents'}[2]{'contents'}[0]{'parent'}
 = $result_trees{'protect_in_body'}{'contents'}[0]{'contents'}[2];
diff --git a/tp/t/results/macro/protect_in_body_line_arg.pl 
b/tp/t/results/macro/protect_in_body_line_arg.pl
index 474fd411ea..e3d2dd9092 100644
--- a/tp/t/results/macro/protect_in_body_line_arg.pl
+++ b/tp/t/results/macro/protect_in_body_line_arg.pl
@@ -31,14 +31,9 @@ $result_trees{'protect_in_body_line_arg'} = {
           'contents' => [
             {
               'parent' => {},
-              'text' => 'result: @emph{\\arg1\\} protected \\\\ -> 
\\\\arg1\\\\ @emph{\\arg2\\}',
-              'type' => 'raw'
-            },
-            {
-              'parent' => {},
-              'text' => '
+              'text' => 'result: @emph{\\arg1\\} protected \\\\ -> 
\\\\arg1\\\\ @emph{\\arg2\\}
 ',
-              'type' => 'last_raw_newline'
+              'type' => 'raw'
             },
             {
               'args' => [
@@ -177,10 +172,9 @@ 
$result_trees{'protect_in_body_line_arg'}{'contents'}[0]{'contents'}[0]{'args'}[
 
$result_trees{'protect_in_body_line_arg'}{'contents'}[0]{'contents'}[0]{'args'}[1]{'parent'}
 = $result_trees{'protect_in_body_line_arg'}{'contents'}[0]{'contents'}[0];
 
$result_trees{'protect_in_body_line_arg'}{'contents'}[0]{'contents'}[0]{'args'}[2]{'parent'}
 = $result_trees{'protect_in_body_line_arg'}{'contents'}[0]{'contents'}[0];
 
$result_trees{'protect_in_body_line_arg'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'parent'}
 = $result_trees{'protect_in_body_line_arg'}{'contents'}[0]{'contents'}[0];
+$result_trees{'protect_in_body_line_arg'}{'contents'}[0]{'contents'}[0]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'protect_in_body_line_arg'}{'contents'}[0]{'contents'}[0]{'contents'}[1]{'args'}[0];
+$result_trees{'protect_in_body_line_arg'}{'contents'}[0]{'contents'}[0]{'contents'}[1]{'args'}[0]{'parent'}
 = 
$result_trees{'protect_in_body_line_arg'}{'contents'}[0]{'contents'}[0]{'contents'}[1];
 
$result_trees{'protect_in_body_line_arg'}{'contents'}[0]{'contents'}[0]{'contents'}[1]{'parent'}
 = $result_trees{'protect_in_body_line_arg'}{'contents'}[0]{'contents'}[0];
-$result_trees{'protect_in_body_line_arg'}{'contents'}[0]{'contents'}[0]{'contents'}[2]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'protect_in_body_line_arg'}{'contents'}[0]{'contents'}[0]{'contents'}[2]{'args'}[0];
-$result_trees{'protect_in_body_line_arg'}{'contents'}[0]{'contents'}[0]{'contents'}[2]{'args'}[0]{'parent'}
 = 
$result_trees{'protect_in_body_line_arg'}{'contents'}[0]{'contents'}[0]{'contents'}[2];
-$result_trees{'protect_in_body_line_arg'}{'contents'}[0]{'contents'}[0]{'contents'}[2]{'parent'}
 = $result_trees{'protect_in_body_line_arg'}{'contents'}[0]{'contents'}[0];
 
$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]{'contents'}[2]{'contents'}[0]{'parent'}
 = $result_trees{'protect_in_body_line_arg'}{'contents'}[0]{'contents'}[2];
diff --git a/tp/t/results/macro/protect_in_body_one_arg.pl 
b/tp/t/results/macro/protect_in_body_one_arg.pl
index 75538ff86b..918fd06c9f 100644
--- a/tp/t/results/macro/protect_in_body_one_arg.pl
+++ b/tp/t/results/macro/protect_in_body_one_arg.pl
@@ -31,14 +31,9 @@ $result_trees{'protect_in_body_one_arg'} = {
           'contents' => [
             {
               'parent' => {},
-              'text' => 'result: @emph{\\arg1\\} protected \\\\ -> 
\\\\arg1\\\\ @emph{\\arg2\\}',
-              'type' => 'raw'
-            },
-            {
-              'parent' => {},
-              'text' => '
+              'text' => 'result: @emph{\\arg1\\} protected \\\\ -> 
\\\\arg1\\\\ @emph{\\arg2\\}
 ',
-              'type' => 'last_raw_newline'
+              'type' => 'raw'
             },
             {
               'args' => [
@@ -174,10 +169,9 @@ 
$result_trees{'protect_in_body_one_arg'}{'contents'}[0]{'contents'}[0]{'args'}[0
 
$result_trees{'protect_in_body_one_arg'}{'contents'}[0]{'contents'}[0]{'args'}[1]{'parent'}
 = $result_trees{'protect_in_body_one_arg'}{'contents'}[0]{'contents'}[0];
 
$result_trees{'protect_in_body_one_arg'}{'contents'}[0]{'contents'}[0]{'args'}[2]{'parent'}
 = $result_trees{'protect_in_body_one_arg'}{'contents'}[0]{'contents'}[0];
 
$result_trees{'protect_in_body_one_arg'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'parent'}
 = $result_trees{'protect_in_body_one_arg'}{'contents'}[0]{'contents'}[0];
+$result_trees{'protect_in_body_one_arg'}{'contents'}[0]{'contents'}[0]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'protect_in_body_one_arg'}{'contents'}[0]{'contents'}[0]{'contents'}[1]{'args'}[0];
+$result_trees{'protect_in_body_one_arg'}{'contents'}[0]{'contents'}[0]{'contents'}[1]{'args'}[0]{'parent'}
 = 
$result_trees{'protect_in_body_one_arg'}{'contents'}[0]{'contents'}[0]{'contents'}[1];
 
$result_trees{'protect_in_body_one_arg'}{'contents'}[0]{'contents'}[0]{'contents'}[1]{'parent'}
 = $result_trees{'protect_in_body_one_arg'}{'contents'}[0]{'contents'}[0];
-$result_trees{'protect_in_body_one_arg'}{'contents'}[0]{'contents'}[0]{'contents'}[2]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'protect_in_body_one_arg'}{'contents'}[0]{'contents'}[0]{'contents'}[2]{'args'}[0];
-$result_trees{'protect_in_body_one_arg'}{'contents'}[0]{'contents'}[0]{'contents'}[2]{'args'}[0]{'parent'}
 = 
$result_trees{'protect_in_body_one_arg'}{'contents'}[0]{'contents'}[0]{'contents'}[2];
-$result_trees{'protect_in_body_one_arg'}{'contents'}[0]{'contents'}[0]{'contents'}[2]{'parent'}
 = $result_trees{'protect_in_body_one_arg'}{'contents'}[0]{'contents'}[0];
 
$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]{'contents'}[2]{'contents'}[0]{'parent'}
 = $result_trees{'protect_in_body_one_arg'}{'contents'}[0]{'contents'}[2];
diff --git a/tp/t/results/macro/recursive_call_in_argument.pl 
b/tp/t/results/macro/recursive_call_in_argument.pl
index ec68075f27..531de35f76 100644
--- a/tp/t/results/macro/recursive_call_in_argument.pl
+++ b/tp/t/results/macro/recursive_call_in_argument.pl
@@ -26,14 +26,9 @@ $result_trees{'recursive_call_in_argument'} = {
           'contents' => [
             {
               'parent' => {},
-              'text' => 'a',
-              'type' => 'raw'
-            },
-            {
-              'parent' => {},
-              'text' => '
+              'text' => 'a
 ',
-              'type' => 'last_raw_newline'
+              'type' => 'raw'
             },
             {
               'args' => [
@@ -103,10 +98,9 @@ $result_trees{'recursive_call_in_argument'} = {
 
$result_trees{'recursive_call_in_argument'}{'contents'}[0]{'contents'}[0]{'args'}[0]{'parent'}
 = $result_trees{'recursive_call_in_argument'}{'contents'}[0]{'contents'}[0];
 
$result_trees{'recursive_call_in_argument'}{'contents'}[0]{'contents'}[0]{'args'}[1]{'parent'}
 = $result_trees{'recursive_call_in_argument'}{'contents'}[0]{'contents'}[0];
 
$result_trees{'recursive_call_in_argument'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'parent'}
 = $result_trees{'recursive_call_in_argument'}{'contents'}[0]{'contents'}[0];
+$result_trees{'recursive_call_in_argument'}{'contents'}[0]{'contents'}[0]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'recursive_call_in_argument'}{'contents'}[0]{'contents'}[0]{'contents'}[1]{'args'}[0];
+$result_trees{'recursive_call_in_argument'}{'contents'}[0]{'contents'}[0]{'contents'}[1]{'args'}[0]{'parent'}
 = 
$result_trees{'recursive_call_in_argument'}{'contents'}[0]{'contents'}[0]{'contents'}[1];
 
$result_trees{'recursive_call_in_argument'}{'contents'}[0]{'contents'}[0]{'contents'}[1]{'parent'}
 = $result_trees{'recursive_call_in_argument'}{'contents'}[0]{'contents'}[0];
-$result_trees{'recursive_call_in_argument'}{'contents'}[0]{'contents'}[0]{'contents'}[2]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'recursive_call_in_argument'}{'contents'}[0]{'contents'}[0]{'contents'}[2]{'args'}[0];
-$result_trees{'recursive_call_in_argument'}{'contents'}[0]{'contents'}[0]{'contents'}[2]{'args'}[0]{'parent'}
 = 
$result_trees{'recursive_call_in_argument'}{'contents'}[0]{'contents'}[0]{'contents'}[2];
-$result_trees{'recursive_call_in_argument'}{'contents'}[0]{'contents'}[0]{'contents'}[2]{'parent'}
 = $result_trees{'recursive_call_in_argument'}{'contents'}[0]{'contents'}[0];
 
$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]{'contents'}[2]{'contents'}[0]{'parent'}
 = $result_trees{'recursive_call_in_argument'}{'contents'}[0]{'contents'}[2];
diff --git a/tp/t/results/macro/recursive_call_in_macro.pl 
b/tp/t/results/macro/recursive_call_in_macro.pl
index 58b3914917..9fb7154f44 100644
--- a/tp/t/results/macro/recursive_call_in_macro.pl
+++ b/tp/t/results/macro/recursive_call_in_macro.pl
@@ -26,14 +26,9 @@ $result_trees{'recursive_call_in_macro'} = {
           'contents' => [
             {
               'parent' => {},
-              'text' => '@anorecurse{arg}',
-              'type' => 'raw'
-            },
-            {
-              'parent' => {},
-              'text' => '
+              'text' => '@anorecurse{arg}
 ',
-              'type' => 'last_raw_newline'
+              'type' => 'raw'
             },
             {
               'args' => [
@@ -98,10 +93,9 @@ $result_trees{'recursive_call_in_macro'} = {
 
$result_trees{'recursive_call_in_macro'}{'contents'}[0]{'contents'}[0]{'args'}[0]{'parent'}
 = $result_trees{'recursive_call_in_macro'}{'contents'}[0]{'contents'}[0];
 
$result_trees{'recursive_call_in_macro'}{'contents'}[0]{'contents'}[0]{'args'}[1]{'parent'}
 = $result_trees{'recursive_call_in_macro'}{'contents'}[0]{'contents'}[0];
 
$result_trees{'recursive_call_in_macro'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'parent'}
 = $result_trees{'recursive_call_in_macro'}{'contents'}[0]{'contents'}[0];
+$result_trees{'recursive_call_in_macro'}{'contents'}[0]{'contents'}[0]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'recursive_call_in_macro'}{'contents'}[0]{'contents'}[0]{'contents'}[1]{'args'}[0];
+$result_trees{'recursive_call_in_macro'}{'contents'}[0]{'contents'}[0]{'contents'}[1]{'args'}[0]{'parent'}
 = 
$result_trees{'recursive_call_in_macro'}{'contents'}[0]{'contents'}[0]{'contents'}[1];
 
$result_trees{'recursive_call_in_macro'}{'contents'}[0]{'contents'}[0]{'contents'}[1]{'parent'}
 = $result_trees{'recursive_call_in_macro'}{'contents'}[0]{'contents'}[0];
-$result_trees{'recursive_call_in_macro'}{'contents'}[0]{'contents'}[0]{'contents'}[2]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'recursive_call_in_macro'}{'contents'}[0]{'contents'}[0]{'contents'}[2]{'args'}[0];
-$result_trees{'recursive_call_in_macro'}{'contents'}[0]{'contents'}[0]{'contents'}[2]{'args'}[0]{'parent'}
 = 
$result_trees{'recursive_call_in_macro'}{'contents'}[0]{'contents'}[0]{'contents'}[2];
-$result_trees{'recursive_call_in_macro'}{'contents'}[0]{'contents'}[0]{'contents'}[2]{'parent'}
 = $result_trees{'recursive_call_in_macro'}{'contents'}[0]{'contents'}[0];
 
$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]{'contents'}[2]{'parent'}
 = $result_trees{'recursive_call_in_macro'}{'contents'}[0];
diff --git a/tp/t/results/macro/redefine_texinfo_macro.pl 
b/tp/t/results/macro/redefine_texinfo_macro.pl
index 19ee2089b5..3cf1d53a68 100644
--- a/tp/t/results/macro/redefine_texinfo_macro.pl
+++ b/tp/t/results/macro/redefine_texinfo_macro.pl
@@ -26,14 +26,9 @@ $result_trees{'redefine_texinfo_macro'} = {
           'contents' => [
             {
               'parent' => {},
-              'text' => '@emph{\\arg\\}',
-              'type' => 'raw'
-            },
-            {
-              'parent' => {},
-              'text' => '
+              'text' => '@emph{\\arg\\}
 ',
-              'type' => 'last_raw_newline'
+              'type' => 'raw'
             },
             {
               'args' => [
@@ -125,10 +120,9 @@ $result_trees{'redefine_texinfo_macro'} = {
 
$result_trees{'redefine_texinfo_macro'}{'contents'}[0]{'contents'}[0]{'args'}[0]{'parent'}
 = $result_trees{'redefine_texinfo_macro'}{'contents'}[0]{'contents'}[0];
 
$result_trees{'redefine_texinfo_macro'}{'contents'}[0]{'contents'}[0]{'args'}[1]{'parent'}
 = $result_trees{'redefine_texinfo_macro'}{'contents'}[0]{'contents'}[0];
 
$result_trees{'redefine_texinfo_macro'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'parent'}
 = $result_trees{'redefine_texinfo_macro'}{'contents'}[0]{'contents'}[0];
+$result_trees{'redefine_texinfo_macro'}{'contents'}[0]{'contents'}[0]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'redefine_texinfo_macro'}{'contents'}[0]{'contents'}[0]{'contents'}[1]{'args'}[0];
+$result_trees{'redefine_texinfo_macro'}{'contents'}[0]{'contents'}[0]{'contents'}[1]{'args'}[0]{'parent'}
 = 
$result_trees{'redefine_texinfo_macro'}{'contents'}[0]{'contents'}[0]{'contents'}[1];
 
$result_trees{'redefine_texinfo_macro'}{'contents'}[0]{'contents'}[0]{'contents'}[1]{'parent'}
 = $result_trees{'redefine_texinfo_macro'}{'contents'}[0]{'contents'}[0];
-$result_trees{'redefine_texinfo_macro'}{'contents'}[0]{'contents'}[0]{'contents'}[2]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'redefine_texinfo_macro'}{'contents'}[0]{'contents'}[0]{'contents'}[2]{'args'}[0];
-$result_trees{'redefine_texinfo_macro'}{'contents'}[0]{'contents'}[0]{'contents'}[2]{'args'}[0]{'parent'}
 = 
$result_trees{'redefine_texinfo_macro'}{'contents'}[0]{'contents'}[0]{'contents'}[2];
-$result_trees{'redefine_texinfo_macro'}{'contents'}[0]{'contents'}[0]{'contents'}[2]{'parent'}
 = $result_trees{'redefine_texinfo_macro'}{'contents'}[0]{'contents'}[0];
 
$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]{'contents'}[2]{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'redefine_texinfo_macro'}{'contents'}[0]{'contents'}[2]{'contents'}[0]{'args'}[0];
diff --git a/tp/t/results/macro/simple_imbricated_macro.pl 
b/tp/t/results/macro/simple_imbricated_macro.pl
index 4d65f86968..86f6c35906 100644
--- a/tp/t/results/macro/simple_imbricated_macro.pl
+++ b/tp/t/results/macro/simple_imbricated_macro.pl
@@ -30,14 +30,9 @@ $result_trees{'simple_imbricated_macro'} = {
               'contents' => [
                 {
                   'parent' => {},
-                  'text' => 'bidule.',
-                  'type' => 'raw'
-                },
-                {
-                  'parent' => {},
-                  'text' => '
+                  'text' => 'bidule.
 ',
-                  'type' => 'last_raw_newline'
+                  'type' => 'raw'
                 },
                 {
                   'args' => [
@@ -141,14 +136,9 @@ $result_trees{'simple_imbricated_macro'} = {
               'contents' => [
                 {
                   'parent' => {},
-                  'text' => 'bidule.',
-                  'type' => 'raw'
-                },
-                {
-                  'parent' => {},
-                  'text' => '
+                  'text' => 'bidule.
 ',
-                  'type' => 'last_raw_newline'
+                  'type' => 'raw'
                 },
                 {
                   'args' => [
@@ -222,10 +212,9 @@ $result_trees{'simple_imbricated_macro'} = {
 
$result_trees{'simple_imbricated_macro'}{'contents'}[0]{'contents'}[0]{'args'}[0]{'parent'}
 = $result_trees{'simple_imbricated_macro'}{'contents'}[0]{'contents'}[0];
 
$result_trees{'simple_imbricated_macro'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'parent'}
 = $result_trees{'simple_imbricated_macro'}{'contents'}[0]{'contents'}[0];
 
$result_trees{'simple_imbricated_macro'}{'contents'}[0]{'contents'}[0]{'contents'}[1]{'contents'}[0]{'parent'}
 = 
$result_trees{'simple_imbricated_macro'}{'contents'}[0]{'contents'}[0]{'contents'}[1];
+$result_trees{'simple_imbricated_macro'}{'contents'}[0]{'contents'}[0]{'contents'}[1]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'simple_imbricated_macro'}{'contents'}[0]{'contents'}[0]{'contents'}[1]{'contents'}[1]{'args'}[0];
+$result_trees{'simple_imbricated_macro'}{'contents'}[0]{'contents'}[0]{'contents'}[1]{'contents'}[1]{'args'}[0]{'parent'}
 = 
$result_trees{'simple_imbricated_macro'}{'contents'}[0]{'contents'}[0]{'contents'}[1]{'contents'}[1];
 
$result_trees{'simple_imbricated_macro'}{'contents'}[0]{'contents'}[0]{'contents'}[1]{'contents'}[1]{'parent'}
 = 
$result_trees{'simple_imbricated_macro'}{'contents'}[0]{'contents'}[0]{'contents'}[1];
-$result_trees{'simple_imbricated_macro'}{'contents'}[0]{'contents'}[0]{'contents'}[1]{'contents'}[2]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'simple_imbricated_macro'}{'contents'}[0]{'contents'}[0]{'contents'}[1]{'contents'}[2]{'args'}[0];
-$result_trees{'simple_imbricated_macro'}{'contents'}[0]{'contents'}[0]{'contents'}[1]{'contents'}[2]{'args'}[0]{'parent'}
 = 
$result_trees{'simple_imbricated_macro'}{'contents'}[0]{'contents'}[0]{'contents'}[1]{'contents'}[2];
-$result_trees{'simple_imbricated_macro'}{'contents'}[0]{'contents'}[0]{'contents'}[1]{'contents'}[2]{'parent'}
 = 
$result_trees{'simple_imbricated_macro'}{'contents'}[0]{'contents'}[0]{'contents'}[1];
 
$result_trees{'simple_imbricated_macro'}{'contents'}[0]{'contents'}[0]{'contents'}[1]{'parent'}
 = $result_trees{'simple_imbricated_macro'}{'contents'}[0]{'contents'}[0];
 
$result_trees{'simple_imbricated_macro'}{'contents'}[0]{'contents'}[0]{'contents'}[2]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'simple_imbricated_macro'}{'contents'}[0]{'contents'}[0]{'contents'}[2]{'args'}[0];
 
$result_trees{'simple_imbricated_macro'}{'contents'}[0]{'contents'}[0]{'contents'}[2]{'args'}[0]{'parent'}
 = 
$result_trees{'simple_imbricated_macro'}{'contents'}[0]{'contents'}[0]{'contents'}[2];
@@ -235,10 +224,9 @@ 
$result_trees{'simple_imbricated_macro'}{'contents'}[0]{'contents'}[1]{'parent'}
 
$result_trees{'simple_imbricated_macro'}{'contents'}[0]{'contents'}[2]{'contents'}[0]{'parent'}
 = $result_trees{'simple_imbricated_macro'}{'contents'}[0]{'contents'}[2];
 
$result_trees{'simple_imbricated_macro'}{'contents'}[0]{'contents'}[2]{'contents'}[1]{'args'}[0]{'parent'}
 = 
$result_trees{'simple_imbricated_macro'}{'contents'}[0]{'contents'}[2]{'contents'}[1];
 
$result_trees{'simple_imbricated_macro'}{'contents'}[0]{'contents'}[2]{'contents'}[1]{'contents'}[0]{'parent'}
 = 
$result_trees{'simple_imbricated_macro'}{'contents'}[0]{'contents'}[2]{'contents'}[1];
+$result_trees{'simple_imbricated_macro'}{'contents'}[0]{'contents'}[2]{'contents'}[1]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'simple_imbricated_macro'}{'contents'}[0]{'contents'}[2]{'contents'}[1]{'contents'}[1]{'args'}[0];
+$result_trees{'simple_imbricated_macro'}{'contents'}[0]{'contents'}[2]{'contents'}[1]{'contents'}[1]{'args'}[0]{'parent'}
 = 
$result_trees{'simple_imbricated_macro'}{'contents'}[0]{'contents'}[2]{'contents'}[1]{'contents'}[1];
 
$result_trees{'simple_imbricated_macro'}{'contents'}[0]{'contents'}[2]{'contents'}[1]{'contents'}[1]{'parent'}
 = 
$result_trees{'simple_imbricated_macro'}{'contents'}[0]{'contents'}[2]{'contents'}[1];
-$result_trees{'simple_imbricated_macro'}{'contents'}[0]{'contents'}[2]{'contents'}[1]{'contents'}[2]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'simple_imbricated_macro'}{'contents'}[0]{'contents'}[2]{'contents'}[1]{'contents'}[2]{'args'}[0];
-$result_trees{'simple_imbricated_macro'}{'contents'}[0]{'contents'}[2]{'contents'}[1]{'contents'}[2]{'args'}[0]{'parent'}
 = 
$result_trees{'simple_imbricated_macro'}{'contents'}[0]{'contents'}[2]{'contents'}[1]{'contents'}[2];
-$result_trees{'simple_imbricated_macro'}{'contents'}[0]{'contents'}[2]{'contents'}[1]{'contents'}[2]{'parent'}
 = 
$result_trees{'simple_imbricated_macro'}{'contents'}[0]{'contents'}[2]{'contents'}[1];
 
$result_trees{'simple_imbricated_macro'}{'contents'}[0]{'contents'}[2]{'contents'}[1]{'parent'}
 = $result_trees{'simple_imbricated_macro'}{'contents'}[0]{'contents'}[2];
 
$result_trees{'simple_imbricated_macro'}{'contents'}[0]{'contents'}[2]{'parent'}
 = $result_trees{'simple_imbricated_macro'}{'contents'}[0];
 
$result_trees{'simple_imbricated_macro'}{'contents'}[0]{'contents'}[3]{'parent'}
 = $result_trees{'simple_imbricated_macro'}{'contents'}[0];
diff --git a/tp/t/results/macro/space_macro_after_end.pl 
b/tp/t/results/macro/space_macro_after_end.pl
index fd1ef7e73e..8de99a5ad9 100644
--- a/tp/t/results/macro/space_macro_after_end.pl
+++ b/tp/t/results/macro/space_macro_after_end.pl
@@ -21,14 +21,9 @@ $result_trees{'space_macro_after_end'} = {
           'contents' => [
             {
               'parent' => {},
-              'text' => '  ',
-              'type' => 'raw'
-            },
-            {
-              'parent' => {},
-              'text' => '
+              'text' => '  
 ',
-              'type' => 'last_raw_newline'
+              'type' => 'raw'
             },
             {
               'args' => [
@@ -147,10 +142,9 @@ $result_trees{'space_macro_after_end'} = {
 };
 
$result_trees{'space_macro_after_end'}{'contents'}[0]{'contents'}[0]{'args'}[0]{'parent'}
 = $result_trees{'space_macro_after_end'}{'contents'}[0]{'contents'}[0];
 
$result_trees{'space_macro_after_end'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'parent'}
 = $result_trees{'space_macro_after_end'}{'contents'}[0]{'contents'}[0];
+$result_trees{'space_macro_after_end'}{'contents'}[0]{'contents'}[0]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'space_macro_after_end'}{'contents'}[0]{'contents'}[0]{'contents'}[1]{'args'}[0];
+$result_trees{'space_macro_after_end'}{'contents'}[0]{'contents'}[0]{'contents'}[1]{'args'}[0]{'parent'}
 = 
$result_trees{'space_macro_after_end'}{'contents'}[0]{'contents'}[0]{'contents'}[1];
 
$result_trees{'space_macro_after_end'}{'contents'}[0]{'contents'}[0]{'contents'}[1]{'parent'}
 = $result_trees{'space_macro_after_end'}{'contents'}[0]{'contents'}[0];
-$result_trees{'space_macro_after_end'}{'contents'}[0]{'contents'}[0]{'contents'}[2]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'space_macro_after_end'}{'contents'}[0]{'contents'}[0]{'contents'}[2]{'args'}[0];
-$result_trees{'space_macro_after_end'}{'contents'}[0]{'contents'}[0]{'contents'}[2]{'args'}[0]{'parent'}
 = 
$result_trees{'space_macro_after_end'}{'contents'}[0]{'contents'}[0]{'contents'}[2];
-$result_trees{'space_macro_after_end'}{'contents'}[0]{'contents'}[0]{'contents'}[2]{'parent'}
 = $result_trees{'space_macro_after_end'}{'contents'}[0]{'contents'}[0];
 $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]{'contents'}[2]{'args'}[0]{'parent'}
 = $result_trees{'space_macro_after_end'}{'contents'}[0]{'contents'}[2];
diff --git a/tp/t/results/macro/space_macro_after_end_verbatim.pl 
b/tp/t/results/macro/space_macro_after_end_verbatim.pl
index 5e58c35688..21a99c7ccf 100644
--- a/tp/t/results/macro/space_macro_after_end_verbatim.pl
+++ b/tp/t/results/macro/space_macro_after_end_verbatim.pl
@@ -19,16 +19,11 @@ $result_trees{'space_macro_after_end_verbatim'} = {
           ],
           'cmdname' => 'macro',
           'contents' => [
-            {
-              'parent' => {},
-              'text' => '',
-              'type' => 'raw'
-            },
             {
               'parent' => {},
               'text' => '
 ',
-              'type' => 'last_raw_newline'
+              'type' => 'raw'
             },
             {
               'args' => [
@@ -142,10 +137,9 @@ $result_trees{'space_macro_after_end_verbatim'} = {
 };
 
$result_trees{'space_macro_after_end_verbatim'}{'contents'}[0]{'contents'}[0]{'args'}[0]{'parent'}
 = 
$result_trees{'space_macro_after_end_verbatim'}{'contents'}[0]{'contents'}[0];
 
$result_trees{'space_macro_after_end_verbatim'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'space_macro_after_end_verbatim'}{'contents'}[0]{'contents'}[0];
+$result_trees{'space_macro_after_end_verbatim'}{'contents'}[0]{'contents'}[0]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'space_macro_after_end_verbatim'}{'contents'}[0]{'contents'}[0]{'contents'}[1]{'args'}[0];
+$result_trees{'space_macro_after_end_verbatim'}{'contents'}[0]{'contents'}[0]{'contents'}[1]{'args'}[0]{'parent'}
 = 
$result_trees{'space_macro_after_end_verbatim'}{'contents'}[0]{'contents'}[0]{'contents'}[1];
 
$result_trees{'space_macro_after_end_verbatim'}{'contents'}[0]{'contents'}[0]{'contents'}[1]{'parent'}
 = 
$result_trees{'space_macro_after_end_verbatim'}{'contents'}[0]{'contents'}[0];
-$result_trees{'space_macro_after_end_verbatim'}{'contents'}[0]{'contents'}[0]{'contents'}[2]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'space_macro_after_end_verbatim'}{'contents'}[0]{'contents'}[0]{'contents'}[2]{'args'}[0];
-$result_trees{'space_macro_after_end_verbatim'}{'contents'}[0]{'contents'}[0]{'contents'}[2]{'args'}[0]{'parent'}
 = 
$result_trees{'space_macro_after_end_verbatim'}{'contents'}[0]{'contents'}[0]{'contents'}[2];
-$result_trees{'space_macro_after_end_verbatim'}{'contents'}[0]{'contents'}[0]{'contents'}[2]{'parent'}
 = 
$result_trees{'space_macro_after_end_verbatim'}{'contents'}[0]{'contents'}[0];
 
$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]{'contents'}[2]{'args'}[0]{'parent'}
 = 
$result_trees{'space_macro_after_end_verbatim'}{'contents'}[0]{'contents'}[2];
diff --git a/tp/t/results/macro/text_before_after.pl 
b/tp/t/results/macro/text_before_after.pl
index c118dffd7b..aeb534cd08 100644
--- a/tp/t/results/macro/text_before_after.pl
+++ b/tp/t/results/macro/text_before_after.pl
@@ -27,14 +27,9 @@ $result_trees{'text_before_after'} = {
               'contents' => [
                 {
                   'parent' => {},
-                  'text' => 'in macro',
-                  'type' => 'raw'
-                },
-                {
-                  'parent' => {},
-                  'text' => '
+                  'text' => 'in macro
 ',
-                  'type' => 'last_raw_newline'
+                  'type' => 'raw'
                 },
                 {
                   'args' => [
@@ -91,10 +86,9 @@ $result_trees{'text_before_after'} = {
 
$result_trees{'text_before_after'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'parent'}
 = $result_trees{'text_before_after'}{'contents'}[0]{'contents'}[0];
 
$result_trees{'text_before_after'}{'contents'}[0]{'contents'}[0]{'contents'}[1]{'args'}[0]{'parent'}
 = 
$result_trees{'text_before_after'}{'contents'}[0]{'contents'}[0]{'contents'}[1];
 
$result_trees{'text_before_after'}{'contents'}[0]{'contents'}[0]{'contents'}[1]{'contents'}[0]{'parent'}
 = 
$result_trees{'text_before_after'}{'contents'}[0]{'contents'}[0]{'contents'}[1];
+$result_trees{'text_before_after'}{'contents'}[0]{'contents'}[0]{'contents'}[1]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'text_before_after'}{'contents'}[0]{'contents'}[0]{'contents'}[1]{'contents'}[1]{'args'}[0];
+$result_trees{'text_before_after'}{'contents'}[0]{'contents'}[0]{'contents'}[1]{'contents'}[1]{'args'}[0]{'parent'}
 = 
$result_trees{'text_before_after'}{'contents'}[0]{'contents'}[0]{'contents'}[1]{'contents'}[1];
 
$result_trees{'text_before_after'}{'contents'}[0]{'contents'}[0]{'contents'}[1]{'contents'}[1]{'parent'}
 = 
$result_trees{'text_before_after'}{'contents'}[0]{'contents'}[0]{'contents'}[1];
-$result_trees{'text_before_after'}{'contents'}[0]{'contents'}[0]{'contents'}[1]{'contents'}[2]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'text_before_after'}{'contents'}[0]{'contents'}[0]{'contents'}[1]{'contents'}[2]{'args'}[0];
-$result_trees{'text_before_after'}{'contents'}[0]{'contents'}[0]{'contents'}[1]{'contents'}[2]{'args'}[0]{'parent'}
 = 
$result_trees{'text_before_after'}{'contents'}[0]{'contents'}[0]{'contents'}[1]{'contents'}[2];
-$result_trees{'text_before_after'}{'contents'}[0]{'contents'}[0]{'contents'}[1]{'contents'}[2]{'parent'}
 = 
$result_trees{'text_before_after'}{'contents'}[0]{'contents'}[0]{'contents'}[1];
 
$result_trees{'text_before_after'}{'contents'}[0]{'contents'}[0]{'contents'}[1]{'parent'}
 = $result_trees{'text_before_after'}{'contents'}[0]{'contents'}[0];
 $result_trees{'text_before_after'}{'contents'}[0]{'contents'}[0]{'parent'} = 
$result_trees{'text_before_after'}{'contents'}[0];
 $result_trees{'text_before_after'}{'contents'}[0]{'parent'} = 
$result_trees{'text_before_after'};
diff --git a/tp/t/results/macro/too_much_args.pl 
b/tp/t/results/macro/too_much_args.pl
index 46c295962d..d6fc11a00c 100644
--- a/tp/t/results/macro/too_much_args.pl
+++ b/tp/t/results/macro/too_much_args.pl
@@ -37,14 +37,9 @@ $result_trees{'too_much_args'} = {
             },
             {
               'parent' => {},
-              'text' => 'second arg: \\second\\',
-              'type' => 'raw'
-            },
-            {
-              'parent' => {},
-              'text' => '
+              'text' => 'second arg: \\second\\
 ',
-              'type' => 'last_raw_newline'
+              'type' => 'raw'
             },
             {
               'args' => [
@@ -121,10 +116,9 @@ 
$result_trees{'too_much_args'}{'contents'}[0]{'contents'}[0]{'args'}[1]{'parent'
 
$result_trees{'too_much_args'}{'contents'}[0]{'contents'}[0]{'args'}[2]{'parent'}
 = $result_trees{'too_much_args'}{'contents'}[0]{'contents'}[0];
 
$result_trees{'too_much_args'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'parent'}
 = $result_trees{'too_much_args'}{'contents'}[0]{'contents'}[0];
 
$result_trees{'too_much_args'}{'contents'}[0]{'contents'}[0]{'contents'}[1]{'parent'}
 = $result_trees{'too_much_args'}{'contents'}[0]{'contents'}[0];
+$result_trees{'too_much_args'}{'contents'}[0]{'contents'}[0]{'contents'}[2]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'too_much_args'}{'contents'}[0]{'contents'}[0]{'contents'}[2]{'args'}[0];
+$result_trees{'too_much_args'}{'contents'}[0]{'contents'}[0]{'contents'}[2]{'args'}[0]{'parent'}
 = $result_trees{'too_much_args'}{'contents'}[0]{'contents'}[0]{'contents'}[2];
 
$result_trees{'too_much_args'}{'contents'}[0]{'contents'}[0]{'contents'}[2]{'parent'}
 = $result_trees{'too_much_args'}{'contents'}[0]{'contents'}[0];
-$result_trees{'too_much_args'}{'contents'}[0]{'contents'}[0]{'contents'}[3]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'too_much_args'}{'contents'}[0]{'contents'}[0]{'contents'}[3]{'args'}[0];
-$result_trees{'too_much_args'}{'contents'}[0]{'contents'}[0]{'contents'}[3]{'args'}[0]{'parent'}
 = $result_trees{'too_much_args'}{'contents'}[0]{'contents'}[0]{'contents'}[3];
-$result_trees{'too_much_args'}{'contents'}[0]{'contents'}[0]{'contents'}[3]{'parent'}
 = $result_trees{'too_much_args'}{'contents'}[0]{'contents'}[0];
 $result_trees{'too_much_args'}{'contents'}[0]{'contents'}[0]{'parent'} = 
$result_trees{'too_much_args'}{'contents'}[0];
 $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]{'contents'}[0]{'parent'}
 = $result_trees{'too_much_args'}{'contents'}[0]{'contents'}[2];
diff --git a/tp/t/results/macro/two_macros_on_a_line.pl 
b/tp/t/results/macro/two_macros_on_a_line.pl
index e13547a68d..dac59baa8a 100644
--- a/tp/t/results/macro/two_macros_on_a_line.pl
+++ b/tp/t/results/macro/two_macros_on_a_line.pl
@@ -21,14 +21,9 @@ $result_trees{'two_macros_on_a_line'} = {
           'contents' => [
             {
               'parent' => {},
-              'text' => 'in mymacro',
-              'type' => 'raw'
-            },
-            {
-              'parent' => {},
-              'text' => '
+              'text' => 'in mymacro
 ',
-              'type' => 'last_raw_newline'
+              'type' => 'raw'
             },
             {
               'args' => [
@@ -106,14 +101,9 @@ $result_trees{'two_macros_on_a_line'} = {
             },
             {
               'parent' => {},
-              'text' => 'after',
-              'type' => 'raw'
-            },
-            {
-              'parent' => {},
-              'text' => '
+              'text' => 'after
 ',
-              'type' => 'last_raw_newline'
+              'type' => 'raw'
             },
             {
               'args' => [
@@ -375,10 +365,9 @@ $result_trees{'two_macros_on_a_line'} = {
 };
 
$result_trees{'two_macros_on_a_line'}{'contents'}[0]{'contents'}[0]{'args'}[0]{'parent'}
 = $result_trees{'two_macros_on_a_line'}{'contents'}[0]{'contents'}[0];
 
$result_trees{'two_macros_on_a_line'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'parent'}
 = $result_trees{'two_macros_on_a_line'}{'contents'}[0]{'contents'}[0];
+$result_trees{'two_macros_on_a_line'}{'contents'}[0]{'contents'}[0]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'two_macros_on_a_line'}{'contents'}[0]{'contents'}[0]{'contents'}[1]{'args'}[0];
+$result_trees{'two_macros_on_a_line'}{'contents'}[0]{'contents'}[0]{'contents'}[1]{'args'}[0]{'parent'}
 = 
$result_trees{'two_macros_on_a_line'}{'contents'}[0]{'contents'}[0]{'contents'}[1];
 
$result_trees{'two_macros_on_a_line'}{'contents'}[0]{'contents'}[0]{'contents'}[1]{'parent'}
 = $result_trees{'two_macros_on_a_line'}{'contents'}[0]{'contents'}[0];
-$result_trees{'two_macros_on_a_line'}{'contents'}[0]{'contents'}[0]{'contents'}[2]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'two_macros_on_a_line'}{'contents'}[0]{'contents'}[0]{'contents'}[2]{'args'}[0];
-$result_trees{'two_macros_on_a_line'}{'contents'}[0]{'contents'}[0]{'contents'}[2]{'args'}[0]{'parent'}
 = 
$result_trees{'two_macros_on_a_line'}{'contents'}[0]{'contents'}[0]{'contents'}[2];
-$result_trees{'two_macros_on_a_line'}{'contents'}[0]{'contents'}[0]{'contents'}[2]{'parent'}
 = $result_trees{'two_macros_on_a_line'}{'contents'}[0]{'contents'}[0];
 $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]{'contents'}[2]{'args'}[0]{'parent'}
 = $result_trees{'two_macros_on_a_line'}{'contents'}[0]{'contents'}[2];
@@ -386,10 +375,9 @@ 
$result_trees{'two_macros_on_a_line'}{'contents'}[0]{'contents'}[2]{'args'}[1]{'
 
$result_trees{'two_macros_on_a_line'}{'contents'}[0]{'contents'}[2]{'contents'}[0]{'parent'}
 = $result_trees{'two_macros_on_a_line'}{'contents'}[0]{'contents'}[2];
 
$result_trees{'two_macros_on_a_line'}{'contents'}[0]{'contents'}[2]{'contents'}[1]{'parent'}
 = $result_trees{'two_macros_on_a_line'}{'contents'}[0]{'contents'}[2];
 
$result_trees{'two_macros_on_a_line'}{'contents'}[0]{'contents'}[2]{'contents'}[2]{'parent'}
 = $result_trees{'two_macros_on_a_line'}{'contents'}[0]{'contents'}[2];
+$result_trees{'two_macros_on_a_line'}{'contents'}[0]{'contents'}[2]{'contents'}[3]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'two_macros_on_a_line'}{'contents'}[0]{'contents'}[2]{'contents'}[3]{'args'}[0];
+$result_trees{'two_macros_on_a_line'}{'contents'}[0]{'contents'}[2]{'contents'}[3]{'args'}[0]{'parent'}
 = 
$result_trees{'two_macros_on_a_line'}{'contents'}[0]{'contents'}[2]{'contents'}[3];
 
$result_trees{'two_macros_on_a_line'}{'contents'}[0]{'contents'}[2]{'contents'}[3]{'parent'}
 = $result_trees{'two_macros_on_a_line'}{'contents'}[0]{'contents'}[2];
-$result_trees{'two_macros_on_a_line'}{'contents'}[0]{'contents'}[2]{'contents'}[4]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'two_macros_on_a_line'}{'contents'}[0]{'contents'}[2]{'contents'}[4]{'args'}[0];
-$result_trees{'two_macros_on_a_line'}{'contents'}[0]{'contents'}[2]{'contents'}[4]{'args'}[0]{'parent'}
 = 
$result_trees{'two_macros_on_a_line'}{'contents'}[0]{'contents'}[2]{'contents'}[4];
-$result_trees{'two_macros_on_a_line'}{'contents'}[0]{'contents'}[2]{'contents'}[4]{'parent'}
 = $result_trees{'two_macros_on_a_line'}{'contents'}[0]{'contents'}[2];
 $result_trees{'two_macros_on_a_line'}{'contents'}[0]{'contents'}[2]{'parent'} 
= $result_trees{'two_macros_on_a_line'}{'contents'}[0];
 $result_trees{'two_macros_on_a_line'}{'contents'}[0]{'contents'}[3]{'parent'} 
= $result_trees{'two_macros_on_a_line'}{'contents'}[0];
 $result_trees{'two_macros_on_a_line'}{'contents'}[0]{'contents'}[4]{'parent'} 
= $result_trees{'two_macros_on_a_line'}{'contents'}[0];
diff --git a/tp/t/results/macro/zero_argument.pl 
b/tp/t/results/macro/zero_argument.pl
index a39083569e..a925efd9f2 100644
--- a/tp/t/results/macro/zero_argument.pl
+++ b/tp/t/results/macro/zero_argument.pl
@@ -21,14 +21,9 @@ $result_trees{'zero_argument'} = {
           'contents' => [
             {
               'parent' => {},
-              'text' => 'in foo',
-              'type' => 'raw'
-            },
-            {
-              'parent' => {},
-              'text' => '
+              'text' => 'in foo
 ',
-              'type' => 'last_raw_newline'
+              'type' => 'raw'
             },
             {
               'args' => [
@@ -89,14 +84,9 @@ $result_trees{'zero_argument'} = {
           'contents' => [
             {
               'parent' => {},
-              'text' => 'in bar',
-              'type' => 'raw'
-            },
-            {
-              'parent' => {},
-              'text' => '
+              'text' => 'in bar
 ',
-              'type' => 'last_raw_newline'
+              'type' => 'raw'
             },
             {
               'args' => [
@@ -144,18 +134,16 @@ $result_trees{'zero_argument'} = {
 };
 
$result_trees{'zero_argument'}{'contents'}[0]{'contents'}[0]{'args'}[0]{'parent'}
 = $result_trees{'zero_argument'}{'contents'}[0]{'contents'}[0];
 
$result_trees{'zero_argument'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'parent'}
 = $result_trees{'zero_argument'}{'contents'}[0]{'contents'}[0];
+$result_trees{'zero_argument'}{'contents'}[0]{'contents'}[0]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'zero_argument'}{'contents'}[0]{'contents'}[0]{'contents'}[1]{'args'}[0];
+$result_trees{'zero_argument'}{'contents'}[0]{'contents'}[0]{'contents'}[1]{'args'}[0]{'parent'}
 = $result_trees{'zero_argument'}{'contents'}[0]{'contents'}[0]{'contents'}[1];
 
$result_trees{'zero_argument'}{'contents'}[0]{'contents'}[0]{'contents'}[1]{'parent'}
 = $result_trees{'zero_argument'}{'contents'}[0]{'contents'}[0];
-$result_trees{'zero_argument'}{'contents'}[0]{'contents'}[0]{'contents'}[2]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'zero_argument'}{'contents'}[0]{'contents'}[0]{'contents'}[2]{'args'}[0];
-$result_trees{'zero_argument'}{'contents'}[0]{'contents'}[0]{'contents'}[2]{'args'}[0]{'parent'}
 = $result_trees{'zero_argument'}{'contents'}[0]{'contents'}[0]{'contents'}[2];
-$result_trees{'zero_argument'}{'contents'}[0]{'contents'}[0]{'contents'}[2]{'parent'}
 = $result_trees{'zero_argument'}{'contents'}[0]{'contents'}[0];
 $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]{'contents'}[2]{'args'}[0]{'parent'}
 = $result_trees{'zero_argument'}{'contents'}[0]{'contents'}[2];
 
$result_trees{'zero_argument'}{'contents'}[0]{'contents'}[2]{'contents'}[0]{'parent'}
 = $result_trees{'zero_argument'}{'contents'}[0]{'contents'}[2];
+$result_trees{'zero_argument'}{'contents'}[0]{'contents'}[2]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'zero_argument'}{'contents'}[0]{'contents'}[2]{'contents'}[1]{'args'}[0];
+$result_trees{'zero_argument'}{'contents'}[0]{'contents'}[2]{'contents'}[1]{'args'}[0]{'parent'}
 = $result_trees{'zero_argument'}{'contents'}[0]{'contents'}[2]{'contents'}[1];
 
$result_trees{'zero_argument'}{'contents'}[0]{'contents'}[2]{'contents'}[1]{'parent'}
 = $result_trees{'zero_argument'}{'contents'}[0]{'contents'}[2];
-$result_trees{'zero_argument'}{'contents'}[0]{'contents'}[2]{'contents'}[2]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'zero_argument'}{'contents'}[0]{'contents'}[2]{'contents'}[2]{'args'}[0];
-$result_trees{'zero_argument'}{'contents'}[0]{'contents'}[2]{'contents'}[2]{'args'}[0]{'parent'}
 = $result_trees{'zero_argument'}{'contents'}[0]{'contents'}[2]{'contents'}[2];
-$result_trees{'zero_argument'}{'contents'}[0]{'contents'}[2]{'contents'}[2]{'parent'}
 = $result_trees{'zero_argument'}{'contents'}[0]{'contents'}[2];
 $result_trees{'zero_argument'}{'contents'}[0]{'contents'}[2]{'parent'} = 
$result_trees{'zero_argument'}{'contents'}[0];
 $result_trees{'zero_argument'}{'contents'}[0]{'parent'} = 
$result_trees{'zero_argument'};
 
diff --git 
a/tp/t/results/misc_commands/codequoteundirected_codequotebacktick.pl 
b/tp/t/results/misc_commands/codequoteundirected_codequotebacktick.pl
index 13bd11c00a..c778935467 100644
--- a/tp/t/results/misc_commands/codequoteundirected_codequotebacktick.pl
+++ b/tp/t/results/misc_commands/codequoteundirected_codequotebacktick.pl
@@ -53,14 +53,9 @@ $result_trees{'codequoteundirected_codequotebacktick'} = {
                 },
                 {
                   'parent' => {},
-                  'text' => 'samp: @samp{``simple-double--three---four----\'\' 
`simple\' quotedblleft: @quotedblleft{}} @*',
-                  'type' => 'raw'
-                },
-                {
-                  'parent' => {},
-                  'text' => '
+                  'text' => 'samp: @samp{``simple-double--three---four----\'\' 
`simple\' quotedblleft: @quotedblleft{}} @*
 ',
-                  'type' => 'last_raw_newline'
+                  'type' => 'raw'
                 },
                 {
                   'args' => [
@@ -217,14 +212,9 @@ $result_trees{'codequoteundirected_codequotebacktick'} = {
                 },
                 {
                   'parent' => {},
-                  'text' => '@quotes{}',
-                  'type' => 'raw'
-                },
-                {
-                  'parent' => {},
-                  'text' => '
+                  'text' => '@quotes{}
 ',
-                  'type' => 'last_raw_newline'
+                  'type' => 'raw'
                 },
                 {
                   'args' => [
@@ -4340,10 +4330,9 @@ 
$result_trees{'codequoteundirected_codequotebacktick'}{'contents'}[0]{'contents'
 
$result_trees{'codequoteundirected_codequotebacktick'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[3]{'parent'}
 = 
$result_trees{'codequoteundirected_codequotebacktick'}{'contents'}[0]{'contents'}[0]{'contents'}[0];
 
$result_trees{'codequoteundirected_codequotebacktick'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[4]{'parent'}
 = 
$result_trees{'codequoteundirected_codequotebacktick'}{'contents'}[0]{'contents'}[0]{'contents'}[0];
 
$result_trees{'codequoteundirected_codequotebacktick'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[5]{'parent'}
 = 
$result_trees{'codequoteundirected_codequotebacktick'}{'contents'}[0]{'contents'}[0]{'contents'}[0];
+$result_trees{'codequoteundirected_codequotebacktick'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[6]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'codequoteundirected_codequotebacktick'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[6]{'args'}[0];
+$result_trees{'codequoteundirected_codequotebacktick'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[6]{'args'}[0]{'parent'}
 = 
$result_trees{'codequoteundirected_codequotebacktick'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[6];
 
$result_trees{'codequoteundirected_codequotebacktick'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[6]{'parent'}
 = 
$result_trees{'codequoteundirected_codequotebacktick'}{'contents'}[0]{'contents'}[0]{'contents'}[0];
-$result_trees{'codequoteundirected_codequotebacktick'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[7]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'codequoteundirected_codequotebacktick'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[7]{'args'}[0];
-$result_trees{'codequoteundirected_codequotebacktick'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[7]{'args'}[0]{'parent'}
 = 
$result_trees{'codequoteundirected_codequotebacktick'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[7];
-$result_trees{'codequoteundirected_codequotebacktick'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[7]{'parent'}
 = 
$result_trees{'codequoteundirected_codequotebacktick'}{'contents'}[0]{'contents'}[0]{'contents'}[0];
 
$result_trees{'codequoteundirected_codequotebacktick'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'codequoteundirected_codequotebacktick'}{'contents'}[0]{'contents'}[0];
 
$result_trees{'codequoteundirected_codequotebacktick'}{'contents'}[0]{'contents'}[0]{'contents'}[1]{'parent'}
 = 
$result_trees{'codequoteundirected_codequotebacktick'}{'contents'}[0]{'contents'}[0];
 
$result_trees{'codequoteundirected_codequotebacktick'}{'contents'}[0]{'contents'}[0]{'contents'}[2]{'args'}[0]{'parent'}
 = 
$result_trees{'codequoteundirected_codequotebacktick'}{'contents'}[0]{'contents'}[0]{'contents'}[2];
@@ -4364,10 +4353,9 @@ 
$result_trees{'codequoteundirected_codequotebacktick'}{'contents'}[0]{'contents'
 
$result_trees{'codequoteundirected_codequotebacktick'}{'contents'}[0]{'contents'}[0]{'contents'}[2]{'contents'}[14]{'parent'}
 = 
$result_trees{'codequoteundirected_codequotebacktick'}{'contents'}[0]{'contents'}[0]{'contents'}[2];
 
$result_trees{'codequoteundirected_codequotebacktick'}{'contents'}[0]{'contents'}[0]{'contents'}[2]{'contents'}[15]{'parent'}
 = 
$result_trees{'codequoteundirected_codequotebacktick'}{'contents'}[0]{'contents'}[0]{'contents'}[2];
 
$result_trees{'codequoteundirected_codequotebacktick'}{'contents'}[0]{'contents'}[0]{'contents'}[2]{'contents'}[16]{'parent'}
 = 
$result_trees{'codequoteundirected_codequotebacktick'}{'contents'}[0]{'contents'}[0]{'contents'}[2];
+$result_trees{'codequoteundirected_codequotebacktick'}{'contents'}[0]{'contents'}[0]{'contents'}[2]{'contents'}[17]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'codequoteundirected_codequotebacktick'}{'contents'}[0]{'contents'}[0]{'contents'}[2]{'contents'}[17]{'args'}[0];
+$result_trees{'codequoteundirected_codequotebacktick'}{'contents'}[0]{'contents'}[0]{'contents'}[2]{'contents'}[17]{'args'}[0]{'parent'}
 = 
$result_trees{'codequoteundirected_codequotebacktick'}{'contents'}[0]{'contents'}[0]{'contents'}[2]{'contents'}[17];
 
$result_trees{'codequoteundirected_codequotebacktick'}{'contents'}[0]{'contents'}[0]{'contents'}[2]{'contents'}[17]{'parent'}
 = 
$result_trees{'codequoteundirected_codequotebacktick'}{'contents'}[0]{'contents'}[0]{'contents'}[2];
-$result_trees{'codequoteundirected_codequotebacktick'}{'contents'}[0]{'contents'}[0]{'contents'}[2]{'contents'}[18]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'codequoteundirected_codequotebacktick'}{'contents'}[0]{'contents'}[0]{'contents'}[2]{'contents'}[18]{'args'}[0];
-$result_trees{'codequoteundirected_codequotebacktick'}{'contents'}[0]{'contents'}[0]{'contents'}[2]{'contents'}[18]{'args'}[0]{'parent'}
 = 
$result_trees{'codequoteundirected_codequotebacktick'}{'contents'}[0]{'contents'}[0]{'contents'}[2]{'contents'}[18];
-$result_trees{'codequoteundirected_codequotebacktick'}{'contents'}[0]{'contents'}[0]{'contents'}[2]{'contents'}[18]{'parent'}
 = 
$result_trees{'codequoteundirected_codequotebacktick'}{'contents'}[0]{'contents'}[0]{'contents'}[2];
 
$result_trees{'codequoteundirected_codequotebacktick'}{'contents'}[0]{'contents'}[0]{'contents'}[2]{'parent'}
 = 
$result_trees{'codequoteundirected_codequotebacktick'}{'contents'}[0]{'contents'}[0];
 
$result_trees{'codequoteundirected_codequotebacktick'}{'contents'}[0]{'contents'}[0]{'contents'}[3]{'parent'}
 = 
$result_trees{'codequoteundirected_codequotebacktick'}{'contents'}[0]{'contents'}[0];
 
$result_trees{'codequoteundirected_codequotebacktick'}{'contents'}[0]{'contents'}[0]{'contents'}[4]{'args'}[0]{'parent'}
 = 
$result_trees{'codequoteundirected_codequotebacktick'}{'contents'}[0]{'contents'}[0]{'contents'}[4];
diff --git a/tp/t/results/misc_commands/kbdinputstyle.pl 
b/tp/t/results/misc_commands/kbdinputstyle.pl
index 2dcc7483e1..e64630233d 100644
--- a/tp/t/results/misc_commands/kbdinputstyle.pl
+++ b/tp/t/results/misc_commands/kbdinputstyle.pl
@@ -87,14 +87,9 @@ $result_trees{'kbdinputstyle'} = {
             },
             {
               'parent' => {},
-              'text' => '@end example',
-              'type' => 'raw'
-            },
-            {
-              'parent' => {},
-              'text' => '
+              'text' => '@end example
 ',
-              'type' => 'last_raw_newline'
+              'type' => 'raw'
             },
             {
               'args' => [
@@ -1804,10 +1799,9 @@ 
$result_trees{'kbdinputstyle'}{'contents'}[0]{'contents'}[0]{'contents'}[8]{'par
 
$result_trees{'kbdinputstyle'}{'contents'}[0]{'contents'}[0]{'contents'}[9]{'parent'}
 = $result_trees{'kbdinputstyle'}{'contents'}[0]{'contents'}[0];
 
$result_trees{'kbdinputstyle'}{'contents'}[0]{'contents'}[0]{'contents'}[10]{'parent'}
 = $result_trees{'kbdinputstyle'}{'contents'}[0]{'contents'}[0];
 
$result_trees{'kbdinputstyle'}{'contents'}[0]{'contents'}[0]{'contents'}[11]{'parent'}
 = $result_trees{'kbdinputstyle'}{'contents'}[0]{'contents'}[0];
+$result_trees{'kbdinputstyle'}{'contents'}[0]{'contents'}[0]{'contents'}[12]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'kbdinputstyle'}{'contents'}[0]{'contents'}[0]{'contents'}[12]{'args'}[0];
+$result_trees{'kbdinputstyle'}{'contents'}[0]{'contents'}[0]{'contents'}[12]{'args'}[0]{'parent'}
 = $result_trees{'kbdinputstyle'}{'contents'}[0]{'contents'}[0]{'contents'}[12];
 
$result_trees{'kbdinputstyle'}{'contents'}[0]{'contents'}[0]{'contents'}[12]{'parent'}
 = $result_trees{'kbdinputstyle'}{'contents'}[0]{'contents'}[0];
-$result_trees{'kbdinputstyle'}{'contents'}[0]{'contents'}[0]{'contents'}[13]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'kbdinputstyle'}{'contents'}[0]{'contents'}[0]{'contents'}[13]{'args'}[0];
-$result_trees{'kbdinputstyle'}{'contents'}[0]{'contents'}[0]{'contents'}[13]{'args'}[0]{'parent'}
 = $result_trees{'kbdinputstyle'}{'contents'}[0]{'contents'}[0]{'contents'}[13];
-$result_trees{'kbdinputstyle'}{'contents'}[0]{'contents'}[0]{'contents'}[13]{'parent'}
 = $result_trees{'kbdinputstyle'}{'contents'}[0]{'contents'}[0];
 $result_trees{'kbdinputstyle'}{'contents'}[0]{'contents'}[0]{'parent'} = 
$result_trees{'kbdinputstyle'}{'contents'}[0];
 $result_trees{'kbdinputstyle'}{'contents'}[0]{'contents'}[1]{'parent'} = 
$result_trees{'kbdinputstyle'}{'contents'}[0];
 
$result_trees{'kbdinputstyle'}{'contents'}[0]{'contents'}[2]{'contents'}[0]{'parent'}
 = $result_trees{'kbdinputstyle'}{'contents'}[0]{'contents'}[2];
diff --git a/tp/t/results/misc_commands/kbdinputstyle_in_table.pl 
b/tp/t/results/misc_commands/kbdinputstyle_in_table.pl
index bb7dcaaef7..4c4aa19e3a 100644
--- a/tp/t/results/misc_commands/kbdinputstyle_in_table.pl
+++ b/tp/t/results/misc_commands/kbdinputstyle_in_table.pl
@@ -117,14 +117,9 @@ $result_trees{'kbdinputstyle_in_table'} = {
             },
             {
               'parent' => {},
-              'text' => '@end example',
-              'type' => 'raw'
-            },
-            {
-              'parent' => {},
-              'text' => '
+              'text' => '@end example
 ',
-              'type' => 'last_raw_newline'
+              'type' => 'raw'
             },
             {
               'args' => [
@@ -1956,10 +1951,9 @@ 
$result_trees{'kbdinputstyle_in_table'}{'contents'}[0]{'contents'}[0]{'contents'
 
$result_trees{'kbdinputstyle_in_table'}{'contents'}[0]{'contents'}[0]{'contents'}[14]{'parent'}
 = $result_trees{'kbdinputstyle_in_table'}{'contents'}[0]{'contents'}[0];
 
$result_trees{'kbdinputstyle_in_table'}{'contents'}[0]{'contents'}[0]{'contents'}[15]{'parent'}
 = $result_trees{'kbdinputstyle_in_table'}{'contents'}[0]{'contents'}[0];
 
$result_trees{'kbdinputstyle_in_table'}{'contents'}[0]{'contents'}[0]{'contents'}[16]{'parent'}
 = $result_trees{'kbdinputstyle_in_table'}{'contents'}[0]{'contents'}[0];
+$result_trees{'kbdinputstyle_in_table'}{'contents'}[0]{'contents'}[0]{'contents'}[17]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'kbdinputstyle_in_table'}{'contents'}[0]{'contents'}[0]{'contents'}[17]{'args'}[0];
+$result_trees{'kbdinputstyle_in_table'}{'contents'}[0]{'contents'}[0]{'contents'}[17]{'args'}[0]{'parent'}
 = 
$result_trees{'kbdinputstyle_in_table'}{'contents'}[0]{'contents'}[0]{'contents'}[17];
 
$result_trees{'kbdinputstyle_in_table'}{'contents'}[0]{'contents'}[0]{'contents'}[17]{'parent'}
 = $result_trees{'kbdinputstyle_in_table'}{'contents'}[0]{'contents'}[0];
-$result_trees{'kbdinputstyle_in_table'}{'contents'}[0]{'contents'}[0]{'contents'}[18]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'kbdinputstyle_in_table'}{'contents'}[0]{'contents'}[0]{'contents'}[18]{'args'}[0];
-$result_trees{'kbdinputstyle_in_table'}{'contents'}[0]{'contents'}[0]{'contents'}[18]{'args'}[0]{'parent'}
 = 
$result_trees{'kbdinputstyle_in_table'}{'contents'}[0]{'contents'}[0]{'contents'}[18];
-$result_trees{'kbdinputstyle_in_table'}{'contents'}[0]{'contents'}[0]{'contents'}[18]{'parent'}
 = $result_trees{'kbdinputstyle_in_table'}{'contents'}[0]{'contents'}[0];
 
$result_trees{'kbdinputstyle_in_table'}{'contents'}[0]{'contents'}[0]{'parent'} 
= $result_trees{'kbdinputstyle_in_table'}{'contents'}[0];
 
$result_trees{'kbdinputstyle_in_table'}{'contents'}[0]{'contents'}[1]{'parent'} 
= $result_trees{'kbdinputstyle_in_table'}{'contents'}[0];
 
$result_trees{'kbdinputstyle_in_table'}{'contents'}[0]{'contents'}[2]{'contents'}[0]{'parent'}
 = $result_trees{'kbdinputstyle_in_table'}{'contents'}[0]{'contents'}[2];
diff --git a/tp/t/results/misc_commands/test_allowcodebreaks.pl 
b/tp/t/results/misc_commands/test_allowcodebreaks.pl
index 9d565a5302..0fd97b4550 100644
--- a/tp/t/results/misc_commands/test_allowcodebreaks.pl
+++ b/tp/t/results/misc_commands/test_allowcodebreaks.pl
@@ -90,14 +90,9 @@ $result_trees{'test_allowcodebreaks'} = {
             },
             {
               'parent' => {},
-              'text' => 'anc-hor@anchor{A node\\nr\\}}',
-              'type' => 'raw'
-            },
-            {
-              'parent' => {},
-              'text' => '
+              'text' => 'anc-hor@anchor{A node\\nr\\}}
 ',
-              'type' => 'last_raw_newline'
+              'type' => 'raw'
             },
             {
               'args' => [
@@ -176,14 +171,9 @@ $result_trees{'test_allowcodebreaks'} = {
             },
             {
               'parent' => {},
-              'text' => '@end example',
-              'type' => 'raw'
-            },
-            {
-              'parent' => {},
-              'text' => '
+              'text' => '@end example
 ',
-              'type' => 'last_raw_newline'
+              'type' => 'raw'
             },
             {
               'args' => [
@@ -2296,10 +2286,9 @@ 
$result_trees{'test_allowcodebreaks'}{'contents'}[1]{'contents'}[1]{'contents'}[
 
$result_trees{'test_allowcodebreaks'}{'contents'}[1]{'contents'}[1]{'contents'}[3]{'parent'}
 = $result_trees{'test_allowcodebreaks'}{'contents'}[1]{'contents'}[1];
 
$result_trees{'test_allowcodebreaks'}{'contents'}[1]{'contents'}[1]{'contents'}[4]{'parent'}
 = $result_trees{'test_allowcodebreaks'}{'contents'}[1]{'contents'}[1];
 
$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]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'test_allowcodebreaks'}{'contents'}[1]{'contents'}[1]{'contents'}[6]{'args'}[0];
+$result_trees{'test_allowcodebreaks'}{'contents'}[1]{'contents'}[1]{'contents'}[6]{'args'}[0]{'parent'}
 = 
$result_trees{'test_allowcodebreaks'}{'contents'}[1]{'contents'}[1]{'contents'}[6];
 
$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]{'contents'}[7]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'test_allowcodebreaks'}{'contents'}[1]{'contents'}[1]{'contents'}[7]{'args'}[0];
-$result_trees{'test_allowcodebreaks'}{'contents'}[1]{'contents'}[1]{'contents'}[7]{'args'}[0]{'parent'}
 = 
$result_trees{'test_allowcodebreaks'}{'contents'}[1]{'contents'}[1]{'contents'}[7];
-$result_trees{'test_allowcodebreaks'}{'contents'}[1]{'contents'}[1]{'contents'}[7]{'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]{'parent'} 
= $result_trees{'test_allowcodebreaks'}{'contents'}[1];
 
$result_trees{'test_allowcodebreaks'}{'contents'}[1]{'contents'}[3]{'args'}[0]{'parent'}
 = $result_trees{'test_allowcodebreaks'}{'contents'}[1]{'contents'}[3];
@@ -2307,10 +2296,9 @@ 
$result_trees{'test_allowcodebreaks'}{'contents'}[1]{'contents'}[3]{'contents'}[
 
$result_trees{'test_allowcodebreaks'}{'contents'}[1]{'contents'}[3]{'contents'}[1]{'parent'}
 = $result_trees{'test_allowcodebreaks'}{'contents'}[1]{'contents'}[3];
 
$result_trees{'test_allowcodebreaks'}{'contents'}[1]{'contents'}[3]{'contents'}[2]{'parent'}
 = $result_trees{'test_allowcodebreaks'}{'contents'}[1]{'contents'}[3];
 
$result_trees{'test_allowcodebreaks'}{'contents'}[1]{'contents'}[3]{'contents'}[3]{'parent'}
 = $result_trees{'test_allowcodebreaks'}{'contents'}[1]{'contents'}[3];
+$result_trees{'test_allowcodebreaks'}{'contents'}[1]{'contents'}[3]{'contents'}[4]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'test_allowcodebreaks'}{'contents'}[1]{'contents'}[3]{'contents'}[4]{'args'}[0];
+$result_trees{'test_allowcodebreaks'}{'contents'}[1]{'contents'}[3]{'contents'}[4]{'args'}[0]{'parent'}
 = 
$result_trees{'test_allowcodebreaks'}{'contents'}[1]{'contents'}[3]{'contents'}[4];
 
$result_trees{'test_allowcodebreaks'}{'contents'}[1]{'contents'}[3]{'contents'}[4]{'parent'}
 = $result_trees{'test_allowcodebreaks'}{'contents'}[1]{'contents'}[3];
-$result_trees{'test_allowcodebreaks'}{'contents'}[1]{'contents'}[3]{'contents'}[5]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'test_allowcodebreaks'}{'contents'}[1]{'contents'}[3]{'contents'}[5]{'args'}[0];
-$result_trees{'test_allowcodebreaks'}{'contents'}[1]{'contents'}[3]{'contents'}[5]{'args'}[0]{'parent'}
 = 
$result_trees{'test_allowcodebreaks'}{'contents'}[1]{'contents'}[3]{'contents'}[5];
-$result_trees{'test_allowcodebreaks'}{'contents'}[1]{'contents'}[3]{'contents'}[5]{'parent'}
 = $result_trees{'test_allowcodebreaks'}{'contents'}[1]{'contents'}[3];
 $result_trees{'test_allowcodebreaks'}{'contents'}[1]{'contents'}[3]{'parent'} 
= $result_trees{'test_allowcodebreaks'}{'contents'}[1];
 $result_trees{'test_allowcodebreaks'}{'contents'}[1]{'contents'}[4]{'parent'} 
= $result_trees{'test_allowcodebreaks'}{'contents'}[1];
 
$result_trees{'test_allowcodebreaks'}{'contents'}[1]{'contents'}[5]{'contents'}[0]{'parent'}
 = $result_trees{'test_allowcodebreaks'}{'contents'}[1]{'contents'}[5];
diff --git a/tp/t/results/plaintext_tests/star_at_command_formatting.pl 
b/tp/t/results/plaintext_tests/star_at_command_formatting.pl
index cd72ba22c6..3d0edc77e1 100644
--- a/tp/t/results/plaintext_tests/star_at_command_formatting.pl
+++ b/tp/t/results/plaintext_tests/star_at_command_formatting.pl
@@ -87,14 +87,9 @@ $result_trees{'star_at_command_formatting'} = {
             },
             {
               'parent' => {},
-              'text' => 'And end para.',
-              'type' => 'raw'
-            },
-            {
-              'parent' => {},
-              'text' => '
+              'text' => 'And end para.
 ',
-              'type' => 'last_raw_newline'
+              'type' => 'raw'
             },
             {
               'args' => [
@@ -1136,10 +1131,9 @@ 
$result_trees{'star_at_command_formatting'}{'contents'}[0]{'contents'}[0]{'conte
 
$result_trees{'star_at_command_formatting'}{'contents'}[0]{'contents'}[0]{'contents'}[9]{'parent'}
 = $result_trees{'star_at_command_formatting'}{'contents'}[0]{'contents'}[0];
 
$result_trees{'star_at_command_formatting'}{'contents'}[0]{'contents'}[0]{'contents'}[10]{'parent'}
 = $result_trees{'star_at_command_formatting'}{'contents'}[0]{'contents'}[0];
 
$result_trees{'star_at_command_formatting'}{'contents'}[0]{'contents'}[0]{'contents'}[11]{'parent'}
 = $result_trees{'star_at_command_formatting'}{'contents'}[0]{'contents'}[0];
+$result_trees{'star_at_command_formatting'}{'contents'}[0]{'contents'}[0]{'contents'}[12]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'star_at_command_formatting'}{'contents'}[0]{'contents'}[0]{'contents'}[12]{'args'}[0];
+$result_trees{'star_at_command_formatting'}{'contents'}[0]{'contents'}[0]{'contents'}[12]{'args'}[0]{'parent'}
 = 
$result_trees{'star_at_command_formatting'}{'contents'}[0]{'contents'}[0]{'contents'}[12];
 
$result_trees{'star_at_command_formatting'}{'contents'}[0]{'contents'}[0]{'contents'}[12]{'parent'}
 = $result_trees{'star_at_command_formatting'}{'contents'}[0]{'contents'}[0];
-$result_trees{'star_at_command_formatting'}{'contents'}[0]{'contents'}[0]{'contents'}[13]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'star_at_command_formatting'}{'contents'}[0]{'contents'}[0]{'contents'}[13]{'args'}[0];
-$result_trees{'star_at_command_formatting'}{'contents'}[0]{'contents'}[0]{'contents'}[13]{'args'}[0]{'parent'}
 = 
$result_trees{'star_at_command_formatting'}{'contents'}[0]{'contents'}[0]{'contents'}[13];
-$result_trees{'star_at_command_formatting'}{'contents'}[0]{'contents'}[0]{'contents'}[13]{'parent'}
 = $result_trees{'star_at_command_formatting'}{'contents'}[0]{'contents'}[0];
 
$result_trees{'star_at_command_formatting'}{'contents'}[0]{'contents'}[0]{'parent'}
 = $result_trees{'star_at_command_formatting'}{'contents'}[0];
 
$result_trees{'star_at_command_formatting'}{'contents'}[0]{'contents'}[1]{'parent'}
 = $result_trees{'star_at_command_formatting'}{'contents'}[0];
 
$result_trees{'star_at_command_formatting'}{'contents'}[0]{'contents'}[2]{'contents'}[0]{'parent'}
 = $result_trees{'star_at_command_formatting'}{'contents'}[0]{'contents'}[2];
diff --git a/tp/t/results/raw/nested_macros.pl 
b/tp/t/results/raw/nested_macros.pl
index 56a01a27b7..fca012e6bd 100644
--- a/tp/t/results/raw/nested_macros.pl
+++ b/tp/t/results/raw/nested_macros.pl
@@ -40,14 +40,9 @@ $result_trees{'nested_macros'} = {
               'contents' => [
                 {
                   'parent' => {},
-                  'text' => 'other macro',
-                  'type' => 'raw'
-                },
-                {
-                  'parent' => {},
-                  'text' => '
+                  'text' => 'other macro
 ',
-                  'type' => 'last_raw_newline'
+                  'type' => 'raw'
                 },
                 {
                   'args' => [
@@ -177,10 +172,9 @@ 
$result_trees{'nested_macros'}{'contents'}[0]{'contents'}[0]{'args'}[1]{'parent'
 
$result_trees{'nested_macros'}{'contents'}[0]{'contents'}[0]{'args'}[2]{'parent'}
 = $result_trees{'nested_macros'}{'contents'}[0]{'contents'}[0];
 
$result_trees{'nested_macros'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'parent'}
 = $result_trees{'nested_macros'}{'contents'}[0]{'contents'}[0];
 
$result_trees{'nested_macros'}{'contents'}[0]{'contents'}[0]{'contents'}[1]{'contents'}[0]{'parent'}
 = $result_trees{'nested_macros'}{'contents'}[0]{'contents'}[0]{'contents'}[1];
+$result_trees{'nested_macros'}{'contents'}[0]{'contents'}[0]{'contents'}[1]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'nested_macros'}{'contents'}[0]{'contents'}[0]{'contents'}[1]{'contents'}[1]{'args'}[0];
+$result_trees{'nested_macros'}{'contents'}[0]{'contents'}[0]{'contents'}[1]{'contents'}[1]{'args'}[0]{'parent'}
 = 
$result_trees{'nested_macros'}{'contents'}[0]{'contents'}[0]{'contents'}[1]{'contents'}[1];
 
$result_trees{'nested_macros'}{'contents'}[0]{'contents'}[0]{'contents'}[1]{'contents'}[1]{'parent'}
 = $result_trees{'nested_macros'}{'contents'}[0]{'contents'}[0]{'contents'}[1];
-$result_trees{'nested_macros'}{'contents'}[0]{'contents'}[0]{'contents'}[1]{'contents'}[2]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'nested_macros'}{'contents'}[0]{'contents'}[0]{'contents'}[1]{'contents'}[2]{'args'}[0];
-$result_trees{'nested_macros'}{'contents'}[0]{'contents'}[0]{'contents'}[1]{'contents'}[2]{'args'}[0]{'parent'}
 = 
$result_trees{'nested_macros'}{'contents'}[0]{'contents'}[0]{'contents'}[1]{'contents'}[2];
-$result_trees{'nested_macros'}{'contents'}[0]{'contents'}[0]{'contents'}[1]{'contents'}[2]{'parent'}
 = $result_trees{'nested_macros'}{'contents'}[0]{'contents'}[0]{'contents'}[1];
 
$result_trees{'nested_macros'}{'contents'}[0]{'contents'}[0]{'contents'}[1]{'parent'}
 = $result_trees{'nested_macros'}{'contents'}[0]{'contents'}[0];
 
$result_trees{'nested_macros'}{'contents'}[0]{'contents'}[0]{'contents'}[2]{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'nested_macros'}{'contents'}[0]{'contents'}[0]{'contents'}[2]{'contents'}[0]{'args'}[0];
 
$result_trees{'nested_macros'}{'contents'}[0]{'contents'}[0]{'contents'}[2]{'contents'}[0]{'args'}[0]{'parent'}
 = 
$result_trees{'nested_macros'}{'contents'}[0]{'contents'}[0]{'contents'}[2]{'contents'}[0];
diff --git a/tp/t/results/value_and_macro/comma_value_in_macro_arg.pl 
b/tp/t/results/value_and_macro/comma_value_in_macro_arg.pl
index 2dc8517218..38c8b292f3 100644
--- a/tp/t/results/value_and_macro/comma_value_in_macro_arg.pl
+++ b/tp/t/results/value_and_macro/comma_value_in_macro_arg.pl
@@ -61,14 +61,9 @@ $result_trees{'comma_value_in_macro_arg'} = {
           'contents' => [
             {
               'parent' => {},
-              'text' => 'result: @emph{\\arg1\\} protected \\\\ -> 
\\\\arg1\\\\ @emph{\\arg2\\}',
-              'type' => 'raw'
-            },
-            {
-              'parent' => {},
-              'text' => '
+              'text' => 'result: @emph{\\arg1\\} protected \\\\ -> 
\\\\arg1\\\\ @emph{\\arg2\\}
 ',
-              'type' => 'last_raw_newline'
+              'type' => 'raw'
             },
             {
               'args' => [
@@ -190,10 +185,9 @@ 
$result_trees{'comma_value_in_macro_arg'}{'contents'}[0]{'contents'}[2]{'args'}[
 
$result_trees{'comma_value_in_macro_arg'}{'contents'}[0]{'contents'}[2]{'args'}[1]{'parent'}
 = $result_trees{'comma_value_in_macro_arg'}{'contents'}[0]{'contents'}[2];
 
$result_trees{'comma_value_in_macro_arg'}{'contents'}[0]{'contents'}[2]{'args'}[2]{'parent'}
 = $result_trees{'comma_value_in_macro_arg'}{'contents'}[0]{'contents'}[2];
 
$result_trees{'comma_value_in_macro_arg'}{'contents'}[0]{'contents'}[2]{'contents'}[0]{'parent'}
 = $result_trees{'comma_value_in_macro_arg'}{'contents'}[0]{'contents'}[2];
+$result_trees{'comma_value_in_macro_arg'}{'contents'}[0]{'contents'}[2]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'comma_value_in_macro_arg'}{'contents'}[0]{'contents'}[2]{'contents'}[1]{'args'}[0];
+$result_trees{'comma_value_in_macro_arg'}{'contents'}[0]{'contents'}[2]{'contents'}[1]{'args'}[0]{'parent'}
 = 
$result_trees{'comma_value_in_macro_arg'}{'contents'}[0]{'contents'}[2]{'contents'}[1];
 
$result_trees{'comma_value_in_macro_arg'}{'contents'}[0]{'contents'}[2]{'contents'}[1]{'parent'}
 = $result_trees{'comma_value_in_macro_arg'}{'contents'}[0]{'contents'}[2];
-$result_trees{'comma_value_in_macro_arg'}{'contents'}[0]{'contents'}[2]{'contents'}[2]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'comma_value_in_macro_arg'}{'contents'}[0]{'contents'}[2]{'contents'}[2]{'args'}[0];
-$result_trees{'comma_value_in_macro_arg'}{'contents'}[0]{'contents'}[2]{'contents'}[2]{'args'}[0]{'parent'}
 = 
$result_trees{'comma_value_in_macro_arg'}{'contents'}[0]{'contents'}[2]{'contents'}[2];
-$result_trees{'comma_value_in_macro_arg'}{'contents'}[0]{'contents'}[2]{'contents'}[2]{'parent'}
 = $result_trees{'comma_value_in_macro_arg'}{'contents'}[0]{'contents'}[2];
 
$result_trees{'comma_value_in_macro_arg'}{'contents'}[0]{'contents'}[2]{'parent'}
 = $result_trees{'comma_value_in_macro_arg'}{'contents'}[0];
 
$result_trees{'comma_value_in_macro_arg'}{'contents'}[0]{'contents'}[3]{'parent'}
 = $result_trees{'comma_value_in_macro_arg'}{'contents'}[0];
 
$result_trees{'comma_value_in_macro_arg'}{'contents'}[0]{'contents'}[4]{'contents'}[0]{'parent'}
 = $result_trees{'comma_value_in_macro_arg'}{'contents'}[0]{'contents'}[4];
diff --git a/tp/t/results/value_and_macro/macro_in_value.pl 
b/tp/t/results/value_and_macro/macro_in_value.pl
index 6f59e1273b..0c4641a89e 100644
--- a/tp/t/results/value_and_macro/macro_in_value.pl
+++ b/tp/t/results/value_and_macro/macro_in_value.pl
@@ -33,14 +33,9 @@ $result_trees{'macro_in_value'} = {
             },
             {
               'parent' => {},
-              'text' => 'b',
-              'type' => 'raw'
-            },
-            {
-              'parent' => {},
-              'text' => '
+              'text' => 'b
 ',
-              'type' => 'last_raw_newline'
+              'type' => 'raw'
             },
             {
               'args' => [
@@ -158,10 +153,9 @@ 
$result_trees{'macro_in_value'}{'contents'}[0]{'contents'}[0]{'args'}[0]{'parent
 
$result_trees{'macro_in_value'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'parent'}
 = $result_trees{'macro_in_value'}{'contents'}[0]{'contents'}[0];
 
$result_trees{'macro_in_value'}{'contents'}[0]{'contents'}[0]{'contents'}[1]{'parent'}
 = $result_trees{'macro_in_value'}{'contents'}[0]{'contents'}[0];
 
$result_trees{'macro_in_value'}{'contents'}[0]{'contents'}[0]{'contents'}[2]{'parent'}
 = $result_trees{'macro_in_value'}{'contents'}[0]{'contents'}[0];
+$result_trees{'macro_in_value'}{'contents'}[0]{'contents'}[0]{'contents'}[3]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'macro_in_value'}{'contents'}[0]{'contents'}[0]{'contents'}[3]{'args'}[0];
+$result_trees{'macro_in_value'}{'contents'}[0]{'contents'}[0]{'contents'}[3]{'args'}[0]{'parent'}
 = $result_trees{'macro_in_value'}{'contents'}[0]{'contents'}[0]{'contents'}[3];
 
$result_trees{'macro_in_value'}{'contents'}[0]{'contents'}[0]{'contents'}[3]{'parent'}
 = $result_trees{'macro_in_value'}{'contents'}[0]{'contents'}[0];
-$result_trees{'macro_in_value'}{'contents'}[0]{'contents'}[0]{'contents'}[4]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'macro_in_value'}{'contents'}[0]{'contents'}[0]{'contents'}[4]{'args'}[0];
-$result_trees{'macro_in_value'}{'contents'}[0]{'contents'}[0]{'contents'}[4]{'args'}[0]{'parent'}
 = $result_trees{'macro_in_value'}{'contents'}[0]{'contents'}[0]{'contents'}[4];
-$result_trees{'macro_in_value'}{'contents'}[0]{'contents'}[0]{'contents'}[4]{'parent'}
 = $result_trees{'macro_in_value'}{'contents'}[0]{'contents'}[0];
 $result_trees{'macro_in_value'}{'contents'}[0]{'contents'}[0]{'parent'} = 
$result_trees{'macro_in_value'}{'contents'}[0];
 $result_trees{'macro_in_value'}{'contents'}[0]{'contents'}[1]{'parent'} = 
$result_trees{'macro_in_value'}{'contents'}[0];
 
$result_trees{'macro_in_value'}{'contents'}[0]{'contents'}[2]{'args'}[0]{'parent'}
 = $result_trees{'macro_in_value'}{'contents'}[0]{'contents'}[2];
diff --git a/tp/t/results/value_and_macro/value_in_macro_body.pl 
b/tp/t/results/value_and_macro/value_in_macro_body.pl
index cfbb7f8954..003488add3 100644
--- a/tp/t/results/value_and_macro/value_in_macro_body.pl
+++ b/tp/t/results/value_and_macro/value_in_macro_body.pl
@@ -56,14 +56,9 @@ $result_trees{'value_in_macro_body'} = {
           'contents' => [
             {
               'parent' => {},
-              'text' => 'result: @emph{\\@value{bodyarg}\\  }',
-              'type' => 'raw'
-            },
-            {
-              'parent' => {},
-              'text' => '
+              'text' => 'result: @emph{\\@value{bodyarg}\\  }
 ',
-              'type' => 'last_raw_newline'
+              'type' => 'raw'
             },
             {
               'args' => [
@@ -163,10 +158,9 @@ 
$result_trees{'value_in_macro_body'}{'contents'}[0]{'contents'}[1]{'parent'} = $
 
$result_trees{'value_in_macro_body'}{'contents'}[0]{'contents'}[2]{'args'}[0]{'parent'}
 = $result_trees{'value_in_macro_body'}{'contents'}[0]{'contents'}[2];
 
$result_trees{'value_in_macro_body'}{'contents'}[0]{'contents'}[2]{'args'}[1]{'parent'}
 = $result_trees{'value_in_macro_body'}{'contents'}[0]{'contents'}[2];
 
$result_trees{'value_in_macro_body'}{'contents'}[0]{'contents'}[2]{'contents'}[0]{'parent'}
 = $result_trees{'value_in_macro_body'}{'contents'}[0]{'contents'}[2];
+$result_trees{'value_in_macro_body'}{'contents'}[0]{'contents'}[2]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'value_in_macro_body'}{'contents'}[0]{'contents'}[2]{'contents'}[1]{'args'}[0];
+$result_trees{'value_in_macro_body'}{'contents'}[0]{'contents'}[2]{'contents'}[1]{'args'}[0]{'parent'}
 = 
$result_trees{'value_in_macro_body'}{'contents'}[0]{'contents'}[2]{'contents'}[1];
 
$result_trees{'value_in_macro_body'}{'contents'}[0]{'contents'}[2]{'contents'}[1]{'parent'}
 = $result_trees{'value_in_macro_body'}{'contents'}[0]{'contents'}[2];
-$result_trees{'value_in_macro_body'}{'contents'}[0]{'contents'}[2]{'contents'}[2]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'value_in_macro_body'}{'contents'}[0]{'contents'}[2]{'contents'}[2]{'args'}[0];
-$result_trees{'value_in_macro_body'}{'contents'}[0]{'contents'}[2]{'contents'}[2]{'args'}[0]{'parent'}
 = 
$result_trees{'value_in_macro_body'}{'contents'}[0]{'contents'}[2]{'contents'}[2];
-$result_trees{'value_in_macro_body'}{'contents'}[0]{'contents'}[2]{'contents'}[2]{'parent'}
 = $result_trees{'value_in_macro_body'}{'contents'}[0]{'contents'}[2];
 $result_trees{'value_in_macro_body'}{'contents'}[0]{'contents'}[2]{'parent'} = 
$result_trees{'value_in_macro_body'}{'contents'}[0];
 $result_trees{'value_in_macro_body'}{'contents'}[0]{'contents'}[3]{'parent'} = 
$result_trees{'value_in_macro_body'}{'contents'}[0];
 
$result_trees{'value_in_macro_body'}{'contents'}[0]{'contents'}[4]{'contents'}[0]{'parent'}
 = $result_trees{'value_in_macro_body'}{'contents'}[0]{'contents'}[4];
diff --git a/tp/t/results/value_and_macro/value_in_macro_formal_arg.pl 
b/tp/t/results/value_and_macro/value_in_macro_formal_arg.pl
index aa64a4ceae..4c70137c75 100644
--- a/tp/t/results/value_and_macro/value_in_macro_formal_arg.pl
+++ b/tp/t/results/value_and_macro/value_in_macro_formal_arg.pl
@@ -61,14 +61,9 @@ $result_trees{'value_in_macro_formal_arg'} = {
           'contents' => [
             {
               'parent' => {},
-              'text' => 'result: @emph{\\arg\\} the \\the\\ thearg \\thearg\\ 
with value \\the@value{argument}\\',
-              'type' => 'raw'
-            },
-            {
-              'parent' => {},
-              'text' => '
+              'text' => 'result: @emph{\\arg\\} the \\the\\ thearg \\thearg\\ 
with value \\the@value{argument}\\
 ',
-              'type' => 'last_raw_newline'
+              'type' => 'raw'
             },
             {
               'args' => [
@@ -144,10 +139,9 @@ 
$result_trees{'value_in_macro_formal_arg'}{'contents'}[0]{'contents'}[2]{'args'}
 
$result_trees{'value_in_macro_formal_arg'}{'contents'}[0]{'contents'}[2]{'args'}[1]{'parent'}
 = $result_trees{'value_in_macro_formal_arg'}{'contents'}[0]{'contents'}[2];
 
$result_trees{'value_in_macro_formal_arg'}{'contents'}[0]{'contents'}[2]{'args'}[2]{'parent'}
 = $result_trees{'value_in_macro_formal_arg'}{'contents'}[0]{'contents'}[2];
 
$result_trees{'value_in_macro_formal_arg'}{'contents'}[0]{'contents'}[2]{'contents'}[0]{'parent'}
 = $result_trees{'value_in_macro_formal_arg'}{'contents'}[0]{'contents'}[2];
+$result_trees{'value_in_macro_formal_arg'}{'contents'}[0]{'contents'}[2]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'value_in_macro_formal_arg'}{'contents'}[0]{'contents'}[2]{'contents'}[1]{'args'}[0];
+$result_trees{'value_in_macro_formal_arg'}{'contents'}[0]{'contents'}[2]{'contents'}[1]{'args'}[0]{'parent'}
 = 
$result_trees{'value_in_macro_formal_arg'}{'contents'}[0]{'contents'}[2]{'contents'}[1];
 
$result_trees{'value_in_macro_formal_arg'}{'contents'}[0]{'contents'}[2]{'contents'}[1]{'parent'}
 = $result_trees{'value_in_macro_formal_arg'}{'contents'}[0]{'contents'}[2];
-$result_trees{'value_in_macro_formal_arg'}{'contents'}[0]{'contents'}[2]{'contents'}[2]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'value_in_macro_formal_arg'}{'contents'}[0]{'contents'}[2]{'contents'}[2]{'args'}[0];
-$result_trees{'value_in_macro_formal_arg'}{'contents'}[0]{'contents'}[2]{'contents'}[2]{'args'}[0]{'parent'}
 = 
$result_trees{'value_in_macro_formal_arg'}{'contents'}[0]{'contents'}[2]{'contents'}[2];
-$result_trees{'value_in_macro_formal_arg'}{'contents'}[0]{'contents'}[2]{'contents'}[2]{'parent'}
 = $result_trees{'value_in_macro_formal_arg'}{'contents'}[0]{'contents'}[2];
 
$result_trees{'value_in_macro_formal_arg'}{'contents'}[0]{'contents'}[2]{'parent'}
 = $result_trees{'value_in_macro_formal_arg'}{'contents'}[0];
 
$result_trees{'value_in_macro_formal_arg'}{'contents'}[0]{'contents'}[3]{'parent'}
 = $result_trees{'value_in_macro_formal_arg'}{'contents'}[0];
 
$result_trees{'value_in_macro_formal_arg'}{'contents'}[0]{'contents'}[4]{'contents'}[0]{'parent'}
 = $result_trees{'value_in_macro_formal_arg'}{'contents'}[0]{'contents'}[4];
diff --git a/tp/t/results/xtable/table_nested.pl 
b/tp/t/results/xtable/table_nested.pl
index b830b432d0..4c3ba7ccc1 100644
--- a/tp/t/results/xtable/table_nested.pl
+++ b/tp/t/results/xtable/table_nested.pl
@@ -141,14 +141,9 @@ $result_trees{'table_nested'} = {
             },
             {
               'parent' => {},
-              'text' => 'After table.',
-              'type' => 'raw'
-            },
-            {
-              'parent' => {},
-              'text' => '
+              'text' => 'After table.
 ',
-              'type' => 'last_raw_newline'
+              'type' => 'raw'
             },
             {
               'args' => [
@@ -2053,10 +2048,9 @@ 
$result_trees{'table_nested'}{'contents'}[0]{'contents'}[0]{'contents'}[17]{'par
 
$result_trees{'table_nested'}{'contents'}[0]{'contents'}[0]{'contents'}[18]{'parent'}
 = $result_trees{'table_nested'}{'contents'}[0]{'contents'}[0];
 
$result_trees{'table_nested'}{'contents'}[0]{'contents'}[0]{'contents'}[19]{'parent'}
 = $result_trees{'table_nested'}{'contents'}[0]{'contents'}[0];
 
$result_trees{'table_nested'}{'contents'}[0]{'contents'}[0]{'contents'}[20]{'parent'}
 = $result_trees{'table_nested'}{'contents'}[0]{'contents'}[0];
+$result_trees{'table_nested'}{'contents'}[0]{'contents'}[0]{'contents'}[21]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'table_nested'}{'contents'}[0]{'contents'}[0]{'contents'}[21]{'args'}[0];
+$result_trees{'table_nested'}{'contents'}[0]{'contents'}[0]{'contents'}[21]{'args'}[0]{'parent'}
 = $result_trees{'table_nested'}{'contents'}[0]{'contents'}[0]{'contents'}[21];
 
$result_trees{'table_nested'}{'contents'}[0]{'contents'}[0]{'contents'}[21]{'parent'}
 = $result_trees{'table_nested'}{'contents'}[0]{'contents'}[0];
-$result_trees{'table_nested'}{'contents'}[0]{'contents'}[0]{'contents'}[22]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'table_nested'}{'contents'}[0]{'contents'}[0]{'contents'}[22]{'args'}[0];
-$result_trees{'table_nested'}{'contents'}[0]{'contents'}[0]{'contents'}[22]{'args'}[0]{'parent'}
 = $result_trees{'table_nested'}{'contents'}[0]{'contents'}[0]{'contents'}[22];
-$result_trees{'table_nested'}{'contents'}[0]{'contents'}[0]{'contents'}[22]{'parent'}
 = $result_trees{'table_nested'}{'contents'}[0]{'contents'}[0];
 $result_trees{'table_nested'}{'contents'}[0]{'contents'}[0]{'parent'} = 
$result_trees{'table_nested'}{'contents'}[0];
 $result_trees{'table_nested'}{'contents'}[0]{'contents'}[1]{'parent'} = 
$result_trees{'table_nested'}{'contents'}[0];
 
$result_trees{'table_nested'}{'contents'}[0]{'contents'}[2]{'contents'}[0]{'parent'}
 = $result_trees{'table_nested'}{'contents'}[0]{'contents'}[2];