texinfo-commits
[Top][All Lists]
Advanced

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

branch master updated: * tp/Texinfo/ParserNonXS.pm (_register_source_mar


From: Patrice Dumas
Subject: branch master updated: * tp/Texinfo/ParserNonXS.pm (_register_source_mark), tp/Texinfo/XS/parsetexi/api.c (store_source_mark_list), tp/Texinfo/XS/parsetexi/source_marks. (register_source_mark): remove the source mark location informatio, it is not useful. Do not set the position if the element text is the empty string.
Date: Tue, 31 Jan 2023 11:59:33 -0500

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

pertusus pushed a commit to branch master
in repository texinfo.

The following commit(s) were added to refs/heads/master by this push:
     new 7b3db20e61 * tp/Texinfo/ParserNonXS.pm (_register_source_mark), 
tp/Texinfo/XS/parsetexi/api.c (store_source_mark_list), 
tp/Texinfo/XS/parsetexi/source_marks. (register_source_mark): remove the source 
mark location informatio, it is not useful. Do not set the position if the 
element text is the empty string.
7b3db20e61 is described below

commit 7b3db20e61642e78be3479d6c63d9d9e791d7357
Author: Patrice Dumas <pertusus@free.fr>
AuthorDate: Tue Jan 31 17:59:22 2023 +0100

    * tp/Texinfo/ParserNonXS.pm (_register_source_mark),
    tp/Texinfo/XS/parsetexi/api.c (store_source_mark_list),
    tp/Texinfo/XS/parsetexi/source_marks. (register_source_mark):
    remove the source mark location informatio, it is not useful.
    Do not set the position if the element text is the empty string.
---
 ChangeLog                                          |   8 +
 tp/Texinfo/ParserNonXS.pm                          |   7 +-
 tp/Texinfo/XS/parsetexi/api.c                      |  12 +-
 tp/Texinfo/XS/parsetexi/source_marks.c             |  14 +-
 tp/Texinfo/XS/parsetexi/tree_types.h               |   5 -
 tp/t/results/conditionals/macro_in_ifset.pl        |   3 -
 tp/t/results/conditionals/macro_in_ifset_set.pl    |   3 -
 tp/t/results/conditionals/nested_ifset_ifclear.pl  |   8 -
 .../conditionals/user_defined_txiinternalvalue.pl  |   3 -
 .../results/converters_tests/at_commands_in_raw.pl |   2 -
 .../converters_tests/definition_commands.pl        |   1 -
 tp/t/results/coverage/def.pl                       |   1 -
 tp/t/results/coverage/delcomment.pl                |   2 -
 .../coverage/delcomment_followed_by_cpp_line.pl    |   4 -
 tp/t/results/coverage_braces/test_image.pl         |  21 --
 tp/t/results/def/all_commands_delimiters.pl        |  10 -
 .../def/all_commands_delimiters_printindex.pl      |  10 -
 tp/t/results/def/end_of_lines_protected.pl         |   2 -
 .../def/end_of_lines_protected_in_footnote.pl      |   2 -
 .../def/end_of_lines_protected_non_ascii.pl        |   2 -
 tp/t/results/def/wrong_braces_with_end_of_lines.pl |   2 -
 tp/t/results/include/cpp_lines.pl                  |  16 -
 tp/t/results/include/double_include.pl             |   4 -
 tp/t/results/include/include_comment.pl            |   1 -
 tp/t/results/include/include_space.pl              |   1 -
 tp/t/results/include/include_space_comment.pl      |   1 -
 tp/t/results/include/include_with_setfilename.pl   |   1 -
 .../include_with_setfilename_in_preformatted.pl    |   1 -
 .../macro_and_commands_in_early_commands.pl        |  13 -
 .../results/include/macro_definition_in_include.pl |   3 -
 tp/t/results/include/macro_in_early_commands.pl    |  24 --
 tp/t/results/include/no_eol_in_included_file.pl    |   2 -
 tp/t/results/include/simple.pl                     |   1 -
 tp/t/results/include/simple_no_eol.pl              |   1 -
 tp/t/results/include/test_two_include.pl           |   3 -
 tp/t/results/include/value_expansion_in_include.pl |   6 -
 tp/t/results/info_tests/def_in_copying.pl          |   6 -
 tp/t/results/macro/arg_body_expansion_order.pl     |   6 -
 tp/t/results/macro/arg_not_closed.pl               |   2 -
 tp/t/results/macro/backslash_in_arg.pl             |  28 --
 tp/t/results/macro/bib_example.pl                  |  18 -
 tp/t/results/macro/complete_macro_for_end.pl       |   3 -
 tp/t/results/macro/complex_argument.pl             |  12 -
 tp/t/results/macro/cpp_directives_after_macros.pl  |   7 -
 tp/t/results/macro/cpp_directives_in_macro.pl      |   3 -
 tp/t/results/macro/double_recursive_macro_call.pl  |   8 -
 tp/t/results/macro/empty_macro_argument.pl         |  18 -
 tp/t/results/macro/empty_macro_in_text_no_arg.pl   |   4 -
 tp/t/results/macro/empty_macro_no_arg.pl           |   8 -
 tp/t/results/macro/expand_two_same.pl              |   6 -
 tp/t/results/macro/expansion_order.pl              |   6 -
 tp/t/results/macro/form_feeds.pl                   |   6 -
 tp/t/results/macro/glossary.pl                     |  22 --
 tp/t/results/macro/ifclear_in_macro.pl             |   2 -
 tp/t/results/macro/ifset_and_end_isef_in_macro.pl  |   2 -
 tp/t/results/macro/ifset_in_macro.pl               |   2 -
 tp/t/results/macro/ifset_in_macro_set.pl           |   2 -
 tp/t/results/macro/ignored_macro_definition.pl     |   3 -
 tp/t/results/macro/implicit_quoting_one_arg.pl     |   2 -
 tp/t/results/macro/implicit_quoting_recursion.pl   |  18 -
 tp/t/results/macro/include_after_empty_line_arg.pl |   4 -
 tp/t/results/macro/leading_spaces_no_ignore.pl     |   3 -
 tp/t/results/macro/line_after_recursive_call.pl    |   3 -
 tp/t/results/macro/macro_expands_to_empty.pl       |   7 -
 tp/t/results/macro/macro_expansion.pl              |  12 -
 tp/t/results/macro/macro_for_end.pl                |   4 -
 .../macro/macro_for_ignored_line_command.pl        |   2 -
 tp/t/results/macro/macro_in_accent.pl              |   1 -
 tp/t/results/macro/macro_in_brace_command.pl       |   4 -
 tp/t/results/macro/macro_in_end_argument.pl        |   2 -
 tp/t/results/macro/macro_in_index_commands.pl      |  29 --
 .../macro/macro_in_invalid_documentencoding.pl     |   2 -
 tp/t/results/macro/macro_in_macro_arg.pl           |   7 -
 tp/t/results/macro/macro_in_macro_arg_simpler.pl   |   6 -
 tp/t/results/macro/macro_in_menu.pl                |  11 -
 tp/t/results/macro/macro_in_misc_commands.pl       | 157 --------
 tp/t/results/macro/macro_name_with_digit.pl        |   5 -
 tp/t/results/macro/macro_name_with_hyphen.pl       |   3 -
 tp/t/results/macro/macro_no_arg_bad_expansion.pl   |   3 -
 tp/t/results/macro/macro_no_arg_expansion.pl       |   3 -
 tp/t/results/macro/macro_one_arg_end_of_file.pl    |   3 -
 .../macro_with_error_at_end_line_after_macro.pl    |   4 -
 tp/t/results/macro/macro_zero.pl                   |   3 -
 tp/t/results/macro/nested_macro_call.pl            |   4 -
 tp/t/results/macro/no_macrobody.pl                 |   8 -
 tp/t/results/macro/paragraph_and_macro.pl          |  18 -
 tp/t/results/macro/protect_comma_macro_line.pl     |   3 -
 tp/t/results/macro/protect_in_body.pl              |   1 -
 tp/t/results/macro/protect_in_body_line_arg.pl     |   2 -
 tp/t/results/macro/protect_in_body_one_arg.pl      |   2 -
 tp/t/results/macro/recursive_call_in_argument.pl   |   3 -
 tp/t/results/macro/recursive_call_in_macro.pl      |   4 -
 tp/t/results/macro/recursive_call_in_rmacro.pl     | 400 ---------------------
 tp/t/results/macro/redefine_texinfo_macro.pl       |   2 -
 tp/t/results/macro/simple_imbricated_macro.pl      |   6 -
 .../macro/simple_imbricated_macro_rmacro.pl        |   6 -
 tp/t/results/macro/space_macro_after_end.pl        |   2 -
 .../macro/space_macro_after_end_verbatim.pl        |   2 -
 tp/t/results/macro/too_much_args.pl                |   3 -
 tp/t/results/macro/two_macros_on_a_line.pl         |  20 --
 .../codequoteundirected_codequotebacktick.pl       |  40 ---
 tp/t/results/misc_commands/kbdinputstyle.pl        |   9 -
 .../misc_commands/kbdinputstyle_in_table.pl        |   9 -
 tp/t/results/misc_commands/test_allowcodebreaks.pl |  15 -
 tp/t/results/moresectioning/raiselowersections.pl  |   2 -
 .../plaintext_tests/star_at_command_formatting.pl  |   9 -
 .../value_and_macro/comma_value_in_macro_arg.pl    |   2 -
 tp/t/results/value_and_macro/macro_in_value.pl     |   2 -
 .../results/value_and_macro/value_in_macro_body.pl |   2 -
 tp/t/results/xtable/table_nested.pl                |   9 -
 110 files changed, 15 insertions(+), 1242 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index d75dd7db72..4b24ee10dd 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2023-01-31  Patrice Dumas  <pertusus@free.fr>
+
+       * tp/Texinfo/ParserNonXS.pm (_register_source_mark),
+       tp/Texinfo/XS/parsetexi/api.c (store_source_mark_list),
+       tp/Texinfo/XS/parsetexi/source_marks. (register_source_mark):
+       remove the source mark location informatio, it is not useful.
+       Do not set the position if the element text is the empty string.
+
 2023-01-31  Patrice Dumas  <pertusus@free.fr>
 
        * tp/Texinfo/XS/parsetexi/api.c (store_source_mark_list): use the
diff --git a/tp/Texinfo/ParserNonXS.pm b/tp/Texinfo/ParserNonXS.pm
index 2198bdb491..d0a36dc66c 100644
--- a/tp/Texinfo/ParserNonXS.pm
+++ b/tp/Texinfo/ParserNonXS.pm
@@ -1294,8 +1294,7 @@ sub _register_source_mark
   if ($element->{'contents'} and scalar(@{$element->{'contents'}}) > 0) {
     my $current = $element->{'contents'}->[-1];
     $mark_element = $current;
-    if (exists ($current->{'text'})) {
-      $source_mark->{'location'} = 'text';
+    if (defined($current->{'text'}) and $current->{'text'} ne '') {
       $source_mark->{'position'} = length($current->{'text'});
     }
     #print STDERR "source_mark: element: "
@@ -1315,8 +1314,8 @@ sub _register_source_mark
 
   print STDERR "MARKS: $source_mark->{'sourcemark_type'} c: "
     .(defined($source_mark->{'counter'}) ? $source_mark->{'counter'}: 'UNDEF')
-    .", ".(defined($source_mark->{'location'})
-             ? $source_mark->{'location'}: 'UNDEF')." "
+    .", ".(defined($source_mark->{'position'})
+             ? $source_mark->{'position'}: 'UNDEF')." "
      .(defined($source_mark->{'status'}) ? $source_mark->{'status'}: 'UNDEF')
      .' '.Texinfo::Common::debug_print_element_short($mark_element)."\n"
         if ($self->{'DEBUG'});
diff --git a/tp/Texinfo/XS/parsetexi/api.c b/tp/Texinfo/XS/parsetexi/api.c
index 26716a997c..769e9c8388 100644
--- a/tp/Texinfo/XS/parsetexi/api.c
+++ b/tp/Texinfo/XS/parsetexi/api.c
@@ -531,7 +531,7 @@ store_source_mark_list (ELEMENT *e)
               different size"). */
           source_mark_counter = (IV) (intptr_t) s_mark->counter;
           STORE ("counter", newSViv (source_mark_counter));
-          if (s_mark->location != source_mark_location_none)
+          if (s_mark->position > 0)
             {
               source_mark_position = (IV) (intptr_t) s_mark->position;
               STORE ("position", newSViv (source_mark_position));
@@ -561,16 +561,6 @@ store_source_mark_list (ELEMENT *e)
               SAVE_S_M_STATUS (end)
               SAVE_S_M_STATUS (fail)
             }
-#define SAVE_S_M_LOCATION(X) \
-           case source_mark_location_ ## X: \
-           sv = newSVpv_utf8 (#X, 0);\
-           STORE ("location", sv); \
-           break;
-
-          switch (s_mark->location)
-            {
-              SAVE_S_M_LOCATION (text)
-            }
 
 #define SAVE_S_M_TYPE(X) \
            case SM_type_ ## X: \
diff --git a/tp/Texinfo/XS/parsetexi/source_marks.c 
b/tp/Texinfo/XS/parsetexi/source_marks.c
index 51ef605816..f2438ae263 100644
--- a/tp/Texinfo/XS/parsetexi/source_marks.c
+++ b/tp/Texinfo/XS/parsetexi/source_marks.c
@@ -37,7 +37,6 @@ new_source_mark (enum source_mark_type type)
   source_mark->type = type;
   source_mark->counter = -1;
   source_mark->status = SM_status_none;
-  source_mark->location = source_mark_location_none;
   return source_mark;
 }
 
@@ -109,15 +108,8 @@ register_source_mark (ELEMENT *e, SOURCE_MARK *source_mark)
     {
       ELEMENT *last_child = last_contents_child (e);
       mark_element = last_child;
-      /* use last_child->text.space and not last_child->text.end
-         to associate to element text when the test string is set
-         but empty.
-         FIXME this looks like a wrong way to do it */
-      if (last_child->text.space > 0)
-        {
-          source_mark->location = source_mark_location_text;
-          source_mark->position = count_convert_u8 (last_child->text.text);
-        }
+      if (last_child->text.end > 0)
+        source_mark->position = count_convert_u8 (last_child->text.text);
     }
   else
     {
@@ -127,7 +119,7 @@ register_source_mark (ELEMENT *e, SOURCE_MARK *source_mark)
     }
 
   debug_nonl ("MARKS: %d c: %d, %d %d ", source_mark->type,
-              source_mark->counter, source_mark->location,
+              source_mark->counter, source_mark->position,
               source_mark->status);
   debug_print_element_short (mark_element, 1);
   debug("");
diff --git a/tp/Texinfo/XS/parsetexi/tree_types.h 
b/tp/Texinfo/XS/parsetexi/tree_types.h
index 0a2c03ab31..1660f99a74 100644
--- a/tp/Texinfo/XS/parsetexi/tree_types.h
+++ b/tp/Texinfo/XS/parsetexi/tree_types.h
@@ -50,10 +50,6 @@ enum source_mark_type { SM_type_none,
                         SM_type_macro_expansion
 };
 
-enum source_mark_location { source_mark_location_none,
-                            source_mark_location_text
-};
-
 enum source_mark_status {
     SM_status_none,
     SM_status_start,
@@ -88,7 +84,6 @@ typedef struct ASSOCIATED_INFO {
 typedef struct SOURCE_MARK {
     enum source_mark_type type;
     enum source_mark_status status;
-    enum source_mark_location location;
     size_t position;
     int counter;
     struct ELEMENT *element; /* needed for elements removed
diff --git a/tp/t/results/conditionals/macro_in_ifset.pl 
b/tp/t/results/conditionals/macro_in_ifset.pl
index b49769d9cb..e956903ee5 100644
--- a/tp/t/results/conditionals/macro_in_ifset.pl
+++ b/tp/t/results/conditionals/macro_in_ifset.pl
@@ -83,7 +83,6 @@ $result_trees{'macro_in_ifset'} = {
               'source_marks' => [
                 {
                   'counter' => 1,
-                  'location' => 'text',
                   'position' => 4,
                   'sourcemark_type' => 'macro_expansion',
                   'status' => 'end'
@@ -110,8 +109,6 @@ $result_trees{'macro_in_ifset'} = {
             },
             'type' => 'macro_call'
           },
-          'location' => 'text',
-          'position' => 0,
           'sourcemark_type' => 'macro_expansion',
           'status' => 'start'
         }
diff --git a/tp/t/results/conditionals/macro_in_ifset_set.pl 
b/tp/t/results/conditionals/macro_in_ifset_set.pl
index 441f45de09..e9403c39f0 100644
--- a/tp/t/results/conditionals/macro_in_ifset_set.pl
+++ b/tp/t/results/conditionals/macro_in_ifset_set.pl
@@ -182,7 +182,6 @@ $result_trees{'macro_in_ifset_set'} = {
               'source_marks' => [
                 {
                   'counter' => 1,
-                  'location' => 'text',
                   'position' => 8,
                   'sourcemark_type' => 'macro_expansion',
                   'status' => 'end'
@@ -209,8 +208,6 @@ $result_trees{'macro_in_ifset_set'} = {
             },
             'type' => 'macro_call'
           },
-          'location' => 'text',
-          'position' => 0,
           'sourcemark_type' => 'macro_expansion',
           'status' => 'start'
         }
diff --git a/tp/t/results/conditionals/nested_ifset_ifclear.pl 
b/tp/t/results/conditionals/nested_ifset_ifclear.pl
index 17eec83861..b4bb26b3a2 100644
--- a/tp/t/results/conditionals/nested_ifset_ifclear.pl
+++ b/tp/t/results/conditionals/nested_ifset_ifclear.pl
@@ -319,8 +319,6 @@ $result_trees{'nested_ifset_ifclear'} = {
             },
             'type' => 'macro_call'
           },
-          'location' => 'text',
-          'position' => 0,
           'sourcemark_type' => 'macro_expansion',
           'status' => 'start'
         },
@@ -337,8 +335,6 @@ $result_trees{'nested_ifset_ifclear'} = {
             },
             'type' => 'macro_call'
           },
-          'location' => 'text',
-          'position' => 0,
           'sourcemark_type' => 'macro_expansion',
           'status' => 'start'
         },
@@ -355,8 +351,6 @@ $result_trees{'nested_ifset_ifclear'} = {
             },
             'type' => 'macro_call'
           },
-          'location' => 'text',
-          'position' => 0,
           'sourcemark_type' => 'macro_expansion',
           'status' => 'start'
         },
@@ -373,8 +367,6 @@ $result_trees{'nested_ifset_ifclear'} = {
             },
             'type' => 'macro_call'
           },
-          'location' => 'text',
-          'position' => 0,
           'sourcemark_type' => 'macro_expansion',
           'status' => 'start'
         }
diff --git a/tp/t/results/conditionals/user_defined_txiinternalvalue.pl 
b/tp/t/results/conditionals/user_defined_txiinternalvalue.pl
index f845ea518a..d3da3f4c6e 100644
--- a/tp/t/results/conditionals/user_defined_txiinternalvalue.pl
+++ b/tp/t/results/conditionals/user_defined_txiinternalvalue.pl
@@ -73,7 +73,6 @@ $result_trees{'user_defined_txiinternalvalue'} = {
               'source_marks' => [
                 {
                   'counter' => 1,
-                  'location' => 'text',
                   'position' => 18,
                   'sourcemark_type' => 'macro_expansion',
                   'status' => 'end'
@@ -95,8 +94,6 @@ $result_trees{'user_defined_txiinternalvalue'} = {
             },
             'type' => 'macro_call'
           },
-          'location' => 'text',
-          'position' => 0,
           'sourcemark_type' => 'macro_expansion',
           'status' => 'start'
         }
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 7246359ef6..5882ef56da 100644
--- a/tp/t/results/converters_tests/at_commands_in_raw.pl
+++ b/tp/t/results/converters_tests/at_commands_in_raw.pl
@@ -800,14 +800,12 @@ $result_trees{'at_commands_in_raw'} = {
                     },
                     'type' => 'macro_call'
                   },
-                  'location' => 'text',
                   'position' => 20,
                   'sourcemark_type' => 'macro_expansion',
                   'status' => 'start'
                 },
                 {
                   'counter' => 1,
-                  'location' => 'text',
                   'position' => 31,
                   'sourcemark_type' => 'macro_expansion',
                   'status' => 'end'
diff --git a/tp/t/results/converters_tests/definition_commands.pl 
b/tp/t/results/converters_tests/definition_commands.pl
index 6099c7c3e1..a3fb1cba65 100644
--- a/tp/t/results/converters_tests/definition_commands.pl
+++ b/tp/t/results/converters_tests/definition_commands.pl
@@ -10727,7 +10727,6 @@ $result_trees{'definition_commands'} = {
                       'source_marks' => [
                         {
                           'counter' => 1,
-                          'location' => 'text',
                           'position' => 1,
                           'sourcemark_type' => 'defline_continuation'
                         }
diff --git a/tp/t/results/coverage/def.pl b/tp/t/results/coverage/def.pl
index 7a3f89934e..2e4deafd95 100644
--- a/tp/t/results/coverage/def.pl
+++ b/tp/t/results/coverage/def.pl
@@ -204,7 +204,6 @@ $result_trees{'def'} = {
                       'source_marks' => [
                         {
                           'counter' => 1,
-                          'location' => 'text',
                           'position' => 1,
                           'sourcemark_type' => 'defline_continuation'
                         }
diff --git a/tp/t/results/coverage/delcomment.pl 
b/tp/t/results/coverage/delcomment.pl
index cc076884c6..4c8edd664f 100644
--- a/tp/t/results/coverage/delcomment.pl
+++ b/tp/t/results/coverage/delcomment.pl
@@ -102,8 +102,6 @@ $result_trees{'delcomment'} = {
                   'counter' => 1,
                   'line' => ' this is a comment.
 ',
-                  'location' => 'text',
-                  'position' => 0,
                   'sourcemark_type' => 'delcomment'
                 }
               ],
diff --git a/tp/t/results/coverage/delcomment_followed_by_cpp_line.pl 
b/tp/t/results/coverage/delcomment_followed_by_cpp_line.pl
index 031626380b..595c114648 100644
--- a/tp/t/results/coverage/delcomment_followed_by_cpp_line.pl
+++ b/tp/t/results/coverage/delcomment_followed_by_cpp_line.pl
@@ -133,7 +133,6 @@ $result_trees{'delcomment_followed_by_cpp_line'} = {
               'counter' => 2,
               'line' => ' this is a comment.
 ',
-              'location' => 'text',
               'position' => 2,
               'sourcemark_type' => 'delcomment'
             }
@@ -181,7 +180,6 @@ $result_trees{'delcomment_followed_by_cpp_line'} = {
                   'counter' => 3,
                   'line' => ' this is a comment.
 ',
-                  'location' => 'text',
                   'position' => 2,
                   'sourcemark_type' => 'delcomment'
                 }
@@ -217,8 +215,6 @@ $result_trees{'delcomment_followed_by_cpp_line'} = {
           'counter' => 1,
           'line' => ' this is a comment.
 ',
-          'location' => 'text',
-          'position' => 0,
           'sourcemark_type' => 'delcomment'
         }
       ],
diff --git a/tp/t/results/coverage_braces/test_image.pl 
b/tp/t/results/coverage_braces/test_image.pl
index f5e2e8533e..2ce2a0568f 100644
--- a/tp/t/results/coverage_braces/test_image.pl
+++ b/tp/t/results/coverage_braces/test_image.pl
@@ -253,8 +253,6 @@ $result_trees{'test_image'} = {
                     },
                     'type' => 'macro_call'
                   },
-                  'location' => 'text',
-                  'position' => 0,
                   'sourcemark_type' => 'macro_expansion',
                   'status' => 'start'
                 }
@@ -530,7 +528,6 @@ $result_trees{'test_image'} = {
                   'source_marks' => [
                     {
                       'counter' => 1,
-                      'location' => 'text',
                       'position' => 1,
                       'sourcemark_type' => 'macro_expansion',
                       'status' => 'end'
@@ -1019,7 +1016,6 @@ $result_trees{'test_image'} = {
               'source_marks' => [
                 {
                   'counter' => 2,
-                  'location' => 'text',
                   'position' => 1,
                   'sourcemark_type' => 'macro_expansion',
                   'status' => 'end'
@@ -1489,7 +1485,6 @@ $result_trees{'test_image'} = {
                   'source_marks' => [
                     {
                       'counter' => 3,
-                      'location' => 'text',
                       'position' => 1,
                       'sourcemark_type' => 'macro_expansion',
                       'status' => 'end'
@@ -1513,8 +1508,6 @@ $result_trees{'test_image'} = {
                     },
                     'type' => 'macro_call'
                   },
-                  'location' => 'text',
-                  'position' => 0,
                   'sourcemark_type' => 'macro_expansion',
                   'status' => 'start'
                 }
@@ -1999,7 +1992,6 @@ $result_trees{'test_image'} = {
                   'source_marks' => [
                     {
                       'counter' => 4,
-                      'location' => 'text',
                       'position' => 1,
                       'sourcemark_type' => 'macro_expansion',
                       'status' => 'end'
@@ -2432,7 +2424,6 @@ $result_trees{'test_image'} = {
                           'source_marks' => [
                             {
                               'counter' => 5,
-                              'location' => 'text',
                               'position' => 1,
                               'sourcemark_type' => 'macro_expansion',
                               'status' => 'end'
@@ -2458,8 +2449,6 @@ $result_trees{'test_image'} = {
                         },
                         'type' => 'macro_call'
                       },
-                      'location' => 'text',
-                      'position' => 0,
                       'sourcemark_type' => 'macro_expansion',
                       'status' => 'start'
                     }
@@ -2546,8 +2535,6 @@ $result_trees{'test_image'} = {
                 },
                 'type' => 'macro_call'
               },
-              'location' => 'text',
-              'position' => 0,
               'sourcemark_type' => 'macro_expansion',
               'status' => 'start'
             }
@@ -2633,8 +2620,6 @@ $result_trees{'test_image'} = {
             },
             'type' => 'macro_call'
           },
-          'location' => 'text',
-          'position' => 0,
           'sourcemark_type' => 'macro_expansion',
           'status' => 'start'
         }
@@ -2731,8 +2716,6 @@ $result_nodes{'test_image'} = {
         },
         'type' => 'macro_call'
       },
-      'location' => 'text',
-      'position' => 0,
       'sourcemark_type' => 'macro_expansion',
       'status' => 'start'
     }
@@ -2754,8 +2737,6 @@ $result_menus{'test_image'} = {
         },
         'type' => 'macro_call'
       },
-      'location' => 'text',
-      'position' => 0,
       'sourcemark_type' => 'macro_expansion',
       'status' => 'start'
     }
@@ -3022,8 +3003,6 @@ $result_floats{'test_image'} = {
             },
             'type' => 'macro_call'
           },
-          'location' => 'text',
-          'position' => 0,
           'sourcemark_type' => 'macro_expansion',
           'status' => 'start'
         }
diff --git a/tp/t/results/def/all_commands_delimiters.pl 
b/tp/t/results/def/all_commands_delimiters.pl
index 6039edc152..cb5ee466fb 100644
--- a/tp/t/results/def/all_commands_delimiters.pl
+++ b/tp/t/results/def/all_commands_delimiters.pl
@@ -131,7 +131,6 @@ $result_trees{'all_commands_delimiters'} = {
                       'source_marks' => [
                         {
                           'counter' => 1,
-                          'location' => 'text',
                           'position' => 1,
                           'sourcemark_type' => 'defline_continuation'
                         }
@@ -525,7 +524,6 @@ $result_trees{'all_commands_delimiters'} = {
                       'source_marks' => [
                         {
                           'counter' => 2,
-                          'location' => 'text',
                           'position' => 1,
                           'sourcemark_type' => 'defline_continuation'
                         }
@@ -1233,7 +1231,6 @@ $result_trees{'all_commands_delimiters'} = {
                       'source_marks' => [
                         {
                           'counter' => 3,
-                          'location' => 'text',
                           'position' => 1,
                           'sourcemark_type' => 'defline_continuation'
                         }
@@ -1844,7 +1841,6 @@ $result_trees{'all_commands_delimiters'} = {
                       'source_marks' => [
                         {
                           'counter' => 4,
-                          'location' => 'text',
                           'position' => 1,
                           'sourcemark_type' => 'defline_continuation'
                         }
@@ -2102,7 +2098,6 @@ $result_trees{'all_commands_delimiters'} = {
                       'source_marks' => [
                         {
                           'counter' => 5,
-                          'location' => 'text',
                           'position' => 1,
                           'sourcemark_type' => 'defline_continuation'
                         }
@@ -2487,7 +2482,6 @@ $result_trees{'all_commands_delimiters'} = {
                       'source_marks' => [
                         {
                           'counter' => 6,
-                          'location' => 'text',
                           'position' => 1,
                           'sourcemark_type' => 'defline_continuation'
                         }
@@ -2858,7 +2852,6 @@ $result_trees{'all_commands_delimiters'} = {
                       'source_marks' => [
                         {
                           'counter' => 7,
-                          'location' => 'text',
                           'position' => 1,
                           'sourcemark_type' => 'defline_continuation'
                         }
@@ -3258,7 +3251,6 @@ $result_trees{'all_commands_delimiters'} = {
                       'source_marks' => [
                         {
                           'counter' => 8,
-                          'location' => 'text',
                           'position' => 1,
                           'sourcemark_type' => 'defline_continuation'
                         }
@@ -3629,7 +3621,6 @@ $result_trees{'all_commands_delimiters'} = {
                       'source_marks' => [
                         {
                           'counter' => 9,
-                          'location' => 'text',
                           'position' => 1,
                           'sourcemark_type' => 'defline_continuation'
                         }
@@ -4027,7 +4018,6 @@ $result_trees{'all_commands_delimiters'} = {
                       'source_marks' => [
                         {
                           'counter' => 10,
-                          'location' => 'text',
                           'position' => 1,
                           'sourcemark_type' => 'defline_continuation'
                         }
diff --git a/tp/t/results/def/all_commands_delimiters_printindex.pl 
b/tp/t/results/def/all_commands_delimiters_printindex.pl
index 72fa8ae66b..6e0653c6d8 100644
--- a/tp/t/results/def/all_commands_delimiters_printindex.pl
+++ b/tp/t/results/def/all_commands_delimiters_printindex.pl
@@ -149,7 +149,6 @@ $result_trees{'all_commands_delimiters_printindex'} = {
                       'source_marks' => [
                         {
                           'counter' => 1,
-                          'location' => 'text',
                           'position' => 1,
                           'sourcemark_type' => 'defline_continuation'
                         }
@@ -544,7 +543,6 @@ $result_trees{'all_commands_delimiters_printindex'} = {
                       'source_marks' => [
                         {
                           'counter' => 2,
-                          'location' => 'text',
                           'position' => 1,
                           'sourcemark_type' => 'defline_continuation'
                         }
@@ -1254,7 +1252,6 @@ $result_trees{'all_commands_delimiters_printindex'} = {
                       'source_marks' => [
                         {
                           'counter' => 3,
-                          'location' => 'text',
                           'position' => 1,
                           'sourcemark_type' => 'defline_continuation'
                         }
@@ -1867,7 +1864,6 @@ $result_trees{'all_commands_delimiters_printindex'} = {
                       'source_marks' => [
                         {
                           'counter' => 4,
-                          'location' => 'text',
                           'position' => 1,
                           'sourcemark_type' => 'defline_continuation'
                         }
@@ -2126,7 +2122,6 @@ $result_trees{'all_commands_delimiters_printindex'} = {
                       'source_marks' => [
                         {
                           'counter' => 5,
-                          'location' => 'text',
                           'position' => 1,
                           'sourcemark_type' => 'defline_continuation'
                         }
@@ -2512,7 +2507,6 @@ $result_trees{'all_commands_delimiters_printindex'} = {
                       'source_marks' => [
                         {
                           'counter' => 6,
-                          'location' => 'text',
                           'position' => 1,
                           'sourcemark_type' => 'defline_continuation'
                         }
@@ -2884,7 +2878,6 @@ $result_trees{'all_commands_delimiters_printindex'} = {
                       'source_marks' => [
                         {
                           'counter' => 7,
-                          'location' => 'text',
                           'position' => 1,
                           'sourcemark_type' => 'defline_continuation'
                         }
@@ -3285,7 +3278,6 @@ $result_trees{'all_commands_delimiters_printindex'} = {
                       'source_marks' => [
                         {
                           'counter' => 8,
-                          'location' => 'text',
                           'position' => 1,
                           'sourcemark_type' => 'defline_continuation'
                         }
@@ -3657,7 +3649,6 @@ $result_trees{'all_commands_delimiters_printindex'} = {
                       'source_marks' => [
                         {
                           'counter' => 9,
-                          'location' => 'text',
                           'position' => 1,
                           'sourcemark_type' => 'defline_continuation'
                         }
@@ -4056,7 +4047,6 @@ $result_trees{'all_commands_delimiters_printindex'} = {
                       'source_marks' => [
                         {
                           'counter' => 10,
-                          'location' => 'text',
                           'position' => 1,
                           'sourcemark_type' => 'defline_continuation'
                         }
diff --git a/tp/t/results/def/end_of_lines_protected.pl 
b/tp/t/results/def/end_of_lines_protected.pl
index db9ae07bfd..68e28ced71 100644
--- a/tp/t/results/def/end_of_lines_protected.pl
+++ b/tp/t/results/def/end_of_lines_protected.pl
@@ -55,7 +55,6 @@ $result_trees{'end_of_lines_protected'} = {
                       'source_marks' => [
                         {
                           'counter' => 1,
-                          'location' => 'text',
                           'position' => 1,
                           'sourcemark_type' => 'defline_continuation'
                         }
@@ -82,7 +81,6 @@ $result_trees{'end_of_lines_protected'} = {
                           'source_marks' => [
                             {
                               'counter' => 2,
-                              'location' => 'text',
                               'position' => 5,
                               'sourcemark_type' => 'defline_continuation'
                             }
diff --git a/tp/t/results/def/end_of_lines_protected_in_footnote.pl 
b/tp/t/results/def/end_of_lines_protected_in_footnote.pl
index dd56ca2456..a8bf12eec4 100644
--- a/tp/t/results/def/end_of_lines_protected_in_footnote.pl
+++ b/tp/t/results/def/end_of_lines_protected_in_footnote.pl
@@ -74,7 +74,6 @@ $result_trees{'end_of_lines_protected_in_footnote'} = {
                                   'source_marks' => [
                                     {
                                       'counter' => 1,
-                                      'location' => 'text',
                                       'position' => 1,
                                       'sourcemark_type' => 
'defline_continuation'
                                     }
@@ -101,7 +100,6 @@ $result_trees{'end_of_lines_protected_in_footnote'} = {
                                       'source_marks' => [
                                         {
                                           'counter' => 2,
-                                          'location' => 'text',
                                           'position' => 5,
                                           'sourcemark_type' => 
'defline_continuation'
                                         }
diff --git a/tp/t/results/def/end_of_lines_protected_non_ascii.pl 
b/tp/t/results/def/end_of_lines_protected_non_ascii.pl
index 151ff8c001..e96746063e 100644
--- a/tp/t/results/def/end_of_lines_protected_non_ascii.pl
+++ b/tp/t/results/def/end_of_lines_protected_non_ascii.pl
@@ -69,7 +69,6 @@ $result_trees{'end_of_lines_protected_non_ascii'} = {
                       'source_marks' => [
                         {
                           'counter' => 1,
-                          'location' => 'text',
                           'position' => 1,
                           'sourcemark_type' => 'defline_continuation'
                         }
@@ -96,7 +95,6 @@ $result_trees{'end_of_lines_protected_non_ascii'} = {
                           'source_marks' => [
                             {
                               'counter' => 2,
-                              'location' => 'text',
                               'position' => 5,
                               'sourcemark_type' => 'defline_continuation'
                             }
diff --git a/tp/t/results/def/wrong_braces_with_end_of_lines.pl 
b/tp/t/results/def/wrong_braces_with_end_of_lines.pl
index 9f6feb0dce..db3371e3a1 100644
--- a/tp/t/results/def/wrong_braces_with_end_of_lines.pl
+++ b/tp/t/results/def/wrong_braces_with_end_of_lines.pl
@@ -77,7 +77,6 @@ $result_trees{'wrong_braces_with_end_of_lines'} = {
                       'source_marks' => [
                         {
                           'counter' => 1,
-                          'location' => 'text',
                           'position' => 1,
                           'sourcemark_type' => 'defline_continuation'
                         }
@@ -227,7 +226,6 @@ $result_trees{'wrong_braces_with_end_of_lines'} = {
                       'source_marks' => [
                         {
                           'counter' => 2,
-                          'location' => 'text',
                           'position' => 2,
                           'sourcemark_type' => 'defline_continuation'
                         }
diff --git a/tp/t/results/include/cpp_lines.pl 
b/tp/t/results/include/cpp_lines.pl
index 2bc1d66da3..0ee4bddbe1 100644
--- a/tp/t/results/include/cpp_lines.pl
+++ b/tp/t/results/include/cpp_lines.pl
@@ -300,7 +300,6 @@ $result_trees{'cpp_lines'} = {
               'source_marks' => [
                 {
                   'counter' => 1,
-                  'location' => 'text',
                   'position' => 12,
                   'sourcemark_type' => 'macro_expansion',
                   'status' => 'end'
@@ -454,7 +453,6 @@ $result_trees{'cpp_lines'} = {
               'source_marks' => [
                 {
                   'counter' => 2,
-                  'location' => 'text',
                   'position' => 14,
                   'sourcemark_type' => 'macro_expansion',
                   'status' => 'end'
@@ -530,7 +528,6 @@ $result_trees{'cpp_lines'} = {
                   'macro' => ''
                 }
               },
-              'location' => 'text',
               'position' => 1,
               'sourcemark_type' => 'include',
               'status' => 'start'
@@ -581,7 +578,6 @@ $result_trees{'cpp_lines'} = {
           'source_marks' => [
             {
               'counter' => 1,
-              'location' => 'text',
               'position' => 1,
               'sourcemark_type' => 'include',
               'status' => 'end'
@@ -1096,8 +1092,6 @@ $result_trees{'cpp_lines'} = {
             },
             'type' => 'macro_call'
           },
-          'location' => 'text',
-          'position' => 0,
           'sourcemark_type' => 'macro_expansion',
           'status' => 'start'
         },
@@ -1114,8 +1108,6 @@ $result_trees{'cpp_lines'} = {
             },
             'type' => 'macro_call'
           },
-          'location' => 'text',
-          'position' => 0,
           'sourcemark_type' => 'macro_expansion',
           'status' => 'start'
         }
@@ -1304,8 +1296,6 @@ $result_nodes{'cpp_lines'} = {
         },
         'type' => 'macro_call'
       },
-      'location' => 'text',
-      'position' => 0,
       'sourcemark_type' => 'macro_expansion',
       'status' => 'start'
     },
@@ -1317,8 +1307,6 @@ $result_nodes{'cpp_lines'} = {
         },
         'type' => 'macro_call'
       },
-      'location' => 'text',
-      'position' => 0,
       'sourcemark_type' => 'macro_expansion',
       'status' => 'start'
     }
@@ -1340,8 +1328,6 @@ $result_menus{'cpp_lines'} = {
         },
         'type' => 'macro_call'
       },
-      'location' => 'text',
-      'position' => 0,
       'sourcemark_type' => 'macro_expansion',
       'status' => 'start'
     },
@@ -1353,8 +1339,6 @@ $result_menus{'cpp_lines'} = {
         },
         'type' => 'macro_call'
       },
-      'location' => 'text',
-      'position' => 0,
       'sourcemark_type' => 'macro_expansion',
       'status' => 'start'
     }
diff --git a/tp/t/results/include/double_include.pl 
b/tp/t/results/include/double_include.pl
index b08531df91..c31785072f 100644
--- a/tp/t/results/include/double_include.pl
+++ b/tp/t/results/include/double_include.pl
@@ -49,7 +49,6 @@ $result_trees{'double_include'} = {
                                 'macro' => ''
                               }
                             },
-                            'location' => 'text',
                             'position' => 14,
                             'sourcemark_type' => 'include',
                             'status' => 'start'
@@ -77,7 +76,6 @@ $result_trees{'double_include'} = {
                   'macro' => ''
                 }
               },
-              'location' => 'text',
               'position' => 1,
               'sourcemark_type' => 'include',
               'status' => 'start'
@@ -93,7 +91,6 @@ $result_trees{'double_include'} = {
               'source_marks' => [
                 {
                   'counter' => 2,
-                  'location' => 'text',
                   'position' => 18,
                   'sourcemark_type' => 'include',
                   'status' => 'end'
@@ -106,7 +103,6 @@ $result_trees{'double_include'} = {
               'source_marks' => [
                 {
                   'counter' => 1,
-                  'location' => 'text',
                   'position' => 18,
                   'sourcemark_type' => 'include',
                   'status' => 'end'
diff --git a/tp/t/results/include/include_comment.pl 
b/tp/t/results/include/include_comment.pl
index 355d728b59..3ce83c7f5c 100644
--- a/tp/t/results/include/include_comment.pl
+++ b/tp/t/results/include/include_comment.pl
@@ -64,7 +64,6 @@ $result_trees{'include_comment'} = {
               'source_marks' => [
                 {
                   'counter' => 1,
-                  'location' => 'text',
                   'position' => 18,
                   'sourcemark_type' => 'include',
                   'status' => 'end'
diff --git a/tp/t/results/include/include_space.pl 
b/tp/t/results/include/include_space.pl
index d42e9a4613..9e1e71c82e 100644
--- a/tp/t/results/include/include_space.pl
+++ b/tp/t/results/include/include_space.pl
@@ -52,7 +52,6 @@ $result_trees{'include_space'} = {
               'source_marks' => [
                 {
                   'counter' => 1,
-                  'location' => 'text',
                   'position' => 18,
                   'sourcemark_type' => 'include',
                   'status' => 'end'
diff --git a/tp/t/results/include/include_space_comment.pl 
b/tp/t/results/include/include_space_comment.pl
index 0e93159e08..87aa09d6bb 100644
--- a/tp/t/results/include/include_space_comment.pl
+++ b/tp/t/results/include/include_space_comment.pl
@@ -65,7 +65,6 @@ $result_trees{'include_space_comment'} = {
               'source_marks' => [
                 {
                   'counter' => 1,
-                  'location' => 'text',
                   'position' => 18,
                   'sourcemark_type' => 'include',
                   'status' => 'end'
diff --git a/tp/t/results/include/include_with_setfilename.pl 
b/tp/t/results/include/include_with_setfilename.pl
index 7e4c5ac94e..8c471f0f95 100644
--- a/tp/t/results/include/include_with_setfilename.pl
+++ b/tp/t/results/include/include_with_setfilename.pl
@@ -89,7 +89,6 @@ $result_trees{'include_with_setfilename'} = {
               'source_marks' => [
                 {
                   'counter' => 1,
-                  'location' => 'text',
                   'position' => 18,
                   'sourcemark_type' => 'include',
                   'status' => 'end'
diff --git a/tp/t/results/include/include_with_setfilename_in_preformatted.pl 
b/tp/t/results/include/include_with_setfilename_in_preformatted.pl
index 616f772787..30467c3366 100644
--- a/tp/t/results/include/include_with_setfilename_in_preformatted.pl
+++ b/tp/t/results/include/include_with_setfilename_in_preformatted.pl
@@ -108,7 +108,6 @@ $result_trees{'include_with_setfilename_in_preformatted'} = 
{
                   'source_marks' => [
                     {
                       'counter' => 1,
-                      'location' => 'text',
                       'position' => 18,
                       'sourcemark_type' => 'include',
                       'status' => 'end'
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 e68af3589e..5da477f0d8 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
@@ -106,7 +106,6 @@ $result_trees{'macro_and_commands_in_early_commands'} = {
                     },
                     'type' => 'macro_call'
                   },
-                  'location' => 'text',
                   'position' => 1,
                   'sourcemark_type' => 'macro_expansion',
                   'status' => 'start'
@@ -227,7 +226,6 @@ $result_trees{'macro_and_commands_in_early_commands'} = {
                     },
                     'type' => 'macro_call'
                   },
-                  'location' => 'text',
                   'position' => 1,
                   'sourcemark_type' => 'macro_expansion',
                   'status' => 'start'
@@ -401,7 +399,6 @@ $result_trees{'macro_and_commands_in_early_commands'} = {
                           },
                           'type' => 'macro_call'
                         },
-                        'location' => 'text',
                         'position' => 1,
                         'sourcemark_type' => 'macro_expansion',
                         'status' => 'start'
@@ -423,7 +420,6 @@ $result_trees{'macro_and_commands_in_early_commands'} = {
                   'macro' => ''
                 }
               },
-              'location' => 'text',
               'position' => 1,
               'sourcemark_type' => 'include',
               'status' => 'start'
@@ -507,7 +503,6 @@ $result_trees{'macro_and_commands_in_early_commands'} = {
                         'source_marks' => [
                           {
                             'counter' => 3,
-                            'location' => 'text',
                             'position' => 11,
                             'sourcemark_type' => 'macro_expansion',
                             'status' => 'end'
@@ -547,7 +542,6 @@ $result_trees{'macro_and_commands_in_early_commands'} = {
               'source_marks' => [
                 {
                   'counter' => 2,
-                  'location' => 'text',
                   'position' => 18,
                   'sourcemark_type' => 'include',
                   'status' => 'end'
@@ -570,7 +564,6 @@ $result_trees{'macro_and_commands_in_early_commands'} = {
               'source_marks' => [
                 {
                   'counter' => 4,
-                  'location' => 'text',
                   'position' => 11,
                   'sourcemark_type' => 'macro_expansion',
                   'status' => 'end'
@@ -646,8 +639,6 @@ $result_trees{'macro_and_commands_in_early_commands'} = {
             },
             'type' => 'macro_call'
           },
-          'location' => 'text',
-          'position' => 0,
           'sourcemark_type' => 'macro_expansion',
           'status' => 'start'
         }
@@ -728,8 +719,6 @@ $result_sectioning{'macro_and_commands_in_early_commands'} 
= {
               },
               'type' => 'macro_call'
             },
-            'location' => 'text',
-            'position' => 0,
             'sourcemark_type' => 'macro_expansion',
             'status' => 'start'
           }
@@ -761,8 +750,6 @@ $result_nodes{'macro_and_commands_in_early_commands'} = {
             },
             'type' => 'macro_call'
           },
-          'location' => 'text',
-          'position' => 0,
           'sourcemark_type' => 'macro_expansion',
           'status' => 'start'
         }
diff --git a/tp/t/results/include/macro_definition_in_include.pl 
b/tp/t/results/include/macro_definition_in_include.pl
index 2532e2d223..637dc74d7e 100644
--- a/tp/t/results/include/macro_definition_in_include.pl
+++ b/tp/t/results/include/macro_definition_in_include.pl
@@ -121,7 +121,6 @@ $result_trees{'macro_definition_in_include'} = {
               'source_marks' => [
                 {
                   'counter' => 1,
-                  'location' => 'text',
                   'position' => 11,
                   'sourcemark_type' => 'macro_expansion',
                   'status' => 'end'
@@ -145,8 +144,6 @@ $result_trees{'macro_definition_in_include'} = {
                 },
                 'type' => 'macro_call'
               },
-              'location' => 'text',
-              'position' => 0,
               'sourcemark_type' => 'macro_expansion',
               'status' => 'start'
             }
diff --git a/tp/t/results/include/macro_in_early_commands.pl 
b/tp/t/results/include/macro_in_early_commands.pl
index 65ce788c8b..c39111bf21 100644
--- a/tp/t/results/include/macro_in_early_commands.pl
+++ b/tp/t/results/include/macro_in_early_commands.pl
@@ -132,7 +132,6 @@ $result_trees{'macro_in_early_commands'} = {
                   'source_marks' => [
                     {
                       'counter' => 1,
-                      'location' => 'text',
                       'position' => 13,
                       'sourcemark_type' => 'macro_expansion',
                       'status' => 'end'
@@ -150,14 +149,12 @@ $result_trees{'macro_in_early_commands'} = {
                         },
                         'type' => 'macro_call'
                       },
-                      'location' => 'text',
                       'position' => 13,
                       'sourcemark_type' => 'macro_expansion',
                       'status' => 'start'
                     },
                     {
                       'counter' => 2,
-                      'location' => 'text',
                       'position' => 31,
                       'sourcemark_type' => 'macro_expansion',
                       'status' => 'end'
@@ -184,7 +181,6 @@ $result_trees{'macro_in_early_commands'} = {
                     },
                     'type' => 'macro_call'
                   },
-                  'location' => 'text',
                   'position' => 1,
                   'sourcemark_type' => 'macro_expansion',
                   'status' => 'start'
@@ -335,7 +331,6 @@ $result_trees{'macro_in_early_commands'} = {
                   'source_marks' => [
                     {
                       'counter' => 4,
-                      'location' => 'text',
                       'position' => 10,
                       'sourcemark_type' => 'macro_expansion',
                       'status' => 'end'
@@ -351,8 +346,6 @@ $result_trees{'macro_in_early_commands'} = {
               'source_marks' => [
                 {
                   'counter' => 3,
-                  'location' => 'text',
-                  'position' => 0,
                   'sourcemark_type' => 'macro_expansion',
                   'status' => 'end'
                 },
@@ -369,7 +362,6 @@ $result_trees{'macro_in_early_commands'} = {
                     },
                     'type' => 'macro_call'
                   },
-                  'location' => 'text',
                   'position' => 1,
                   'sourcemark_type' => 'macro_expansion',
                   'status' => 'start'
@@ -471,8 +463,6 @@ $result_trees{'macro_in_early_commands'} = {
             },
             'type' => 'macro_call'
           },
-          'location' => 'text',
-          'position' => 0,
           'sourcemark_type' => 'macro_expansion',
           'status' => 'start'
         }
@@ -560,7 +550,6 @@ $result_trees{'macro_in_early_commands'} = {
                           },
                           'type' => 'macro_call'
                         },
-                        'location' => 'text',
                         'position' => 1,
                         'sourcemark_type' => 'macro_expansion',
                         'status' => 'start'
@@ -582,7 +571,6 @@ $result_trees{'macro_in_early_commands'} = {
                   'macro' => ''
                 }
               },
-              'location' => 'text',
               'position' => 1,
               'sourcemark_type' => 'include',
               'status' => 'start'
@@ -660,7 +648,6 @@ $result_trees{'macro_in_early_commands'} = {
                         'source_marks' => [
                           {
                             'counter' => 5,
-                            'location' => 'text',
                             'position' => 13,
                             'sourcemark_type' => 'macro_expansion',
                             'status' => 'end'
@@ -700,7 +687,6 @@ $result_trees{'macro_in_early_commands'} = {
               'source_marks' => [
                 {
                   'counter' => 2,
-                  'location' => 'text',
                   'position' => 18,
                   'sourcemark_type' => 'include',
                   'status' => 'end'
@@ -723,7 +709,6 @@ $result_trees{'macro_in_early_commands'} = {
               'source_marks' => [
                 {
                   'counter' => 6,
-                  'location' => 'text',
                   'position' => 11,
                   'sourcemark_type' => 'macro_expansion',
                   'status' => 'end'
@@ -762,7 +747,6 @@ $result_trees{'macro_in_early_commands'} = {
               'source_marks' => [
                 {
                   'counter' => 7,
-                  'location' => 'text',
                   'position' => 18,
                   'sourcemark_type' => 'macro_expansion',
                   'status' => 'end'
@@ -786,8 +770,6 @@ $result_trees{'macro_in_early_commands'} = {
                 },
                 'type' => 'macro_call'
               },
-              'location' => 'text',
-              'position' => 0,
               'sourcemark_type' => 'macro_expansion',
               'status' => 'start'
             }
@@ -818,8 +800,6 @@ $result_trees{'macro_in_early_commands'} = {
             },
             'type' => 'macro_call'
           },
-          'location' => 'text',
-          'position' => 0,
           'sourcemark_type' => 'macro_expansion',
           'status' => 'start'
         }
@@ -911,8 +891,6 @@ $result_sectioning{'macro_in_early_commands'} = {
               },
               'type' => 'macro_call'
             },
-            'location' => 'text',
-            'position' => 0,
             'sourcemark_type' => 'macro_expansion',
             'status' => 'start'
           }
@@ -944,8 +922,6 @@ $result_nodes{'macro_in_early_commands'} = {
             },
             'type' => 'macro_call'
           },
-          'location' => 'text',
-          'position' => 0,
           'sourcemark_type' => 'macro_expansion',
           'status' => 'start'
         }
diff --git a/tp/t/results/include/no_eol_in_included_file.pl 
b/tp/t/results/include/no_eol_in_included_file.pl
index 9a41f043fd..e562ed5051 100644
--- a/tp/t/results/include/no_eol_in_included_file.pl
+++ b/tp/t/results/include/no_eol_in_included_file.pl
@@ -43,7 +43,6 @@ $result_trees{'no_eol_in_included_file'} = {
                       'macro' => ''
                     }
                   },
-                  'location' => 'text',
                   'position' => 12,
                   'sourcemark_type' => 'include',
                   'status' => 'start'
@@ -56,7 +55,6 @@ $result_trees{'no_eol_in_included_file'} = {
               'source_marks' => [
                 {
                   'counter' => 1,
-                  'location' => 'text',
                   'position' => 3,
                   'sourcemark_type' => 'include',
                   'status' => 'end'
diff --git a/tp/t/results/include/simple.pl b/tp/t/results/include/simple.pl
index 27c9afc92c..d2722f7d5f 100644
--- a/tp/t/results/include/simple.pl
+++ b/tp/t/results/include/simple.pl
@@ -52,7 +52,6 @@ $result_trees{'simple'} = {
               'source_marks' => [
                 {
                   'counter' => 1,
-                  'location' => 'text',
                   'position' => 18,
                   'sourcemark_type' => 'include',
                   'status' => 'end'
diff --git a/tp/t/results/include/simple_no_eol.pl 
b/tp/t/results/include/simple_no_eol.pl
index e4a3badd75..88baeebdc7 100644
--- a/tp/t/results/include/simple_no_eol.pl
+++ b/tp/t/results/include/simple_no_eol.pl
@@ -48,7 +48,6 @@ $result_trees{'simple_no_eol'} = {
               'source_marks' => [
                 {
                   'counter' => 1,
-                  'location' => 'text',
                   'position' => 18,
                   'sourcemark_type' => 'include',
                   'status' => 'end'
diff --git a/tp/t/results/include/test_two_include.pl 
b/tp/t/results/include/test_two_include.pl
index bbcc66a111..37b6926bbc 100644
--- a/tp/t/results/include/test_two_include.pl
+++ b/tp/t/results/include/test_two_include.pl
@@ -43,7 +43,6 @@ $result_trees{'test_two_include'} = {
                       'macro' => ''
                     }
                   },
-                  'location' => 'text',
                   'position' => 16,
                   'sourcemark_type' => 'include',
                   'status' => 'start'
@@ -267,7 +266,6 @@ $result_trees{'test_two_include'} = {
                       'macro' => ''
                     }
                   },
-                  'location' => 'text',
                   'position' => 17,
                   'sourcemark_type' => 'include',
                   'status' => 'start'
@@ -280,7 +278,6 @@ $result_trees{'test_two_include'} = {
               'source_marks' => [
                 {
                   'counter' => 2,
-                  'location' => 'text',
                   'position' => 18,
                   'sourcemark_type' => 'include',
                   'status' => 'end'
diff --git a/tp/t/results/include/value_expansion_in_include.pl 
b/tp/t/results/include/value_expansion_in_include.pl
index 3f3c1f68d5..f3e8b845ce 100644
--- a/tp/t/results/include/value_expansion_in_include.pl
+++ b/tp/t/results/include/value_expansion_in_include.pl
@@ -189,7 +189,6 @@ $result_trees{'value_expansion_in_include'} = {
                       'macro' => ''
                     }
                   },
-                  'location' => 'text',
                   'position' => 17,
                   'sourcemark_type' => 'include',
                   'status' => 'start'
@@ -219,7 +218,6 @@ $result_trees{'value_expansion_in_include'} = {
               'source_marks' => [
                 {
                   'counter' => 1,
-                  'location' => 'text',
                   'position' => 36,
                   'sourcemark_type' => 'include',
                   'status' => 'end'
@@ -317,7 +315,6 @@ $result_trees{'value_expansion_in_include'} = {
                       'macro' => ''
                     }
                   },
-                  'location' => 'text',
                   'position' => 18,
                   'sourcemark_type' => 'include',
                   'status' => 'start'
@@ -347,7 +344,6 @@ $result_trees{'value_expansion_in_include'} = {
               'source_marks' => [
                 {
                   'counter' => 2,
-                  'location' => 'text',
                   'position' => 36,
                   'sourcemark_type' => 'include',
                   'status' => 'end'
@@ -445,7 +441,6 @@ $result_trees{'value_expansion_in_include'} = {
                       'macro' => ''
                     }
                   },
-                  'location' => 'text',
                   'position' => 18,
                   'sourcemark_type' => 'include',
                   'status' => 'start'
@@ -475,7 +470,6 @@ $result_trees{'value_expansion_in_include'} = {
               'source_marks' => [
                 {
                   'counter' => 3,
-                  'location' => 'text',
                   'position' => 36,
                   'sourcemark_type' => 'include',
                   'status' => 'end'
diff --git a/tp/t/results/info_tests/def_in_copying.pl 
b/tp/t/results/info_tests/def_in_copying.pl
index b7d8658129..eb2a361a4b 100644
--- a/tp/t/results/info_tests/def_in_copying.pl
+++ b/tp/t/results/info_tests/def_in_copying.pl
@@ -180,8 +180,6 @@ $result_trees{'def_in_copying'} = {
                     },
                     'type' => 'macro_call'
                   },
-                  'location' => 'text',
-                  'position' => 0,
                   'sourcemark_type' => 'macro_expansion',
                   'status' => 'start'
                 }
@@ -367,7 +365,6 @@ $result_trees{'def_in_copying'} = {
                           'source_marks' => [
                             {
                               'counter' => 1,
-                              'location' => 'text',
                               'position' => 5,
                               'sourcemark_type' => 'macro_expansion',
                               'status' => 'end'
@@ -467,8 +464,6 @@ $result_trees{'def_in_copying'} = {
                 },
                 'type' => 'macro_call'
               },
-              'location' => 'text',
-              'position' => 0,
               'sourcemark_type' => 'macro_expansion',
               'status' => 'start'
             }
@@ -654,7 +649,6 @@ $result_trees{'def_in_copying'} = {
                       'source_marks' => [
                         {
                           'counter' => 2,
-                          'location' => 'text',
                           'position' => 5,
                           'sourcemark_type' => 'macro_expansion',
                           'status' => 'end'
diff --git a/tp/t/results/macro/arg_body_expansion_order.pl 
b/tp/t/results/macro/arg_body_expansion_order.pl
index 8de7312e52..c9656aed7b 100644
--- a/tp/t/results/macro/arg_body_expansion_order.pl
+++ b/tp/t/results/macro/arg_body_expansion_order.pl
@@ -231,14 +231,12 @@ $result_trees{'arg_body_expansion_order'} = {
               'source_marks' => [
                 {
                   'counter' => 2,
-                  'location' => 'text',
                   'position' => 9,
                   'sourcemark_type' => 'macro_expansion',
                   'status' => 'end'
                 },
                 {
                   'counter' => 1,
-                  'location' => 'text',
                   'position' => 9,
                   'sourcemark_type' => 'macro_expansion',
                   'status' => 'end'
@@ -265,8 +263,6 @@ $result_trees{'arg_body_expansion_order'} = {
             },
             'type' => 'macro_call'
           },
-          'location' => 'text',
-          'position' => 0,
           'sourcemark_type' => 'macro_expansion',
           'status' => 'start'
         },
@@ -283,8 +279,6 @@ $result_trees{'arg_body_expansion_order'} = {
             },
             'type' => 'macro_call'
           },
-          'location' => 'text',
-          'position' => 0,
           'sourcemark_type' => 'macro_expansion',
           'status' => 'start'
         }
diff --git a/tp/t/results/macro/arg_not_closed.pl 
b/tp/t/results/macro/arg_not_closed.pl
index 86cda979c8..0546e08963 100644
--- a/tp/t/results/macro/arg_not_closed.pl
+++ b/tp/t/results/macro/arg_not_closed.pl
@@ -89,14 +89,12 @@ $result_trees{'arg_not_closed'} = {
                     },
                     'type' => 'macro_call'
                   },
-                  'location' => 'text',
                   'position' => 5,
                   'sourcemark_type' => 'macro_expansion',
                   'status' => 'start'
                 },
                 {
                   'counter' => 1,
-                  'location' => 'text',
                   'position' => 8,
                   'sourcemark_type' => 'macro_expansion',
                   'status' => 'end'
diff --git a/tp/t/results/macro/backslash_in_arg.pl 
b/tp/t/results/macro/backslash_in_arg.pl
index 59eb9137a7..cf9ab23eac 100644
--- a/tp/t/results/macro/backslash_in_arg.pl
+++ b/tp/t/results/macro/backslash_in_arg.pl
@@ -102,7 +102,6 @@ $result_trees{'backslash_in_arg'} = {
                   'source_marks' => [
                     {
                       'counter' => 1,
-                      'location' => 'text',
                       'position' => 3,
                       'sourcemark_type' => 'macro_expansion',
                       'status' => 'end'
@@ -151,7 +150,6 @@ $result_trees{'backslash_in_arg'} = {
                   'source_marks' => [
                     {
                       'counter' => 2,
-                      'location' => 'text',
                       'position' => 2,
                       'sourcemark_type' => 'macro_expansion',
                       'status' => 'end'
@@ -200,7 +198,6 @@ $result_trees{'backslash_in_arg'} = {
                   'source_marks' => [
                     {
                       'counter' => 3,
-                      'location' => 'text',
                       'position' => 2,
                       'sourcemark_type' => 'macro_expansion',
                       'status' => 'end'
@@ -249,7 +246,6 @@ $result_trees{'backslash_in_arg'} = {
                   'source_marks' => [
                     {
                       'counter' => 4,
-                      'location' => 'text',
                       'position' => 2,
                       'sourcemark_type' => 'macro_expansion',
                       'status' => 'end'
@@ -358,8 +354,6 @@ $result_trees{'backslash_in_arg'} = {
             },
             'type' => 'macro_call'
           },
-          'location' => 'text',
-          'position' => 0,
           'sourcemark_type' => 'macro_expansion',
           'status' => 'start'
         },
@@ -376,8 +370,6 @@ $result_trees{'backslash_in_arg'} = {
             },
             'type' => 'macro_call'
           },
-          'location' => 'text',
-          'position' => 0,
           'sourcemark_type' => 'macro_expansion',
           'status' => 'start'
         },
@@ -394,8 +386,6 @@ $result_trees{'backslash_in_arg'} = {
             },
             'type' => 'macro_call'
           },
-          'location' => 'text',
-          'position' => 0,
           'sourcemark_type' => 'macro_expansion',
           'status' => 'start'
         },
@@ -412,8 +402,6 @@ $result_trees{'backslash_in_arg'} = {
             },
             'type' => 'macro_call'
           },
-          'location' => 'text',
-          'position' => 0,
           'sourcemark_type' => 'macro_expansion',
           'status' => 'start'
         }
@@ -475,8 +463,6 @@ $result_nodes{'backslash_in_arg'} = {
         },
         'type' => 'macro_call'
       },
-      'location' => 'text',
-      'position' => 0,
       'sourcemark_type' => 'macro_expansion',
       'status' => 'start'
     },
@@ -488,8 +474,6 @@ $result_nodes{'backslash_in_arg'} = {
         },
         'type' => 'macro_call'
       },
-      'location' => 'text',
-      'position' => 0,
       'sourcemark_type' => 'macro_expansion',
       'status' => 'start'
     },
@@ -501,8 +485,6 @@ $result_nodes{'backslash_in_arg'} = {
         },
         'type' => 'macro_call'
       },
-      'location' => 'text',
-      'position' => 0,
       'sourcemark_type' => 'macro_expansion',
       'status' => 'start'
     },
@@ -514,8 +496,6 @@ $result_nodes{'backslash_in_arg'} = {
         },
         'type' => 'macro_call'
       },
-      'location' => 'text',
-      'position' => 0,
       'sourcemark_type' => 'macro_expansion',
       'status' => 'start'
     }
@@ -538,8 +518,6 @@ $result_menus{'backslash_in_arg'} = {
         },
         'type' => 'macro_call'
       },
-      'location' => 'text',
-      'position' => 0,
       'sourcemark_type' => 'macro_expansion',
       'status' => 'start'
     },
@@ -551,8 +529,6 @@ $result_menus{'backslash_in_arg'} = {
         },
         'type' => 'macro_call'
       },
-      'location' => 'text',
-      'position' => 0,
       'sourcemark_type' => 'macro_expansion',
       'status' => 'start'
     },
@@ -564,8 +540,6 @@ $result_menus{'backslash_in_arg'} = {
         },
         'type' => 'macro_call'
       },
-      'location' => 'text',
-      'position' => 0,
       'sourcemark_type' => 'macro_expansion',
       'status' => 'start'
     },
@@ -577,8 +551,6 @@ $result_menus{'backslash_in_arg'} = {
         },
         'type' => 'macro_call'
       },
-      'location' => 'text',
-      'position' => 0,
       'sourcemark_type' => 'macro_expansion',
       'status' => 'start'
     }
diff --git a/tp/t/results/macro/bib_example.pl 
b/tp/t/results/macro/bib_example.pl
index 9321003e8e..93bfff02da 100644
--- a/tp/t/results/macro/bib_example.pl
+++ b/tp/t/results/macro/bib_example.pl
@@ -359,7 +359,6 @@ $result_trees{'bib_example'} = {
                       'macro' => ''
                     }
                   },
-                  'location' => 'text',
                   'position' => 1,
                   'sourcemark_type' => 'include',
                   'status' => 'start'
@@ -3460,8 +3459,6 @@ $result_trees{'bib_example'} = {
             },
             'type' => 'macro_call'
           },
-          'location' => 'text',
-          'position' => 0,
           'sourcemark_type' => 'macro_expansion',
           'status' => 'start'
         },
@@ -3478,8 +3475,6 @@ $result_trees{'bib_example'} = {
             },
             'type' => 'macro_call'
           },
-          'location' => 'text',
-          'position' => 0,
           'sourcemark_type' => 'macro_expansion',
           'status' => 'start'
         }
@@ -3640,7 +3635,6 @@ $result_trees{'bib_example'} = {
                       'source_marks' => [
                         {
                           'counter' => 3,
-                          'location' => 'text',
                           'position' => 10,
                           'sourcemark_type' => 'macro_expansion',
                           'status' => 'end'
@@ -3835,7 +3829,6 @@ $result_trees{'bib_example'} = {
                     },
                     'type' => 'macro_call'
                   },
-                  'location' => 'text',
                   'position' => 33,
                   'sourcemark_type' => 'macro_expansion',
                   'status' => 'start'
@@ -3870,7 +3863,6 @@ $result_trees{'bib_example'} = {
                       'source_marks' => [
                         {
                           'counter' => 6,
-                          'location' => 'text',
                           'position' => 10,
                           'sourcemark_type' => 'macro_expansion',
                           'status' => 'end'
@@ -3893,8 +3885,6 @@ $result_trees{'bib_example'} = {
                         },
                         'type' => 'macro_call'
                       },
-                      'location' => 'text',
-                      'position' => 0,
                       'sourcemark_type' => 'macro_expansion',
                       'status' => 'start'
                     }
@@ -3923,7 +3913,6 @@ $result_trees{'bib_example'} = {
                           'source_marks' => [
                             {
                               'counter' => 7,
-                              'location' => 'text',
                               'position' => 10,
                               'sourcemark_type' => 'macro_expansion',
                               'status' => 'end'
@@ -3950,7 +3939,6 @@ $result_trees{'bib_example'} = {
                             },
                             'type' => 'macro_call'
                           },
-                          'location' => 'text',
                           'position' => 1,
                           'sourcemark_type' => 'macro_expansion',
                           'status' => 'start'
@@ -4000,14 +3988,12 @@ $result_trees{'bib_example'} = {
               'source_marks' => [
                 {
                   'counter' => 5,
-                  'location' => 'text',
                   'position' => 2,
                   'sourcemark_type' => 'macro_expansion',
                   'status' => 'end'
                 },
                 {
                   'counter' => 4,
-                  'location' => 'text',
                   'position' => 3,
                   'sourcemark_type' => 'macro_expansion',
                   'status' => 'end'
@@ -4042,8 +4028,6 @@ $result_trees{'bib_example'} = {
                 },
                 'type' => 'macro_call'
               },
-              'location' => 'text',
-              'position' => 0,
               'sourcemark_type' => 'macro_expansion',
               'status' => 'start'
             }
@@ -4139,8 +4123,6 @@ $result_trees{'bib_example'} = {
                     },
                     'type' => 'macro_call'
                   },
-                  'location' => 'text',
-                  'position' => 0,
                   'sourcemark_type' => 'macro_expansion',
                   'status' => 'start'
                 }
diff --git a/tp/t/results/macro/complete_macro_for_end.pl 
b/tp/t/results/macro/complete_macro_for_end.pl
index e5ef13deea..08b4061f24 100644
--- a/tp/t/results/macro/complete_macro_for_end.pl
+++ b/tp/t/results/macro/complete_macro_for_end.pl
@@ -87,7 +87,6 @@ $result_trees{'complete_macro_for_end'} = {
                       'source_marks' => [
                         {
                           'counter' => 1,
-                          'location' => 'text',
                           'position' => 9,
                           'sourcemark_type' => 'macro_expansion',
                           'status' => 'end'
@@ -132,8 +131,6 @@ $result_trees{'complete_macro_for_end'} = {
                 },
                 'type' => 'macro_call'
               },
-              'location' => 'text',
-              'position' => 0,
               'sourcemark_type' => 'macro_expansion',
               'status' => 'start'
             }
diff --git a/tp/t/results/macro/complex_argument.pl 
b/tp/t/results/macro/complex_argument.pl
index 3cb0c011d4..b8f8e0fe6e 100644
--- a/tp/t/results/macro/complex_argument.pl
+++ b/tp/t/results/macro/complex_argument.pl
@@ -278,7 +278,6 @@ $result_trees{'complex_argument'} = {
                             },
                             'type' => 'macro_call'
                           },
-                          'location' => 'text',
                           'position' => 2,
                           'sourcemark_type' => 'macro_expansion',
                           'status' => 'start'
@@ -316,7 +315,6 @@ $result_trees{'complex_argument'} = {
               'source_marks' => [
                 {
                   'counter' => 2,
-                  'location' => 'text',
                   'position' => 1,
                   'sourcemark_type' => 'macro_expansion',
                   'status' => 'end'
@@ -344,7 +342,6 @@ $result_trees{'complex_argument'} = {
                             },
                             'type' => 'macro_call'
                           },
-                          'location' => 'text',
                           'position' => 12,
                           'sourcemark_type' => 'macro_expansion',
                           'status' => 'start'
@@ -382,7 +379,6 @@ $result_trees{'complex_argument'} = {
               'source_marks' => [
                 {
                   'counter' => 3,
-                  'location' => 'text',
                   'position' => 1,
                   'sourcemark_type' => 'macro_expansion',
                   'status' => 'end'
@@ -577,7 +573,6 @@ $result_trees{'complex_argument'} = {
               'source_marks' => [
                 {
                   'counter' => 4,
-                  'location' => 'text',
                   'position' => 1,
                   'sourcemark_type' => 'macro_expansion',
                   'status' => 'end'
@@ -601,8 +596,6 @@ $result_trees{'complex_argument'} = {
                 },
                 'type' => 'macro_call'
               },
-              'location' => 'text',
-              'position' => 0,
               'sourcemark_type' => 'macro_expansion',
               'status' => 'start'
             }
@@ -620,7 +613,6 @@ $result_trees{'complex_argument'} = {
               'source_marks' => [
                 {
                   'counter' => 1,
-                  'location' => 'text',
                   'position' => 5,
                   'sourcemark_type' => 'macro_expansion',
                   'status' => 'end'
@@ -687,8 +679,6 @@ $result_trees{'complex_argument'} = {
                 },
                 'type' => 'macro_call'
               },
-              'location' => 'text',
-              'position' => 0,
               'sourcemark_type' => 'macro_expansion',
               'status' => 'start'
             }
@@ -736,8 +726,6 @@ macroseven defined
             },
             'type' => 'macro_call'
           },
-          'location' => 'text',
-          'position' => 0,
           'sourcemark_type' => 'macro_expansion',
           'status' => 'start'
         }
diff --git a/tp/t/results/macro/cpp_directives_after_macros.pl 
b/tp/t/results/macro/cpp_directives_after_macros.pl
index bbcb2c15b0..d74a91407f 100644
--- a/tp/t/results/macro/cpp_directives_after_macros.pl
+++ b/tp/t/results/macro/cpp_directives_after_macros.pl
@@ -157,14 +157,11 @@ $result_trees{'cpp_directives_after_macros'} = {
                     },
                     'type' => 'macro_call'
                   },
-                  'location' => 'text',
-                  'position' => 0,
                   'sourcemark_type' => 'macro_expansion',
                   'status' => 'start'
                 },
                 {
                   'counter' => 1,
-                  'location' => 'text',
                   'position' => 2,
                   'sourcemark_type' => 'macro_expansion',
                   'status' => 'end'
@@ -242,15 +239,11 @@ $result_trees{'cpp_directives_after_macros'} = {
             },
             'type' => 'macro_call'
           },
-          'location' => 'text',
-          'position' => 0,
           'sourcemark_type' => 'macro_expansion',
           'status' => 'start'
         },
         {
           'counter' => 2,
-          'location' => 'text',
-          'position' => 0,
           'sourcemark_type' => 'macro_expansion',
           'status' => 'end'
         }
diff --git a/tp/t/results/macro/cpp_directives_in_macro.pl 
b/tp/t/results/macro/cpp_directives_in_macro.pl
index 804c0a762e..03b54516da 100644
--- a/tp/t/results/macro/cpp_directives_in_macro.pl
+++ b/tp/t/results/macro/cpp_directives_in_macro.pl
@@ -106,7 +106,6 @@ $result_trees{'cpp_directives_in_macro'} = {
               'source_marks' => [
                 {
                   'counter' => 1,
-                  'location' => 'text',
                   'position' => 1,
                   'sourcemark_type' => 'macro_expansion',
                   'status' => 'end'
@@ -160,8 +159,6 @@ $result_trees{'cpp_directives_in_macro'} = {
             },
             'type' => 'macro_call'
           },
-          'location' => 'text',
-          'position' => 0,
           'sourcemark_type' => 'macro_expansion',
           'status' => 'start'
         }
diff --git a/tp/t/results/macro/double_recursive_macro_call.pl 
b/tp/t/results/macro/double_recursive_macro_call.pl
index 7e5ae0e411..de3c1a1637 100644
--- a/tp/t/results/macro/double_recursive_macro_call.pl
+++ b/tp/t/results/macro/double_recursive_macro_call.pl
@@ -153,8 +153,6 @@ $result_trees{'double_recursive_macro_call'} = {
                 },
                 'type' => 'macro_call'
               },
-              'location' => 'text',
-              'position' => 0,
               'sourcemark_type' => 'macro_expansion',
               'status' => 'start'
             },
@@ -171,22 +169,16 @@ $result_trees{'double_recursive_macro_call'} = {
                 },
                 'type' => 'macro_call'
               },
-              'location' => 'text',
-              'position' => 0,
               'sourcemark_type' => 'macro_expansion',
               'status' => 'start'
             },
             {
               'counter' => 2,
-              'location' => 'text',
-              'position' => 0,
               'sourcemark_type' => 'macro_expansion',
               'status' => 'end'
             },
             {
               'counter' => 1,
-              'location' => 'text',
-              'position' => 0,
               'sourcemark_type' => 'macro_expansion',
               'status' => 'end'
             }
diff --git a/tp/t/results/macro/empty_macro_argument.pl 
b/tp/t/results/macro/empty_macro_argument.pl
index 55104714aa..a92ad1484b 100644
--- a/tp/t/results/macro/empty_macro_argument.pl
+++ b/tp/t/results/macro/empty_macro_argument.pl
@@ -73,7 +73,6 @@ $result_trees{'empty_macro_argument'} = {
               'source_marks' => [
                 {
                   'counter' => 1,
-                  'location' => 'text',
                   'position' => 4,
                   'sourcemark_type' => 'macro_expansion',
                   'status' => 'end'
@@ -91,14 +90,12 @@ $result_trees{'empty_macro_argument'} = {
                     },
                     'type' => 'macro_call'
                   },
-                  'location' => 'text',
                   'position' => 5,
                   'sourcemark_type' => 'macro_expansion',
                   'status' => 'start'
                 },
                 {
                   'counter' => 2,
-                  'location' => 'text',
                   'position' => 9,
                   'sourcemark_type' => 'macro_expansion',
                   'status' => 'end'
@@ -116,14 +113,12 @@ $result_trees{'empty_macro_argument'} = {
                     },
                     'type' => 'macro_call'
                   },
-                  'location' => 'text',
                   'position' => 10,
                   'sourcemark_type' => 'macro_expansion',
                   'status' => 'start'
                 },
                 {
                   'counter' => 3,
-                  'location' => 'text',
                   'position' => 14,
                   'sourcemark_type' => 'macro_expansion',
                   'status' => 'end'
@@ -141,14 +136,12 @@ $result_trees{'empty_macro_argument'} = {
                     },
                     'type' => 'macro_call'
                   },
-                  'location' => 'text',
                   'position' => 15,
                   'sourcemark_type' => 'macro_expansion',
                   'status' => 'start'
                 },
                 {
                   'counter' => 4,
-                  'location' => 'text',
                   'position' => 19,
                   'sourcemark_type' => 'macro_expansion',
                   'status' => 'end'
@@ -233,7 +226,6 @@ $result_trees{'empty_macro_argument'} = {
               'source_marks' => [
                 {
                   'counter' => 5,
-                  'location' => 'text',
                   'position' => 2,
                   'sourcemark_type' => 'macro_expansion',
                   'status' => 'end'
@@ -251,14 +243,12 @@ $result_trees{'empty_macro_argument'} = {
                     },
                     'type' => 'macro_call'
                   },
-                  'location' => 'text',
                   'position' => 3,
                   'sourcemark_type' => 'macro_expansion',
                   'status' => 'start'
                 },
                 {
                   'counter' => 6,
-                  'location' => 'text',
                   'position' => 5,
                   'sourcemark_type' => 'macro_expansion',
                   'status' => 'end'
@@ -276,14 +266,12 @@ $result_trees{'empty_macro_argument'} = {
                     },
                     'type' => 'macro_call'
                   },
-                  'location' => 'text',
                   'position' => 6,
                   'sourcemark_type' => 'macro_expansion',
                   'status' => 'start'
                 },
                 {
                   'counter' => 7,
-                  'location' => 'text',
                   'position' => 8,
                   'sourcemark_type' => 'macro_expansion',
                   'status' => 'end'
@@ -301,14 +289,12 @@ $result_trees{'empty_macro_argument'} = {
                     },
                     'type' => 'macro_call'
                   },
-                  'location' => 'text',
                   'position' => 9,
                   'sourcemark_type' => 'macro_expansion',
                   'status' => 'start'
                 },
                 {
                   'counter' => 8,
-                  'location' => 'text',
                   'position' => 12,
                   'sourcemark_type' => 'macro_expansion',
                   'status' => 'end'
@@ -334,8 +320,6 @@ $result_trees{'empty_macro_argument'} = {
             },
             'type' => 'macro_call'
           },
-          'location' => 'text',
-          'position' => 0,
           'sourcemark_type' => 'macro_expansion',
           'status' => 'start'
         },
@@ -352,8 +336,6 @@ $result_trees{'empty_macro_argument'} = {
             },
             'type' => 'macro_call'
           },
-          'location' => 'text',
-          'position' => 0,
           'sourcemark_type' => 'macro_expansion',
           'status' => 'start'
         }
diff --git a/tp/t/results/macro/empty_macro_in_text_no_arg.pl 
b/tp/t/results/macro/empty_macro_in_text_no_arg.pl
index 47e522cce4..432bb14097 100644
--- a/tp/t/results/macro/empty_macro_in_text_no_arg.pl
+++ b/tp/t/results/macro/empty_macro_in_text_no_arg.pl
@@ -78,14 +78,12 @@ $result_trees{'empty_macro_in_text_no_arg'} = {
                     },
                     'type' => 'macro_call'
                   },
-                  'location' => 'text',
                   'position' => 5,
                   'sourcemark_type' => 'macro_expansion',
                   'status' => 'start'
                 },
                 {
                   'counter' => 1,
-                  'location' => 'text',
                   'position' => 5,
                   'sourcemark_type' => 'macro_expansion',
                   'status' => 'end'
@@ -167,14 +165,12 @@ $result_trees{'empty_macro_in_text_no_arg'} = {
                     },
                     'type' => 'macro_call'
                   },
-                  'location' => 'text',
                   'position' => 11,
                   'sourcemark_type' => 'macro_expansion',
                   'status' => 'start'
                 },
                 {
                   'counter' => 2,
-                  'location' => 'text',
                   'position' => 11,
                   'sourcemark_type' => 'macro_expansion',
                   'status' => 'end'
diff --git a/tp/t/results/macro/empty_macro_no_arg.pl 
b/tp/t/results/macro/empty_macro_no_arg.pl
index 539b63cfa9..f12e7a07a3 100644
--- a/tp/t/results/macro/empty_macro_no_arg.pl
+++ b/tp/t/results/macro/empty_macro_no_arg.pl
@@ -72,15 +72,11 @@ $result_trees{'empty_macro_no_arg'} = {
                 },
                 'type' => 'macro_call'
               },
-              'location' => 'text',
-              'position' => 0,
               'sourcemark_type' => 'macro_expansion',
               'status' => 'start'
             },
             {
               'counter' => 1,
-              'location' => 'text',
-              'position' => 0,
               'sourcemark_type' => 'macro_expansion',
               'status' => 'end'
             }
@@ -109,15 +105,11 @@ $result_trees{'empty_macro_no_arg'} = {
                 },
                 'type' => 'macro_call'
               },
-              'location' => 'text',
-              'position' => 0,
               'sourcemark_type' => 'macro_expansion',
               'status' => 'start'
             },
             {
               'counter' => 2,
-              'location' => 'text',
-              'position' => 0,
               'sourcemark_type' => 'macro_expansion',
               'status' => 'end'
             }
diff --git a/tp/t/results/macro/expand_two_same.pl 
b/tp/t/results/macro/expand_two_same.pl
index 31eeb4e173..641ec4b835 100644
--- a/tp/t/results/macro/expand_two_same.pl
+++ b/tp/t/results/macro/expand_two_same.pl
@@ -152,8 +152,6 @@ arg}
                 },
                 'type' => 'macro_call'
               },
-              'location' => 'text',
-              'position' => 0,
               'sourcemark_type' => 'macro_expansion',
               'status' => 'start'
             }
@@ -164,7 +162,6 @@ arg}
           'source_marks' => [
             {
               'counter' => 1,
-              'location' => 'text',
               'position' => 1,
               'sourcemark_type' => 'macro_expansion',
               'status' => 'end'
@@ -189,7 +186,6 @@ arg}
               'source_marks' => [
                 {
                   'counter' => 2,
-                  'location' => 'text',
                   'position' => 72,
                   'sourcemark_type' => 'macro_expansion',
                   'status' => 'end'
@@ -213,8 +209,6 @@ arg}
                 },
                 'type' => 'macro_call'
               },
-              'location' => 'text',
-              'position' => 0,
               'sourcemark_type' => 'macro_expansion',
               'status' => 'start'
             }
diff --git a/tp/t/results/macro/expansion_order.pl 
b/tp/t/results/macro/expansion_order.pl
index 0cd2691cda..d01f478e16 100644
--- a/tp/t/results/macro/expansion_order.pl
+++ b/tp/t/results/macro/expansion_order.pl
@@ -140,14 +140,12 @@ $result_trees{'expansion_order'} = {
               'source_marks' => [
                 {
                   'counter' => 2,
-                  'location' => 'text',
                   'position' => 6,
                   'sourcemark_type' => 'macro_expansion',
                   'status' => 'end'
                 },
                 {
                   'counter' => 1,
-                  'location' => 'text',
                   'position' => 6,
                   'sourcemark_type' => 'macro_expansion',
                   'status' => 'end'
@@ -179,8 +177,6 @@ $result_trees{'expansion_order'} = {
             },
             'type' => 'macro_call'
           },
-          'location' => 'text',
-          'position' => 0,
           'sourcemark_type' => 'macro_expansion',
           'status' => 'start'
         },
@@ -197,8 +193,6 @@ $result_trees{'expansion_order'} = {
             },
             'type' => 'macro_call'
           },
-          'location' => 'text',
-          'position' => 0,
           'sourcemark_type' => 'macro_expansion',
           'status' => 'start'
         }
diff --git a/tp/t/results/macro/form_feeds.pl b/tp/t/results/macro/form_feeds.pl
index 91471c050d..5dfad81aef 100644
--- a/tp/t/results/macro/form_feeds.pl
+++ b/tp/t/results/macro/form_feeds.pl
@@ -159,7 +159,6 @@ $result_trees{'form_feeds'} = {
               'source_marks' => [
                 {
                   'counter' => 1,
-                  'location' => 'text',
                   'position' => 6,
                   'sourcemark_type' => 'macro_expansion',
                   'status' => 'end'
@@ -188,7 +187,6 @@ $result_trees{'form_feeds'} = {
               'source_marks' => [
                 {
                   'counter' => 2,
-                  'location' => 'text',
                   'position' => 8,
                   'sourcemark_type' => 'macro_expansion',
                   'status' => 'end'
@@ -223,8 +221,6 @@ $result_trees{'form_feeds'} = {
             },
             'type' => 'macro_call'
           },
-          'location' => 'text',
-          'position' => 0,
           'sourcemark_type' => 'macro_expansion',
           'status' => 'start'
         },
@@ -241,8 +237,6 @@ $result_trees{'form_feeds'} = {
             },
             'type' => 'macro_call'
           },
-          'location' => 'text',
-          'position' => 0,
           'sourcemark_type' => 'macro_expansion',
           'status' => 'start'
         }
diff --git a/tp/t/results/macro/glossary.pl b/tp/t/results/macro/glossary.pl
index ca64335e71..639d4a0cf2 100644
--- a/tp/t/results/macro/glossary.pl
+++ b/tp/t/results/macro/glossary.pl
@@ -531,7 +531,6 @@ $result_trees{'glossary'} = {
                     },
                     'type' => 'macro_call'
                   },
-                  'location' => 'text',
                   'position' => 4,
                   'sourcemark_type' => 'macro_expansion',
                   'status' => 'start'
@@ -727,7 +726,6 @@ $result_trees{'glossary'} = {
                           'source_marks' => [
                             {
                               'counter' => 2,
-                              'location' => 'text',
                               'position' => 5,
                               'sourcemark_type' => 'macro_expansion',
                               'status' => 'end'
@@ -990,7 +988,6 @@ $result_trees{'glossary'} = {
                           'source_marks' => [
                             {
                               'counter' => 4,
-                              'location' => 'text',
                               'position' => 5,
                               'sourcemark_type' => 'macro_expansion',
                               'status' => 'end'
@@ -1056,8 +1053,6 @@ $result_trees{'glossary'} = {
                 },
                 'type' => 'macro_call'
               },
-              'location' => 'text',
-              'position' => 0,
               'sourcemark_type' => 'macro_expansion',
               'status' => 'start'
             },
@@ -1080,8 +1075,6 @@ $result_trees{'glossary'} = {
                 },
                 'type' => 'macro_call'
               },
-              'location' => 'text',
-              'position' => 0,
               'sourcemark_type' => 'macro_expansion',
               'status' => 'start'
             },
@@ -1098,8 +1091,6 @@ $result_trees{'glossary'} = {
                 },
                 'type' => 'macro_call'
               },
-              'location' => 'text',
-              'position' => 0,
               'sourcemark_type' => 'macro_expansion',
               'status' => 'start'
             }
@@ -1197,7 +1188,6 @@ $result_trees{'glossary'} = {
               'source_marks' => [
                 {
                   'counter' => 6,
-                  'location' => 'text',
                   'position' => 5,
                   'sourcemark_type' => 'macro_expansion',
                   'status' => 'end'
@@ -1250,8 +1240,6 @@ $result_trees{'glossary'} = {
             },
             'type' => 'macro_call'
           },
-          'location' => 'text',
-          'position' => 0,
           'sourcemark_type' => 'macro_expansion',
           'status' => 'start'
         },
@@ -1263,8 +1251,6 @@ $result_trees{'glossary'} = {
             },
             'type' => 'macro_call'
           },
-          'location' => 'text',
-          'position' => 0,
           'sourcemark_type' => 'macro_expansion',
           'status' => 'start'
         }
@@ -1430,8 +1416,6 @@ $result_sectioning{'glossary'} = {
                     },
                     'type' => 'macro_call'
                   },
-                  'location' => 'text',
-                  'position' => 0,
                   'sourcemark_type' => 'macro_expansion',
                   'status' => 'start'
                 },
@@ -1443,8 +1427,6 @@ $result_sectioning{'glossary'} = {
                     },
                     'type' => 'macro_call'
                   },
-                  'location' => 'text',
-                  'position' => 0,
                   'sourcemark_type' => 'macro_expansion',
                   'status' => 'start'
                 }
@@ -1505,8 +1487,6 @@ $result_nodes{'glossary'} = {
                 },
                 'type' => 'macro_call'
               },
-              'location' => 'text',
-              'position' => 0,
               'sourcemark_type' => 'macro_expansion',
               'status' => 'start'
             },
@@ -1518,8 +1498,6 @@ $result_nodes{'glossary'} = {
                 },
                 'type' => 'macro_call'
               },
-              'location' => 'text',
-              'position' => 0,
               'sourcemark_type' => 'macro_expansion',
               'status' => 'start'
             }
diff --git a/tp/t/results/macro/ifclear_in_macro.pl 
b/tp/t/results/macro/ifclear_in_macro.pl
index 7b50eeeb71..f813dbaea1 100644
--- a/tp/t/results/macro/ifclear_in_macro.pl
+++ b/tp/t/results/macro/ifclear_in_macro.pl
@@ -111,8 +111,6 @@ $result_trees{'ifclear_in_macro'} = {
             },
             'type' => 'macro_call'
           },
-          'location' => 'text',
-          'position' => 0,
           'sourcemark_type' => 'macro_expansion',
           'status' => 'start'
         }
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 8ccd1b5772..06fa54eba2 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
@@ -135,8 +135,6 @@ $result_trees{'ifset_and_end_isef_in_macro'} = {
             },
             'type' => 'macro_call'
           },
-          'location' => 'text',
-          'position' => 0,
           'sourcemark_type' => 'macro_expansion',
           'status' => 'start'
         }
diff --git a/tp/t/results/macro/ifset_in_macro.pl 
b/tp/t/results/macro/ifset_in_macro.pl
index e9301beb96..d60a8d9342 100644
--- a/tp/t/results/macro/ifset_in_macro.pl
+++ b/tp/t/results/macro/ifset_in_macro.pl
@@ -97,8 +97,6 @@ $result_trees{'ifset_in_macro'} = {
             },
             'type' => 'macro_call'
           },
-          'location' => 'text',
-          'position' => 0,
           'sourcemark_type' => 'macro_expansion',
           'status' => 'start'
         }
diff --git a/tp/t/results/macro/ifset_in_macro_set.pl 
b/tp/t/results/macro/ifset_in_macro_set.pl
index 7ade930417..2a36f367d6 100644
--- a/tp/t/results/macro/ifset_in_macro_set.pl
+++ b/tp/t/results/macro/ifset_in_macro_set.pl
@@ -111,8 +111,6 @@ $result_trees{'ifset_in_macro_set'} = {
             },
             'type' => 'macro_call'
           },
-          'location' => 'text',
-          'position' => 0,
           'sourcemark_type' => 'macro_expansion',
           'status' => 'start'
         }
diff --git a/tp/t/results/macro/ignored_macro_definition.pl 
b/tp/t/results/macro/ignored_macro_definition.pl
index dfb1f1bde1..7b11351a6a 100644
--- a/tp/t/results/macro/ignored_macro_definition.pl
+++ b/tp/t/results/macro/ignored_macro_definition.pl
@@ -116,7 +116,6 @@ $result_trees{'ignored_macro_definition'} = {
               'source_marks' => [
                 {
                   'counter' => 1,
-                  'location' => 'text',
                   'position' => 7,
                   'sourcemark_type' => 'macro_expansion',
                   'status' => 'end'
@@ -143,8 +142,6 @@ $result_trees{'ignored_macro_definition'} = {
             },
             'type' => 'macro_call'
           },
-          'location' => 'text',
-          'position' => 0,
           'sourcemark_type' => 'macro_expansion',
           'status' => 'start'
         }
diff --git a/tp/t/results/macro/implicit_quoting_one_arg.pl 
b/tp/t/results/macro/implicit_quoting_one_arg.pl
index f3a36393e2..46c49914e4 100644
--- a/tp/t/results/macro/implicit_quoting_one_arg.pl
+++ b/tp/t/results/macro/implicit_quoting_one_arg.pl
@@ -125,8 +125,6 @@ $result_trees{'implicit_quoting_one_arg'} = {
             },
             'type' => 'macro_call'
           },
-          'location' => 'text',
-          'position' => 0,
           'sourcemark_type' => 'macro_expansion',
           'status' => 'start'
         }
diff --git a/tp/t/results/macro/implicit_quoting_recursion.pl 
b/tp/t/results/macro/implicit_quoting_recursion.pl
index 6a4d0ff47b..d09317b94a 100644
--- a/tp/t/results/macro/implicit_quoting_recursion.pl
+++ b/tp/t/results/macro/implicit_quoting_recursion.pl
@@ -81,42 +81,36 @@ $result_trees{'implicit_quoting_recursion'} = {
               'source_marks' => [
                 {
                   'counter' => 6,
-                  'location' => 'text',
                   'position' => 4,
                   'sourcemark_type' => 'macro_expansion',
                   'status' => 'end'
                 },
                 {
                   'counter' => 5,
-                  'location' => 'text',
                   'position' => 6,
                   'sourcemark_type' => 'macro_expansion',
                   'status' => 'end'
                 },
                 {
                   'counter' => 4,
-                  'location' => 'text',
                   'position' => 8,
                   'sourcemark_type' => 'macro_expansion',
                   'status' => 'end'
                 },
                 {
                   'counter' => 3,
-                  'location' => 'text',
                   'position' => 10,
                   'sourcemark_type' => 'macro_expansion',
                   'status' => 'end'
                 },
                 {
                   'counter' => 2,
-                  'location' => 'text',
                   'position' => 13,
                   'sourcemark_type' => 'macro_expansion',
                   'status' => 'end'
                 },
                 {
                   'counter' => 1,
-                  'location' => 'text',
                   'position' => 16,
                   'sourcemark_type' => 'macro_expansion',
                   'status' => 'end'
@@ -146,8 +140,6 @@ $result_trees{'implicit_quoting_recursion'} = {
             },
             'type' => 'rmacro_call'
           },
-          'location' => 'text',
-          'position' => 0,
           'sourcemark_type' => 'macro_expansion',
           'status' => 'start'
         },
@@ -167,8 +159,6 @@ $result_trees{'implicit_quoting_recursion'} = {
             },
             'type' => 'rmacro_call'
           },
-          'location' => 'text',
-          'position' => 0,
           'sourcemark_type' => 'macro_expansion',
           'status' => 'start'
         },
@@ -188,8 +178,6 @@ $result_trees{'implicit_quoting_recursion'} = {
             },
             'type' => 'rmacro_call'
           },
-          'location' => 'text',
-          'position' => 0,
           'sourcemark_type' => 'macro_expansion',
           'status' => 'start'
         },
@@ -209,8 +197,6 @@ $result_trees{'implicit_quoting_recursion'} = {
             },
             'type' => 'rmacro_call'
           },
-          'location' => 'text',
-          'position' => 0,
           'sourcemark_type' => 'macro_expansion',
           'status' => 'start'
         },
@@ -230,8 +216,6 @@ $result_trees{'implicit_quoting_recursion'} = {
             },
             'type' => 'rmacro_call'
           },
-          'location' => 'text',
-          'position' => 0,
           'sourcemark_type' => 'macro_expansion',
           'status' => 'start'
         },
@@ -251,8 +235,6 @@ $result_trees{'implicit_quoting_recursion'} = {
             },
             'type' => 'rmacro_call'
           },
-          'location' => 'text',
-          'position' => 0,
           'sourcemark_type' => 'macro_expansion',
           'status' => 'start'
         }
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 0cec43d2c6..5140ffede1 100644
--- a/tp/t/results/macro/include_after_empty_line_arg.pl
+++ b/tp/t/results/macro/include_after_empty_line_arg.pl
@@ -125,7 +125,6 @@ $result_trees{'include_after_empty_line_arg'} = {
                       'macro' => ''
                     }
                   },
-                  'location' => 'text',
                   'position' => 1,
                   'sourcemark_type' => 'include',
                   'status' => 'start'
@@ -138,7 +137,6 @@ $result_trees{'include_after_empty_line_arg'} = {
               'source_marks' => [
                 {
                   'counter' => 1,
-                  'location' => 'text',
                   'position' => 18,
                   'sourcemark_type' => 'include',
                   'status' => 'end'
@@ -165,8 +163,6 @@ $result_trees{'include_after_empty_line_arg'} = {
             },
             'type' => 'macro_call'
           },
-          'location' => 'text',
-          'position' => 0,
           'sourcemark_type' => 'macro_expansion',
           'status' => 'start'
         }
diff --git a/tp/t/results/macro/leading_spaces_no_ignore.pl 
b/tp/t/results/macro/leading_spaces_no_ignore.pl
index d1f3f2ccf8..fb06f75548 100644
--- a/tp/t/results/macro/leading_spaces_no_ignore.pl
+++ b/tp/t/results/macro/leading_spaces_no_ignore.pl
@@ -87,8 +87,6 @@ $result_trees{'leading_spaces_no_ignore'} = {
                 },
                 'type' => 'macro_call'
               },
-              'location' => 'text',
-              'position' => 0,
               'sourcemark_type' => 'macro_expansion',
               'status' => 'start'
             }
@@ -106,7 +104,6 @@ $result_trees{'leading_spaces_no_ignore'} = {
               'source_marks' => [
                 {
                   'counter' => 1,
-                  'location' => 'text',
                   'position' => 6,
                   'sourcemark_type' => 'macro_expansion',
                   'status' => 'end'
diff --git a/tp/t/results/macro/line_after_recursive_call.pl 
b/tp/t/results/macro/line_after_recursive_call.pl
index 64f0f82bce..da3169ec1e 100644
--- a/tp/t/results/macro/line_after_recursive_call.pl
+++ b/tp/t/results/macro/line_after_recursive_call.pl
@@ -82,7 +82,6 @@ $result_trees{'line_after_recursive_call'} = {
               'source_marks' => [
                 {
                   'counter' => 1,
-                  'location' => 'text',
                   'position' => 3,
                   'sourcemark_type' => 'macro_expansion',
                   'status' => 'end'
@@ -103,8 +102,6 @@ $result_trees{'line_after_recursive_call'} = {
             },
             'type' => 'macro_call'
           },
-          'location' => 'text',
-          'position' => 0,
           'sourcemark_type' => 'macro_expansion',
           'status' => 'start'
         }
diff --git a/tp/t/results/macro/macro_expands_to_empty.pl 
b/tp/t/results/macro/macro_expands_to_empty.pl
index 161229f718..0921d65735 100644
--- a/tp/t/results/macro/macro_expands_to_empty.pl
+++ b/tp/t/results/macro/macro_expands_to_empty.pl
@@ -86,15 +86,11 @@ $result_trees{'macro_expands_to_empty'} = {
                 },
                 'type' => 'macro_call'
               },
-              'location' => 'text',
-              'position' => 0,
               'sourcemark_type' => 'macro_expansion',
               'status' => 'start'
             },
             {
               'counter' => 1,
-              'location' => 'text',
-              'position' => 0,
               'sourcemark_type' => 'macro_expansion',
               'status' => 'end'
             }
@@ -109,7 +105,6 @@ $result_trees{'macro_expands_to_empty'} = {
               'source_marks' => [
                 {
                   'counter' => 2,
-                  'location' => 'text',
                   'position' => 2,
                   'sourcemark_type' => 'macro_expansion',
                   'status' => 'end'
@@ -136,8 +131,6 @@ $result_trees{'macro_expands_to_empty'} = {
             },
             'type' => 'macro_call'
           },
-          'location' => 'text',
-          'position' => 0,
           'sourcemark_type' => 'macro_expansion',
           'status' => 'start'
         }
diff --git a/tp/t/results/macro/macro_expansion.pl 
b/tp/t/results/macro/macro_expansion.pl
index acc5972b71..3eae703cbc 100644
--- a/tp/t/results/macro/macro_expansion.pl
+++ b/tp/t/results/macro/macro_expansion.pl
@@ -115,7 +115,6 @@ $result_trees{'macro_expansion'} = {
                     },
                     'type' => 'macro_call'
                   },
-                  'location' => 'text',
                   'position' => 15,
                   'sourcemark_type' => 'macro_expansion',
                   'status' => 'start'
@@ -152,7 +151,6 @@ $result_trees{'macro_expansion'} = {
                       'source_marks' => [
                         {
                           'counter' => 1,
-                          'location' => 'text',
                           'position' => 8,
                           'sourcemark_type' => 'macro_expansion',
                           'status' => 'end'
@@ -210,7 +208,6 @@ $result_trees{'macro_expansion'} = {
                     },
                     'type' => 'macro_call'
                   },
-                  'location' => 'text',
                   'position' => 18,
                   'sourcemark_type' => 'macro_expansion',
                   'status' => 'start'
@@ -268,7 +265,6 @@ $result_trees{'macro_expansion'} = {
                       'source_marks' => [
                         {
                           'counter' => 2,
-                          'location' => 'text',
                           'position' => 8,
                           'sourcemark_type' => 'macro_expansion',
                           'status' => 'end'
@@ -321,7 +317,6 @@ $result_trees{'macro_expansion'} = {
                     },
                     'type' => 'macro_call'
                   },
-                  'location' => 'text',
                   'position' => 18,
                   'sourcemark_type' => 'macro_expansion',
                   'status' => 'start'
@@ -358,7 +353,6 @@ $result_trees{'macro_expansion'} = {
                       'source_marks' => [
                         {
                           'counter' => 3,
-                          'location' => 'text',
                           'position' => 8,
                           'sourcemark_type' => 'macro_expansion',
                           'status' => 'end'
@@ -419,7 +413,6 @@ $result_trees{'macro_expansion'} = {
                     },
                     'type' => 'macro_call'
                   },
-                  'location' => 'text',
                   'position' => 16,
                   'sourcemark_type' => 'macro_expansion',
                   'status' => 'start'
@@ -456,7 +449,6 @@ $result_trees{'macro_expansion'} = {
                       'source_marks' => [
                         {
                           'counter' => 4,
-                          'location' => 'text',
                           'position' => 8,
                           'sourcemark_type' => 'macro_expansion',
                           'status' => 'end'
@@ -517,7 +509,6 @@ $result_trees{'macro_expansion'} = {
                     },
                     'type' => 'macro_call'
                   },
-                  'location' => 'text',
                   'position' => 15,
                   'sourcemark_type' => 'macro_expansion',
                   'status' => 'start'
@@ -554,7 +545,6 @@ $result_trees{'macro_expansion'} = {
                       'source_marks' => [
                         {
                           'counter' => 5,
-                          'location' => 'text',
                           'position' => 8,
                           'sourcemark_type' => 'macro_expansion',
                           'status' => 'end'
@@ -619,7 +609,6 @@ now'
                     },
                     'type' => 'macro_call'
                   },
-                  'location' => 'text',
                   'position' => 16,
                   'sourcemark_type' => 'macro_expansion',
                   'status' => 'start'
@@ -680,7 +669,6 @@ now'
                       'source_marks' => [
                         {
                           'counter' => 6,
-                          'location' => 'text',
                           'position' => 8,
                           'sourcemark_type' => 'macro_expansion',
                           'status' => 'end'
diff --git a/tp/t/results/macro/macro_for_end.pl 
b/tp/t/results/macro/macro_for_end.pl
index 59351d0778..ece4c1e157 100644
--- a/tp/t/results/macro/macro_for_end.pl
+++ b/tp/t/results/macro/macro_for_end.pl
@@ -94,8 +94,6 @@ $result_trees{'macro_for_end'} = {
                   'source_marks' => [
                     {
                       'counter' => 1,
-                      'location' => 'text',
-                      'position' => 0,
                       'sourcemark_type' => 'macro_expansion',
                       'status' => 'end'
                     }
@@ -136,8 +134,6 @@ $result_trees{'macro_for_end'} = {
                 },
                 'type' => 'macro_call'
               },
-              'location' => 'text',
-              'position' => 0,
               'sourcemark_type' => 'macro_expansion',
               'status' => 'start'
             }
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 217f769b65..fd26286f2c 100644
--- a/tp/t/results/macro/macro_for_ignored_line_command.pl
+++ b/tp/t/results/macro/macro_for_ignored_line_command.pl
@@ -92,8 +92,6 @@ $result_trees{'macro_for_ignored_line_command'} = {
             },
             'type' => 'macro_call'
           },
-          'location' => 'text',
-          'position' => 0,
           'sourcemark_type' => 'macro_expansion',
           'status' => 'start'
         }
diff --git a/tp/t/results/macro/macro_in_accent.pl 
b/tp/t/results/macro/macro_in_accent.pl
index 4d8cb4a55c..f56e198cb6 100644
--- a/tp/t/results/macro/macro_in_accent.pl
+++ b/tp/t/results/macro/macro_in_accent.pl
@@ -293,7 +293,6 @@ $result_trees{'macro_in_accent'} = {
                       'source_marks' => [
                         {
                           'counter' => 4,
-                          'location' => 'text',
                           'position' => 1,
                           'sourcemark_type' => 'macro_expansion',
                           'status' => 'end'
diff --git a/tp/t/results/macro/macro_in_brace_command.pl 
b/tp/t/results/macro/macro_in_brace_command.pl
index 79ff453206..92dcd6f26c 100644
--- a/tp/t/results/macro/macro_in_brace_command.pl
+++ b/tp/t/results/macro/macro_in_brace_command.pl
@@ -165,7 +165,6 @@ $result_trees{'macro_in_brace_command'} = {
                               'source_marks' => [
                                 {
                                   'counter' => 1,
-                                  'location' => 'text',
                                   'position' => 13,
                                   'sourcemark_type' => 'macro_expansion',
                                   'status' => 'end'
@@ -198,7 +197,6 @@ $result_trees{'macro_in_brace_command'} = {
                               'source_marks' => [
                                 {
                                   'counter' => 2,
-                                  'location' => 'text',
                                   'position' => 13,
                                   'sourcemark_type' => 'macro_expansion',
                                   'status' => 'end'
@@ -221,8 +219,6 @@ $result_trees{'macro_in_brace_command'} = {
                                 },
                                 'type' => 'macro_call'
                               },
-                              'location' => 'text',
-                              'position' => 0,
                               'sourcemark_type' => 'macro_expansion',
                               'status' => 'start'
                             }
diff --git a/tp/t/results/macro/macro_in_end_argument.pl 
b/tp/t/results/macro/macro_in_end_argument.pl
index 1878717a6a..c3cfc37682 100644
--- a/tp/t/results/macro/macro_in_end_argument.pl
+++ b/tp/t/results/macro/macro_in_end_argument.pl
@@ -87,7 +87,6 @@ $result_trees{'macro_in_end_argument'} = {
                       'source_marks' => [
                         {
                           'counter' => 1,
-                          'location' => 'text',
                           'position' => 9,
                           'sourcemark_type' => 'macro_expansion',
                           'status' => 'end'
@@ -114,7 +113,6 @@ $result_trees{'macro_in_end_argument'} = {
                         },
                         'type' => 'macro_call'
                       },
-                      'location' => 'text',
                       'position' => 1,
                       'sourcemark_type' => 'macro_expansion',
                       'status' => 'start'
diff --git a/tp/t/results/macro/macro_in_index_commands.pl 
b/tp/t/results/macro/macro_in_index_commands.pl
index e4a89e6354..688bd7ce48 100644
--- a/tp/t/results/macro/macro_in_index_commands.pl
+++ b/tp/t/results/macro/macro_in_index_commands.pl
@@ -181,7 +181,6 @@ $result_trees{'macro_in_index_commands'} = {
                   'source_marks' => [
                     {
                       'counter' => 1,
-                      'location' => 'text',
                       'position' => 2,
                       'sourcemark_type' => 'macro_expansion',
                       'status' => 'end'
@@ -199,14 +198,12 @@ $result_trees{'macro_in_index_commands'} = {
                         },
                         'type' => 'macro_call'
                       },
-                      'location' => 'text',
                       'position' => 3,
                       'sourcemark_type' => 'macro_expansion',
                       'status' => 'start'
                     },
                     {
                       'counter' => 2,
-                      'location' => 'text',
                       'position' => 5,
                       'sourcemark_type' => 'macro_expansion',
                       'status' => 'end'
@@ -233,7 +230,6 @@ $result_trees{'macro_in_index_commands'} = {
                     },
                     'type' => 'macro_call'
                   },
-                  'location' => 'text',
                   'position' => 1,
                   'sourcemark_type' => 'macro_expansion',
                   'status' => 'start'
@@ -273,8 +269,6 @@ $result_trees{'macro_in_index_commands'} = {
               'source_marks' => [
                 {
                   'counter' => 3,
-                  'location' => 'text',
-                  'position' => 0,
                   'sourcemark_type' => 'macro_expansion',
                   'status' => 'end'
                 }
@@ -375,7 +369,6 @@ $result_trees{'macro_in_index_commands'} = {
                       'source_marks' => [
                         {
                           'counter' => 4,
-                          'location' => 'text',
                           'position' => 4,
                           'sourcemark_type' => 'macro_expansion',
                           'status' => 'end'
@@ -402,7 +395,6 @@ $result_trees{'macro_in_index_commands'} = {
                         },
                         'type' => 'macro_call'
                       },
-                      'location' => 'text',
                       'position' => 1,
                       'sourcemark_type' => 'macro_expansion',
                       'status' => 'start'
@@ -562,7 +554,6 @@ $result_trees{'macro_in_index_commands'} = {
                   'source_marks' => [
                     {
                       'counter' => 5,
-                      'location' => 'text',
                       'position' => 7,
                       'sourcemark_type' => 'macro_expansion',
                       'status' => 'end'
@@ -589,7 +580,6 @@ $result_trees{'macro_in_index_commands'} = {
                     },
                     'type' => 'macro_call'
                   },
-                  'location' => 'text',
                   'position' => 1,
                   'sourcemark_type' => 'macro_expansion',
                   'status' => 'start'
@@ -691,8 +681,6 @@ $result_trees{'macro_in_index_commands'} = {
             },
             'type' => 'macro_call'
           },
-          'location' => 'text',
-          'position' => 0,
           'sourcemark_type' => 'macro_expansion',
           'status' => 'start'
         }
@@ -736,8 +724,6 @@ $result_trees{'macro_in_index_commands'} = {
               'source_marks' => [
                 {
                   'counter' => 6,
-                  'location' => 'text',
-                  'position' => 0,
                   'sourcemark_type' => 'macro_expansion',
                   'status' => 'end'
                 }
@@ -883,7 +869,6 @@ $result_trees{'macro_in_index_commands'} = {
                     },
                     'type' => 'macro_call'
                   },
-                  'location' => 'text',
                   'position' => 1,
                   'sourcemark_type' => 'macro_expansion',
                   'status' => 'start'
@@ -930,7 +915,6 @@ $result_trees{'macro_in_index_commands'} = {
                   'source_marks' => [
                     {
                       'counter' => 8,
-                      'location' => 'text',
                       'position' => 4,
                       'sourcemark_type' => 'macro_expansion',
                       'status' => 'end'
@@ -957,7 +941,6 @@ $result_trees{'macro_in_index_commands'} = {
                     },
                     'type' => 'macro_call'
                   },
-                  'location' => 'text',
                   'position' => 1,
                   'sourcemark_type' => 'macro_expansion',
                   'status' => 'start'
@@ -1010,14 +993,12 @@ $result_trees{'macro_in_index_commands'} = {
                         },
                         'type' => 'macro_call'
                       },
-                      'location' => 'text',
                       'position' => 7,
                       'sourcemark_type' => 'macro_expansion',
                       'status' => 'start'
                     },
                     {
                       'counter' => 9,
-                      'location' => 'text',
                       'position' => 14,
                       'sourcemark_type' => 'macro_expansion',
                       'status' => 'end'
@@ -1080,7 +1061,6 @@ $result_trees{'macro_in_index_commands'} = {
                   'source_marks' => [
                     {
                       'counter' => 10,
-                      'location' => 'text',
                       'position' => 4,
                       'sourcemark_type' => 'macro_expansion',
                       'status' => 'end'
@@ -1107,7 +1087,6 @@ $result_trees{'macro_in_index_commands'} = {
                     },
                     'type' => 'macro_call'
                   },
-                  'location' => 'text',
                   'position' => 1,
                   'sourcemark_type' => 'macro_expansion',
                   'status' => 'start'
@@ -1153,7 +1132,6 @@ $result_trees{'macro_in_index_commands'} = {
                   'source_marks' => [
                     {
                       'counter' => 11,
-                      'location' => 'text',
                       'position' => 2,
                       'sourcemark_type' => 'macro_expansion',
                       'status' => 'end'
@@ -1180,7 +1158,6 @@ $result_trees{'macro_in_index_commands'} = {
                     },
                     'type' => 'macro_call'
                   },
-                  'location' => 'text',
                   'position' => 1,
                   'sourcemark_type' => 'macro_expansion',
                   'status' => 'start'
@@ -1247,8 +1224,6 @@ $result_trees{'macro_in_index_commands'} = {
             },
             'type' => 'macro_call'
           },
-          'location' => 'text',
-          'position' => 0,
           'sourcemark_type' => 'macro_expansion',
           'status' => 'start'
         }
@@ -1365,8 +1340,6 @@ $result_nodes{'macro_in_index_commands'} = {
         },
         'type' => 'macro_call'
       },
-      'location' => 'text',
-      'position' => 0,
       'sourcemark_type' => 'macro_expansion',
       'status' => 'start'
     }
@@ -1389,8 +1362,6 @@ $result_menus{'macro_in_index_commands'} = {
         },
         'type' => 'macro_call'
       },
-      'location' => 'text',
-      'position' => 0,
       'sourcemark_type' => 'macro_expansion',
       'status' => 'start'
     }
diff --git a/tp/t/results/macro/macro_in_invalid_documentencoding.pl 
b/tp/t/results/macro/macro_in_invalid_documentencoding.pl
index a5359d818a..235939c422 100644
--- a/tp/t/results/macro/macro_in_invalid_documentencoding.pl
+++ b/tp/t/results/macro/macro_in_invalid_documentencoding.pl
@@ -70,7 +70,6 @@ $result_trees{'macro_in_invalid_documentencoding'} = {
                   'source_marks' => [
                     {
                       'counter' => 1,
-                      'location' => 'text',
                       'position' => 4,
                       'sourcemark_type' => 'macro_expansion',
                       'status' => 'end'
@@ -97,7 +96,6 @@ $result_trees{'macro_in_invalid_documentencoding'} = {
                     },
                     'type' => 'macro_call'
                   },
-                  'location' => 'text',
                   'position' => 1,
                   'sourcemark_type' => 'macro_expansion',
                   'status' => 'start'
diff --git a/tp/t/results/macro/macro_in_macro_arg.pl 
b/tp/t/results/macro/macro_in_macro_arg.pl
index 26e4492655..5d6761bd18 100644
--- a/tp/t/results/macro/macro_in_macro_arg.pl
+++ b/tp/t/results/macro/macro_in_macro_arg.pl
@@ -222,14 +222,12 @@ $result_trees{'macro_in_macro_arg'} = {
                     },
                     'type' => 'macro_call'
                   },
-                  'location' => 'text',
                   'position' => 3,
                   'sourcemark_type' => 'macro_expansion',
                   'status' => 'start'
                 },
                 {
                   'counter' => 3,
-                  'location' => 'text',
                   'position' => 34,
                   'sourcemark_type' => 'macro_expansion',
                   'status' => 'end'
@@ -242,7 +240,6 @@ $result_trees{'macro_in_macro_arg'} = {
               'source_marks' => [
                 {
                   'counter' => 1,
-                  'location' => 'text',
                   'position' => 5,
                   'sourcemark_type' => 'macro_expansion',
                   'status' => 'end'
@@ -269,8 +266,6 @@ $result_trees{'macro_in_macro_arg'} = {
             },
             'type' => 'macro_call'
           },
-          'location' => 'text',
-          'position' => 0,
           'sourcemark_type' => 'macro_expansion',
           'status' => 'start'
         },
@@ -287,8 +282,6 @@ $result_trees{'macro_in_macro_arg'} = {
             },
             'type' => 'macro_call'
           },
-          'location' => 'text',
-          'position' => 0,
           'sourcemark_type' => 'macro_expansion',
           'status' => 'start'
         }
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 a9c93d81ef..d0adf88eb0 100644
--- a/tp/t/results/macro/macro_in_macro_arg_simpler.pl
+++ b/tp/t/results/macro/macro_in_macro_arg_simpler.pl
@@ -144,7 +144,6 @@ $result_trees{'macro_in_macro_arg_simpler'} = {
               'source_marks' => [
                 {
                   'counter' => 2,
-                  'location' => 'text',
                   'position' => 9,
                   'sourcemark_type' => 'macro_expansion',
                   'status' => 'end'
@@ -157,7 +156,6 @@ $result_trees{'macro_in_macro_arg_simpler'} = {
               'source_marks' => [
                 {
                   'counter' => 1,
-                  'location' => 'text',
                   'position' => 5,
                   'sourcemark_type' => 'macro_expansion',
                   'status' => 'end'
@@ -184,8 +182,6 @@ $result_trees{'macro_in_macro_arg_simpler'} = {
             },
             'type' => 'macro_call'
           },
-          'location' => 'text',
-          'position' => 0,
           'sourcemark_type' => 'macro_expansion',
           'status' => 'start'
         },
@@ -202,8 +198,6 @@ $result_trees{'macro_in_macro_arg_simpler'} = {
             },
             'type' => 'macro_call'
           },
-          'location' => 'text',
-          'position' => 0,
           'sourcemark_type' => 'macro_expansion',
           'status' => 'start'
         }
diff --git a/tp/t/results/macro/macro_in_menu.pl 
b/tp/t/results/macro/macro_in_menu.pl
index 15dfc849c1..2ec9d072c0 100644
--- a/tp/t/results/macro/macro_in_menu.pl
+++ b/tp/t/results/macro/macro_in_menu.pl
@@ -406,7 +406,6 @@ $result_trees{'macro_in_menu'} = {
                             },
                             'type' => 'macro_call'
                           },
-                          'location' => 'text',
                           'position' => 10,
                           'sourcemark_type' => 'macro_expansion',
                           'status' => 'start'
@@ -492,14 +491,11 @@ $result_trees{'macro_in_menu'} = {
                         },
                         'type' => 'macro_call'
                       },
-                      'location' => 'text',
-                      'position' => 0,
                       'sourcemark_type' => 'macro_expansion',
                       'status' => 'start'
                     },
                     {
                       'counter' => 4,
-                      'location' => 'text',
                       'position' => 1,
                       'sourcemark_type' => 'macro_expansion',
                       'status' => 'end'
@@ -551,14 +547,11 @@ $result_trees{'macro_in_menu'} = {
                             },
                             'type' => 'macro_call'
                           },
-                          'location' => 'text',
-                          'position' => 0,
                           'sourcemark_type' => 'macro_expansion',
                           'status' => 'start'
                         },
                         {
                           'counter' => 5,
-                          'location' => 'text',
                           'position' => 1,
                           'sourcemark_type' => 'macro_expansion',
                           'status' => 'end'
@@ -576,7 +569,6 @@ $result_trees{'macro_in_menu'} = {
                             },
                             'type' => 'macro_call'
                           },
-                          'location' => 'text',
                           'position' => 1,
                           'sourcemark_type' => 'macro_expansion',
                           'status' => 'start'
@@ -686,7 +678,6 @@ $result_trees{'macro_in_menu'} = {
                             },
                             'type' => 'macro_call'
                           },
-                          'location' => 'text',
                           'position' => 16,
                           'sourcemark_type' => 'macro_expansion',
                           'status' => 'start'
@@ -922,8 +913,6 @@ $result_trees{'macro_in_menu'} = {
                 },
                 'type' => 'macro_call'
               },
-              'location' => 'text',
-              'position' => 0,
               'sourcemark_type' => 'macro_expansion',
               'status' => 'start'
             }
diff --git a/tp/t/results/macro/macro_in_misc_commands.pl 
b/tp/t/results/macro/macro_in_misc_commands.pl
index d244bed220..dcc2d62667 100644
--- a/tp/t/results/macro/macro_in_misc_commands.pl
+++ b/tp/t/results/macro/macro_in_misc_commands.pl
@@ -136,7 +136,6 @@ $result_trees{'macro_in_misc_commands'} = {
               'source_marks' => [
                 {
                   'counter' => 1,
-                  'location' => 'text',
                   'position' => 3,
                   'sourcemark_type' => 'macro_expansion',
                   'status' => 'end'
@@ -163,7 +162,6 @@ $result_trees{'macro_in_misc_commands'} = {
                 },
                 'type' => 'macro_call'
               },
-              'location' => 'text',
               'position' => 1,
               'sourcemark_type' => 'macro_expansion',
               'status' => 'start'
@@ -215,14 +213,12 @@ $result_trees{'macro_in_misc_commands'} = {
                     },
                     'type' => 'macro_call'
                   },
-                  'location' => 'text',
                   'position' => 4,
                   'sourcemark_type' => 'macro_expansion',
                   'status' => 'start'
                 },
                 {
                   'counter' => 2,
-                  'location' => 'text',
                   'position' => 9,
                   'sourcemark_type' => 'macro_expansion',
                   'status' => 'end'
@@ -259,14 +255,12 @@ $result_trees{'macro_in_misc_commands'} = {
                         },
                         'type' => 'macro_call'
                       },
-                      'location' => 'text',
                       'position' => 14,
                       'sourcemark_type' => 'macro_expansion',
                       'status' => 'start'
                     },
                     {
                       'counter' => 3,
-                      'location' => 'text',
                       'position' => 19,
                       'sourcemark_type' => 'macro_expansion',
                       'status' => 'end'
@@ -466,7 +460,6 @@ $result_trees{'macro_in_misc_commands'} = {
                       'source_marks' => [
                         {
                           'counter' => 4,
-                          'location' => 'text',
                           'position' => 2,
                           'sourcemark_type' => 'macro_expansion',
                           'status' => 'end'
@@ -493,7 +486,6 @@ $result_trees{'macro_in_misc_commands'} = {
                         },
                         'type' => 'macro_call'
                       },
-                      'location' => 'text',
                       'position' => 2,
                       'sourcemark_type' => 'macro_expansion',
                       'status' => 'start'
@@ -544,8 +536,6 @@ $result_trees{'macro_in_misc_commands'} = {
                   'source_marks' => [
                     {
                       'counter' => 5,
-                      'location' => 'text',
-                      'position' => 0,
                       'sourcemark_type' => 'macro_expansion',
                       'status' => 'end'
                     }
@@ -585,8 +575,6 @@ $result_trees{'macro_in_misc_commands'} = {
                 },
                 'type' => 'macro_call'
               },
-              'location' => 'text',
-              'position' => 0,
               'sourcemark_type' => 'macro_expansion',
               'status' => 'start'
             }
@@ -722,7 +710,6 @@ $result_trees{'macro_in_misc_commands'} = {
                   'source_marks' => [
                     {
                       'counter' => 6,
-                      'location' => 'text',
                       'position' => 11,
                       'sourcemark_type' => 'macro_expansion',
                       'status' => 'end'
@@ -749,7 +736,6 @@ $result_trees{'macro_in_misc_commands'} = {
                     },
                     'type' => 'macro_call'
                   },
-                  'location' => 'text',
                   'position' => 1,
                   'sourcemark_type' => 'macro_expansion',
                   'status' => 'start'
@@ -802,14 +788,12 @@ $result_trees{'macro_in_misc_commands'} = {
                         },
                         'type' => 'macro_call'
                       },
-                      'location' => 'text',
                       'position' => 27,
                       'sourcemark_type' => 'macro_expansion',
                       'status' => 'start'
                     },
                     {
                       'counter' => 8,
-                      'location' => 'text',
                       'position' => 32,
                       'sourcemark_type' => 'macro_expansion',
                       'status' => 'end'
@@ -854,14 +838,12 @@ $result_trees{'macro_in_misc_commands'} = {
                         },
                         'type' => 'macro_call'
                       },
-                      'location' => 'text',
                       'position' => 29,
                       'sourcemark_type' => 'macro_expansion',
                       'status' => 'start'
                     },
                     {
                       'counter' => 9,
-                      'location' => 'text',
                       'position' => 34,
                       'sourcemark_type' => 'macro_expansion',
                       'status' => 'end'
@@ -906,14 +888,12 @@ $result_trees{'macro_in_misc_commands'} = {
                         },
                         'type' => 'macro_call'
                       },
-                      'location' => 'text',
                       'position' => 31,
                       'sourcemark_type' => 'macro_expansion',
                       'status' => 'start'
                     },
                     {
                       'counter' => 10,
-                      'location' => 'text',
                       'position' => 36,
                       'sourcemark_type' => 'macro_expansion',
                       'status' => 'end'
@@ -1010,7 +990,6 @@ $result_trees{'macro_in_misc_commands'} = {
                   'source_marks' => [
                     {
                       'counter' => 11,
-                      'location' => 'text',
                       'position' => 3,
                       'sourcemark_type' => 'macro_expansion',
                       'status' => 'end'
@@ -1037,7 +1016,6 @@ $result_trees{'macro_in_misc_commands'} = {
                     },
                     'type' => 'macro_call'
                   },
-                  'location' => 'text',
                   'position' => 1,
                   'sourcemark_type' => 'macro_expansion',
                   'status' => 'start'
@@ -1343,7 +1321,6 @@ $result_trees{'macro_in_misc_commands'} = {
                   'source_marks' => [
                     {
                       'counter' => 14,
-                      'location' => 'text',
                       'position' => 3,
                       'sourcemark_type' => 'macro_expansion',
                       'status' => 'end'
@@ -1370,7 +1347,6 @@ $result_trees{'macro_in_misc_commands'} = {
                     },
                     'type' => 'macro_call'
                   },
-                  'location' => 'text',
                   'position' => 1,
                   'sourcemark_type' => 'macro_expansion',
                   'status' => 'start'
@@ -1600,7 +1576,6 @@ $result_trees{'macro_in_misc_commands'} = {
                   'source_marks' => [
                     {
                       'counter' => 16,
-                      'location' => 'text',
                       'position' => 6,
                       'sourcemark_type' => 'macro_expansion',
                       'status' => 'end'
@@ -1618,14 +1593,12 @@ $result_trees{'macro_in_misc_commands'} = {
                         },
                         'type' => 'macro_call'
                       },
-                      'location' => 'text',
                       'position' => 8,
                       'sourcemark_type' => 'macro_expansion',
                       'status' => 'start'
                     },
                     {
                       'counter' => 17,
-                      'location' => 'text',
                       'position' => 14,
                       'sourcemark_type' => 'macro_expansion',
                       'status' => 'end'
@@ -1652,7 +1625,6 @@ $result_trees{'macro_in_misc_commands'} = {
                     },
                     'type' => 'macro_call'
                   },
-                  'location' => 'text',
                   'position' => 1,
                   'sourcemark_type' => 'macro_expansion',
                   'status' => 'start'
@@ -1824,7 +1796,6 @@ $result_trees{'macro_in_misc_commands'} = {
                   'source_marks' => [
                     {
                       'counter' => 19,
-                      'location' => 'text',
                       'position' => 4,
                       'sourcemark_type' => 'macro_expansion',
                       'status' => 'end'
@@ -1851,7 +1822,6 @@ $result_trees{'macro_in_misc_commands'} = {
                     },
                     'type' => 'macro_call'
                   },
-                  'location' => 'text',
                   'position' => 1,
                   'sourcemark_type' => 'macro_expansion',
                   'status' => 'start'
@@ -2275,7 +2245,6 @@ $result_trees{'macro_in_misc_commands'} = {
                   'source_marks' => [
                     {
                       'counter' => 20,
-                      'location' => 'text',
                       'position' => 4,
                       'sourcemark_type' => 'macro_expansion',
                       'status' => 'end'
@@ -2302,7 +2271,6 @@ $result_trees{'macro_in_misc_commands'} = {
                     },
                     'type' => 'macro_call'
                   },
-                  'location' => 'text',
                   'position' => 1,
                   'sourcemark_type' => 'macro_expansion',
                   'status' => 'start'
@@ -2334,7 +2302,6 @@ $result_trees{'macro_in_misc_commands'} = {
                   'source_marks' => [
                     {
                       'counter' => 21,
-                      'location' => 'text',
                       'position' => 1,
                       'sourcemark_type' => 'macro_expansion',
                       'status' => 'end'
@@ -2361,7 +2328,6 @@ $result_trees{'macro_in_misc_commands'} = {
                     },
                     'type' => 'macro_call'
                   },
-                  'location' => 'text',
                   'position' => 1,
                   'sourcemark_type' => 'macro_expansion',
                   'status' => 'start'
@@ -2393,7 +2359,6 @@ $result_trees{'macro_in_misc_commands'} = {
                   'source_marks' => [
                     {
                       'counter' => 22,
-                      'location' => 'text',
                       'position' => 4,
                       'sourcemark_type' => 'macro_expansion',
                       'status' => 'end'
@@ -2420,7 +2385,6 @@ $result_trees{'macro_in_misc_commands'} = {
                     },
                     'type' => 'macro_call'
                   },
-                  'location' => 'text',
                   'position' => 1,
                   'sourcemark_type' => 'macro_expansion',
                   'status' => 'start'
@@ -2452,7 +2416,6 @@ $result_trees{'macro_in_misc_commands'} = {
                   'source_marks' => [
                     {
                       'counter' => 23,
-                      'location' => 'text',
                       'position' => 1,
                       'sourcemark_type' => 'macro_expansion',
                       'status' => 'end'
@@ -2479,7 +2442,6 @@ $result_trees{'macro_in_misc_commands'} = {
                     },
                     'type' => 'macro_call'
                   },
-                  'location' => 'text',
                   'position' => 1,
                   'sourcemark_type' => 'macro_expansion',
                   'status' => 'start'
@@ -2511,7 +2473,6 @@ $result_trees{'macro_in_misc_commands'} = {
                   'source_marks' => [
                     {
                       'counter' => 24,
-                      'location' => 'text',
                       'position' => 4,
                       'sourcemark_type' => 'macro_expansion',
                       'status' => 'end'
@@ -2538,7 +2499,6 @@ $result_trees{'macro_in_misc_commands'} = {
                     },
                     'type' => 'macro_call'
                   },
-                  'location' => 'text',
                   'position' => 1,
                   'sourcemark_type' => 'macro_expansion',
                   'status' => 'start'
@@ -2570,7 +2530,6 @@ $result_trees{'macro_in_misc_commands'} = {
                   'source_marks' => [
                     {
                       'counter' => 25,
-                      'location' => 'text',
                       'position' => 1,
                       'sourcemark_type' => 'macro_expansion',
                       'status' => 'end'
@@ -2597,7 +2556,6 @@ $result_trees{'macro_in_misc_commands'} = {
                     },
                     'type' => 'macro_call'
                   },
-                  'location' => 'text',
                   'position' => 1,
                   'sourcemark_type' => 'macro_expansion',
                   'status' => 'start'
@@ -2740,7 +2698,6 @@ $result_trees{'macro_in_misc_commands'} = {
                   'source_marks' => [
                     {
                       'counter' => 26,
-                      'location' => 'text',
                       'position' => 3,
                       'sourcemark_type' => 'macro_expansion',
                       'status' => 'end'
@@ -2767,7 +2724,6 @@ $result_trees{'macro_in_misc_commands'} = {
                     },
                     'type' => 'macro_call'
                   },
-                  'location' => 'text',
                   'position' => 1,
                   'sourcemark_type' => 'macro_expansion',
                   'status' => 'start'
@@ -2799,7 +2755,6 @@ $result_trees{'macro_in_misc_commands'} = {
                   'source_marks' => [
                     {
                       'counter' => 27,
-                      'location' => 'text',
                       'position' => 9,
                       'sourcemark_type' => 'macro_expansion',
                       'status' => 'end'
@@ -2826,7 +2781,6 @@ $result_trees{'macro_in_misc_commands'} = {
                     },
                     'type' => 'macro_call'
                   },
-                  'location' => 'text',
                   'position' => 1,
                   'sourcemark_type' => 'macro_expansion',
                   'status' => 'start'
@@ -2969,7 +2923,6 @@ $result_trees{'macro_in_misc_commands'} = {
                   'source_marks' => [
                     {
                       'counter' => 28,
-                      'location' => 'text',
                       'position' => 2,
                       'sourcemark_type' => 'macro_expansion',
                       'status' => 'end'
@@ -2996,7 +2949,6 @@ $result_trees{'macro_in_misc_commands'} = {
                     },
                     'type' => 'macro_call'
                   },
-                  'location' => 'text',
                   'position' => 1,
                   'sourcemark_type' => 'macro_expansion',
                   'status' => 'start'
@@ -3028,7 +2980,6 @@ $result_trees{'macro_in_misc_commands'} = {
                   'source_marks' => [
                     {
                       'counter' => 29,
-                      'location' => 'text',
                       'position' => 3,
                       'sourcemark_type' => 'macro_expansion',
                       'status' => 'end'
@@ -3055,7 +3006,6 @@ $result_trees{'macro_in_misc_commands'} = {
                     },
                     'type' => 'macro_call'
                   },
-                  'location' => 'text',
                   'position' => 1,
                   'sourcemark_type' => 'macro_expansion',
                   'status' => 'start'
@@ -3161,7 +3111,6 @@ $result_trees{'macro_in_misc_commands'} = {
                   'source_marks' => [
                     {
                       'counter' => 30,
-                      'location' => 'text',
                       'position' => 2,
                       'sourcemark_type' => 'macro_expansion',
                       'status' => 'end'
@@ -3188,7 +3137,6 @@ $result_trees{'macro_in_misc_commands'} = {
                     },
                     'type' => 'macro_call'
                   },
-                  'location' => 'text',
                   'position' => 1,
                   'sourcemark_type' => 'macro_expansion',
                   'status' => 'start'
@@ -3342,7 +3290,6 @@ $result_trees{'macro_in_misc_commands'} = {
                   'source_marks' => [
                     {
                       'counter' => 31,
-                      'location' => 'text',
                       'position' => 5,
                       'sourcemark_type' => 'macro_expansion',
                       'status' => 'end'
@@ -3369,7 +3316,6 @@ $result_trees{'macro_in_misc_commands'} = {
                     },
                     'type' => 'macro_call'
                   },
-                  'location' => 'text',
                   'position' => 1,
                   'sourcemark_type' => 'macro_expansion',
                   'status' => 'start'
@@ -3406,7 +3352,6 @@ $result_trees{'macro_in_misc_commands'} = {
                   'source_marks' => [
                     {
                       'counter' => 32,
-                      'location' => 'text',
                       'position' => 4,
                       'sourcemark_type' => 'macro_expansion',
                       'status' => 'end'
@@ -3433,7 +3378,6 @@ $result_trees{'macro_in_misc_commands'} = {
                     },
                     'type' => 'macro_call'
                   },
-                  'location' => 'text',
                   'position' => 1,
                   'sourcemark_type' => 'macro_expansion',
                   'status' => 'start'
@@ -3646,7 +3590,6 @@ $result_trees{'macro_in_misc_commands'} = {
                     },
                     'type' => 'macro_call'
                   },
-                  'location' => 'text',
                   'position' => 5,
                   'sourcemark_type' => 'macro_expansion',
                   'status' => 'start'
@@ -3687,7 +3630,6 @@ $result_trees{'macro_in_misc_commands'} = {
                     },
                     'type' => 'macro_call'
                   },
-                  'location' => 'text',
                   'position' => 9,
                   'sourcemark_type' => 'macro_expansion',
                   'status' => 'start'
@@ -3707,8 +3649,6 @@ $result_trees{'macro_in_misc_commands'} = {
               'source_marks' => [
                 {
                   'counter' => 34,
-                  'location' => 'text',
-                  'position' => 0,
                   'sourcemark_type' => 'macro_expansion',
                   'status' => 'end'
                 }
@@ -3734,7 +3674,6 @@ $result_trees{'macro_in_misc_commands'} = {
                     },
                     'type' => 'macro_call'
                   },
-                  'location' => 'text',
                   'position' => 7,
                   'sourcemark_type' => 'macro_expansion',
                   'status' => 'start'
@@ -3776,8 +3715,6 @@ $result_trees{'macro_in_misc_commands'} = {
           'source_marks' => [
             {
               'counter' => 36,
-              'location' => 'text',
-              'position' => 0,
               'sourcemark_type' => 'macro_expansion',
               'status' => 'end'
             }
@@ -3803,8 +3740,6 @@ $result_trees{'macro_in_misc_commands'} = {
               'source_marks' => [
                 {
                   'counter' => 37,
-                  'location' => 'text',
-                  'position' => 0,
                   'sourcemark_type' => 'macro_expansion',
                   'status' => 'end'
                 }
@@ -3832,7 +3767,6 @@ $result_trees{'macro_in_misc_commands'} = {
                     },
                     'type' => 'macro_call'
                   },
-                  'location' => 'text',
                   'position' => 2,
                   'sourcemark_type' => 'macro_expansion',
                   'status' => 'start'
@@ -3852,8 +3786,6 @@ $result_trees{'macro_in_misc_commands'} = {
               'source_marks' => [
                 {
                   'counter' => 38,
-                  'location' => 'text',
-                  'position' => 0,
                   'sourcemark_type' => 'macro_expansion',
                   'status' => 'end'
                 }
@@ -3883,8 +3815,6 @@ $result_trees{'macro_in_misc_commands'} = {
                 },
                 'type' => 'macro_call'
               },
-              'location' => 'text',
-              'position' => 0,
               'sourcemark_type' => 'macro_expansion',
               'status' => 'start'
             },
@@ -3901,8 +3831,6 @@ $result_trees{'macro_in_misc_commands'} = {
                 },
                 'type' => 'macro_call'
               },
-              'location' => 'text',
-              'position' => 0,
               'sourcemark_type' => 'macro_expansion',
               'status' => 'start'
             }
@@ -3963,7 +3891,6 @@ $result_trees{'macro_in_misc_commands'} = {
                     },
                     'type' => 'macro_call'
                   },
-                  'location' => 'text',
                   'position' => 5,
                   'sourcemark_type' => 'macro_expansion',
                   'status' => 'start'
@@ -4007,7 +3934,6 @@ $result_trees{'macro_in_misc_commands'} = {
                     },
                     'type' => 'macro_call'
                   },
-                  'location' => 'text',
                   'position' => 9,
                   'sourcemark_type' => 'macro_expansion',
                   'status' => 'start'
@@ -4027,8 +3953,6 @@ $result_trees{'macro_in_misc_commands'} = {
               'source_marks' => [
                 {
                   'counter' => 42,
-                  'location' => 'text',
-                  'position' => 0,
                   'sourcemark_type' => 'macro_expansion',
                   'status' => 'end'
                 }
@@ -4054,7 +3978,6 @@ $result_trees{'macro_in_misc_commands'} = {
                     },
                     'type' => 'macro_call'
                   },
-                  'location' => 'text',
                   'position' => 7,
                   'sourcemark_type' => 'macro_expansion',
                   'status' => 'start'
@@ -4246,8 +4169,6 @@ $result_trees{'macro_in_misc_commands'} = {
               'source_marks' => [
                 {
                   'counter' => 45,
-                  'location' => 'text',
-                  'position' => 0,
                   'sourcemark_type' => 'macro_expansion',
                   'status' => 'end'
                 }
@@ -4331,7 +4252,6 @@ $result_trees{'macro_in_misc_commands'} = {
                   'source_marks' => [
                     {
                       'counter' => 46,
-                      'location' => 'text',
                       'position' => 1,
                       'sourcemark_type' => 'macro_expansion',
                       'status' => 'end'
@@ -4358,7 +4278,6 @@ $result_trees{'macro_in_misc_commands'} = {
                     },
                     'type' => 'macro_call'
                   },
-                  'location' => 'text',
                   'position' => 1,
                   'sourcemark_type' => 'macro_expansion',
                   'status' => 'start'
@@ -4508,14 +4427,12 @@ $result_trees{'macro_in_misc_commands'} = {
                             },
                             'type' => 'macro_call'
                           },
-                          'location' => 'text',
                           'position' => 5,
                           'sourcemark_type' => 'macro_expansion',
                           'status' => 'start'
                         },
                         {
                           'counter' => 47,
-                          'location' => 'text',
                           'position' => 10,
                           'sourcemark_type' => 'macro_expansion',
                           'status' => 'end'
@@ -4625,8 +4542,6 @@ $result_trees{'macro_in_misc_commands'} = {
             },
             'type' => 'macro_call'
           },
-          'location' => 'text',
-          'position' => 0,
           'sourcemark_type' => 'macro_expansion',
           'status' => 'start'
         },
@@ -4643,8 +4558,6 @@ $result_trees{'macro_in_misc_commands'} = {
             },
             'type' => 'macro_call'
           },
-          'location' => 'text',
-          'position' => 0,
           'sourcemark_type' => 'macro_expansion',
           'status' => 'start'
         },
@@ -4661,8 +4574,6 @@ $result_trees{'macro_in_misc_commands'} = {
             },
             'type' => 'macro_call'
           },
-          'location' => 'text',
-          'position' => 0,
           'sourcemark_type' => 'macro_expansion',
           'status' => 'start'
         },
@@ -4679,8 +4590,6 @@ $result_trees{'macro_in_misc_commands'} = {
             },
             'type' => 'macro_call'
           },
-          'location' => 'text',
-          'position' => 0,
           'sourcemark_type' => 'macro_expansion',
           'status' => 'start'
         },
@@ -4697,8 +4606,6 @@ $result_trees{'macro_in_misc_commands'} = {
             },
             'type' => 'macro_call'
           },
-          'location' => 'text',
-          'position' => 0,
           'sourcemark_type' => 'macro_expansion',
           'status' => 'start'
         },
@@ -4715,8 +4622,6 @@ $result_trees{'macro_in_misc_commands'} = {
             },
             'type' => 'macro_call'
           },
-          'location' => 'text',
-          'position' => 0,
           'sourcemark_type' => 'macro_expansion',
           'status' => 'start'
         },
@@ -4733,8 +4638,6 @@ $result_trees{'macro_in_misc_commands'} = {
             },
             'type' => 'macro_call'
           },
-          'location' => 'text',
-          'position' => 0,
           'sourcemark_type' => 'macro_expansion',
           'status' => 'start'
         },
@@ -4751,8 +4654,6 @@ $result_trees{'macro_in_misc_commands'} = {
             },
             'type' => 'macro_call'
           },
-          'location' => 'text',
-          'position' => 0,
           'sourcemark_type' => 'macro_expansion',
           'status' => 'start'
         },
@@ -4769,8 +4670,6 @@ $result_trees{'macro_in_misc_commands'} = {
             },
             'type' => 'macro_call'
           },
-          'location' => 'text',
-          'position' => 0,
           'sourcemark_type' => 'macro_expansion',
           'status' => 'start'
         }
@@ -4795,14 +4694,12 @@ $result_trees{'macro_in_misc_commands'} = {
                     },
                     'type' => 'macro_call'
                   },
-                  'location' => 'text',
                   'position' => 5,
                   'sourcemark_type' => 'macro_expansion',
                   'status' => 'start'
                 },
                 {
                   'counter' => 48,
-                  'location' => 'text',
                   'position' => 10,
                   'sourcemark_type' => 'macro_expansion',
                   'status' => 'end'
@@ -5039,8 +4936,6 @@ $result_trees{'macro_in_misc_commands'} = {
             },
             'type' => 'macro_call'
           },
-          'location' => 'text',
-          'position' => 0,
           'sourcemark_type' => 'macro_expansion',
           'status' => 'start'
         },
@@ -5057,8 +4952,6 @@ $result_trees{'macro_in_misc_commands'} = {
             },
             'type' => 'macro_call'
           },
-          'location' => 'text',
-          'position' => 0,
           'sourcemark_type' => 'macro_expansion',
           'status' => 'start'
         },
@@ -5075,8 +4968,6 @@ $result_trees{'macro_in_misc_commands'} = {
             },
             'type' => 'macro_call'
           },
-          'location' => 'text',
-          'position' => 0,
           'sourcemark_type' => 'macro_expansion',
           'status' => 'start'
         }
@@ -5424,8 +5315,6 @@ $result_sectioning{'macro_in_misc_commands'} = {
               },
               'type' => 'macro_call'
             },
-            'location' => 'text',
-            'position' => 0,
             'sourcemark_type' => 'macro_expansion',
             'status' => 'start'
           },
@@ -5437,8 +5326,6 @@ $result_sectioning{'macro_in_misc_commands'} = {
               },
               'type' => 'macro_call'
             },
-            'location' => 'text',
-            'position' => 0,
             'sourcemark_type' => 'macro_expansion',
             'status' => 'start'
           },
@@ -5450,8 +5337,6 @@ $result_sectioning{'macro_in_misc_commands'} = {
               },
               'type' => 'macro_call'
             },
-            'location' => 'text',
-            'position' => 0,
             'sourcemark_type' => 'macro_expansion',
             'status' => 'start'
           },
@@ -5463,8 +5348,6 @@ $result_sectioning{'macro_in_misc_commands'} = {
               },
               'type' => 'macro_call'
             },
-            'location' => 'text',
-            'position' => 0,
             'sourcemark_type' => 'macro_expansion',
             'status' => 'start'
           },
@@ -5476,8 +5359,6 @@ $result_sectioning{'macro_in_misc_commands'} = {
               },
               'type' => 'macro_call'
             },
-            'location' => 'text',
-            'position' => 0,
             'sourcemark_type' => 'macro_expansion',
             'status' => 'start'
           },
@@ -5489,8 +5370,6 @@ $result_sectioning{'macro_in_misc_commands'} = {
               },
               'type' => 'macro_call'
             },
-            'location' => 'text',
-            'position' => 0,
             'sourcemark_type' => 'macro_expansion',
             'status' => 'start'
           },
@@ -5502,8 +5381,6 @@ $result_sectioning{'macro_in_misc_commands'} = {
               },
               'type' => 'macro_call'
             },
-            'location' => 'text',
-            'position' => 0,
             'sourcemark_type' => 'macro_expansion',
             'status' => 'start'
           },
@@ -5515,8 +5392,6 @@ $result_sectioning{'macro_in_misc_commands'} = {
               },
               'type' => 'macro_call'
             },
-            'location' => 'text',
-            'position' => 0,
             'sourcemark_type' => 'macro_expansion',
             'status' => 'start'
           },
@@ -5528,8 +5403,6 @@ $result_sectioning{'macro_in_misc_commands'} = {
               },
               'type' => 'macro_call'
             },
-            'location' => 'text',
-            'position' => 0,
             'sourcemark_type' => 'macro_expansion',
             'status' => 'start'
           }
@@ -5558,8 +5431,6 @@ $result_sectioning{'macro_in_misc_commands'} = {
                     },
                     'type' => 'macro_call'
                   },
-                  'location' => 'text',
-                  'position' => 0,
                   'sourcemark_type' => 'macro_expansion',
                   'status' => 'start'
                 },
@@ -5571,8 +5442,6 @@ $result_sectioning{'macro_in_misc_commands'} = {
                     },
                     'type' => 'macro_call'
                   },
-                  'location' => 'text',
-                  'position' => 0,
                   'sourcemark_type' => 'macro_expansion',
                   'status' => 'start'
                 },
@@ -5584,8 +5453,6 @@ $result_sectioning{'macro_in_misc_commands'} = {
                     },
                     'type' => 'macro_call'
                   },
-                  'location' => 'text',
-                  'position' => 0,
                   'sourcemark_type' => 'macro_expansion',
                   'status' => 'start'
                 }
@@ -5628,8 +5495,6 @@ $result_nodes{'macro_in_misc_commands'} = {
             },
             'type' => 'macro_call'
           },
-          'location' => 'text',
-          'position' => 0,
           'sourcemark_type' => 'macro_expansion',
           'status' => 'start'
         },
@@ -5641,8 +5506,6 @@ $result_nodes{'macro_in_misc_commands'} = {
             },
             'type' => 'macro_call'
           },
-          'location' => 'text',
-          'position' => 0,
           'sourcemark_type' => 'macro_expansion',
           'status' => 'start'
         },
@@ -5654,8 +5517,6 @@ $result_nodes{'macro_in_misc_commands'} = {
             },
             'type' => 'macro_call'
           },
-          'location' => 'text',
-          'position' => 0,
           'sourcemark_type' => 'macro_expansion',
           'status' => 'start'
         },
@@ -5667,8 +5528,6 @@ $result_nodes{'macro_in_misc_commands'} = {
             },
             'type' => 'macro_call'
           },
-          'location' => 'text',
-          'position' => 0,
           'sourcemark_type' => 'macro_expansion',
           'status' => 'start'
         },
@@ -5680,8 +5539,6 @@ $result_nodes{'macro_in_misc_commands'} = {
             },
             'type' => 'macro_call'
           },
-          'location' => 'text',
-          'position' => 0,
           'sourcemark_type' => 'macro_expansion',
           'status' => 'start'
         },
@@ -5693,8 +5550,6 @@ $result_nodes{'macro_in_misc_commands'} = {
             },
             'type' => 'macro_call'
           },
-          'location' => 'text',
-          'position' => 0,
           'sourcemark_type' => 'macro_expansion',
           'status' => 'start'
         },
@@ -5706,8 +5561,6 @@ $result_nodes{'macro_in_misc_commands'} = {
             },
             'type' => 'macro_call'
           },
-          'location' => 'text',
-          'position' => 0,
           'sourcemark_type' => 'macro_expansion',
           'status' => 'start'
         },
@@ -5719,8 +5572,6 @@ $result_nodes{'macro_in_misc_commands'} = {
             },
             'type' => 'macro_call'
           },
-          'location' => 'text',
-          'position' => 0,
           'sourcemark_type' => 'macro_expansion',
           'status' => 'start'
         },
@@ -5732,8 +5583,6 @@ $result_nodes{'macro_in_misc_commands'} = {
             },
             'type' => 'macro_call'
           },
-          'location' => 'text',
-          'position' => 0,
           'sourcemark_type' => 'macro_expansion',
           'status' => 'start'
         }
@@ -5765,8 +5614,6 @@ $result_nodes{'macro_in_misc_commands'} = {
                 },
                 'type' => 'macro_call'
               },
-              'location' => 'text',
-              'position' => 0,
               'sourcemark_type' => 'macro_expansion',
               'status' => 'start'
             },
@@ -5778,8 +5625,6 @@ $result_nodes{'macro_in_misc_commands'} = {
                 },
                 'type' => 'macro_call'
               },
-              'location' => 'text',
-              'position' => 0,
               'sourcemark_type' => 'macro_expansion',
               'status' => 'start'
             },
@@ -5791,8 +5636,6 @@ $result_nodes{'macro_in_misc_commands'} = {
                 },
                 'type' => 'macro_call'
               },
-              'location' => 'text',
-              'position' => 0,
               'sourcemark_type' => 'macro_expansion',
               'status' => 'start'
             }
diff --git a/tp/t/results/macro/macro_name_with_digit.pl 
b/tp/t/results/macro/macro_name_with_digit.pl
index a9b1086829..5ca323897f 100644
--- a/tp/t/results/macro/macro_name_with_digit.pl
+++ b/tp/t/results/macro/macro_name_with_digit.pl
@@ -146,21 +146,18 @@ $result_trees{'macro_name_with_digit'} = {
                     },
                     'type' => 'macro_call'
                   },
-                  'location' => 'text',
                   'position' => 18,
                   'sourcemark_type' => 'macro_expansion',
                   'status' => 'start'
                 },
                 {
                   'counter' => 2,
-                  'location' => 'text',
                   'position' => 24,
                   'sourcemark_type' => 'macro_expansion',
                   'status' => 'end'
                 },
                 {
                   'counter' => 1,
-                  'location' => 'text',
                   'position' => 24,
                   'sourcemark_type' => 'macro_expansion',
                   'status' => 'end'
@@ -187,8 +184,6 @@ $result_trees{'macro_name_with_digit'} = {
             },
             'type' => 'macro_call'
           },
-          'location' => 'text',
-          'position' => 0,
           'sourcemark_type' => 'macro_expansion',
           'status' => 'start'
         }
diff --git a/tp/t/results/macro/macro_name_with_hyphen.pl 
b/tp/t/results/macro/macro_name_with_hyphen.pl
index 8cd9c5fe09..c9d8b94fd5 100644
--- a/tp/t/results/macro/macro_name_with_hyphen.pl
+++ b/tp/t/results/macro/macro_name_with_hyphen.pl
@@ -102,7 +102,6 @@ $result_trees{'macro_name_with_hyphen'} = {
               'source_marks' => [
                 {
                   'counter' => 1,
-                  'location' => 'text',
                   'position' => 1,
                   'sourcemark_type' => 'macro_expansion',
                   'status' => 'end'
@@ -132,8 +131,6 @@ $result_trees{'macro_name_with_hyphen'} = {
             },
             'type' => 'macro_call'
           },
-          'location' => 'text',
-          'position' => 0,
           'sourcemark_type' => 'macro_expansion',
           'status' => 'start'
         }
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 256738d53c..63aa5739cb 100644
--- a/tp/t/results/macro/macro_no_arg_bad_expansion.pl
+++ b/tp/t/results/macro/macro_no_arg_bad_expansion.pl
@@ -73,7 +73,6 @@ $result_trees{'macro_no_arg_bad_expansion'} = {
               'source_marks' => [
                 {
                   'counter' => 1,
-                  'location' => 'text',
                   'position' => 4,
                   'sourcemark_type' => 'macro_expansion',
                   'status' => 'end'
@@ -95,8 +94,6 @@ $result_trees{'macro_no_arg_bad_expansion'} = {
             },
             'type' => 'macro_call'
           },
-          'location' => 'text',
-          'position' => 0,
           'sourcemark_type' => 'macro_expansion',
           'status' => 'start'
         }
diff --git a/tp/t/results/macro/macro_no_arg_expansion.pl 
b/tp/t/results/macro/macro_no_arg_expansion.pl
index df5327a40c..730afb57c9 100644
--- a/tp/t/results/macro/macro_no_arg_expansion.pl
+++ b/tp/t/results/macro/macro_no_arg_expansion.pl
@@ -73,7 +73,6 @@ $result_trees{'macro_no_arg_expansion'} = {
               'source_marks' => [
                 {
                   'counter' => 1,
-                  'location' => 'text',
                   'position' => 4,
                   'sourcemark_type' => 'macro_expansion',
                   'status' => 'end'
@@ -100,8 +99,6 @@ $result_trees{'macro_no_arg_expansion'} = {
             },
             'type' => 'macro_call'
           },
-          'location' => 'text',
-          'position' => 0,
           'sourcemark_type' => 'macro_expansion',
           'status' => 'start'
         }
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 8d0e6b81a8..74befd10d7 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
@@ -77,7 +77,6 @@ $result_trees{'macro_one_arg_end_of_file'} = {
               'source_marks' => [
                 {
                   'counter' => 1,
-                  'location' => 'text',
                   'position' => 5,
                   'sourcemark_type' => 'macro_expansion',
                   'status' => 'end'
@@ -103,8 +102,6 @@ $result_trees{'macro_one_arg_end_of_file'} = {
             },
             'type' => 'macro_call'
           },
-          'location' => 'text',
-          'position' => 0,
           'sourcemark_type' => 'macro_expansion',
           'status' => 'start'
         }
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 f8b6349320..27abf38e79 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
@@ -81,8 +81,6 @@ $result_trees{'macro_with_error_at_end_line_after_macro'} = {
               'source_marks' => [
                 {
                   'counter' => 1,
-                  'location' => 'text',
-                  'position' => 0,
                   'sourcemark_type' => 'macro_expansion',
                   'status' => 'end'
                 }
@@ -115,8 +113,6 @@ $result_trees{'macro_with_error_at_end_line_after_macro'} = 
{
             },
             'type' => 'macro_call'
           },
-          'location' => 'text',
-          'position' => 0,
           'sourcemark_type' => 'macro_expansion',
           'status' => 'start'
         }
diff --git a/tp/t/results/macro/macro_zero.pl b/tp/t/results/macro/macro_zero.pl
index 6f456bf10d..4c9a9d9c4b 100644
--- a/tp/t/results/macro/macro_zero.pl
+++ b/tp/t/results/macro/macro_zero.pl
@@ -77,7 +77,6 @@ $result_trees{'macro_zero'} = {
               'source_marks' => [
                 {
                   'counter' => 1,
-                  'location' => 'text',
                   'position' => 1,
                   'sourcemark_type' => 'macro_expansion',
                   'status' => 'end'
@@ -101,8 +100,6 @@ $result_trees{'macro_zero'} = {
                 },
                 'type' => 'macro_call'
               },
-              'location' => 'text',
-              'position' => 0,
               'sourcemark_type' => 'macro_expansion',
               'status' => 'start'
             }
diff --git a/tp/t/results/macro/nested_macro_call.pl 
b/tp/t/results/macro/nested_macro_call.pl
index 90b34b1172..36811d0302 100644
--- a/tp/t/results/macro/nested_macro_call.pl
+++ b/tp/t/results/macro/nested_macro_call.pl
@@ -147,7 +147,6 @@ $result_trees{'nested_macro_call'} = {
                     },
                     'type' => 'macro_call'
                   },
-                  'location' => 'text',
                   'position' => 7,
                   'sourcemark_type' => 'macro_expansion',
                   'status' => 'start'
@@ -165,21 +164,18 @@ $result_trees{'nested_macro_call'} = {
                     },
                     'type' => 'macro_call'
                   },
-                  'location' => 'text',
                   'position' => 7,
                   'sourcemark_type' => 'macro_expansion',
                   'status' => 'start'
                 },
                 {
                   'counter' => 2,
-                  'location' => 'text',
                   'position' => 15,
                   'sourcemark_type' => 'macro_expansion',
                   'status' => 'end'
                 },
                 {
                   'counter' => 1,
-                  'location' => 'text',
                   'position' => 16,
                   'sourcemark_type' => 'macro_expansion',
                   'status' => 'end'
diff --git a/tp/t/results/macro/no_macrobody.pl 
b/tp/t/results/macro/no_macrobody.pl
index 209016b55e..91b3ec761a 100644
--- a/tp/t/results/macro/no_macrobody.pl
+++ b/tp/t/results/macro/no_macrobody.pl
@@ -81,15 +81,11 @@ $result_trees{'no_macrobody'} = {
                 },
                 'type' => 'macro_call'
               },
-              'location' => 'text',
-              'position' => 0,
               'sourcemark_type' => 'macro_expansion',
               'status' => 'start'
             },
             {
               'counter' => 1,
-              'location' => 'text',
-              'position' => 0,
               'sourcemark_type' => 'macro_expansion',
               'status' => 'end'
             }
@@ -127,15 +123,11 @@ $result_trees{'no_macrobody'} = {
             },
             'type' => 'macro_call'
           },
-          'location' => 'text',
-          'position' => 0,
           'sourcemark_type' => 'macro_expansion',
           'status' => 'start'
         },
         {
           'counter' => 2,
-          'location' => 'text',
-          'position' => 0,
           'sourcemark_type' => 'macro_expansion',
           'status' => 'end'
         }
diff --git a/tp/t/results/macro/paragraph_and_macro.pl 
b/tp/t/results/macro/paragraph_and_macro.pl
index 2fa6ea8f40..b72509ecc2 100644
--- a/tp/t/results/macro/paragraph_and_macro.pl
+++ b/tp/t/results/macro/paragraph_and_macro.pl
@@ -193,15 +193,11 @@ $result_trees{'paragraph_and_macro'} = {
                 },
                 'type' => 'macro_call'
               },
-              'location' => 'text',
-              'position' => 0,
               'sourcemark_type' => 'macro_expansion',
               'status' => 'start'
             },
             {
               'counter' => 1,
-              'location' => 'text',
-              'position' => 0,
               'sourcemark_type' => 'macro_expansion',
               'status' => 'end'
             }
@@ -230,14 +226,12 @@ $result_trees{'paragraph_and_macro'} = {
                 },
                 'type' => 'macro_call'
               },
-              'location' => 'text',
               'position' => 2,
               'sourcemark_type' => 'macro_expansion',
               'status' => 'start'
             },
             {
               'counter' => 2,
-              'location' => 'text',
               'position' => 2,
               'sourcemark_type' => 'macro_expansion',
               'status' => 'end'
@@ -267,15 +261,11 @@ $result_trees{'paragraph_and_macro'} = {
                 },
                 'type' => 'macro_call'
               },
-              'location' => 'text',
-              'position' => 0,
               'sourcemark_type' => 'macro_expansion',
               'status' => 'start'
             },
             {
               'counter' => 3,
-              'location' => 'text',
-              'position' => 0,
               'sourcemark_type' => 'macro_expansion',
               'status' => 'end'
             }
@@ -312,14 +302,11 @@ $result_trees{'paragraph_and_macro'} = {
                 },
                 'type' => 'macro_call'
               },
-              'location' => 'text',
-              'position' => 0,
               'sourcemark_type' => 'macro_expansion',
               'status' => 'start'
             },
             {
               'counter' => 4,
-              'location' => 'text',
               'position' => 3,
               'sourcemark_type' => 'macro_expansion',
               'status' => 'end'
@@ -349,14 +336,12 @@ $result_trees{'paragraph_and_macro'} = {
                 },
                 'type' => 'macro_call'
               },
-              'location' => 'text',
               'position' => 2,
               'sourcemark_type' => 'macro_expansion',
               'status' => 'start'
             },
             {
               'counter' => 5,
-              'location' => 'text',
               'position' => 5,
               'sourcemark_type' => 'macro_expansion',
               'status' => 'end'
@@ -386,14 +371,11 @@ $result_trees{'paragraph_and_macro'} = {
                 },
                 'type' => 'macro_call'
               },
-              'location' => 'text',
-              'position' => 0,
               'sourcemark_type' => 'macro_expansion',
               'status' => 'start'
             },
             {
               'counter' => 6,
-              'location' => 'text',
               'position' => 3,
               'sourcemark_type' => 'macro_expansion',
               'status' => 'end'
diff --git a/tp/t/results/macro/protect_comma_macro_line.pl 
b/tp/t/results/macro/protect_comma_macro_line.pl
index fdca622719..36b3a7dd5a 100644
--- a/tp/t/results/macro/protect_comma_macro_line.pl
+++ b/tp/t/results/macro/protect_comma_macro_line.pl
@@ -110,7 +110,6 @@ $result_trees{'protect_comma_macro_line'} = {
               'source_marks' => [
                 {
                   'counter' => 1,
-                  'location' => 'text',
                   'position' => 31,
                   'sourcemark_type' => 'macro_expansion',
                   'status' => 'end'
@@ -137,8 +136,6 @@ $result_trees{'protect_comma_macro_line'} = {
             },
             'type' => 'macro_call'
           },
-          'location' => 'text',
-          'position' => 0,
           'sourcemark_type' => 'macro_expansion',
           'status' => 'start'
         }
diff --git a/tp/t/results/macro/protect_in_body.pl 
b/tp/t/results/macro/protect_in_body.pl
index 1fda0c59d7..bebf34a1e7 100644
--- a/tp/t/results/macro/protect_in_body.pl
+++ b/tp/t/results/macro/protect_in_body.pl
@@ -95,7 +95,6 @@ $result_trees{'protect_in_body'} = {
                     },
                     'type' => 'macro_call'
                   },
-                  'location' => 'text',
                   'position' => 4,
                   'sourcemark_type' => 'macro_expansion',
                   'status' => 'start'
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 879ecbca5f..973e76b984 100644
--- a/tp/t/results/macro/protect_in_body_line_arg.pl
+++ b/tp/t/results/macro/protect_in_body_line_arg.pl
@@ -154,8 +154,6 @@ $result_trees{'protect_in_body_line_arg'} = {
             },
             'type' => 'macro_call'
           },
-          'location' => 'text',
-          'position' => 0,
           'sourcemark_type' => 'macro_expansion',
           'status' => 'start'
         }
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 8efc5eb87c..0d1a96d4e0 100644
--- a/tp/t/results/macro/protect_in_body_one_arg.pl
+++ b/tp/t/results/macro/protect_in_body_one_arg.pl
@@ -158,8 +158,6 @@ $result_trees{'protect_in_body_one_arg'} = {
             },
             'type' => 'macro_call'
           },
-          'location' => 'text',
-          'position' => 0,
           'sourcemark_type' => 'macro_expansion',
           'status' => 'start'
         }
diff --git a/tp/t/results/macro/recursive_call_in_argument.pl 
b/tp/t/results/macro/recursive_call_in_argument.pl
index 86bd149d22..73feb9b1b2 100644
--- a/tp/t/results/macro/recursive_call_in_argument.pl
+++ b/tp/t/results/macro/recursive_call_in_argument.pl
@@ -77,7 +77,6 @@ $result_trees{'recursive_call_in_argument'} = {
               'source_marks' => [
                 {
                   'counter' => 1,
-                  'location' => 'text',
                   'position' => 1,
                   'sourcemark_type' => 'macro_expansion',
                   'status' => 'end'
@@ -104,8 +103,6 @@ $result_trees{'recursive_call_in_argument'} = {
             },
             'type' => 'macro_call'
           },
-          'location' => 'text',
-          'position' => 0,
           'sourcemark_type' => 'macro_expansion',
           'status' => 'start'
         }
diff --git a/tp/t/results/macro/recursive_call_in_macro.pl 
b/tp/t/results/macro/recursive_call_in_macro.pl
index be6e361dc4..a4cd5a7bd5 100644
--- a/tp/t/results/macro/recursive_call_in_macro.pl
+++ b/tp/t/results/macro/recursive_call_in_macro.pl
@@ -86,15 +86,11 @@ $result_trees{'recursive_call_in_macro'} = {
                 },
                 'type' => 'macro_call'
               },
-              'location' => 'text',
-              'position' => 0,
               'sourcemark_type' => 'macro_expansion',
               'status' => 'start'
             },
             {
               'counter' => 1,
-              'location' => 'text',
-              'position' => 0,
               'sourcemark_type' => 'macro_expansion',
               'status' => 'end'
             }
diff --git a/tp/t/results/macro/recursive_call_in_rmacro.pl 
b/tp/t/results/macro/recursive_call_in_rmacro.pl
index 1d95bce708..a1b82ca41f 100644
--- a/tp/t/results/macro/recursive_call_in_rmacro.pl
+++ b/tp/t/results/macro/recursive_call_in_rmacro.pl
@@ -87,8 +87,6 @@ $result_trees{'recursive_call_in_rmacro'} = {
                 },
                 'type' => 'rmacro_call'
               },
-              'location' => 'text',
-              'position' => 0,
               'sourcemark_type' => 'macro_expansion',
               'status' => 'start'
             },
@@ -105,8 +103,6 @@ $result_trees{'recursive_call_in_rmacro'} = {
                 },
                 'type' => 'rmacro_call'
               },
-              'location' => 'text',
-              'position' => 0,
               'sourcemark_type' => 'macro_expansion',
               'status' => 'start'
             },
@@ -123,8 +119,6 @@ $result_trees{'recursive_call_in_rmacro'} = {
                 },
                 'type' => 'rmacro_call'
               },
-              'location' => 'text',
-              'position' => 0,
               'sourcemark_type' => 'macro_expansion',
               'status' => 'start'
             },
@@ -141,8 +135,6 @@ $result_trees{'recursive_call_in_rmacro'} = {
                 },
                 'type' => 'rmacro_call'
               },
-              'location' => 'text',
-              'position' => 0,
               'sourcemark_type' => 'macro_expansion',
               'status' => 'start'
             },
@@ -159,8 +151,6 @@ $result_trees{'recursive_call_in_rmacro'} = {
                 },
                 'type' => 'rmacro_call'
               },
-              'location' => 'text',
-              'position' => 0,
               'sourcemark_type' => 'macro_expansion',
               'status' => 'start'
             },
@@ -177,8 +167,6 @@ $result_trees{'recursive_call_in_rmacro'} = {
                 },
                 'type' => 'rmacro_call'
               },
-              'location' => 'text',
-              'position' => 0,
               'sourcemark_type' => 'macro_expansion',
               'status' => 'start'
             },
@@ -195,8 +183,6 @@ $result_trees{'recursive_call_in_rmacro'} = {
                 },
                 'type' => 'rmacro_call'
               },
-              'location' => 'text',
-              'position' => 0,
               'sourcemark_type' => 'macro_expansion',
               'status' => 'start'
             },
@@ -213,8 +199,6 @@ $result_trees{'recursive_call_in_rmacro'} = {
                 },
                 'type' => 'rmacro_call'
               },
-              'location' => 'text',
-              'position' => 0,
               'sourcemark_type' => 'macro_expansion',
               'status' => 'start'
             },
@@ -231,8 +215,6 @@ $result_trees{'recursive_call_in_rmacro'} = {
                 },
                 'type' => 'rmacro_call'
               },
-              'location' => 'text',
-              'position' => 0,
               'sourcemark_type' => 'macro_expansion',
               'status' => 'start'
             },
@@ -249,8 +231,6 @@ $result_trees{'recursive_call_in_rmacro'} = {
                 },
                 'type' => 'rmacro_call'
               },
-              'location' => 'text',
-              'position' => 0,
               'sourcemark_type' => 'macro_expansion',
               'status' => 'start'
             },
@@ -267,8 +247,6 @@ $result_trees{'recursive_call_in_rmacro'} = {
                 },
                 'type' => 'rmacro_call'
               },
-              'location' => 'text',
-              'position' => 0,
               'sourcemark_type' => 'macro_expansion',
               'status' => 'start'
             },
@@ -285,8 +263,6 @@ $result_trees{'recursive_call_in_rmacro'} = {
                 },
                 'type' => 'rmacro_call'
               },
-              'location' => 'text',
-              'position' => 0,
               'sourcemark_type' => 'macro_expansion',
               'status' => 'start'
             },
@@ -303,8 +279,6 @@ $result_trees{'recursive_call_in_rmacro'} = {
                 },
                 'type' => 'rmacro_call'
               },
-              'location' => 'text',
-              'position' => 0,
               'sourcemark_type' => 'macro_expansion',
               'status' => 'start'
             },
@@ -321,8 +295,6 @@ $result_trees{'recursive_call_in_rmacro'} = {
                 },
                 'type' => 'rmacro_call'
               },
-              'location' => 'text',
-              'position' => 0,
               'sourcemark_type' => 'macro_expansion',
               'status' => 'start'
             },
@@ -339,8 +311,6 @@ $result_trees{'recursive_call_in_rmacro'} = {
                 },
                 'type' => 'rmacro_call'
               },
-              'location' => 'text',
-              'position' => 0,
               'sourcemark_type' => 'macro_expansion',
               'status' => 'start'
             },
@@ -357,8 +327,6 @@ $result_trees{'recursive_call_in_rmacro'} = {
                 },
                 'type' => 'rmacro_call'
               },
-              'location' => 'text',
-              'position' => 0,
               'sourcemark_type' => 'macro_expansion',
               'status' => 'start'
             },
@@ -375,8 +343,6 @@ $result_trees{'recursive_call_in_rmacro'} = {
                 },
                 'type' => 'rmacro_call'
               },
-              'location' => 'text',
-              'position' => 0,
               'sourcemark_type' => 'macro_expansion',
               'status' => 'start'
             },
@@ -393,8 +359,6 @@ $result_trees{'recursive_call_in_rmacro'} = {
                 },
                 'type' => 'rmacro_call'
               },
-              'location' => 'text',
-              'position' => 0,
               'sourcemark_type' => 'macro_expansion',
               'status' => 'start'
             },
@@ -411,8 +375,6 @@ $result_trees{'recursive_call_in_rmacro'} = {
                 },
                 'type' => 'rmacro_call'
               },
-              'location' => 'text',
-              'position' => 0,
               'sourcemark_type' => 'macro_expansion',
               'status' => 'start'
             },
@@ -429,8 +391,6 @@ $result_trees{'recursive_call_in_rmacro'} = {
                 },
                 'type' => 'rmacro_call'
               },
-              'location' => 'text',
-              'position' => 0,
               'sourcemark_type' => 'macro_expansion',
               'status' => 'start'
             },
@@ -447,8 +407,6 @@ $result_trees{'recursive_call_in_rmacro'} = {
                 },
                 'type' => 'rmacro_call'
               },
-              'location' => 'text',
-              'position' => 0,
               'sourcemark_type' => 'macro_expansion',
               'status' => 'start'
             },
@@ -465,8 +423,6 @@ $result_trees{'recursive_call_in_rmacro'} = {
                 },
                 'type' => 'rmacro_call'
               },
-              'location' => 'text',
-              'position' => 0,
               'sourcemark_type' => 'macro_expansion',
               'status' => 'start'
             },
@@ -483,8 +439,6 @@ $result_trees{'recursive_call_in_rmacro'} = {
                 },
                 'type' => 'rmacro_call'
               },
-              'location' => 'text',
-              'position' => 0,
               'sourcemark_type' => 'macro_expansion',
               'status' => 'start'
             },
@@ -501,8 +455,6 @@ $result_trees{'recursive_call_in_rmacro'} = {
                 },
                 'type' => 'rmacro_call'
               },
-              'location' => 'text',
-              'position' => 0,
               'sourcemark_type' => 'macro_expansion',
               'status' => 'start'
             },
@@ -519,8 +471,6 @@ $result_trees{'recursive_call_in_rmacro'} = {
                 },
                 'type' => 'rmacro_call'
               },
-              'location' => 'text',
-              'position' => 0,
               'sourcemark_type' => 'macro_expansion',
               'status' => 'start'
             },
@@ -537,8 +487,6 @@ $result_trees{'recursive_call_in_rmacro'} = {
                 },
                 'type' => 'rmacro_call'
               },
-              'location' => 'text',
-              'position' => 0,
               'sourcemark_type' => 'macro_expansion',
               'status' => 'start'
             },
@@ -555,8 +503,6 @@ $result_trees{'recursive_call_in_rmacro'} = {
                 },
                 'type' => 'rmacro_call'
               },
-              'location' => 'text',
-              'position' => 0,
               'sourcemark_type' => 'macro_expansion',
               'status' => 'start'
             },
@@ -573,8 +519,6 @@ $result_trees{'recursive_call_in_rmacro'} = {
                 },
                 'type' => 'rmacro_call'
               },
-              'location' => 'text',
-              'position' => 0,
               'sourcemark_type' => 'macro_expansion',
               'status' => 'start'
             },
@@ -591,8 +535,6 @@ $result_trees{'recursive_call_in_rmacro'} = {
                 },
                 'type' => 'rmacro_call'
               },
-              'location' => 'text',
-              'position' => 0,
               'sourcemark_type' => 'macro_expansion',
               'status' => 'start'
             },
@@ -609,8 +551,6 @@ $result_trees{'recursive_call_in_rmacro'} = {
                 },
                 'type' => 'rmacro_call'
               },
-              'location' => 'text',
-              'position' => 0,
               'sourcemark_type' => 'macro_expansion',
               'status' => 'start'
             },
@@ -627,8 +567,6 @@ $result_trees{'recursive_call_in_rmacro'} = {
                 },
                 'type' => 'rmacro_call'
               },
-              'location' => 'text',
-              'position' => 0,
               'sourcemark_type' => 'macro_expansion',
               'status' => 'start'
             },
@@ -645,8 +583,6 @@ $result_trees{'recursive_call_in_rmacro'} = {
                 },
                 'type' => 'rmacro_call'
               },
-              'location' => 'text',
-              'position' => 0,
               'sourcemark_type' => 'macro_expansion',
               'status' => 'start'
             },
@@ -663,8 +599,6 @@ $result_trees{'recursive_call_in_rmacro'} = {
                 },
                 'type' => 'rmacro_call'
               },
-              'location' => 'text',
-              'position' => 0,
               'sourcemark_type' => 'macro_expansion',
               'status' => 'start'
             },
@@ -681,8 +615,6 @@ $result_trees{'recursive_call_in_rmacro'} = {
                 },
                 'type' => 'rmacro_call'
               },
-              'location' => 'text',
-              'position' => 0,
               'sourcemark_type' => 'macro_expansion',
               'status' => 'start'
             },
@@ -699,8 +631,6 @@ $result_trees{'recursive_call_in_rmacro'} = {
                 },
                 'type' => 'rmacro_call'
               },
-              'location' => 'text',
-              'position' => 0,
               'sourcemark_type' => 'macro_expansion',
               'status' => 'start'
             },
@@ -717,8 +647,6 @@ $result_trees{'recursive_call_in_rmacro'} = {
                 },
                 'type' => 'rmacro_call'
               },
-              'location' => 'text',
-              'position' => 0,
               'sourcemark_type' => 'macro_expansion',
               'status' => 'start'
             },
@@ -735,8 +663,6 @@ $result_trees{'recursive_call_in_rmacro'} = {
                 },
                 'type' => 'rmacro_call'
               },
-              'location' => 'text',
-              'position' => 0,
               'sourcemark_type' => 'macro_expansion',
               'status' => 'start'
             },
@@ -753,8 +679,6 @@ $result_trees{'recursive_call_in_rmacro'} = {
                 },
                 'type' => 'rmacro_call'
               },
-              'location' => 'text',
-              'position' => 0,
               'sourcemark_type' => 'macro_expansion',
               'status' => 'start'
             },
@@ -771,8 +695,6 @@ $result_trees{'recursive_call_in_rmacro'} = {
                 },
                 'type' => 'rmacro_call'
               },
-              'location' => 'text',
-              'position' => 0,
               'sourcemark_type' => 'macro_expansion',
               'status' => 'start'
             },
@@ -789,8 +711,6 @@ $result_trees{'recursive_call_in_rmacro'} = {
                 },
                 'type' => 'rmacro_call'
               },
-              'location' => 'text',
-              'position' => 0,
               'sourcemark_type' => 'macro_expansion',
               'status' => 'start'
             },
@@ -807,8 +727,6 @@ $result_trees{'recursive_call_in_rmacro'} = {
                 },
                 'type' => 'rmacro_call'
               },
-              'location' => 'text',
-              'position' => 0,
               'sourcemark_type' => 'macro_expansion',
               'status' => 'start'
             },
@@ -825,8 +743,6 @@ $result_trees{'recursive_call_in_rmacro'} = {
                 },
                 'type' => 'rmacro_call'
               },
-              'location' => 'text',
-              'position' => 0,
               'sourcemark_type' => 'macro_expansion',
               'status' => 'start'
             },
@@ -843,8 +759,6 @@ $result_trees{'recursive_call_in_rmacro'} = {
                 },
                 'type' => 'rmacro_call'
               },
-              'location' => 'text',
-              'position' => 0,
               'sourcemark_type' => 'macro_expansion',
               'status' => 'start'
             },
@@ -861,8 +775,6 @@ $result_trees{'recursive_call_in_rmacro'} = {
                 },
                 'type' => 'rmacro_call'
               },
-              'location' => 'text',
-              'position' => 0,
               'sourcemark_type' => 'macro_expansion',
               'status' => 'start'
             },
@@ -879,8 +791,6 @@ $result_trees{'recursive_call_in_rmacro'} = {
                 },
                 'type' => 'rmacro_call'
               },
-              'location' => 'text',
-              'position' => 0,
               'sourcemark_type' => 'macro_expansion',
               'status' => 'start'
             },
@@ -897,8 +807,6 @@ $result_trees{'recursive_call_in_rmacro'} = {
                 },
                 'type' => 'rmacro_call'
               },
-              'location' => 'text',
-              'position' => 0,
               'sourcemark_type' => 'macro_expansion',
               'status' => 'start'
             },
@@ -915,8 +823,6 @@ $result_trees{'recursive_call_in_rmacro'} = {
                 },
                 'type' => 'rmacro_call'
               },
-              'location' => 'text',
-              'position' => 0,
               'sourcemark_type' => 'macro_expansion',
               'status' => 'start'
             },
@@ -933,8 +839,6 @@ $result_trees{'recursive_call_in_rmacro'} = {
                 },
                 'type' => 'rmacro_call'
               },
-              'location' => 'text',
-              'position' => 0,
               'sourcemark_type' => 'macro_expansion',
               'status' => 'start'
             },
@@ -951,8 +855,6 @@ $result_trees{'recursive_call_in_rmacro'} = {
                 },
                 'type' => 'rmacro_call'
               },
-              'location' => 'text',
-              'position' => 0,
               'sourcemark_type' => 'macro_expansion',
               'status' => 'start'
             },
@@ -969,8 +871,6 @@ $result_trees{'recursive_call_in_rmacro'} = {
                 },
                 'type' => 'rmacro_call'
               },
-              'location' => 'text',
-              'position' => 0,
               'sourcemark_type' => 'macro_expansion',
               'status' => 'start'
             },
@@ -987,8 +887,6 @@ $result_trees{'recursive_call_in_rmacro'} = {
                 },
                 'type' => 'rmacro_call'
               },
-              'location' => 'text',
-              'position' => 0,
               'sourcemark_type' => 'macro_expansion',
               'status' => 'start'
             },
@@ -1005,8 +903,6 @@ $result_trees{'recursive_call_in_rmacro'} = {
                 },
                 'type' => 'rmacro_call'
               },
-              'location' => 'text',
-              'position' => 0,
               'sourcemark_type' => 'macro_expansion',
               'status' => 'start'
             },
@@ -1023,8 +919,6 @@ $result_trees{'recursive_call_in_rmacro'} = {
                 },
                 'type' => 'rmacro_call'
               },
-              'location' => 'text',
-              'position' => 0,
               'sourcemark_type' => 'macro_expansion',
               'status' => 'start'
             },
@@ -1041,8 +935,6 @@ $result_trees{'recursive_call_in_rmacro'} = {
                 },
                 'type' => 'rmacro_call'
               },
-              'location' => 'text',
-              'position' => 0,
               'sourcemark_type' => 'macro_expansion',
               'status' => 'start'
             },
@@ -1059,8 +951,6 @@ $result_trees{'recursive_call_in_rmacro'} = {
                 },
                 'type' => 'rmacro_call'
               },
-              'location' => 'text',
-              'position' => 0,
               'sourcemark_type' => 'macro_expansion',
               'status' => 'start'
             },
@@ -1077,8 +967,6 @@ $result_trees{'recursive_call_in_rmacro'} = {
                 },
                 'type' => 'rmacro_call'
               },
-              'location' => 'text',
-              'position' => 0,
               'sourcemark_type' => 'macro_expansion',
               'status' => 'start'
             },
@@ -1095,8 +983,6 @@ $result_trees{'recursive_call_in_rmacro'} = {
                 },
                 'type' => 'rmacro_call'
               },
-              'location' => 'text',
-              'position' => 0,
               'sourcemark_type' => 'macro_expansion',
               'status' => 'start'
             },
@@ -1113,8 +999,6 @@ $result_trees{'recursive_call_in_rmacro'} = {
                 },
                 'type' => 'rmacro_call'
               },
-              'location' => 'text',
-              'position' => 0,
               'sourcemark_type' => 'macro_expansion',
               'status' => 'start'
             },
@@ -1131,8 +1015,6 @@ $result_trees{'recursive_call_in_rmacro'} = {
                 },
                 'type' => 'rmacro_call'
               },
-              'location' => 'text',
-              'position' => 0,
               'sourcemark_type' => 'macro_expansion',
               'status' => 'start'
             },
@@ -1149,8 +1031,6 @@ $result_trees{'recursive_call_in_rmacro'} = {
                 },
                 'type' => 'rmacro_call'
               },
-              'location' => 'text',
-              'position' => 0,
               'sourcemark_type' => 'macro_expansion',
               'status' => 'start'
             },
@@ -1167,8 +1047,6 @@ $result_trees{'recursive_call_in_rmacro'} = {
                 },
                 'type' => 'rmacro_call'
               },
-              'location' => 'text',
-              'position' => 0,
               'sourcemark_type' => 'macro_expansion',
               'status' => 'start'
             },
@@ -1185,8 +1063,6 @@ $result_trees{'recursive_call_in_rmacro'} = {
                 },
                 'type' => 'rmacro_call'
               },
-              'location' => 'text',
-              'position' => 0,
               'sourcemark_type' => 'macro_expansion',
               'status' => 'start'
             },
@@ -1203,8 +1079,6 @@ $result_trees{'recursive_call_in_rmacro'} = {
                 },
                 'type' => 'rmacro_call'
               },
-              'location' => 'text',
-              'position' => 0,
               'sourcemark_type' => 'macro_expansion',
               'status' => 'start'
             },
@@ -1221,8 +1095,6 @@ $result_trees{'recursive_call_in_rmacro'} = {
                 },
                 'type' => 'rmacro_call'
               },
-              'location' => 'text',
-              'position' => 0,
               'sourcemark_type' => 'macro_expansion',
               'status' => 'start'
             },
@@ -1239,8 +1111,6 @@ $result_trees{'recursive_call_in_rmacro'} = {
                 },
                 'type' => 'rmacro_call'
               },
-              'location' => 'text',
-              'position' => 0,
               'sourcemark_type' => 'macro_expansion',
               'status' => 'start'
             },
@@ -1257,8 +1127,6 @@ $result_trees{'recursive_call_in_rmacro'} = {
                 },
                 'type' => 'rmacro_call'
               },
-              'location' => 'text',
-              'position' => 0,
               'sourcemark_type' => 'macro_expansion',
               'status' => 'start'
             },
@@ -1275,8 +1143,6 @@ $result_trees{'recursive_call_in_rmacro'} = {
                 },
                 'type' => 'rmacro_call'
               },
-              'location' => 'text',
-              'position' => 0,
               'sourcemark_type' => 'macro_expansion',
               'status' => 'start'
             },
@@ -1293,8 +1159,6 @@ $result_trees{'recursive_call_in_rmacro'} = {
                 },
                 'type' => 'rmacro_call'
               },
-              'location' => 'text',
-              'position' => 0,
               'sourcemark_type' => 'macro_expansion',
               'status' => 'start'
             },
@@ -1311,8 +1175,6 @@ $result_trees{'recursive_call_in_rmacro'} = {
                 },
                 'type' => 'rmacro_call'
               },
-              'location' => 'text',
-              'position' => 0,
               'sourcemark_type' => 'macro_expansion',
               'status' => 'start'
             },
@@ -1329,8 +1191,6 @@ $result_trees{'recursive_call_in_rmacro'} = {
                 },
                 'type' => 'rmacro_call'
               },
-              'location' => 'text',
-              'position' => 0,
               'sourcemark_type' => 'macro_expansion',
               'status' => 'start'
             },
@@ -1347,8 +1207,6 @@ $result_trees{'recursive_call_in_rmacro'} = {
                 },
                 'type' => 'rmacro_call'
               },
-              'location' => 'text',
-              'position' => 0,
               'sourcemark_type' => 'macro_expansion',
               'status' => 'start'
             },
@@ -1365,8 +1223,6 @@ $result_trees{'recursive_call_in_rmacro'} = {
                 },
                 'type' => 'rmacro_call'
               },
-              'location' => 'text',
-              'position' => 0,
               'sourcemark_type' => 'macro_expansion',
               'status' => 'start'
             },
@@ -1383,8 +1239,6 @@ $result_trees{'recursive_call_in_rmacro'} = {
                 },
                 'type' => 'rmacro_call'
               },
-              'location' => 'text',
-              'position' => 0,
               'sourcemark_type' => 'macro_expansion',
               'status' => 'start'
             },
@@ -1401,8 +1255,6 @@ $result_trees{'recursive_call_in_rmacro'} = {
                 },
                 'type' => 'rmacro_call'
               },
-              'location' => 'text',
-              'position' => 0,
               'sourcemark_type' => 'macro_expansion',
               'status' => 'start'
             },
@@ -1419,8 +1271,6 @@ $result_trees{'recursive_call_in_rmacro'} = {
                 },
                 'type' => 'rmacro_call'
               },
-              'location' => 'text',
-              'position' => 0,
               'sourcemark_type' => 'macro_expansion',
               'status' => 'start'
             },
@@ -1437,8 +1287,6 @@ $result_trees{'recursive_call_in_rmacro'} = {
                 },
                 'type' => 'rmacro_call'
               },
-              'location' => 'text',
-              'position' => 0,
               'sourcemark_type' => 'macro_expansion',
               'status' => 'start'
             },
@@ -1455,8 +1303,6 @@ $result_trees{'recursive_call_in_rmacro'} = {
                 },
                 'type' => 'rmacro_call'
               },
-              'location' => 'text',
-              'position' => 0,
               'sourcemark_type' => 'macro_expansion',
               'status' => 'start'
             },
@@ -1473,8 +1319,6 @@ $result_trees{'recursive_call_in_rmacro'} = {
                 },
                 'type' => 'rmacro_call'
               },
-              'location' => 'text',
-              'position' => 0,
               'sourcemark_type' => 'macro_expansion',
               'status' => 'start'
             },
@@ -1491,8 +1335,6 @@ $result_trees{'recursive_call_in_rmacro'} = {
                 },
                 'type' => 'rmacro_call'
               },
-              'location' => 'text',
-              'position' => 0,
               'sourcemark_type' => 'macro_expansion',
               'status' => 'start'
             },
@@ -1509,8 +1351,6 @@ $result_trees{'recursive_call_in_rmacro'} = {
                 },
                 'type' => 'rmacro_call'
               },
-              'location' => 'text',
-              'position' => 0,
               'sourcemark_type' => 'macro_expansion',
               'status' => 'start'
             },
@@ -1527,8 +1367,6 @@ $result_trees{'recursive_call_in_rmacro'} = {
                 },
                 'type' => 'rmacro_call'
               },
-              'location' => 'text',
-              'position' => 0,
               'sourcemark_type' => 'macro_expansion',
               'status' => 'start'
             },
@@ -1545,8 +1383,6 @@ $result_trees{'recursive_call_in_rmacro'} = {
                 },
                 'type' => 'rmacro_call'
               },
-              'location' => 'text',
-              'position' => 0,
               'sourcemark_type' => 'macro_expansion',
               'status' => 'start'
             },
@@ -1563,8 +1399,6 @@ $result_trees{'recursive_call_in_rmacro'} = {
                 },
                 'type' => 'rmacro_call'
               },
-              'location' => 'text',
-              'position' => 0,
               'sourcemark_type' => 'macro_expansion',
               'status' => 'start'
             },
@@ -1581,8 +1415,6 @@ $result_trees{'recursive_call_in_rmacro'} = {
                 },
                 'type' => 'rmacro_call'
               },
-              'location' => 'text',
-              'position' => 0,
               'sourcemark_type' => 'macro_expansion',
               'status' => 'start'
             },
@@ -1599,8 +1431,6 @@ $result_trees{'recursive_call_in_rmacro'} = {
                 },
                 'type' => 'rmacro_call'
               },
-              'location' => 'text',
-              'position' => 0,
               'sourcemark_type' => 'macro_expansion',
               'status' => 'start'
             },
@@ -1617,8 +1447,6 @@ $result_trees{'recursive_call_in_rmacro'} = {
                 },
                 'type' => 'rmacro_call'
               },
-              'location' => 'text',
-              'position' => 0,
               'sourcemark_type' => 'macro_expansion',
               'status' => 'start'
             },
@@ -1635,8 +1463,6 @@ $result_trees{'recursive_call_in_rmacro'} = {
                 },
                 'type' => 'rmacro_call'
               },
-              'location' => 'text',
-              'position' => 0,
               'sourcemark_type' => 'macro_expansion',
               'status' => 'start'
             },
@@ -1653,8 +1479,6 @@ $result_trees{'recursive_call_in_rmacro'} = {
                 },
                 'type' => 'rmacro_call'
               },
-              'location' => 'text',
-              'position' => 0,
               'sourcemark_type' => 'macro_expansion',
               'status' => 'start'
             },
@@ -1671,8 +1495,6 @@ $result_trees{'recursive_call_in_rmacro'} = {
                 },
                 'type' => 'rmacro_call'
               },
-              'location' => 'text',
-              'position' => 0,
               'sourcemark_type' => 'macro_expansion',
               'status' => 'start'
             },
@@ -1689,8 +1511,6 @@ $result_trees{'recursive_call_in_rmacro'} = {
                 },
                 'type' => 'rmacro_call'
               },
-              'location' => 'text',
-              'position' => 0,
               'sourcemark_type' => 'macro_expansion',
               'status' => 'start'
             },
@@ -1707,8 +1527,6 @@ $result_trees{'recursive_call_in_rmacro'} = {
                 },
                 'type' => 'rmacro_call'
               },
-              'location' => 'text',
-              'position' => 0,
               'sourcemark_type' => 'macro_expansion',
               'status' => 'start'
             },
@@ -1725,8 +1543,6 @@ $result_trees{'recursive_call_in_rmacro'} = {
                 },
                 'type' => 'rmacro_call'
               },
-              'location' => 'text',
-              'position' => 0,
               'sourcemark_type' => 'macro_expansion',
               'status' => 'start'
             },
@@ -1743,8 +1559,6 @@ $result_trees{'recursive_call_in_rmacro'} = {
                 },
                 'type' => 'rmacro_call'
               },
-              'location' => 'text',
-              'position' => 0,
               'sourcemark_type' => 'macro_expansion',
               'status' => 'start'
             },
@@ -1761,8 +1575,6 @@ $result_trees{'recursive_call_in_rmacro'} = {
                 },
                 'type' => 'rmacro_call'
               },
-              'location' => 'text',
-              'position' => 0,
               'sourcemark_type' => 'macro_expansion',
               'status' => 'start'
             },
@@ -1779,8 +1591,6 @@ $result_trees{'recursive_call_in_rmacro'} = {
                 },
                 'type' => 'rmacro_call'
               },
-              'location' => 'text',
-              'position' => 0,
               'sourcemark_type' => 'macro_expansion',
               'status' => 'start'
             },
@@ -1797,8 +1607,6 @@ $result_trees{'recursive_call_in_rmacro'} = {
                 },
                 'type' => 'rmacro_call'
               },
-              'location' => 'text',
-              'position' => 0,
               'sourcemark_type' => 'macro_expansion',
               'status' => 'start'
             },
@@ -1815,8 +1623,6 @@ $result_trees{'recursive_call_in_rmacro'} = {
                 },
                 'type' => 'rmacro_call'
               },
-              'location' => 'text',
-              'position' => 0,
               'sourcemark_type' => 'macro_expansion',
               'status' => 'start'
             },
@@ -1833,8 +1639,6 @@ $result_trees{'recursive_call_in_rmacro'} = {
                 },
                 'type' => 'rmacro_call'
               },
-              'location' => 'text',
-              'position' => 0,
               'sourcemark_type' => 'macro_expansion',
               'status' => 'start'
             },
@@ -1851,8 +1655,6 @@ $result_trees{'recursive_call_in_rmacro'} = {
                 },
                 'type' => 'rmacro_call'
               },
-              'location' => 'text',
-              'position' => 0,
               'sourcemark_type' => 'macro_expansion',
               'status' => 'start'
             },
@@ -1869,708 +1671,506 @@ $result_trees{'recursive_call_in_rmacro'} = {
                 },
                 'type' => 'rmacro_call'
               },
-              'location' => 'text',
-              'position' => 0,
               'sourcemark_type' => 'macro_expansion',
               'status' => 'start'
             },
             {
               'counter' => 100,
-              'location' => 'text',
-              'position' => 0,
               'sourcemark_type' => 'macro_expansion',
               'status' => 'end'
             },
             {
               'counter' => 99,
-              'location' => 'text',
-              'position' => 0,
               'sourcemark_type' => 'macro_expansion',
               'status' => 'end'
             },
             {
               'counter' => 98,
-              'location' => 'text',
-              'position' => 0,
               'sourcemark_type' => 'macro_expansion',
               'status' => 'end'
             },
             {
               'counter' => 97,
-              'location' => 'text',
-              'position' => 0,
               'sourcemark_type' => 'macro_expansion',
               'status' => 'end'
             },
             {
               'counter' => 96,
-              'location' => 'text',
-              'position' => 0,
               'sourcemark_type' => 'macro_expansion',
               'status' => 'end'
             },
             {
               'counter' => 95,
-              'location' => 'text',
-              'position' => 0,
               'sourcemark_type' => 'macro_expansion',
               'status' => 'end'
             },
             {
               'counter' => 94,
-              'location' => 'text',
-              'position' => 0,
               'sourcemark_type' => 'macro_expansion',
               'status' => 'end'
             },
             {
               'counter' => 93,
-              'location' => 'text',
-              'position' => 0,
               'sourcemark_type' => 'macro_expansion',
               'status' => 'end'
             },
             {
               'counter' => 92,
-              'location' => 'text',
-              'position' => 0,
               'sourcemark_type' => 'macro_expansion',
               'status' => 'end'
             },
             {
               'counter' => 91,
-              'location' => 'text',
-              'position' => 0,
               'sourcemark_type' => 'macro_expansion',
               'status' => 'end'
             },
             {
               'counter' => 90,
-              'location' => 'text',
-              'position' => 0,
               'sourcemark_type' => 'macro_expansion',
               'status' => 'end'
             },
             {
               'counter' => 89,
-              'location' => 'text',
-              'position' => 0,
               'sourcemark_type' => 'macro_expansion',
               'status' => 'end'
             },
             {
               'counter' => 88,
-              'location' => 'text',
-              'position' => 0,
               'sourcemark_type' => 'macro_expansion',
               'status' => 'end'
             },
             {
               'counter' => 87,
-              'location' => 'text',
-              'position' => 0,
               'sourcemark_type' => 'macro_expansion',
               'status' => 'end'
             },
             {
               'counter' => 86,
-              'location' => 'text',
-              'position' => 0,
               'sourcemark_type' => 'macro_expansion',
               'status' => 'end'
             },
             {
               'counter' => 85,
-              'location' => 'text',
-              'position' => 0,
               'sourcemark_type' => 'macro_expansion',
               'status' => 'end'
             },
             {
               'counter' => 84,
-              'location' => 'text',
-              'position' => 0,
               'sourcemark_type' => 'macro_expansion',
               'status' => 'end'
             },
             {
               'counter' => 83,
-              'location' => 'text',
-              'position' => 0,
               'sourcemark_type' => 'macro_expansion',
               'status' => 'end'
             },
             {
               'counter' => 82,
-              'location' => 'text',
-              'position' => 0,
               'sourcemark_type' => 'macro_expansion',
               'status' => 'end'
             },
             {
               'counter' => 81,
-              'location' => 'text',
-              'position' => 0,
               'sourcemark_type' => 'macro_expansion',
               'status' => 'end'
             },
             {
               'counter' => 80,
-              'location' => 'text',
-              'position' => 0,
               'sourcemark_type' => 'macro_expansion',
               'status' => 'end'
             },
             {
               'counter' => 79,
-              'location' => 'text',
-              'position' => 0,
               'sourcemark_type' => 'macro_expansion',
               'status' => 'end'
             },
             {
               'counter' => 78,
-              'location' => 'text',
-              'position' => 0,
               'sourcemark_type' => 'macro_expansion',
               'status' => 'end'
             },
             {
               'counter' => 77,
-              'location' => 'text',
-              'position' => 0,
               'sourcemark_type' => 'macro_expansion',
               'status' => 'end'
             },
             {
               'counter' => 76,
-              'location' => 'text',
-              'position' => 0,
               'sourcemark_type' => 'macro_expansion',
               'status' => 'end'
             },
             {
               'counter' => 75,
-              'location' => 'text',
-              'position' => 0,
               'sourcemark_type' => 'macro_expansion',
               'status' => 'end'
             },
             {
               'counter' => 74,
-              'location' => 'text',
-              'position' => 0,
               'sourcemark_type' => 'macro_expansion',
               'status' => 'end'
             },
             {
               'counter' => 73,
-              'location' => 'text',
-              'position' => 0,
               'sourcemark_type' => 'macro_expansion',
               'status' => 'end'
             },
             {
               'counter' => 72,
-              'location' => 'text',
-              'position' => 0,
               'sourcemark_type' => 'macro_expansion',
               'status' => 'end'
             },
             {
               'counter' => 71,
-              'location' => 'text',
-              'position' => 0,
               'sourcemark_type' => 'macro_expansion',
               'status' => 'end'
             },
             {
               'counter' => 70,
-              'location' => 'text',
-              'position' => 0,
               'sourcemark_type' => 'macro_expansion',
               'status' => 'end'
             },
             {
               'counter' => 69,
-              'location' => 'text',
-              'position' => 0,
               'sourcemark_type' => 'macro_expansion',
               'status' => 'end'
             },
             {
               'counter' => 68,
-              'location' => 'text',
-              'position' => 0,
               'sourcemark_type' => 'macro_expansion',
               'status' => 'end'
             },
             {
               'counter' => 67,
-              'location' => 'text',
-              'position' => 0,
               'sourcemark_type' => 'macro_expansion',
               'status' => 'end'
             },
             {
               'counter' => 66,
-              'location' => 'text',
-              'position' => 0,
               'sourcemark_type' => 'macro_expansion',
               'status' => 'end'
             },
             {
               'counter' => 65,
-              'location' => 'text',
-              'position' => 0,
               'sourcemark_type' => 'macro_expansion',
               'status' => 'end'
             },
             {
               'counter' => 64,
-              'location' => 'text',
-              'position' => 0,
               'sourcemark_type' => 'macro_expansion',
               'status' => 'end'
             },
             {
               'counter' => 63,
-              'location' => 'text',
-              'position' => 0,
               'sourcemark_type' => 'macro_expansion',
               'status' => 'end'
             },
             {
               'counter' => 62,
-              'location' => 'text',
-              'position' => 0,
               'sourcemark_type' => 'macro_expansion',
               'status' => 'end'
             },
             {
               'counter' => 61,
-              'location' => 'text',
-              'position' => 0,
               'sourcemark_type' => 'macro_expansion',
               'status' => 'end'
             },
             {
               'counter' => 60,
-              'location' => 'text',
-              'position' => 0,
               'sourcemark_type' => 'macro_expansion',
               'status' => 'end'
             },
             {
               'counter' => 59,
-              'location' => 'text',
-              'position' => 0,
               'sourcemark_type' => 'macro_expansion',
               'status' => 'end'
             },
             {
               'counter' => 58,
-              'location' => 'text',
-              'position' => 0,
               'sourcemark_type' => 'macro_expansion',
               'status' => 'end'
             },
             {
               'counter' => 57,
-              'location' => 'text',
-              'position' => 0,
               'sourcemark_type' => 'macro_expansion',
               'status' => 'end'
             },
             {
               'counter' => 56,
-              'location' => 'text',
-              'position' => 0,
               'sourcemark_type' => 'macro_expansion',
               'status' => 'end'
             },
             {
               'counter' => 55,
-              'location' => 'text',
-              'position' => 0,
               'sourcemark_type' => 'macro_expansion',
               'status' => 'end'
             },
             {
               'counter' => 54,
-              'location' => 'text',
-              'position' => 0,
               'sourcemark_type' => 'macro_expansion',
               'status' => 'end'
             },
             {
               'counter' => 53,
-              'location' => 'text',
-              'position' => 0,
               'sourcemark_type' => 'macro_expansion',
               'status' => 'end'
             },
             {
               'counter' => 52,
-              'location' => 'text',
-              'position' => 0,
               'sourcemark_type' => 'macro_expansion',
               'status' => 'end'
             },
             {
               'counter' => 51,
-              'location' => 'text',
-              'position' => 0,
               'sourcemark_type' => 'macro_expansion',
               'status' => 'end'
             },
             {
               'counter' => 50,
-              'location' => 'text',
-              'position' => 0,
               'sourcemark_type' => 'macro_expansion',
               'status' => 'end'
             },
             {
               'counter' => 49,
-              'location' => 'text',
-              'position' => 0,
               'sourcemark_type' => 'macro_expansion',
               'status' => 'end'
             },
             {
               'counter' => 48,
-              'location' => 'text',
-              'position' => 0,
               'sourcemark_type' => 'macro_expansion',
               'status' => 'end'
             },
             {
               'counter' => 47,
-              'location' => 'text',
-              'position' => 0,
               'sourcemark_type' => 'macro_expansion',
               'status' => 'end'
             },
             {
               'counter' => 46,
-              'location' => 'text',
-              'position' => 0,
               'sourcemark_type' => 'macro_expansion',
               'status' => 'end'
             },
             {
               'counter' => 45,
-              'location' => 'text',
-              'position' => 0,
               'sourcemark_type' => 'macro_expansion',
               'status' => 'end'
             },
             {
               'counter' => 44,
-              'location' => 'text',
-              'position' => 0,
               'sourcemark_type' => 'macro_expansion',
               'status' => 'end'
             },
             {
               'counter' => 43,
-              'location' => 'text',
-              'position' => 0,
               'sourcemark_type' => 'macro_expansion',
               'status' => 'end'
             },
             {
               'counter' => 42,
-              'location' => 'text',
-              'position' => 0,
               'sourcemark_type' => 'macro_expansion',
               'status' => 'end'
             },
             {
               'counter' => 41,
-              'location' => 'text',
-              'position' => 0,
               'sourcemark_type' => 'macro_expansion',
               'status' => 'end'
             },
             {
               'counter' => 40,
-              'location' => 'text',
-              'position' => 0,
               'sourcemark_type' => 'macro_expansion',
               'status' => 'end'
             },
             {
               'counter' => 39,
-              'location' => 'text',
-              'position' => 0,
               'sourcemark_type' => 'macro_expansion',
               'status' => 'end'
             },
             {
               'counter' => 38,
-              'location' => 'text',
-              'position' => 0,
               'sourcemark_type' => 'macro_expansion',
               'status' => 'end'
             },
             {
               'counter' => 37,
-              'location' => 'text',
-              'position' => 0,
               'sourcemark_type' => 'macro_expansion',
               'status' => 'end'
             },
             {
               'counter' => 36,
-              'location' => 'text',
-              'position' => 0,
               'sourcemark_type' => 'macro_expansion',
               'status' => 'end'
             },
             {
               'counter' => 35,
-              'location' => 'text',
-              'position' => 0,
               'sourcemark_type' => 'macro_expansion',
               'status' => 'end'
             },
             {
               'counter' => 34,
-              'location' => 'text',
-              'position' => 0,
               'sourcemark_type' => 'macro_expansion',
               'status' => 'end'
             },
             {
               'counter' => 33,
-              'location' => 'text',
-              'position' => 0,
               'sourcemark_type' => 'macro_expansion',
               'status' => 'end'
             },
             {
               'counter' => 32,
-              'location' => 'text',
-              'position' => 0,
               'sourcemark_type' => 'macro_expansion',
               'status' => 'end'
             },
             {
               'counter' => 31,
-              'location' => 'text',
-              'position' => 0,
               'sourcemark_type' => 'macro_expansion',
               'status' => 'end'
             },
             {
               'counter' => 30,
-              'location' => 'text',
-              'position' => 0,
               'sourcemark_type' => 'macro_expansion',
               'status' => 'end'
             },
             {
               'counter' => 29,
-              'location' => 'text',
-              'position' => 0,
               'sourcemark_type' => 'macro_expansion',
               'status' => 'end'
             },
             {
               'counter' => 28,
-              'location' => 'text',
-              'position' => 0,
               'sourcemark_type' => 'macro_expansion',
               'status' => 'end'
             },
             {
               'counter' => 27,
-              'location' => 'text',
-              'position' => 0,
               'sourcemark_type' => 'macro_expansion',
               'status' => 'end'
             },
             {
               'counter' => 26,
-              'location' => 'text',
-              'position' => 0,
               'sourcemark_type' => 'macro_expansion',
               'status' => 'end'
             },
             {
               'counter' => 25,
-              'location' => 'text',
-              'position' => 0,
               'sourcemark_type' => 'macro_expansion',
               'status' => 'end'
             },
             {
               'counter' => 24,
-              'location' => 'text',
-              'position' => 0,
               'sourcemark_type' => 'macro_expansion',
               'status' => 'end'
             },
             {
               'counter' => 23,
-              'location' => 'text',
-              'position' => 0,
               'sourcemark_type' => 'macro_expansion',
               'status' => 'end'
             },
             {
               'counter' => 22,
-              'location' => 'text',
-              'position' => 0,
               'sourcemark_type' => 'macro_expansion',
               'status' => 'end'
             },
             {
               'counter' => 21,
-              'location' => 'text',
-              'position' => 0,
               'sourcemark_type' => 'macro_expansion',
               'status' => 'end'
             },
             {
               'counter' => 20,
-              'location' => 'text',
-              'position' => 0,
               'sourcemark_type' => 'macro_expansion',
               'status' => 'end'
             },
             {
               'counter' => 19,
-              'location' => 'text',
-              'position' => 0,
               'sourcemark_type' => 'macro_expansion',
               'status' => 'end'
             },
             {
               'counter' => 18,
-              'location' => 'text',
-              'position' => 0,
               'sourcemark_type' => 'macro_expansion',
               'status' => 'end'
             },
             {
               'counter' => 17,
-              'location' => 'text',
-              'position' => 0,
               'sourcemark_type' => 'macro_expansion',
               'status' => 'end'
             },
             {
               'counter' => 16,
-              'location' => 'text',
-              'position' => 0,
               'sourcemark_type' => 'macro_expansion',
               'status' => 'end'
             },
             {
               'counter' => 15,
-              'location' => 'text',
-              'position' => 0,
               'sourcemark_type' => 'macro_expansion',
               'status' => 'end'
             },
             {
               'counter' => 14,
-              'location' => 'text',
-              'position' => 0,
               'sourcemark_type' => 'macro_expansion',
               'status' => 'end'
             },
             {
               'counter' => 13,
-              'location' => 'text',
-              'position' => 0,
               'sourcemark_type' => 'macro_expansion',
               'status' => 'end'
             },
             {
               'counter' => 12,
-              'location' => 'text',
-              'position' => 0,
               'sourcemark_type' => 'macro_expansion',
               'status' => 'end'
             },
             {
               'counter' => 11,
-              'location' => 'text',
-              'position' => 0,
               'sourcemark_type' => 'macro_expansion',
               'status' => 'end'
             },
             {
               'counter' => 10,
-              'location' => 'text',
-              'position' => 0,
               'sourcemark_type' => 'macro_expansion',
               'status' => 'end'
             },
             {
               'counter' => 9,
-              'location' => 'text',
-              'position' => 0,
               'sourcemark_type' => 'macro_expansion',
               'status' => 'end'
             },
             {
               'counter' => 8,
-              'location' => 'text',
-              'position' => 0,
               'sourcemark_type' => 'macro_expansion',
               'status' => 'end'
             },
             {
               'counter' => 7,
-              'location' => 'text',
-              'position' => 0,
               'sourcemark_type' => 'macro_expansion',
               'status' => 'end'
             },
             {
               'counter' => 6,
-              'location' => 'text',
-              'position' => 0,
               'sourcemark_type' => 'macro_expansion',
               'status' => 'end'
             },
             {
               'counter' => 5,
-              'location' => 'text',
-              'position' => 0,
               'sourcemark_type' => 'macro_expansion',
               'status' => 'end'
             },
             {
               'counter' => 4,
-              'location' => 'text',
-              'position' => 0,
               'sourcemark_type' => 'macro_expansion',
               'status' => 'end'
             },
             {
               'counter' => 3,
-              'location' => 'text',
-              'position' => 0,
               'sourcemark_type' => 'macro_expansion',
               'status' => 'end'
             },
             {
               'counter' => 2,
-              'location' => 'text',
-              'position' => 0,
               'sourcemark_type' => 'macro_expansion',
               'status' => 'end'
             },
             {
               'counter' => 1,
-              'location' => 'text',
-              'position' => 0,
               'sourcemark_type' => 'macro_expansion',
               'status' => 'end'
             }
diff --git a/tp/t/results/macro/redefine_texinfo_macro.pl 
b/tp/t/results/macro/redefine_texinfo_macro.pl
index 4cf12039cd..fa710471eb 100644
--- a/tp/t/results/macro/redefine_texinfo_macro.pl
+++ b/tp/t/results/macro/redefine_texinfo_macro.pl
@@ -120,8 +120,6 @@ $result_trees{'redefine_texinfo_macro'} = {
             },
             'type' => 'macro_call'
           },
-          'location' => 'text',
-          'position' => 0,
           'sourcemark_type' => 'macro_expansion',
           'status' => 'start'
         }
diff --git a/tp/t/results/macro/simple_imbricated_macro.pl 
b/tp/t/results/macro/simple_imbricated_macro.pl
index 805ef7b2fc..03fa021a64 100644
--- a/tp/t/results/macro/simple_imbricated_macro.pl
+++ b/tp/t/results/macro/simple_imbricated_macro.pl
@@ -110,7 +110,6 @@ $result_trees{'simple_imbricated_macro'} = {
                           'source_marks' => [
                             {
                               'counter' => 1,
-                              'location' => 'text',
                               'position' => 5,
                               'sourcemark_type' => 'macro_expansion',
                               'status' => 'end'
@@ -164,7 +163,6 @@ $result_trees{'simple_imbricated_macro'} = {
               'source_marks' => [
                 {
                   'counter' => 2,
-                  'location' => 'text',
                   'position' => 7,
                   'sourcemark_type' => 'macro_expansion',
                   'status' => 'end'
@@ -191,8 +189,6 @@ $result_trees{'simple_imbricated_macro'} = {
             },
             'type' => 'macro_call'
           },
-          'location' => 'text',
-          'position' => 0,
           'sourcemark_type' => 'macro_expansion',
           'status' => 'start'
         },
@@ -209,8 +205,6 @@ $result_trees{'simple_imbricated_macro'} = {
             },
             'type' => 'macro_call'
           },
-          'location' => 'text',
-          'position' => 0,
           'sourcemark_type' => 'macro_expansion',
           'status' => 'start'
         }
diff --git a/tp/t/results/macro/simple_imbricated_macro_rmacro.pl 
b/tp/t/results/macro/simple_imbricated_macro_rmacro.pl
index b5d1a76cc6..5a9a1b1d9e 100644
--- a/tp/t/results/macro/simple_imbricated_macro_rmacro.pl
+++ b/tp/t/results/macro/simple_imbricated_macro_rmacro.pl
@@ -110,7 +110,6 @@ $result_trees{'simple_imbricated_macro_rmacro'} = {
                           'source_marks' => [
                             {
                               'counter' => 1,
-                              'location' => 'text',
                               'position' => 6,
                               'sourcemark_type' => 'macro_expansion',
                               'status' => 'end'
@@ -164,7 +163,6 @@ $result_trees{'simple_imbricated_macro_rmacro'} = {
               'source_marks' => [
                 {
                   'counter' => 2,
-                  'location' => 'text',
                   'position' => 7,
                   'sourcemark_type' => 'macro_expansion',
                   'status' => 'end'
@@ -191,8 +189,6 @@ $result_trees{'simple_imbricated_macro_rmacro'} = {
             },
             'type' => 'macro_call'
           },
-          'location' => 'text',
-          'position' => 0,
           'sourcemark_type' => 'macro_expansion',
           'status' => 'start'
         },
@@ -209,8 +205,6 @@ $result_trees{'simple_imbricated_macro_rmacro'} = {
             },
             'type' => 'rmacro_call'
           },
-          'location' => 'text',
-          'position' => 0,
           'sourcemark_type' => 'macro_expansion',
           'status' => 'start'
         }
diff --git a/tp/t/results/macro/space_macro_after_end.pl 
b/tp/t/results/macro/space_macro_after_end.pl
index 83a8bec8a3..f1b17bfddd 100644
--- a/tp/t/results/macro/space_macro_after_end.pl
+++ b/tp/t/results/macro/space_macro_after_end.pl
@@ -107,14 +107,12 @@ $result_trees{'space_macro_after_end'} = {
                             },
                             'type' => 'macro_call'
                           },
-                          'location' => 'text',
                           'position' => 5,
                           'sourcemark_type' => 'macro_expansion',
                           'status' => 'start'
                         },
                         {
                           'counter' => 1,
-                          'location' => 'text',
                           'position' => 7,
                           'sourcemark_type' => 'macro_expansion',
                           'status' => 'end'
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 df02cc6b92..9e5c32e515 100644
--- a/tp/t/results/macro/space_macro_after_end_verbatim.pl
+++ b/tp/t/results/macro/space_macro_after_end_verbatim.pl
@@ -103,14 +103,12 @@ $result_trees{'space_macro_after_end_verbatim'} = {
                             },
                             'type' => 'macro_call'
                           },
-                          'location' => 'text',
                           'position' => 9,
                           'sourcemark_type' => 'macro_expansion',
                           'status' => 'start'
                         },
                         {
                           'counter' => 1,
-                          'location' => 'text',
                           'position' => 9,
                           'sourcemark_type' => 'macro_expansion',
                           'status' => 'end'
diff --git a/tp/t/results/macro/too_much_args.pl 
b/tp/t/results/macro/too_much_args.pl
index 609cbc475e..cf20a276f8 100644
--- a/tp/t/results/macro/too_much_args.pl
+++ b/tp/t/results/macro/too_much_args.pl
@@ -90,7 +90,6 @@ $result_trees{'too_much_args'} = {
               'source_marks' => [
                 {
                   'counter' => 1,
-                  'location' => 'text',
                   'position' => 22,
                   'sourcemark_type' => 'macro_expansion',
                   'status' => 'end'
@@ -120,8 +119,6 @@ $result_trees{'too_much_args'} = {
             },
             'type' => 'macro_call'
           },
-          'location' => 'text',
-          'position' => 0,
           'sourcemark_type' => 'macro_expansion',
           'status' => 'start'
         }
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 22c0fc3267..3ce1b43480 100644
--- a/tp/t/results/macro/two_macros_on_a_line.pl
+++ b/tp/t/results/macro/two_macros_on_a_line.pl
@@ -181,7 +181,6 @@ $result_trees{'two_macros_on_a_line'} = {
               'source_marks' => [
                 {
                   'counter' => 1,
-                  'location' => 'text',
                   'position' => 10,
                   'sourcemark_type' => 'macro_expansion',
                   'status' => 'end'
@@ -199,14 +198,12 @@ $result_trees{'two_macros_on_a_line'} = {
                     },
                     'type' => 'macro_call'
                   },
-                  'location' => 'text',
                   'position' => 11,
                   'sourcemark_type' => 'macro_expansion',
                   'status' => 'start'
                 },
                 {
                   'counter' => 2,
-                  'location' => 'text',
                   'position' => 21,
                   'sourcemark_type' => 'macro_expansion',
                   'status' => 'end'
@@ -230,8 +227,6 @@ $result_trees{'two_macros_on_a_line'} = {
                 },
                 'type' => 'macro_call'
               },
-              'location' => 'text',
-              'position' => 0,
               'sourcemark_type' => 'macro_expansion',
               'status' => 'start'
             }
@@ -271,7 +266,6 @@ $result_trees{'two_macros_on_a_line'} = {
               'source_marks' => [
                 {
                   'counter' => 3,
-                  'location' => 'text',
                   'position' => 10,
                   'sourcemark_type' => 'macro_expansion',
                   'status' => 'end'
@@ -289,14 +283,12 @@ $result_trees{'two_macros_on_a_line'} = {
                     },
                     'type' => 'macro_call'
                   },
-                  'location' => 'text',
                   'position' => 11,
                   'sourcemark_type' => 'macro_expansion',
                   'status' => 'start'
                 },
                 {
                   'counter' => 4,
-                  'location' => 'text',
                   'position' => 21,
                   'sourcemark_type' => 'macro_expansion',
                   'status' => 'end'
@@ -315,8 +307,6 @@ $result_trees{'two_macros_on_a_line'} = {
                 },
                 'type' => 'macro_call'
               },
-              'location' => 'text',
-              'position' => 0,
               'sourcemark_type' => 'macro_expansion',
               'status' => 'start'
             }
@@ -356,7 +346,6 @@ $result_trees{'two_macros_on_a_line'} = {
               'source_marks' => [
                 {
                   'counter' => 5,
-                  'location' => 'text',
                   'position' => 10,
                   'sourcemark_type' => 'macro_expansion',
                   'status' => 'end'
@@ -369,14 +358,12 @@ $result_trees{'two_macros_on_a_line'} = {
                     },
                     'type' => 'macro_call'
                   },
-                  'location' => 'text',
                   'position' => 11,
                   'sourcemark_type' => 'macro_expansion',
                   'status' => 'start'
                 },
                 {
                   'counter' => 6,
-                  'location' => 'text',
                   'position' => 21,
                   'sourcemark_type' => 'macro_expansion',
                   'status' => 'end'
@@ -400,8 +387,6 @@ $result_trees{'two_macros_on_a_line'} = {
                 },
                 'type' => 'macro_call'
               },
-              'location' => 'text',
-              'position' => 0,
               'sourcemark_type' => 'macro_expansion',
               'status' => 'start'
             }
@@ -449,8 +434,6 @@ in macro'
                 },
                 'type' => 'macro_call'
               },
-              'location' => 'text',
-              'position' => 0,
               'sourcemark_type' => 'macro_expansion',
               'status' => 'start'
             }
@@ -472,7 +455,6 @@ in macro'
               'source_marks' => [
                 {
                   'counter' => 7,
-                  'location' => 'text',
                   'position' => 5,
                   'sourcemark_type' => 'macro_expansion',
                   'status' => 'end'
@@ -490,14 +472,12 @@ in macro'
                     },
                     'type' => 'macro_call'
                   },
-                  'location' => 'text',
                   'position' => 6,
                   'sourcemark_type' => 'macro_expansion',
                   'status' => 'start'
                 },
                 {
                   'counter' => 8,
-                  'location' => 'text',
                   'position' => 16,
                   'sourcemark_type' => 'macro_expansion',
                   'status' => 'end'
diff --git 
a/tp/t/results/misc_commands/codequoteundirected_codequotebacktick.pl 
b/tp/t/results/misc_commands/codequoteundirected_codequotebacktick.pl
index 2321e73b39..efe28d7176 100644
--- a/tp/t/results/misc_commands/codequoteundirected_codequotebacktick.pl
+++ b/tp/t/results/misc_commands/codequoteundirected_codequotebacktick.pl
@@ -1313,8 +1313,6 @@ $result_trees{'codequoteundirected_codequotebacktick'} = {
                     },
                     'type' => 'macro_call'
                   },
-                  'location' => 'text',
-                  'position' => 0,
                   'sourcemark_type' => 'macro_expansion',
                   'status' => 'start'
                 },
@@ -1331,8 +1329,6 @@ $result_trees{'codequoteundirected_codequotebacktick'} = {
                     },
                     'type' => 'macro_call'
                   },
-                  'location' => 'text',
-                  'position' => 0,
                   'sourcemark_type' => 'macro_expansion',
                   'status' => 'start'
                 },
@@ -1349,8 +1345,6 @@ $result_trees{'codequoteundirected_codequotebacktick'} = {
                     },
                     'type' => 'macro_call'
                   },
-                  'location' => 'text',
-                  'position' => 0,
                   'sourcemark_type' => 'macro_expansion',
                   'status' => 'start'
                 },
@@ -1367,8 +1361,6 @@ $result_trees{'codequoteundirected_codequotebacktick'} = {
                     },
                     'type' => 'macro_call'
                   },
-                  'location' => 'text',
-                  'position' => 0,
                   'sourcemark_type' => 'macro_expansion',
                   'status' => 'start'
                 }
@@ -2907,8 +2899,6 @@ $result_trees{'codequoteundirected_codequotebacktick'} = {
                     },
                     'type' => 'macro_call'
                   },
-                  'location' => 'text',
-                  'position' => 0,
                   'sourcemark_type' => 'macro_expansion',
                   'status' => 'start'
                 },
@@ -2925,8 +2915,6 @@ $result_trees{'codequoteundirected_codequotebacktick'} = {
                     },
                     'type' => 'macro_call'
                   },
-                  'location' => 'text',
-                  'position' => 0,
                   'sourcemark_type' => 'macro_expansion',
                   'status' => 'start'
                 }
@@ -3314,8 +3302,6 @@ $result_trees{'codequoteundirected_codequotebacktick'} = {
                     },
                     'type' => 'macro_call'
                   },
-                  'location' => 'text',
-                  'position' => 0,
                   'sourcemark_type' => 'macro_expansion',
                   'status' => 'start'
                 }
@@ -3723,8 +3709,6 @@ $result_trees{'codequoteundirected_codequotebacktick'} = {
                     },
                     'type' => 'macro_call'
                   },
-                  'location' => 'text',
-                  'position' => 0,
                   'sourcemark_type' => 'macro_expansion',
                   'status' => 'start'
                 }
@@ -3795,8 +3779,6 @@ $result_trees{'codequoteundirected_codequotebacktick'} = {
             },
             'type' => 'macro_call'
           },
-          'location' => 'text',
-          'position' => 0,
           'sourcemark_type' => 'macro_expansion',
           'status' => 'start'
         },
@@ -3813,8 +3795,6 @@ $result_trees{'codequoteundirected_codequotebacktick'} = {
             },
             'type' => 'macro_call'
           },
-          'location' => 'text',
-          'position' => 0,
           'sourcemark_type' => 'macro_expansion',
           'status' => 'start'
         },
@@ -3831,8 +3811,6 @@ $result_trees{'codequoteundirected_codequotebacktick'} = {
             },
             'type' => 'macro_call'
           },
-          'location' => 'text',
-          'position' => 0,
           'sourcemark_type' => 'macro_expansion',
           'status' => 'start'
         },
@@ -3849,8 +3827,6 @@ $result_trees{'codequoteundirected_codequotebacktick'} = {
             },
             'type' => 'macro_call'
           },
-          'location' => 'text',
-          'position' => 0,
           'sourcemark_type' => 'macro_expansion',
           'status' => 'start'
         }
@@ -4148,8 +4124,6 @@ 
$result_sectioning{'codequoteundirected_codequotebacktick'} = {
                     },
                     'type' => 'macro_call'
                   },
-                  'location' => 'text',
-                  'position' => 0,
                   'sourcemark_type' => 'macro_expansion',
                   'status' => 'start'
                 },
@@ -4161,8 +4135,6 @@ 
$result_sectioning{'codequoteundirected_codequotebacktick'} = {
                     },
                     'type' => 'macro_call'
                   },
-                  'location' => 'text',
-                  'position' => 0,
                   'sourcemark_type' => 'macro_expansion',
                   'status' => 'start'
                 },
@@ -4174,8 +4146,6 @@ 
$result_sectioning{'codequoteundirected_codequotebacktick'} = {
                     },
                     'type' => 'macro_call'
                   },
-                  'location' => 'text',
-                  'position' => 0,
                   'sourcemark_type' => 'macro_expansion',
                   'status' => 'start'
                 },
@@ -4187,8 +4157,6 @@ 
$result_sectioning{'codequoteundirected_codequotebacktick'} = {
                     },
                     'type' => 'macro_call'
                   },
-                  'location' => 'text',
-                  'position' => 0,
                   'sourcemark_type' => 'macro_expansion',
                   'status' => 'start'
                 }
@@ -4244,8 +4212,6 @@ $result_nodes{'codequoteundirected_codequotebacktick'} = {
                 },
                 'type' => 'macro_call'
               },
-              'location' => 'text',
-              'position' => 0,
               'sourcemark_type' => 'macro_expansion',
               'status' => 'start'
             },
@@ -4257,8 +4223,6 @@ $result_nodes{'codequoteundirected_codequotebacktick'} = {
                 },
                 'type' => 'macro_call'
               },
-              'location' => 'text',
-              'position' => 0,
               'sourcemark_type' => 'macro_expansion',
               'status' => 'start'
             },
@@ -4270,8 +4234,6 @@ $result_nodes{'codequoteundirected_codequotebacktick'} = {
                 },
                 'type' => 'macro_call'
               },
-              'location' => 'text',
-              'position' => 0,
               'sourcemark_type' => 'macro_expansion',
               'status' => 'start'
             },
@@ -4283,8 +4245,6 @@ $result_nodes{'codequoteundirected_codequotebacktick'} = {
                 },
                 'type' => 'macro_call'
               },
-              'location' => 'text',
-              'position' => 0,
               'sourcemark_type' => 'macro_expansion',
               'status' => 'start'
             }
diff --git a/tp/t/results/misc_commands/kbdinputstyle.pl 
b/tp/t/results/misc_commands/kbdinputstyle.pl
index 174b9259bf..5b9e49208c 100644
--- a/tp/t/results/misc_commands/kbdinputstyle.pl
+++ b/tp/t/results/misc_commands/kbdinputstyle.pl
@@ -559,7 +559,6 @@ $result_trees{'kbdinputstyle'} = {
                       'source_marks' => [
                         {
                           'counter' => 1,
-                          'location' => 'text',
                           'position' => 7,
                           'sourcemark_type' => 'macro_expansion',
                           'status' => 'end'
@@ -1028,7 +1027,6 @@ $result_trees{'kbdinputstyle'} = {
                       'source_marks' => [
                         {
                           'counter' => 2,
-                          'location' => 'text',
                           'position' => 7,
                           'sourcemark_type' => 'macro_expansion',
                           'status' => 'end'
@@ -1488,7 +1486,6 @@ $result_trees{'kbdinputstyle'} = {
                       'source_marks' => [
                         {
                           'counter' => 3,
-                          'location' => 'text',
                           'position' => 7,
                           'sourcemark_type' => 'macro_expansion',
                           'status' => 'end'
@@ -1539,8 +1536,6 @@ $result_trees{'kbdinputstyle'} = {
             },
             'type' => 'macro_call'
           },
-          'location' => 'text',
-          'position' => 0,
           'sourcemark_type' => 'macro_expansion',
           'status' => 'start'
         },
@@ -1557,8 +1552,6 @@ $result_trees{'kbdinputstyle'} = {
             },
             'type' => 'macro_call'
           },
-          'location' => 'text',
-          'position' => 0,
           'sourcemark_type' => 'macro_expansion',
           'status' => 'start'
         },
@@ -1575,8 +1568,6 @@ $result_trees{'kbdinputstyle'} = {
             },
             'type' => 'macro_call'
           },
-          'location' => 'text',
-          'position' => 0,
           'sourcemark_type' => 'macro_expansion',
           'status' => 'start'
         }
diff --git a/tp/t/results/misc_commands/kbdinputstyle_in_table.pl 
b/tp/t/results/misc_commands/kbdinputstyle_in_table.pl
index 88d15e6464..637b96fb38 100644
--- a/tp/t/results/misc_commands/kbdinputstyle_in_table.pl
+++ b/tp/t/results/misc_commands/kbdinputstyle_in_table.pl
@@ -660,7 +660,6 @@ $result_trees{'kbdinputstyle_in_table'} = {
                       'source_marks' => [
                         {
                           'counter' => 1,
-                          'location' => 'text',
                           'position' => 7,
                           'sourcemark_type' => 'macro_expansion',
                           'status' => 'end'
@@ -1206,7 +1205,6 @@ $result_trees{'kbdinputstyle_in_table'} = {
                       'source_marks' => [
                         {
                           'counter' => 2,
-                          'location' => 'text',
                           'position' => 7,
                           'sourcemark_type' => 'macro_expansion',
                           'status' => 'end'
@@ -1744,7 +1742,6 @@ $result_trees{'kbdinputstyle_in_table'} = {
                       'source_marks' => [
                         {
                           'counter' => 3,
-                          'location' => 'text',
                           'position' => 7,
                           'sourcemark_type' => 'macro_expansion',
                           'status' => 'end'
@@ -1795,8 +1792,6 @@ $result_trees{'kbdinputstyle_in_table'} = {
             },
             'type' => 'macro_call'
           },
-          'location' => 'text',
-          'position' => 0,
           'sourcemark_type' => 'macro_expansion',
           'status' => 'start'
         },
@@ -1813,8 +1808,6 @@ $result_trees{'kbdinputstyle_in_table'} = {
             },
             'type' => 'macro_call'
           },
-          'location' => 'text',
-          'position' => 0,
           'sourcemark_type' => 'macro_expansion',
           'status' => 'start'
         },
@@ -1831,8 +1824,6 @@ $result_trees{'kbdinputstyle_in_table'} = {
             },
             'type' => 'macro_call'
           },
-          'location' => 'text',
-          'position' => 0,
           'sourcemark_type' => 'macro_expansion',
           'status' => 'start'
         }
diff --git a/tp/t/results/misc_commands/test_allowcodebreaks.pl 
b/tp/t/results/misc_commands/test_allowcodebreaks.pl
index b75fb9da2c..a53d007389 100644
--- a/tp/t/results/misc_commands/test_allowcodebreaks.pl
+++ b/tp/t/results/misc_commands/test_allowcodebreaks.pl
@@ -530,8 +530,6 @@ $result_trees{'test_allowcodebreaks'} = {
                 },
                 'type' => 'macro_call'
               },
-              'location' => 'text',
-              'position' => 0,
               'sourcemark_type' => 'macro_expansion',
               'status' => 'start'
             }
@@ -553,8 +551,6 @@ $result_trees{'test_allowcodebreaks'} = {
                 },
                 'type' => 'macro_call'
               },
-              'location' => 'text',
-              'position' => 0,
               'sourcemark_type' => 'macro_expansion',
               'status' => 'start'
             }
@@ -610,7 +606,6 @@ $result_trees{'test_allowcodebreaks'} = {
                       'source_marks' => [
                         {
                           'counter' => 2,
-                          'location' => 'text',
                           'position' => 7,
                           'sourcemark_type' => 'macro_expansion',
                           'status' => 'end'
@@ -1013,8 +1008,6 @@ $result_trees{'test_allowcodebreaks'} = {
                 },
                 'type' => 'macro_call'
               },
-              'location' => 'text',
-              'position' => 0,
               'sourcemark_type' => 'macro_expansion',
               'status' => 'start'
             }
@@ -1036,8 +1029,6 @@ $result_trees{'test_allowcodebreaks'} = {
                 },
                 'type' => 'macro_call'
               },
-              'location' => 'text',
-              'position' => 0,
               'sourcemark_type' => 'macro_expansion',
               'status' => 'start'
             }
@@ -1093,7 +1084,6 @@ $result_trees{'test_allowcodebreaks'} = {
                       'source_marks' => [
                         {
                           'counter' => 4,
-                          'location' => 'text',
                           'position' => 7,
                           'sourcemark_type' => 'macro_expansion',
                           'status' => 'end'
@@ -1954,8 +1944,6 @@ $result_trees{'test_allowcodebreaks'} = {
                 },
                 'type' => 'macro_call'
               },
-              'location' => 'text',
-              'position' => 0,
               'sourcemark_type' => 'macro_expansion',
               'status' => 'start'
             }
@@ -1977,8 +1965,6 @@ $result_trees{'test_allowcodebreaks'} = {
                 },
                 'type' => 'macro_call'
               },
-              'location' => 'text',
-              'position' => 0,
               'sourcemark_type' => 'macro_expansion',
               'status' => 'start'
             }
@@ -2034,7 +2020,6 @@ $result_trees{'test_allowcodebreaks'} = {
                       'source_marks' => [
                         {
                           'counter' => 7,
-                          'location' => 'text',
                           'position' => 7,
                           'sourcemark_type' => 'macro_expansion',
                           'status' => 'end'
diff --git a/tp/t/results/moresectioning/raiselowersections.pl 
b/tp/t/results/moresectioning/raiselowersections.pl
index 9fcbf44c65..82d08e821c 100644
--- a/tp/t/results/moresectioning/raiselowersections.pl
+++ b/tp/t/results/moresectioning/raiselowersections.pl
@@ -482,7 +482,6 @@ $result_trees{'raiselowersections'} = {
                   'macro' => ''
                 }
               },
-              'location' => 'text',
               'position' => 1,
               'sourcemark_type' => 'include',
               'status' => 'start'
@@ -952,7 +951,6 @@ $result_trees{'raiselowersections'} = {
           'source_marks' => [
             {
               'counter' => 1,
-              'location' => 'text',
               'position' => 1,
               'sourcemark_type' => 'include',
               'status' => 'end'
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 28e080a9b1..016fa11592 100644
--- a/tp/t/results/plaintext_tests/star_at_command_formatting.pl
+++ b/tp/t/results/plaintext_tests/star_at_command_formatting.pl
@@ -339,7 +339,6 @@ $result_trees{'star_at_command_formatting'} = {
               'source_marks' => [
                 {
                   'counter' => 1,
-                  'location' => 'text',
                   'position' => 13,
                   'sourcemark_type' => 'macro_expansion',
                   'status' => 'end'
@@ -584,7 +583,6 @@ $result_trees{'star_at_command_formatting'} = {
                   'source_marks' => [
                     {
                       'counter' => 2,
-                      'location' => 'text',
                       'position' => 13,
                       'sourcemark_type' => 'macro_expansion',
                       'status' => 'end'
@@ -608,8 +606,6 @@ $result_trees{'star_at_command_formatting'} = {
                     },
                     'type' => 'macro_call'
                   },
-                  'location' => 'text',
-                  'position' => 0,
                   'sourcemark_type' => 'macro_expansion',
                   'status' => 'start'
                 }
@@ -716,8 +712,6 @@ $result_trees{'star_at_command_formatting'} = {
                     },
                     'type' => 'macro_call'
                   },
-                  'location' => 'text',
-                  'position' => 0,
                   'sourcemark_type' => 'macro_expansion',
                   'status' => 'start'
                 }
@@ -909,7 +903,6 @@ $result_trees{'star_at_command_formatting'} = {
                   'source_marks' => [
                     {
                       'counter' => 3,
-                      'location' => 'text',
                       'position' => 13,
                       'sourcemark_type' => 'macro_expansion',
                       'status' => 'end'
@@ -976,8 +969,6 @@ $result_trees{'star_at_command_formatting'} = {
             },
             'type' => 'macro_call'
           },
-          'location' => 'text',
-          'position' => 0,
           'sourcemark_type' => 'macro_expansion',
           'status' => 'start'
         }
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 9aef0ea413..9a97143703 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
@@ -171,8 +171,6 @@ $result_trees{'comma_value_in_macro_arg'} = {
             },
             'type' => 'macro_call'
           },
-          'location' => 'text',
-          'position' => 0,
           'sourcemark_type' => 'macro_expansion',
           'status' => 'start'
         }
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 af73187138..2629d39f9e 100644
--- a/tp/t/results/value_and_macro/macro_in_value.pl
+++ b/tp/t/results/value_and_macro/macro_in_value.pl
@@ -117,7 +117,6 @@ $result_trees{'macro_in_value'} = {
                     },
                     'type' => 'macro_call'
                   },
-                  'location' => 'text',
                   'position' => 8,
                   'sourcemark_type' => 'macro_expansion',
                   'status' => 'start'
@@ -140,7 +139,6 @@ $result_trees{'macro_in_value'} = {
               'source_marks' => [
                 {
                   'counter' => 1,
-                  'location' => 'text',
                   'position' => 1,
                   'sourcemark_type' => 'macro_expansion',
                   'status' => 'end'
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 295afce353..858f1ac63e 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
@@ -151,8 +151,6 @@ $result_trees{'value_in_macro_body'} = {
             },
             'type' => 'macro_call'
           },
-          'location' => 'text',
-          'position' => 0,
           'sourcemark_type' => 'macro_expansion',
           'status' => 'start'
         }
diff --git a/tp/t/results/xtable/table_nested.pl 
b/tp/t/results/xtable/table_nested.pl
index 788f5fc11d..c92e7dcea1 100644
--- a/tp/t/results/xtable/table_nested.pl
+++ b/tp/t/results/xtable/table_nested.pl
@@ -664,7 +664,6 @@ $result_trees{'table_nested'} = {
                   'source_marks' => [
                     {
                       'counter' => 1,
-                      'location' => 'text',
                       'position' => 12,
                       'sourcemark_type' => 'macro_expansion',
                       'status' => 'end'
@@ -724,8 +723,6 @@ $result_trees{'table_nested'} = {
                 },
                 'type' => 'macro_call'
               },
-              'location' => 'text',
-              'position' => 0,
               'sourcemark_type' => 'macro_expansion',
               'status' => 'start'
             }
@@ -1233,7 +1230,6 @@ $result_trees{'table_nested'} = {
                   'source_marks' => [
                     {
                       'counter' => 2,
-                      'location' => 'text',
                       'position' => 12,
                       'sourcemark_type' => 'macro_expansion',
                       'status' => 'end'
@@ -1293,8 +1289,6 @@ $result_trees{'table_nested'} = {
                 },
                 'type' => 'macro_call'
               },
-              'location' => 'text',
-              'position' => 0,
               'sourcemark_type' => 'macro_expansion',
               'status' => 'start'
             }
@@ -1814,7 +1808,6 @@ $result_trees{'table_nested'} = {
                       'source_marks' => [
                         {
                           'counter' => 3,
-                          'location' => 'text',
                           'position' => 12,
                           'sourcemark_type' => 'macro_expansion',
                           'status' => 'end'
@@ -1874,8 +1867,6 @@ $result_trees{'table_nested'} = {
                     },
                     'type' => 'macro_call'
                   },
-                  'location' => 'text',
-                  'position' => 0,
                   'sourcemark_type' => 'macro_expansion',
                   'status' => 'start'
                 }



reply via email to

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